Merge branch '4.4' into 5.1

* 4.4:
  Revert "bug symfony#38063 [FrameworkBundle] generate preload.php in src/ to make opcache.preload predictable (nicolas-grekas)"
  [PhpUnitBridge] Fix class_alias() for PHPUnit\Framework\Error\Error

Author: fabpot

src/Symfony/Bridge/PhpUnit/Tests/BootstrapTest.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Tests;
+
+use PHPUnit\Framework\TestCase;
+
+class BootstrapTest extends TestCase
+{
+    /**
+     * @requires PHPUnit < 6.0
+     */
+    public function testAliasingOfErrorClasses()
+    {
+        $this->assertInstanceOf(
+            \PHPUnit_Framework_Error::class,
+            new \PHPUnit\Framework\Error\Error('message', 0, __FILE__, __LINE__)
+        );
+        $this->assertInstanceOf(
+            \PHPUnit_Framework_Error_Deprecated::class,
+            new \PHPUnit\Framework\Error\Deprecated('message', 0, __FILE__, __LINE__)
+        );
+        $this->assertInstanceOf(
+            \PHPUnit_Framework_Error_Notice::class,
+            new \PHPUnit\Framework\Error\Notice('message', 0, __FILE__, __LINE__)
+        );
+        $this->assertInstanceOf(
+            \PHPUnit_Framework_Error_Warning::class,
+            new \PHPUnit\Framework\Error\Warning('message', 0, __FILE__, __LINE__)
+        );
+    }
+}

src/Symfony/Bridge/PhpUnit/bootstrap.php

@@ -56,7 +56,6 @@
         'PHPUnit_Framework_Constraint_TraversableContains',
         'PHPUnit_Framework_Constraint_TraversableContainsOnly',
 
-        'PHPUnit_Framework_Error',
         'PHPUnit_Framework_Error_Deprecated',
         'PHPUnit_Framework_Error_Notice',
         'PHPUnit_Framework_Error_Warning',
@@ -100,6 +99,7 @@ class_alias('PHPUnit_Framework_Constraint_And', 'PHPUnit\Framework\Constraint\Lo
     class_alias('PHPUnit_Framework_Constraint_Not', 'PHPUnit\Framework\Constraint\LogicalNot');
     class_alias('PHPUnit_Framework_Constraint_Or', 'PHPUnit\Framework\Constraint\LogicalOr');
     class_alias('PHPUnit_Framework_Constraint_Xor', 'PHPUnit\Framework\Constraint\LogicalXor');
+    class_alias('PHPUnit_Framework_Error', 'PHPUnit\Framework\Error\Error');
 }
 
 // Detect if we need to serialize deprecations to a file.

src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php

@@ -175,20 +175,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');
         }

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');
     }
 }