Skip to content

enable autowiring for every discoverable service #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2017
Merged

enable autowiring for every discoverable service #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions DependencyInjection/Compiler/DiscoveryPass.php
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions HttplugBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace Http\HttplugBundle;

use Http\HttplugBundle\DependencyInjection\Compiler\DiscoveryPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;

/**
Expand All @@ -12,10 +10,4 @@
*/
class HttplugBundle extends Bundle
{
public function build(ContainerBuilder $container)
{
parent::build($container);

$container->addCompilerPass(new DiscoveryPass());
}
}
25 changes: 24 additions & 1 deletion Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,30 @@
<tag name="kernel.event_subscriber"/>
</service>

<!-- enable autowiring compatibility in Symfony 3.3+ -->
<!-- Discovery with autowiring support for Symfony 3.3+ -->
<service id="httplug.message_factory.default" class="Http\Message\MessageFactory">
<factory class="Http\Discovery\MessageFactoryDiscovery" method="find" />
</service>
<service id="Http\Message\MessageFactory" alias="httplug.message_factory" public="false" />

<service id="httplug.stream_factory.default" class="Http\Message\StreamFactory">
<factory class="Http\Discovery\StreamFactoryDiscovery" method="find" />
</service>
<service id="Http\Message\StreamFactory" alias="httplug.stream_factory" public="false" />

<service id="httplug.uri_factory.default" class="Http\Message\UriFactory">
<factory class="Http\Discovery\UriFactoryDiscovery" method="find" />
</service>
<service id="Http\Message\UriFactory" alias="httplug.uri_factory" public="false" />

<service id="httplug.async_client.default" class="Http\Client\HttpAsyncClient">
<factory class="Http\Discovery\HttpAsyncClientDiscovery" method="find" />
</service>
<service id="Http\Client\HttpAsyncClient" alias="httplug.async_client.default" public="false" />

<service id="httplug.client.default" class="Http\Client\HttpClient">
<factory class="Http\Discovery\HttpClientDiscovery" method="find" />
</service>
<service id="Http\Client\HttpClient" alias="httplug.client" public="false" />

<!-- ClientFactories -->
Expand Down
34 changes: 24 additions & 10 deletions ...yInjection/Compiler/DiscoveryPassTest.php → Tests/Functional/DiscoveryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,58 @@

namespace Http\HttplugBundle\Tests\Unit\DependencyInjection\Compiler;

use Http\Client\HttpAsyncClient;
use Http\Client\HttpClient;
use Http\HttplugBundle\DependencyInjection\Compiler\DiscoveryPass;
use Http\HttplugBundle\DependencyInjection\HttplugExtension;
use Http\Message\MessageFactory;
use Http\Message\StreamFactory;
use Http\Message\UriFactory;
use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractCompilerPassTestCase;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
use Symfony\Component\DependencyInjection\Definition;

/**
* @author Márk Sági-Kazár <mark.sagikazar@gmail.com>
*/
final class DiscoveryPassTest extends AbstractCompilerPassTestCase
final class DiscoveryTest extends AbstractExtensionTestCase
{
protected function registerCompilerPass(ContainerBuilder $container)
protected function setUp()
{
$container->addCompilerPass(new DiscoveryPass());
parent::setUp();

$this->setParameter('kernel.debug', true);
}

/**
* {@inheritdoc}
*/
protected function getContainerExtensions()
{
return [
new HttplugExtension(),
];
}

public function testDiscoveryFallbacks()
{
$this->compile();
$this->load();

$this->assertContainerBuilderHasService('httplug.client.default', HttpClient::class);
$this->assertContainerBuilderHasService('httplug.message_factory.default', MessageFactory::class);
$this->assertContainerBuilderHasService('httplug.uri_factory.default', UriFactory::class);
$this->assertContainerBuilderHasService('httplug.stream_factory.default', StreamFactory::class);
$this->assertContainerBuilderHasService('httplug.async_client.default', HttpAsyncClient::class);
}

public function testDiscoveryPartialFallbacks()
{
$this->load();
$this->setDefinition('httplug.client.default', new Definition('Http\Adapter\Guzzle6\Client'));

$this->compile();

$this->assertContainerBuilderHasService('httplug.client.default', 'Http\Adapter\Guzzle6\Client');
$this->assertContainerBuilderHasService('httplug.message_factory.default', MessageFactory::class);
$this->assertContainerBuilderHasService('httplug.uri_factory.default', UriFactory::class);
$this->assertContainerBuilderHasService('httplug.stream_factory.default', StreamFactory::class);
$this->assertContainerBuilderHasService('httplug.async_client.default', HttpAsyncClient::class);
}

public function testNoDiscoveryFallbacks()
Expand All @@ -49,7 +62,8 @@ public function testNoDiscoveryFallbacks()
$this->setDefinition('httplug.message_factory.default', new Definition(MessageFactory::class));
$this->setDefinition('httplug.uri_factory.default', new Definition(UriFactory::class));
$this->setDefinition('httplug.stream_factory.default', new Definition(StreamFactory::class));
$this->setDefinition('httplug.async_client.default', new Definition(HttpAsyncClient::class));

$this->compile();
$this->load();
}
}