bug #24040 [HttpKernel] Fix loading legacy 3.3 containers in 3.4 context (nicolas-grekas)

fabpot · fabpot · commit b3d31e9d80c5 · 2017-08-30T07:45:04.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Fix loading legacy 3.3 containers in 3.4 context | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - When moving from 3.3 to 3.4, if a dumped container exists, an exception is triggered because "include" returns "1". ping @umpirsky Commits ------- 8264a9e [HttpKernel] Fix loading legacy 3.3 containers in 3.4 context
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`