diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
-------

8264a9e398 [HttpKernel] Fix loading legacy 3.3 containers in 3.4 context
This commit is contained in:
Fabien Potencier 2017-08-30 07:45:04 -07:00
commit b3d31e9d80
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/HttpKernel/Kernel.php
View File

@ -598,9 +598,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
}
}
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());