Adding back ContainerBuilderAwareLoader::getResourceLoader()

weaverryan · weaverryan · commit 92e419decb5b · 2015-09-17T20:51:16.000-04:00
This allows us to pass configureServices() the original, unwrapper loader, which could
be useful if you've chosen to use a different LoaderInterface concrete implementation
with custom methods. You should have access to this.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/ContainerBuilderAwareLoader.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/ContainerBuilderAwareLoader.php
@@ -49,6 +49,14 @@ public function getContainerBuilder()
         return $this->containerBuilder;
     }
 
+    /**
+     * @return LoaderInterface
+     */
+    public function getResourceLoader()
+    {
+        return $this->resourceLoader;
+    }
+
     /**
      * @see {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernel.php
@@ -99,7 +99,6 @@ public function registerContainerConfiguration(LoaderInterface $loader)
 
         /* @var ContainerBuilderAwareLoader $loader */
         $builder = $loader->getContainerBuilder();
-        $loader = $loader->getResourceLoader();
 
         // load the bundle configuration
         foreach ($this->bundleConfiguration as $bundleName => $configuration) {
@@ -115,7 +114,7 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         // allow the kernel to configure its services
         $this->configureServices(
             $builder,
-            $loader
+            $loader->getResourceLoader()
         );
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Kernel/MicroKernelForTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Kernel/MicroKernelForTest.php
@@ -23,6 +23,8 @@ class MicroKernelForTest extends MicroKernel
 
     private $configureServicesCalled = false;
 
+    private $configureServicesArgs = array();
+
     public function addBundleExternally(BundleInterface $bundle, $configuration = array())
     {
         $this->addBundle($bundle, $configuration);
@@ -45,6 +47,8 @@ protected function configureBundles()
 
     protected function configureServices(ContainerBuilder $c, LoaderInterface $loader)
     {
+        $this->configureServicesArgs = array($c, $loader);
+
         $this->configureServicesCalled = true;
     }
 
@@ -57,4 +61,9 @@ public function wasConfigureServicesCalled()
     {
         return $this->configureServicesCalled;
     }
+
+    public function getConfigureServicesArguments()
+    {
+        return $this->configureServicesArgs;
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/MicroKernelTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/MicroKernelTest.php
@@ -87,6 +87,8 @@ public function testRegisterContainerConfiguration()
         $kernel->registerContainerConfiguration($loader);
 
         $this->assertTrue($kernel->wasConfigureServicesCalled());
+        $configureServicesArgs = $kernel->getConfigureServicesArguments();
+        $this->assertSame($loader->getResourceLoader(), $configureServicesArgs[1], 'The original loader is sent to configureServices');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@ class MicroKernelForTest extends MicroKernel`
`23`	`23`
`24`	`24`	`private $configureServicesCalled = false;`
`25`	`25`
	`26`	`+ private $configureServicesArgs = array();`
	`27`	`+`
`26`	`28`	`public function addBundleExternally(BundleInterface $bundle, $configuration = array())`
`27`	`29`	`{`
`28`	`30`	`$this->addBundle($bundle, $configuration);`
`@@ -45,6 +47,8 @@ protected function configureBundles()`
`45`	`47`
`46`	`48`	`protected function configureServices(ContainerBuilder $c, LoaderInterface $loader)`
`47`	`49`	`{`
	`50`	`+ $this->configureServicesArgs = array($c, $loader);`
	`51`	`+`
`48`	`52`	`$this->configureServicesCalled = true;`
`49`	`53`	`}`
`50`	`54`
`@@ -57,4 +61,9 @@ public function wasConfigureServicesCalled()`
`57`	`61`	`{`
`58`	`62`	`return $this->configureServicesCalled;`
`59`	`63`	`}`
	`64`	`+`
	`65`	`+ public function getConfigureServicesArguments()`
	`66`	`+ {`
	`67`	`+ return $this->configureServicesArgs;`
	`68`	`+ }`
`60`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ public function testRegisterContainerConfiguration()`
`87`	`87`	`$kernel->registerContainerConfiguration($loader);`
`88`	`88`
`89`	`89`	`$this->assertTrue($kernel->wasConfigureServicesCalled());`
	`90`	`+ $configureServicesArgs = $kernel->getConfigureServicesArguments();`
	`91`	`+ $this->assertSame($loader->getResourceLoader(), $configureServicesArgs[1], 'The original loader is sent to configureServices');`
`90`	`92`	`}`
`91`	`93`
`92`	`94`	`/**`