minor #29645 Allow running PHPUnit with "xdebug.scream" ON (nico-incubiq)

nicolas-grekas · nicolas-grekas · commit c0cf123eee6d · 2018-12-19T19:59:13.000+01:00
This PR was submitted for the master branch but it was merged into the 3.4 branch instead (closes #29645). Discussion ---------- Allow running PHPUnit with "xdebug.scream" ON | 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 |  Since #25733 the Kernel attempts to unlink the legacy container while being built. This throws an error if the file did not exist, for example on a clean install, on the build, which is then silenced. That's fine on production systems, but on our build we have enabled `xdebug.scream` in order to visualise every errors, which basically un-silences the errors. I believe there should not be a need to silence anything on a usual, clean usage of the system. Making this `unlink` conditional fixes it. Could you please approve and merge this PR? Thanks Commits ------- 7a7165e Allow running PHPUnit with "xdebug.scream" ON
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -862,7 +862,10 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $fs->dumpFile($dir.$file, $code);
             @chmod($dir.$file, 0666 & ~umask());
         }
-        @unlink(\dirname($dir.$file).'.legacy');
+        $legacyFile = \dirname($dir.$file).'.legacy';
+        if (file_exists($legacyFile)) {
+            @unlink($legacyFile);
+        }
 
         $cache->write($rootCode, $container->getResources());
     }

Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,10 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`862`	`862`	`$fs->dumpFile($dir.$file, $code);`
`863`	`863`	`@chmod($dir.$file, 0666 & ~umask());`
`864`	`864`	`}`
`865`		`- @unlink(\dirname($dir.$file).'.legacy');`
	`865`	`+ $legacyFile = \dirname($dir.$file).'.legacy';`
	`866`	`+ if (file_exists($legacyFile)) {`
	`867`	`+ @unlink($legacyFile);`
	`868`	`+ }`
`866`	`869`
`867`	`870`	`$cache->write($rootCode, $container->getResources());`
`868`	`871`	`}`