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

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

Browse Source 
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:
https://github.com/symfony/recipes/pull/825

TL;DR, these PRs replace `src/.preload.php` (generated) by `config/preload.php` (committed).

Commits
-------

662fcff40f Revert "bug #38063 [FrameworkBundle] generate preload.php in src/ to make opcache.preload predictable (nicolas-grekas)"
This commit is contained in:
Fabien Potencier 2020-09-30 07:26:25 +02:00
commit c4015edcfb
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
View File

@ -170,20 +170,6 @@ EOF
}
}
$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');
}

3
src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
View File

@ -38,7 +38,6 @@ class CacheClearCommandTest extends TestCase
protected function tearDown(): void
{
$this->fs->remove($this->kernel->getProjectDir());
$this->fs->remove(__DIR__.'/Fixture/.preload.php');
}
public function testCacheIsFreshAfterCacheClearedWithWarmup()
@ -83,7 +82,5 @@ class CacheClearCommandTest extends TestCase
$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');
}
}

5
src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/preload.php.expected
View File

@ -1,5 +0,0 @@
<?php
if (file_exists(__DIR__.'/test/var/cache/test/FixtureSymfony_Bundle_FrameworkBundle_Tests_Command_CacheClearCommand_Fixture_TestAppKernelTestDebugContainer.preload.php')) {
require __DIR__.'/test/var/cache/test/FixtureSymfony_Bundle_FrameworkBundle_Tests_Command_CacheClearCommand_Fixture_TestAppKernelTestDebugContainer.preload.php';
}