bug #38343 Revert "bug #38063 [FrameworkBundle] generate preload.php in src/ to make opcache.preload predictable" (nicolas-grekas)

fabpot · fabpot · commit c4015edcfb10 · 2020-09-30T07:26:25.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- Revert "bug #38063 [FrameworkBundle] generate preload.php in src/ to make opcache.preload predictable" | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38334 | License | MIT | Doc PR | - As discussed in the linked issue, let's replace this with a recipe: symfony/recipes#825 TL;DR, these PRs replace `src/.preload.php` (generated) by `config/preload.php` (committed). Commits ------- 662fcff Revert "bug #38063 [FrameworkBundle] generate preload.php in src/ to make opcache.preload predictable (nicolas-grekas)"
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -170,20 +170,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
         }
 
-        $kernelDir = \dirname((new \ReflectionObject($kernel))->getFileName());
-        $preloadFile = $fs->makePathRelative(\dirname($containerFile, 2), $kernelDir);
-        $preloadFile .= substr_replace(basename($containerFile), '.preload', -4, 0);
-        $preloadFile = var_export('/'.$preloadFile, true);
-        @file_put_contents($kernelDir.'/.preload.php', <<<EOPHP
-<?php
-
-if (file_exists(__DIR__.$preloadFile)) {
-    require __DIR__.$preloadFile;
-}
-
-EOPHP
-        );
-
         if ($output->isVerbose()) {
             $io->comment('Finished');
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
@@ -38,7 +38,6 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $this->fs->remove($this->kernel->getProjectDir());
-        $this->fs->remove(__DIR__.'/Fixture/.preload.php');
     }
 
     public function testCacheIsFreshAfterCacheClearedWithWarmup()
@@ -83,7 +82,5 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()
         $containerRef = new \ReflectionClass(require $containerFile);
         $containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());
         $this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s*=>\s*\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');
-
-        $this->assertFileEquals(__DIR__.'/Fixture/preload.php.expected', __DIR__.'/Fixture/.preload.php');
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/preload.php.expected b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/preload.php.expected

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ protected function setUp(): void`
`38`	`38`	`protected function tearDown(): void`
`39`	`39`	`{`
`40`	`40`	`$this->fs->remove($this->kernel->getProjectDir());`
`41`		`- $this->fs->remove(__DIR__.'/Fixture/.preload.php');`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`public function testCacheIsFreshAfterCacheClearedWithWarmup()`
`@@ -83,7 +82,5 @@ public function testCacheIsFreshAfterCacheClearedWithWarmup()`
`83`	`82`	`$containerRef = new \ReflectionClass(require $containerFile);`
`84`	`83`	`$containerFile = str_replace('tes_'.\DIRECTORY_SEPARATOR, 'test'.\DIRECTORY_SEPARATOR, $containerRef->getFileName());`
`85`	`84`	`$this->assertMatchesRegularExpression(sprintf('/\'kernel.container_class\'\s=>\s\'%s\'/', $containerClass), file_get_contents($containerFile), 'kernel.container_class is properly set on the dumped container');`
`86`		`-`
`87`		`- $this->assertFileEquals(__DIR__.'/Fixture/preload.php.expected', __DIR__.'/Fixture/.preload.php');`
`88`	`85`	`}`
`89`	`86`	`}`