[DependencyInjection] moved up ResolveClassPass in the container pass list

fabpot · fabpot · commit 2e5b69f8d829 · 2017-01-08T10:25:16.000-08:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -39,9 +39,14 @@ public function __construct()
     {
         $this->mergePass = new MergeExtensionConfigurationPass();
 
+        $this->beforeOptimizationPasses = array(
+            100 => array(
+                $resolveClassPass = new ResolveClassPass(),
+            ),
+        );
+
         $this->optimizationPasses = array(array(
             new ExtensionCompilerPass(),
-            $resolveClassPass = new ResolveClassPass(),
             new ResolveDefinitionTemplatesPass(),
             new DecoratorServicePass(),
             new ResolveParameterPlaceHoldersPass(),
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/PassConfigTest.php
@@ -29,6 +29,8 @@ public function testPassOrdering()
         $pass2 = $this->getMockBuilder(CompilerPassInterface::class)->getMock();
         $config->addPass($pass2, PassConfig::TYPE_BEFORE_OPTIMIZATION, 30);
 
-        $this->assertSame(array($pass2, $pass1), $config->getBeforeOptimizationPasses());
+        $passes = $config->getBeforeOptimizationPasses();
+        $this->assertSame($pass2, $passes[1]);
+        $this->assertSame($pass1, $passes[2]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ public function testPassOrdering()`
`29`	`29`	`$pass2 = $this->getMockBuilder(CompilerPassInterface::class)->getMock();`
`30`	`30`	`$config->addPass($pass2, PassConfig::TYPE_BEFORE_OPTIMIZATION, 30);`
`31`	`31`
`32`		`- $this->assertSame(array($pass2, $pass1), $config->getBeforeOptimizationPasses());`
	`32`	`+ $passes = $config->getBeforeOptimizationPasses();`
	`33`	`+ $this->assertSame($pass2, $passes[1]);`
	`34`	`+ $this->assertSame($pass1, $passes[2]);`
`33`	`35`	`}`
`34`	`36`	`}`