From a2eb62dfcee0d76b422ac67a3938d3490323a429 Mon Sep 17 00:00:00 2001 From: Richard van Laak Date: Thu, 4 Jun 2015 10:53:20 +0200 Subject: [PATCH] 2.7 Definition deprecation fix --- .../DependencyInjection/Driver/AbstractDatabaseDriver.php | 6 ++---- .../DependencyInjection/Driver/DoctrineODMDriver.php | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDatabaseDriver.php b/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDatabaseDriver.php index 96e54f9e4e..51f4e0367b 100644 --- a/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDatabaseDriver.php +++ b/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/AbstractDatabaseDriver.php @@ -126,8 +126,7 @@ abstract class AbstractDatabaseDriver implements DatabaseDriverInterface { $definition = new Definition(new Parameter('sylius.controller.configuration.class')); $definition - ->setFactoryService('sylius.controller.configuration_factory') - ->setFactoryMethod('createConfiguration') + ->setFactory(array(new Reference('sylius.controller.configuration_factory'), 'createConfiguration')) ->setArguments(array($this->prefix, $this->resourceName, $this->templates)) ->setPublic(false) ; @@ -188,8 +187,7 @@ abstract class AbstractDatabaseDriver implements DatabaseDriverInterface { $definition = new Definition($this->getClassMetadataClassname()); $definition - ->setFactoryService($this->getManagerServiceKey()) - ->setFactoryMethod('getClassMetadata') + ->setFactory(array(new Reference($this->getManagerServiceKey()), 'getClassMetadata')) ->setArguments(array($models)) ->setPublic(false) ; diff --git a/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/DoctrineODMDriver.php b/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/DoctrineODMDriver.php index a8a22c427e..95ad84838c 100644 --- a/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/DoctrineODMDriver.php +++ b/src/Sylius/Bundle/ResourceBundle/DependencyInjection/Driver/DoctrineODMDriver.php @@ -49,8 +49,7 @@ class DoctrineODMDriver extends AbstractDatabaseDriver $unitOfWorkDefinition = new Definition('Doctrine\\ODM\\MongoDB\\UnitOfWork'); $unitOfWorkDefinition - ->setFactoryService($this->getManagerServiceKey()) - ->setFactoryMethod('getUnitOfWork') + ->setFactory(array(new Reference($this->getManagerServiceKey()), 'getUnitOfWork')) ->setPublic(false); $definition = new Definition($repositoryClass);