[HttpKernel] Fix loading legacy 3.3 containers in 3.4 context

nicolas-grekas · nicolas-grekas · commit 8264a9e3983c · 2017-08-30T16:25:32.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -598,9 +598,7 @@ protected function initializeContainer()
                 }
             }
 
-            if ($oldContainer = file_exists($cache->getPath()) ? @include $cache->getPath() : false) {
-                $oldContainer = new \ReflectionClass($oldContainer);
-            }
+            $oldContainer = file_exists($cache->getPath()) && is_object($oldContainer = @include $cache->getPath()) ? new \ReflectionClass($oldContainer) : false;
 
             $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
 

Original file line number	Diff line number	Diff line change
`@@ -598,9 +598,7 @@ protected function initializeContainer()`
`598`	`598`	`}`
`599`	`599`	`}`
`600`	`600`
`601`		`- if ($oldContainer = file_exists($cache->getPath()) ? @include $cache->getPath() : false) {`
`602`		`- $oldContainer = new \ReflectionClass($oldContainer);`
`603`		`- }`
	`601`	`+ $oldContainer = file_exists($cache->getPath()) && is_object($oldContainer = @include $cache->getPath()) ? new \ReflectionClass($oldContainer) : false;`
`604`	`602`
`605`	`603`	`$this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());`
`606`	`604`