Skip to content
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

Jump to bottom

Add autowiring for Doctrine\DBAL\Connection #685

Merged
merged 2 commits into from
Aug 25, 2017
Merged

Add autowiring for Doctrine\DBAL\Connection #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d44c45
Add autowiring for Doctrine\DBAL\Connection
stof Aug 9, 2017
ac74c82
Add a test ensuring autowiring aliases are there.
stof Aug 11, 2017
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
1 change: 1 addition & 0 deletions Resources/config/dbal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

<services>
<service id="Doctrine\DBAL\Driver\Connection" alias="database_connection" public="false" />
<service id="Doctrine\DBAL\Connection" alias="database_connection" public="false" />

<service id="doctrine.dbal.logger.chain" class="%doctrine.dbal.logger.chain.class%" public="false" abstract="true">
<call method="addLogger">
Expand Down
30 changes: 29 additions & 1 deletion Tests/DependencyInjection/DoctrineExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@

use Doctrine\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
use Doctrine\Bundle\DoctrineBundle\Tests\Builder\BundleConfigurationBuilder;
use Doctrine\Common\Persistence\ManagerRegistry;
use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\Common\Proxy\AbstractProxyFactory;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\Driver\Connection as DriverConnection;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Version;
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
Expand All @@ -28,6 +32,30 @@

class DoctrineExtensionTest extends TestCase
{
public function testAutowiringAlias()
{
$container = $this->getContainer();
$extension = new DoctrineExtension();
$config = BundleConfigurationBuilder::createBuilderWithBaseValues()->build();

$extension->load(array($config), $container);

$expectedAliases = array(
DriverConnection::class => 'database_connection',
Connection::class => 'database_connection',
ManagerRegistry::class => 'doctrine',
ObjectManager::class => 'doctrine.orm.entity_manager',
EntityManagerInterface::class => 'doctrine.orm.entity_manager',
);

foreach ($expectedAliases as $id => $target) {
$this->assertTrue($container->hasAlias($id), sprintf('The container should have a `%s` alias for autowiring support.', $id));

$alias = $container->getAlias($id);
$this->assertEquals($target, (string) $alias, sprintf('The autowiring for `%s` should use `%s`.', $id, $target));
$this->assertFalse($alias->isPublic(), sprintf('The autowiring alias for `%s` should be private.', $id, $target));
}
}

public function testDbalGenerateDefaultConnectionConfiguration()
{
Expand Down Expand Up @@ -782,4 +810,4 @@ private function compileContainer(ContainerBuilder $container)

}

class TestWrapperClass extends Connection {}
class TestWrapperClass extends Connection {}