bug #25733 [HttpKernel] Fix compile error when a legacy container is fresh again (nicolas-grekas)

fabpot · fabpot · commit eac7e19eb31e · 2018-01-10T07:23:11.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] Fix compile error when a legacy container is fresh again | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25654 | License | MIT | Doc PR | - Noticed by @jpauli again: when reverting some configuration changes ends up generating the same container as the previously legacy one, the legacy flag should be removed. Commits ------- 8c3eadb [HttpKernel] Fix compile error when a legacy container is fresh again
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -851,6 +851,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $fs->dumpFile($dir.$file, $code);
             @chmod($dir.$file, 0666 & ~umask());
         }
+        @unlink(dirname($dir.$file).'.legacy');
 
         $cache->write($rootCode, $container->getResources());
     }

Original file line number	Diff line number	Diff line change
`@@ -851,6 +851,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`851`	`851`	`$fs->dumpFile($dir.$file, $code);`
`852`	`852`	`@chmod($dir.$file, 0666 & ~umask());`
`853`	`853`	`}`
	`854`	`+ @unlink(dirname($dir.$file).'.legacy');`
`854`	`855`
`855`	`856`	`$cache->write($rootCode, $container->getResources());`
`856`	`857`	`}`