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

Require PHP 7.1 #668

Merged
merged 3 commits into from
Jun 1, 2017
Merged

Require PHP 7.1 #668

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72e716f
Require PHP 7
alcaeus May 31, 2017
0a3f150
Use ChildDefinition class when available
alcaeus May 31, 2017
9f9360c
Drop PHP 7.0
alcaeus Jun 1, 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
Prev Previous commit
Next Next commit
Use ChildDefinition class when available
  • Loading branch information
@alcaeus
alcaeus committed May 31, 2017
commit 0a3f1504355ad2f621af3bd608821fecb686944d
28 changes: 20 additions & 8 deletions DependencyInjection/DoctrineExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\DefinitionDecorator;
use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
use Symfony\Component\Config\FileLocator;
Expand Down Expand Up @@ -139,20 +140,22 @@ protected function dbalLoad(array $config, ContainerBuilder $container)
protected function loadDbalConnection($name, array $connection, ContainerBuilder $container)
{
// configuration
$configuration = $container->setDefinition(sprintf('doctrine.dbal.%s_connection.configuration', $name), new DefinitionDecorator('doctrine.dbal.connection.configuration'));
$defitionClassname = $this->getDefinitionClassname();

$configuration = $container->setDefinition(sprintf('doctrine.dbal.%s_connection.configuration', $name), new $defitionClassname('doctrine.dbal.connection.configuration'));
$logger = null;
if ($connection['logging']) {
$logger = new Reference('doctrine.dbal.logger');
}
unset ($connection['logging']);
if ($connection['profiling']) {
$profilingLoggerId = 'doctrine.dbal.logger.profiling.'.$name;
$container->setDefinition($profilingLoggerId, new DefinitionDecorator('doctrine.dbal.logger.profiling'));
$container->setDefinition($profilingLoggerId, new $defitionClassname('doctrine.dbal.logger.profiling'));
$profilingLogger = new Reference($profilingLoggerId);
$container->getDefinition('data_collector.doctrine')->addMethodCall('addLogger', array($name, $profilingLogger));

if (null !== $logger) {
$chainLogger = new DefinitionDecorator('doctrine.dbal.logger.chain');
$chainLogger = new $defitionClassname('doctrine.dbal.logger.chain');
$chainLogger->addMethodCall('addLogger', array($profilingLogger));

$loggerId = 'doctrine.dbal.logger.chain.'.$name;
Expand Down Expand Up @@ -181,13 +184,13 @@ protected function loadDbalConnection($name, array $connection, ContainerBuilder
}

// event manager
$container->setDefinition(sprintf('doctrine.dbal.%s_connection.event_manager', $name), new DefinitionDecorator('doctrine.dbal.connection.event_manager'));
$container->setDefinition(sprintf('doctrine.dbal.%s_connection.event_manager', $name), new $defitionClassname('doctrine.dbal.connection.event_manager'));

// connection
$options = $this->getConnectionOptions($connection);

$def = $container
->setDefinition(sprintf('doctrine.dbal.%s_connection', $name), new DefinitionDecorator('doctrine.dbal.connection'))
->setDefinition(sprintf('doctrine.dbal.%s_connection', $name), new $defitionClassname('doctrine.dbal.connection'))
->setArguments(array(
$options,
new Reference(sprintf('doctrine.dbal.%s_connection.configuration', $name)),
Expand Down Expand Up @@ -373,7 +376,8 @@ protected function ormLoad(array $config, ContainerBuilder $container)
*/
protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $container)
{
$ormConfigDef = $container->setDefinition(sprintf('doctrine.orm.%s_configuration', $entityManager['name']), new DefinitionDecorator('doctrine.orm.configuration'));
$definitionClassname = $this->getDefinitionClassname();
$ormConfigDef = $container->setDefinition(sprintf('doctrine.orm.%s_configuration', $entityManager['name']), new $definitionClassname('doctrine.orm.configuration'));

$this->loadOrmEntityManagerMappingInformation($entityManager, $ormConfigDef, $container);
$this->loadOrmCacheDrivers($entityManager, $container);
Expand Down Expand Up @@ -463,7 +467,7 @@ protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $

$managerConfiguratorName = sprintf('doctrine.orm.%s_manager_configurator', $entityManager['name']);
$container
->setDefinition($managerConfiguratorName, new DefinitionDecorator('doctrine.orm.manager_configurator.abstract'))
->setDefinition($managerConfiguratorName, new $definitionClassname('doctrine.orm.manager_configurator.abstract'))
->replaceArgument(0, $enabledFilters)
->replaceArgument(1, $filtersParameters)
;
Expand All @@ -473,7 +477,7 @@ protected function loadOrmEntityManager(array $entityManager, ContainerBuilder $
}

$container
->setDefinition(sprintf('doctrine.orm.%s_entity_manager', $entityManager['name']), new DefinitionDecorator('doctrine.orm.entity_manager.abstract'))
->setDefinition(sprintf('doctrine.orm.%s_entity_manager', $entityManager['name']), new $definitionClassname('doctrine.orm.entity_manager.abstract'))
->setArguments(array(
new Reference(sprintf('doctrine.dbal.%s_connection', $entityManager['connection'])),
new Reference(sprintf('doctrine.orm.%s_configuration', $entityManager['name'])),
Expand Down Expand Up @@ -790,4 +794,12 @@ public function getConfiguration(array $config, ContainerBuilder $container)
{
return new Configuration($container->getParameter('kernel.debug'));
}

/**
* @return string
*/
private function getDefinitionClassname(): string
{
return class_exists(ChildDefinition::class) ? ChildDefinition::class : DefinitionDecorator::class;
}
}