[2.6] cleanup deprecated uses

Author: nicolas-grekas

Compiler/AnalyzeServiceReferencesPass.php

@@ -74,16 +74,16 @@ public function process(ContainerBuilder $container)
             if ($definition->getFactoryService()) {
                 $this->processArguments(array(new Reference($definition->getFactoryService())));
             }
+            if (is_array($definition->getFactory())) {
+                $this->processArguments($definition->getFactory());
+            }
 
             if (!$this->onlyConstructorArguments) {
                 $this->processArguments($definition->getMethodCalls());
                 $this->processArguments($definition->getProperties());
                 if ($definition->getConfigurator()) {
                     $this->processArguments(array($definition->getConfigurator()));
                 }
-                if ($definition->getFactory()) {
-                    $this->processArguments(array($definition->getFactory()));
-                }
             }
         }
 
@@ -115,6 +115,9 @@ private function processArguments(array $arguments)
                 $this->processArguments($argument->getMethodCalls());
                 $this->processArguments($argument->getProperties());
 
+                if (is_array($argument->getFactory())) {
+                    $this->processArguments($argument->getFactory());
+                }
                 if ($argument->getFactoryService()) {
                     $this->processArguments(array(new Reference($argument->getFactoryService())));
                 }

Compiler/InlineServiceDefinitionsPass.php

@@ -144,6 +144,10 @@ private function isInlineableDefinition(ContainerBuilder $container, $id, Defini
             return false;
         }
 
+        if (count($ids) > 1 && is_array($factory = $definition->getFactory()) && ($factory[0] instanceof Reference || $factory[0] instanceof Definition)) {
+            return false;
+        }
+
         if (count($ids) > 1 && $definition->getFactoryService()) {
             return false;
         }

Compiler/ResolveDefinitionTemplatesPass.php

@@ -81,11 +81,9 @@ private function resolveDefinition($id, DefinitionDecorator $definition)
         $def->setArguments($parentDef->getArguments());
         $def->setMethodCalls($parentDef->getMethodCalls());
         $def->setProperties($parentDef->getProperties());
-        if (null !== $parentDef->getFactoryMethod()) {
-            $def->setFactoryClass($parentDef->getFactoryClass());
-            $def->setFactoryMethod($parentDef->getFactoryMethod());
-            $def->setFactoryService($parentDef->getFactoryService());
-        }
+        $def->setFactoryClass($parentDef->getFactoryClass());
+        $def->setFactoryMethod($parentDef->getFactoryMethod());
+        $def->setFactoryService($parentDef->getFactoryService());
         $def->setFactory($parentDef->getFactory());
         $def->setConfigurator($parentDef->getConfigurator());
         $def->setFile($parentDef->getFile());

Tests/Compiler/AnalyzeServiceReferencesPassTest.php

@@ -87,7 +87,7 @@ public function testProcessDetectsReferencesFromInlinedFactoryDefinitions()
         ;
 
         $factory = new Definition();
-        $factory->setFactoryService('a');
+        $factory->setFactory(array(new Reference('a'), 'a'));
 
         $container
             ->register('b')
@@ -124,13 +124,11 @@ public function testProcessDetectsFactoryReferences()
 
         $container
             ->register('foo', 'stdClass')
-            ->setFactoryClass('stdClass')
-            ->setFactoryMethod('getInstance');
+            ->setFactory(array('stdClass', 'getInstance'));
 
         $container
             ->register('bar', 'stdClass')
-            ->setFactoryService('foo')
-            ->setFactoryMethod('getInstance');
+            ->setFactory(array(new Reference('foo'), 'getInstance'));
 
         $graph = $this->process($container);
 

Tests/Compiler/CheckCircularReferencesPassTest.php

@@ -53,13 +53,11 @@ public function testProcessWithFactory()
 
         $container
             ->register('a', 'stdClass')
-            ->setFactoryService('b')
-            ->setFactoryMethod('getInstance');
+            ->setFactory(array(new Reference('b'), 'getInstance'));
 
         $container
             ->register('b', 'stdClass')
-            ->setFactoryService('a')
-            ->setFactoryMethod('getInstance');
+            ->setFactory(array(new Reference('a'), 'getInstance'));
 
         $this->process($container);
     }
@@ -88,8 +86,7 @@ public function testProcessDetectsIndirectCircularReferenceWithFactory()
 
         $container
             ->register('b', 'stdClass')
-            ->setFactoryService('c')
-            ->setFactoryMethod('getInstance');
+            ->setFactory(array(new Reference('c'), 'getInstance'));
 
         $container->register('c')->addArgument(new Reference('a'));
 

Tests/Compiler/InlineServiceDefinitionsPassTest.php

@@ -118,7 +118,7 @@ public function testProcessInlinesPrivateFactoryReference()
         $b = $container
             ->register('b')
             ->setPublic(false)
-            ->setFactoryService('a')
+            ->setFactory(array(new Reference('a'), 'a'))
         ;
 
         $container
@@ -142,7 +142,7 @@ public function testProcessDoesNotInlinePrivateFactoryIfReferencedMultipleTimesW
         $container
             ->register('b')
             ->setPublic(false)
-            ->setFactoryService('a')
+            ->setFactory(array(new Reference('a'), 'a'))
         ;
 
         $container
@@ -168,12 +168,12 @@ public function testProcessDoesNotInlineReferenceWhenUsedByInlineFactory()
         $container
             ->register('b')
             ->setPublic(false)
-            ->setFactoryService('a')
+            ->setFactory(array(new Reference('a'), 'a'))
         ;
 
         $inlineFactory = new Definition();
         $inlineFactory->setPublic(false);
-        $inlineFactory->setFactoryService('b');
+        $inlineFactory->setFactory(array(new Reference('b'), 'b'));
 
         $container
             ->register('foo')

Tests/Compiler/RemoveUnusedDefinitionsPassTest.php

@@ -86,14 +86,12 @@ public function testProcessWontRemovePrivateFactory()
 
         $container
             ->register('foo', 'stdClass')
-            ->setFactoryClass('stdClass')
-            ->setFactoryMethod('getInstance')
+            ->setFactory(array('stdClass', 'getInstance'))
             ->setPublic(false);
 
         $container
             ->register('bar', 'stdClass')
-            ->setFactoryService('foo')
-            ->setFactoryMethod('getInstance')
+            ->setFactory(array(new Reference('foo'), 'getInstance'))
             ->setPublic(false);
 
         $container

Tests/LegacyContainerBuilderTest.php

@@ -16,6 +16,11 @@
 
 class LegacyContainerBuilderTest extends \PHPUnit_Framework_TestCase
 {
+    public function setUp()
+    {
+        $this->iniSet('error_reporting', -1 & E_USER_DEPRECATED);
+    }
+
     /**
      * @covers Symfony\Component\DependencyInjection\ContainerBuilder::createService
      */