From b30f4c1537147cc592374b6ef635a337fe476be5 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 12 Jun 2020 13:14:22 +0200
Subject: [PATCH 01/59] bumped Symfony version to 3.4.43

---
 src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 1f0e29b97cef5..7fad1ee281311 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -67,12 +67,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private $requestStackSize = 0;
     private $resetServices = false;
 
-    const VERSION = '3.4.42';
-    const VERSION_ID = 30442;
+    const VERSION = '3.4.43-DEV';
+    const VERSION_ID = 30443;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 4;
-    const RELEASE_VERSION = 42;
-    const EXTRA_VERSION = '';
+    const RELEASE_VERSION = 43;
+    const EXTRA_VERSION = 'DEV';
 
     const END_OF_MAINTENANCE = '11/2020';
     const END_OF_LIFE = '11/2021';

From fcc0e2c143caba8cf5ff0dda363af7e60d1be92f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sat, 13 Jun 2020 17:55:52 +0200
Subject: [PATCH 02/59] [FrameworkBundle] preserve dots in query-string when
 redirecting

---
 .../Controller/RedirectController.php         |  3 +-
 .../Controller/RedirectControllerTest.php     | 43 ++++++++-----------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
index 244e8a0f355a3..05e39a27a0a6a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -128,8 +128,7 @@ public function urlRedirectAction(Request $request, $path, $permanent = false, $
             $scheme = $request->getScheme();
         }
 
-        $qs = $request->getQueryString();
-        if ($qs) {
+        if ($qs = $request->server->get('QUERY_STRING') ?: $request->getQueryString()) {
             if (false === strpos($path, '?')) {
                 $qs = '?'.$qs;
             } else {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
index 4bd0212e6953d..78d41a2f2bc7e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -220,9 +220,9 @@ public function pathQueryParamsProvider()
         return [
             ['http://www.example.com/base/redirect-path', '/redirect-path',  ''],
             ['http://www.example.com/base/redirect-path?foo=bar', '/redirect-path?foo=bar',  ''],
-            ['http://www.example.com/base/redirect-path?foo=bar', '/redirect-path', 'foo=bar'],
-            ['http://www.example.com/base/redirect-path?foo=bar&abc=example', '/redirect-path?foo=bar', 'abc=example'],
-            ['http://www.example.com/base/redirect-path?foo=bar&abc=example&baz=def', '/redirect-path?foo=bar', 'abc=example&baz=def'],
+            ['http://www.example.com/base/redirect-path?f.o=bar', '/redirect-path', 'f.o=bar'],
+            ['http://www.example.com/base/redirect-path?f.o=bar&a.c=example', '/redirect-path?f.o=bar', 'a.c=example'],
+            ['http://www.example.com/base/redirect-path?f.o=bar&a.c=example&b.z=def', '/redirect-path?f.o=bar', 'a.c=example&b.z=def'],
         ];
     }
 
@@ -246,29 +246,20 @@ public function testPathQueryParams($expectedUrl, $path, $queryString)
 
     private function createRequestObject($scheme, $host, $port, $baseUrl, $queryString = '')
     {
-        $request = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')->getMock();
-        $request
-            ->expects($this->any())
-            ->method('getScheme')
-            ->willReturn($scheme);
-        $request
-            ->expects($this->any())
-            ->method('getHost')
-            ->willReturn($host);
-        $request
-            ->expects($this->any())
-            ->method('getPort')
-            ->willReturn($port);
-        $request
-            ->expects($this->any())
-            ->method('getBaseUrl')
-            ->willReturn($baseUrl);
-        $request
-            ->expects($this->any())
-            ->method('getQueryString')
-            ->willReturn($queryString);
-
-        return $request;
+        if ('' !== $queryString) {
+            parse_str($queryString, $query);
+        } else {
+            $query = [];
+        }
+
+        return new Request($query, [], [], [], [], [
+            'HTTPS' => 'https' === $scheme,
+            'HTTP_HOST' => $host.($port ? ':'.$port : ''),
+            'SERVER_PORT' => $port,
+            'SCRIPT_FILENAME' => $baseUrl,
+            'REQUEST_URI' => $baseUrl,
+            'QUERY_STRING' => $queryString,
+        ]);
     }
 
     private function createRedirectController($httpPort = null, $httpsPort = null)

From b746dd900cf50a545064e51f5178be8e0b2aab4c Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 14 Jun 2020 14:27:25 +0200
Subject: [PATCH 03/59] [DI] tighten detection of local dirs to prevent false
 positives

---
 .../Component/DependencyInjection/Dumper/PhpDumper.php     | 7 ++++---
 .../DependencyInjection/Tests/Dumper/PhpDumperTest.php     | 2 +-
 .../DependencyInjection/Tests/Fixtures/php/services12.php  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 3bfa0c318891e..c66c3bcf7c2cc 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -191,7 +191,7 @@ public function dump(array $options = [])
                     $regex = preg_quote(\DIRECTORY_SEPARATOR.$dir[$i], '#').$regex;
                 } while (0 < --$i);
 
-                $this->targetDirRegex = '#'.preg_quote($dir[0], '#').$regex.'#';
+                $this->targetDirRegex = '#(^|file://|[:;, \|\r\n])'.preg_quote($dir[0], '#').$regex.'#';
             }
         }
 
@@ -1993,11 +1993,12 @@ private function isHotPath(Definition $definition)
     private function export($value)
     {
         if (null !== $this->targetDirRegex && \is_string($value) && preg_match($this->targetDirRegex, $value, $matches, PREG_OFFSET_CAPTURE)) {
-            $prefix = $matches[0][1] ? $this->doExport(substr($value, 0, $matches[0][1]), true).'.' : '';
             $suffix = $matches[0][1] + \strlen($matches[0][0]);
+            $matches[0][1] += \strlen($matches[1][0]);
+            $prefix = $matches[0][1] ? $this->doExport(substr($value, 0, $matches[0][1]), true).'.' : '';
             $suffix = isset($value[$suffix]) ? '.'.$this->doExport(substr($value, $suffix), true) : '';
             $dirname = $this->asFiles ? '$this->containerDir' : '__DIR__';
-            $offset = 1 + $this->targetDirMaxMatches - \count($matches);
+            $offset = 2 + $this->targetDirMaxMatches - \count($matches);
 
             if ($this->asFiles || 0 < $offset) {
                 $dirname = sprintf('$this->targetDirs[%d]', $offset);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index b2cbb3caf6283..946d09c74852f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -98,7 +98,7 @@ public function testDumpRelativeDir()
 
         $container = new ContainerBuilder();
         $container->setDefinition('test', $definition);
-        $container->setParameter('foo', 'wiz'.\dirname(__DIR__));
+        $container->setParameter('foo', 'file://'.\dirname(__DIR__));
         $container->setParameter('bar', __DIR__);
         $container->setParameter('baz', '%bar%/PhpDumperTest.php');
         $container->setParameter('buz', \dirname(\dirname(__DIR__)));
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 0e8f581e8ab7a..eb21559686fb1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -67,7 +67,7 @@ public function isFrozen()
      */
     protected function getTestService()
     {
-        return $this->services['test'] = new \stdClass(('wiz'.$this->targetDirs[1]), [('wiz'.$this->targetDirs[1]) => ($this->targetDirs[2].'/')]);
+        return $this->services['test'] = new \stdClass(('file://'.$this->targetDirs[1]), [('file://'.$this->targetDirs[1]) => ($this->targetDirs[2].'/')]);
     }
 
     public function getParameter($name)
@@ -131,7 +131,7 @@ public function getParameterBag()
     private function getDynamicParameter($name)
     {
         switch ($name) {
-            case 'foo': $value = ('wiz'.$this->targetDirs[1]); break;
+            case 'foo': $value = ('file://'.$this->targetDirs[1]); break;
             case 'buz': $value = $this->targetDirs[2]; break;
             default: throw new InvalidArgumentException(sprintf('The dynamic parameter "%s" must be defined.', $name));
         }

From 7af34697715018bc7c6510289907e003d129e19c Mon Sep 17 00:00:00 2001
From: Laurent VOULLEMIER <laurent.voullemier@gmail.com>
Date: Tue, 24 Mar 2020 21:48:50 +0100
Subject: [PATCH 04/59] [VarDumper] Fix CliDumper coloration

When using AbstractDumper::DUMP_LIGHT_ARRAY
---
 .../Component/VarDumper/Dumper/CliDumper.php  |  3 +-
 .../VarDumper/Tests/Dumper/CliDumperTest.php  | 52 +++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
index 946df78257bae..881241ab3e878 100644
--- a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
+++ b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -268,7 +268,8 @@ public function enterHash(Cursor $cursor, $type, $class, $hasChild)
         } elseif (Cursor::HASH_RESOURCE === $type) {
             $prefix = $this->style('note', $class.' resource').($hasChild ? ' {' : ' ');
         } else {
-            $prefix = $class && !(self::DUMP_LIGHT_ARRAY & $this->flags) ? $this->style('note', 'array:'.$class).' [' : '[';
+            $unstyledPrefix = $class && !(self::DUMP_LIGHT_ARRAY & $this->flags) ? 'array:'.$class : '';
+            $prefix = $this->style('note', $unstyledPrefix).($unstyledPrefix ? ' [' : '[');
         }
 
         if ($cursor->softRefCount || 0 < $cursor->softRefHandle) {
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
index 7656e09259264..e7efaae95cec3 100644
--- a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
+++ b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
+use Symfony\Component\VarDumper\Dumper\AbstractDumper;
 use Symfony\Component\VarDumper\Dumper\CliDumper;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
 use Twig\Environment;
@@ -572,6 +573,57 @@ public function testIncompleteClass()
         );
     }
 
+    public function provideDumpArrayWithColor()
+    {
+        yield [
+            ['foo' => 'bar'],
+            0,
+<<<EOTXT
+\e[0;38;5;208m\e[38;5;38marray:1\e[0;38;5;208m [\e[m
+  \e[0;38;5;208m"\e[38;5;113mfoo\e[0;38;5;208m" => "\e[1;38;5;113mbar\e[0;38;5;208m"\e[m
+\e[0;38;5;208m]\e[m
+
+EOTXT
+        ];
+
+        yield [[], AbstractDumper::DUMP_LIGHT_ARRAY, "\e[0;38;5;208m\e[38;5;38m\e[0;38;5;208m[]\e[m\n"];
+
+        yield [
+            ['foo' => 'bar'],
+            AbstractDumper::DUMP_LIGHT_ARRAY,
+            <<<EOTXT
+\e[0;38;5;208m\e[38;5;38m\e[0;38;5;208m[\e[m
+  \e[0;38;5;208m"\e[38;5;113mfoo\e[0;38;5;208m" => "\e[1;38;5;113mbar\e[0;38;5;208m"\e[m
+\e[0;38;5;208m]\e[m
+
+EOTXT
+        ];
+
+        yield [[], 0, "\e[0;38;5;208m\e[38;5;38m\e[0;38;5;208m[]\e[m\n"];
+    }
+
+    /**
+     * @dataProvider provideDumpArrayWithColor
+     */
+    public function testDumpArrayWithColor($value, $flags, $expectedOut)
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('Windows console does not support coloration');
+        }
+
+        $out = '';
+        $dumper = new CliDumper(function ($line, $depth) use (&$out) {
+            if ($depth >= 0) {
+                $out .= str_repeat('  ', $depth).$line."\n";
+            }
+        }, null, $flags);
+        $dumper->setColors(true);
+        $cloner = new VarCloner();
+        $dumper->dump($cloner->cloneVar($value));
+
+        $this->assertSame($expectedOut, $out);
+    }
+
     private function getSpecialVars()
     {
         foreach (array_keys($GLOBALS) as $var) {

From 8c4b49613ac32c238a794f987dc474ded1df4809 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 18 Jun 2020 17:42:01 +0200
Subject: [PATCH 05/59] [Cache] fix compat with DBAL v3

---
 .../Component/Cache/Traits/PdoTrait.php       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php
index 1aa87cd3f1a11..d453904d44a81 100644
--- a/src/Symfony/Component/Cache/Traits/PdoTrait.php
+++ b/src/Symfony/Component/Cache/Traits/PdoTrait.php
@@ -366,25 +366,31 @@ private function getConnection()
             if ($this->conn instanceof \PDO) {
                 $this->driver = $this->conn->getAttribute(\PDO::ATTR_DRIVER_NAME);
             } else {
-                switch ($this->driver = $this->conn->getDriver()->getName()) {
-                    case 'mysqli':
-                    case 'pdo_mysql':
-                    case 'drizzle_pdo_mysql':
+                $driver = $this->conn->getDriver();
+
+                switch (true) {
+                    case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOMySql\Driver:
                         $this->driver = 'mysql';
                         break;
-                    case 'pdo_sqlite':
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
                         $this->driver = 'sqlite';
                         break;
-                    case 'pdo_pgsql':
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
                         $this->driver = 'pgsql';
                         break;
-                    case 'oci8':
-                    case 'pdo_oracle':
+                    case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
                         $this->driver = 'oci';
                         break;
-                    case 'pdo_sqlsrv':
+                    case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
                         $this->driver = 'sqlsrv';
                         break;
+                    default:
+                        $this->driver = \get_class($driver);
+                        break;
                 }
             }
         }

From c143aacd811d0cab4e3351cb77d7d3e37c031c16 Mon Sep 17 00:00:00 2001
From: Nyholm <tobias.nyholm@gmail.com>
Date: Sat, 13 Jun 2020 10:25:25 +0200
Subject: [PATCH 06/59] [3.4] Small update in our internal terminology

---
 .../Handler/FingersCrossed/NotFoundActivationStrategy.php   | 6 +++---
 .../DependencyInjection/AddAnnotatedClassesToCachePass.php  | 4 ++--
 .../Component/Intl/Data/Generator/CurrencyDataGenerator.php | 4 ++--
 .../Component/Intl/Data/Generator/RegionDataGenerator.php   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
index ed41929a2cef3..e5ccf1afc57b4 100644
--- a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
+++ b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php
@@ -23,7 +23,7 @@
  */
 class NotFoundActivationStrategy extends ErrorLevelActivationStrategy
 {
-    private $blacklist;
+    private $exclude;
     private $requestStack;
 
     public function __construct(RequestStack $requestStack, array $excludedUrls, $actionLevel)
@@ -31,7 +31,7 @@ public function __construct(RequestStack $requestStack, array $excludedUrls, $ac
         parent::__construct($actionLevel);
 
         $this->requestStack = $requestStack;
-        $this->blacklist = '{('.implode('|', $excludedUrls).')}i';
+        $this->exclude = '{('.implode('|', $excludedUrls).')}i';
     }
 
     public function isHandlerActivated(array $record)
@@ -45,7 +45,7 @@ public function isHandlerActivated(array $record)
             && 404 == $record['context']['exception']->getStatusCode()
             && ($request = $this->requestStack->getMasterRequest())
         ) {
-            return !preg_match($this->blacklist, $request->getPathInfo());
+            return !preg_match($this->exclude, $request->getPathInfo());
         }
 
         return $isActivated;
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
index 8bb03bd0c78d0..b59949379dd07 100644
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -136,10 +136,10 @@ private function patternsToRegexps($patterns)
 
     private function matchAnyRegexps($class, $regexps)
     {
-        $blacklisted = false !== strpos($class, 'Test');
+        $isTest = false !== strpos($class, 'Test');
 
         foreach ($regexps as $regex) {
-            if ($blacklisted && false === strpos($regex, 'Test')) {
+            if ($isTest && false === strpos($regex, 'Test')) {
                 continue;
             }
 
diff --git a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
index b4543428ebb60..a5ed6d10268f2 100644
--- a/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/CurrencyDataGenerator.php
@@ -25,7 +25,7 @@
  */
 class CurrencyDataGenerator extends AbstractDataGenerator
 {
-    private static $blacklist = [
+    private static $denylist = [
         'XBA' => true, // European Composite Unit
         'XBB' => true, // European Monetary Unit
         'XBC' => true, // European Unit of Account (XBC)
@@ -136,7 +136,7 @@ private function generateSymbolNamePairs(ArrayAccessibleResourceBundle $rootBund
         $symbolNamePairs = iterator_to_array($rootBundle['Currencies']);
 
         // Remove unwanted currencies
-        $symbolNamePairs = array_diff_key($symbolNamePairs, self::$blacklist);
+        $symbolNamePairs = array_diff_key($symbolNamePairs, self::$denylist);
 
         return $symbolNamePairs;
     }
diff --git a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
index bab85b11b15d5..b50a585de6779 100644
--- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
@@ -27,7 +27,7 @@
  */
 class RegionDataGenerator extends AbstractDataGenerator
 {
-    private static $blacklist = [
+    private static $denylist = [
         // Look like countries, but are sub-continents
         'QO' => true, // Outlying Oceania
         'EU' => true, // European Union
@@ -50,7 +50,7 @@ class RegionDataGenerator extends AbstractDataGenerator
 
     public static function isValidCountryCode($region)
     {
-        if (isset(self::$blacklist[$region])) {
+        if (isset(self::$denylist[$region])) {
             return false;
         }
 

From 968d6c4276bb1540786bc4ba6ef2a49f913f8b10 Mon Sep 17 00:00:00 2001
From: kick-the-bucket <kick-the-bucket@users.noreply.github.com>
Date: Thu, 4 Jun 2020 11:26:35 +0300
Subject: [PATCH 07/59] [PhpUnitBridge] Streamline ansi/no-ansi of composer
 according to phpunit --colors option

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index eae4cc3125147..90efc97658a0d 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -106,15 +106,21 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
         }
     }
 
+    if (in_array('--colors=never', $argv, true) || (isset($argv[$i = array_search('never', $argv, true) - 1]) && '--colors' === $argv[$i])) {
+        $COMPOSER .= ' --no-ansi';
+    } else {
+        $COMPOSER .= ' --ansi';
+    }
+
     $info += array(
         'versions' => array(),
         'requires' => array('php' => '*'),
     );
 
     if (1 === \count($info['versions'])) {
-        $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress --ansi -s dev phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");
+        $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress -s dev phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");
     } else {
-        $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress --ansi phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");
+        $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");
     }
 
     @copy("phpunit-$PHPUNIT_VERSION/phpunit.xsd", 'phpunit.xsd');
@@ -144,7 +150,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
     $q = '\\' === DIRECTORY_SEPARATOR ? '"' : '';
     // --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
-    $exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress --ansi$q", array(), $p, getcwd()));
+    $exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress$q", array(), $p, getcwd()));
     putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
     if ($exit) {
         exit($exit);

From e09372bcbf3de62acf139c203f4492b6c8e41d07 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 15 Jun 2020 16:43:28 +0200
Subject: [PATCH 08/59] [3.4] Fix support for PHP8 union types

---
 .../Resource/ReflectionClassResource.php      |  6 ++-
 .../LazyProxy/ProxyHelper.php                 | 42 ++++++++++++-------
 .../OptionsResolver/OptionsResolver.php       |  2 +-
 .../PropertyAccess/PropertyAccessor.php       |  3 +-
 .../Extractor/ReflectionExtractor.php         | 42 ++++++++++---------
 .../Normalizer/AbstractNormalizer.php         |  2 +-
 .../VarDumper/Caster/ReflectionCaster.php     |  6 +--
 7 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index cfab1f6c10a65..294da3e10cef4 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -177,6 +177,7 @@ private function generateSignature(\ReflectionClass $class)
                 if (!$parametersWithUndefinedConstants) {
                     yield preg_replace('/^  @@.*/m', '', $m);
                 } else {
+                    $t = \PHP_VERSION_ID >= 70000 ? $m->getReturnType() : '';
                     $stack = [
                         $m->getDocComment(),
                         $m->getName(),
@@ -187,15 +188,16 @@ private function generateSignature(\ReflectionClass $class)
                         $m->isPrivate(),
                         $m->isProtected(),
                         $m->returnsReference(),
-                        \PHP_VERSION_ID >= 70000 && $m->hasReturnType() ? (\PHP_VERSION_ID >= 70100 ? $m->getReturnType()->getName() : (string) $m->getReturnType()) : '',
+                        $t instanceof \ReflectionNamedType ? ((string) $t->allowsNull()).$t->getName() : (string) $t,
                     ];
 
                     foreach ($m->getParameters() as $p) {
                         if (!isset($parametersWithUndefinedConstants[$p->name])) {
                             $stack[] = (string) $p;
                         } else {
+                            $t = \PHP_VERSION_ID >= 70000 ? $p->getType() : '';
                             $stack[] = $p->isOptional();
-                            $stack[] = \PHP_VERSION_ID >= 70000 && $p->hasType() ? (\PHP_VERSION_ID >= 70100 ? $p->getType()->getName() : (string) $p->getType()) : '';
+                            $stack[] = $t instanceof \ReflectionNamedType ? $t->getName() : (string) $t;
                             $stack[] = $p->isPassedByReference();
                             $stack[] = \PHP_VERSION_ID >= 50600 ? $p->isVariadic() : '';
                             $stack[] = $p->getName();
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php
index cb19c729c100c..bfa65f56f0a44 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php
@@ -39,26 +39,36 @@ public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionPa
         if (!$type) {
             return null;
         }
-        if (!\is_string($type)) {
-            $name = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString();
 
-            if ($type->isBuiltin()) {
-                return $noBuiltin ? null : $name;
+        $types = [];
+
+        foreach ($type instanceof \ReflectionUnionType ? $type->getTypes() : [$type] as $type) {
+            $name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
+
+            if (!\is_string($type) && $type->isBuiltin()) {
+                if (!$noBuiltin) {
+                    $types[] = $name;
+                }
+                continue;
             }
-        }
-        $lcName = strtolower($name);
-        $prefix = $noBuiltin ? '' : '\\';
 
-        if ('self' !== $lcName && 'parent' !== $lcName) {
-            return $prefix.$name;
-        }
-        if (!$r instanceof \ReflectionMethod) {
-            return null;
-        }
-        if ('self' === $lcName) {
-            return $prefix.$r->getDeclaringClass()->name;
+            $lcName = strtolower($name);
+            $prefix = $noBuiltin ? '' : '\\';
+
+            if ('self' !== $lcName && 'parent' !== $lcName) {
+                $types[] = '' !== $prefix ? $prefix.$name : $name;
+                continue;
+            }
+            if (!$r instanceof \ReflectionMethod) {
+                continue;
+            }
+            if ('self' === $lcName) {
+                $types[] = $prefix.$r->getDeclaringClass()->name;
+            } else {
+                $types[] = ($parent = $r->getDeclaringClass()->getParentClass()) ? $prefix.$parent->name : null;
+            }
         }
 
-        return ($parent = $r->getDeclaringClass()->getParentClass()) ? $prefix.$parent->name : null;
+        return $types ? implode('|', $types) : null;
     }
 }
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index 7354caf8a6fe7..ffb101e512ff8 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1076,7 +1076,7 @@ private function getParameterClassName(\ReflectionParameter $parameter)
             return ($class = $parameter->getClass()) ? $class->name : null;
         }
 
-        if (!($type = $parameter->getType()) || $type->isBuiltin()) {
+        if (!($type = $parameter->getType()) instanceof \ReflectionNamedType || $type->isBuiltin()) {
             return null;
         }
 
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
index 99aa9a3ebc32a..07e0204cd26c0 100644
--- a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
+++ b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -519,8 +519,9 @@ private function readProperty($zval, $property)
             // handle uninitialized properties in PHP >= 7.4
             if (\PHP_VERSION_ID >= 70400 && preg_match('/^Typed property ([\w\\\]+)::\$(\w+) must not be accessed before initialization$/', $e->getMessage(), $matches)) {
                 $r = new \ReflectionProperty($matches[1], $matches[2]);
+                $type = ($type = $r->getType()) instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
 
-                throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%s". You should initialize it or declare a default value instead.', $r->getDeclaringClass()->getName(), $r->getName(), $r->getType()->getName()), 0, $e);
+                throw new AccessException(sprintf('The property "%s::$%s" is not readable because it is typed "%s". You should initialize it or declare a default value instead.', $r->getDeclaringClass()->getName(), $r->getName(), $type), 0, $e);
             }
 
             throw $e;
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index 3306946a9b337..cbcb349d2e110 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -187,26 +187,26 @@ private function extractFromMutator($class, $property)
             $type = $this->extractFromReflectionType($reflectionType, $reflectionMethod);
 
             // HHVM reports variadics with "array" but not builtin type hints
-            if (!$reflectionType->isBuiltin() && Type::BUILTIN_TYPE_ARRAY === $type->getBuiltinType()) {
+            if (1 === \count($type) && !$reflectionType->isBuiltin() && Type::BUILTIN_TYPE_ARRAY === $type[0]->getBuiltinType()) {
                 return null;
             }
         } elseif (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $reflectionParameter, $info)) {
             if (Type::BUILTIN_TYPE_ARRAY === $info[1]) {
-                $type = new Type(Type::BUILTIN_TYPE_ARRAY, $reflectionParameter->allowsNull(), null, true);
+                $type = [new Type(Type::BUILTIN_TYPE_ARRAY, $reflectionParameter->allowsNull(), null, true)];
             } elseif (Type::BUILTIN_TYPE_CALLABLE === $info[1]) {
-                $type = new Type(Type::BUILTIN_TYPE_CALLABLE, $reflectionParameter->allowsNull());
+                $type = [new Type(Type::BUILTIN_TYPE_CALLABLE, $reflectionParameter->allowsNull())];
             } else {
-                $type = new Type(Type::BUILTIN_TYPE_OBJECT, $reflectionParameter->allowsNull(), $this->resolveTypeName($info[1], $reflectionMethod));
+                $type = [new Type(Type::BUILTIN_TYPE_OBJECT, $reflectionParameter->allowsNull(), $this->resolveTypeName($info[1], $reflectionMethod))];
             }
         } else {
             return null;
         }
 
-        if (\in_array($prefix, $this->arrayMutatorPrefixes)) {
-            $type = new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $type);
+        if (1 === \count($type) && \in_array($prefix, $this->arrayMutatorPrefixes)) {
+            $type = [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $type[0])];
         }
 
-        return [$type];
+        return $type;
     }
 
     /**
@@ -225,7 +225,7 @@ private function extractFromAccessor($class, $property)
         }
 
         if ($this->supportsParameterType && $reflectionType = $reflectionMethod->getReturnType()) {
-            return [$this->extractFromReflectionType($reflectionType, $reflectionMethod)];
+            return $this->extractFromReflectionType($reflectionType, $reflectionMethod);
         }
 
         return \in_array($prefix, ['is', 'can']) ? [new Type(Type::BUILTIN_TYPE_BOOL)] : null;
@@ -234,24 +234,28 @@ private function extractFromAccessor($class, $property)
     /**
      * Extracts data from the PHP 7 reflection type.
      *
-     * @return Type
+     * @return Type[]
      */
     private function extractFromReflectionType(\ReflectionType $reflectionType, \ReflectionMethod $reflectionMethod)
     {
-        $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : $reflectionType->__toString();
+        $types = [];
         $nullable = $reflectionType->allowsNull();
 
-        if (Type::BUILTIN_TYPE_ARRAY === $phpTypeOrClass) {
-            $type = new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true);
-        } elseif ('void' === $phpTypeOrClass) {
-            $type = new Type(Type::BUILTIN_TYPE_NULL, $nullable);
-        } elseif ($reflectionType->isBuiltin()) {
-            $type = new Type($phpTypeOrClass, $nullable);
-        } else {
-            $type = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $reflectionMethod));
+        foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) {
+            $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type;
+
+            if (Type::BUILTIN_TYPE_ARRAY === $phpTypeOrClass) {
+                $types[] = new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true);
+            } elseif ('void' === $phpTypeOrClass || 'null' === $phpTypeOrClass) {
+                $types[] = new Type(Type::BUILTIN_TYPE_NULL, $nullable);
+            } elseif ($reflectionType->isBuiltin()) {
+                $types[] = new Type($phpTypeOrClass, $nullable);
+            } else {
+                $types[] = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $reflectionMethod));
+            }
         }
 
-        return $type;
+        return $types;
     }
 
     private function resolveTypeName($name, \ReflectionMethod $reflectionMethod)
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
index 71b1e38d37bd4..e88b5a2110b8b 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -388,7 +388,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
         try {
             if (\PHP_VERSION_ID < 70100 && null !== $parameterClass = $parameter->getClass()) {
                 $parameterClass = $parameterClass->name;
-            } elseif (\PHP_VERSION_ID >= 70100 && ($parameterType = $parameter->getType()) && !$parameterType->isBuiltin()) {
+            } elseif (\PHP_VERSION_ID >= 70100 && ($parameterType = $parameter->getType()) instanceof \ReflectionNamedType && !$parameterType->isBuiltin()) {
                 $parameterClass = $parameterType->getName();
                 new \ReflectionClass($parameterClass); // throws a \ReflectionException if the class doesn't exist
             } else {
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
index 067da6bbd3d9d..31de78e961db0 100644
--- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -91,7 +91,7 @@ public static function castType(\ReflectionType $c, array $a, Stub $stub, $isNes
         $prefix = Caster::PREFIX_VIRTUAL;
 
         $a += [
-            $prefix.'name' => $c instanceof \ReflectionNamedType ? $c->getName() : $c->__toString(),
+            $prefix.'name' => $c instanceof \ReflectionNamedType ? $c->getName() : (string) $c,
             $prefix.'allowsNull' => $c->allowsNull(),
             $prefix.'isBuiltin' => $c->isBuiltin(),
         ];
@@ -178,7 +178,7 @@ public static function castFunctionAbstract(\ReflectionFunctionAbstract $c, arra
 
         if (isset($a[$prefix.'returnType'])) {
             $v = $a[$prefix.'returnType'];
-            $v = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
+            $v = $v instanceof \ReflectionNamedType ? $v->getName() : (string) $v;
             $a[$prefix.'returnType'] = new ClassStub($a[$prefix.'returnType']->allowsNull() ? '?'.$v : $v, [class_exists($v, false) || interface_exists($v, false) || trait_exists($v, false) ? $v : '', '']);
         }
         if (isset($a[$prefix.'class'])) {
@@ -247,7 +247,7 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
 
         if (method_exists($c, 'getType')) {
             if ($v = $c->getType()) {
-                $a[$prefix.'typeHint'] = $v instanceof \ReflectionNamedType ? $v->getName() : $v->__toString();
+                $a[$prefix.'typeHint'] = $v instanceof \ReflectionNamedType ? $v->getName() : (string) $v;
             }
         } elseif (preg_match('/^(?:[^ ]++ ){4}([a-zA-Z_\x7F-\xFF][^ ]++)/', $c, $v)) {
             $a[$prefix.'typeHint'] = $v[1];

From 8bbbdbe74576639224d7019d90d80f4f2a4b5737 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 18 Jun 2020 21:30:53 +0200
Subject: [PATCH 09/59] Fix

---
 .../Component/Config/Resource/ReflectionClassResource.php       | 2 +-
 .../DependencyInjection/Compiler/FactoryReturnTypePass.php      | 2 +-
 .../HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php   | 2 +-
 src/Symfony/Component/OptionsResolver/OptionsResolver.php       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index 294da3e10cef4..79b21fbf4c218 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -197,7 +197,7 @@ private function generateSignature(\ReflectionClass $class)
                         } else {
                             $t = \PHP_VERSION_ID >= 70000 ? $p->getType() : '';
                             $stack[] = $p->isOptional();
-                            $stack[] = $t instanceof \ReflectionNamedType ? $t->getName() : (string) $t;
+                            $stack[] = $t instanceof \ReflectionNamedType ? ((string) $t->allowsNull()).$t->getName() : (string) $t;
                             $stack[] = $p->isPassedByReference();
                             $stack[] = \PHP_VERSION_ID >= 50600 ? $p->isVariadic() : '';
                             $stack[] = $p->getName();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php b/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
index d688fb59fd1fd..6b1277e26a6bc 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/FactoryReturnTypePass.php
@@ -93,7 +93,7 @@ private function updateDefinition(ContainerBuilder $container, $id, Definition $
 
         $returnType = $m->getReturnType();
         if (null !== $returnType && !$returnType->isBuiltin()) {
-            $returnType = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType->__toString();
+            $returnType = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
             if (null !== $class) {
                 $declaringClass = $m->getDeclaringClass()->getName();
                 if ('self' === strtolower($returnType)) {
diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
index 2548a2a083c39..14e7ca3d11405 100644
--- a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
+++ b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -105,7 +105,7 @@ private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbs
             if (!$type = $parameter->getType()) {
                 return null;
             }
-            $name = $type instanceof \ReflectionNamedType ? $type->getName() : $type->__toString();
+            $name = $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
             if ('array' === $name && !$type->isBuiltin()) {
                 // Special case for HHVM with variadics
                 return null;
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index ffb101e512ff8..7354caf8a6fe7 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1076,7 +1076,7 @@ private function getParameterClassName(\ReflectionParameter $parameter)
             return ($class = $parameter->getClass()) ? $class->name : null;
         }
 
-        if (!($type = $parameter->getType()) instanceof \ReflectionNamedType || $type->isBuiltin()) {
+        if (!($type = $parameter->getType()) || $type->isBuiltin()) {
             return null;
         }
 

From 2ca8ecdb7461377ffc1a572d9e80c64bdd1eb70a Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 18 Jun 2020 22:18:19 +0200
Subject: [PATCH 10/59] Added Unit tests for php 8 union types.

---
 .../Tests/Compiler/AutowirePassTest.php       | 68 +++++++++++++++++++
 .../Fixtures/includes/autowiring_classes.php  |  4 ++
 .../Fixtures/includes/uniontype_classes.php   | 24 +++++++
 .../Extractor/ReflectionExtractor.php         |  7 +-
 .../Extractor/ReflectionExtractorTest.php     | 20 ++++++
 .../Tests/Fixtures/Php80Dummy.php             | 26 +++++++
 6 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/uniontype_classes.php
 create mode 100644 src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index e11154889c297..2482db631403b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -254,6 +254,25 @@ public function testTypeNotGuessableNoServicesFound()
         $pass->process($container);
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testTypeNotGuessableUnionType()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionClasses::__construct()" has type "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionA|Symfony\Component\DependencyInjection\Tests\Compiler\CollisionB" but this class was not found.');
+        $container = new ContainerBuilder();
+
+        $container->register(CollisionA::class);
+        $container->register(CollisionB::class);
+
+        $aDefinition = $container->register('a', UnionClasses::class);
+        $aDefinition->setAutowired(true);
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+    }
+
     public function testTypeNotGuessableWithTypeSet()
     {
         $container = new ContainerBuilder();
@@ -350,6 +369,40 @@ public function testOptionalParameter()
         $this->assertEquals(Foo::class, $definition->getArgument(2));
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testParameterWithNullUnionIsSkipped()
+    {
+        $container = new ContainerBuilder();
+
+        $optDefinition = $container->register('opt', UnionNull::class);
+        $optDefinition->setAutowired(true);
+
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('opt');
+        $this->assertNull($definition->getArgument(0));
+    }
+
+    /**
+     * @requires PHP 8
+     */
+    public function testParameterWithNullUnionIsAutowired()
+    {
+        $container = new ContainerBuilder();
+
+        $container->register(CollisionInterface::class, CollisionA::class);
+
+        $optDefinition = $container->register('opt', UnionNull::class);
+        $optDefinition->setAutowired(true);
+
+        (new AutowirePass())->process($container);
+
+        $definition = $container->getDefinition('opt');
+        $this->assertEquals(CollisionInterface::class, $definition->getArgument(0));
+    }
+
     public function testDontTriggerAutowiring()
     {
         $container = new ContainerBuilder();
@@ -459,6 +512,21 @@ public function testScalarArgsCannotBeAutowired()
         (new AutowirePass())->process($container);
     }
 
+    /**
+     * @requires PHP 8
+     */
+    public function testUnionScalarArgsCannotBeAutowired()
+    {
+        $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
+        $this->expectExceptionMessage('Cannot autowire service "union_scalars": argument "$timeout" of method "Symfony\Component\DependencyInjection\Tests\Compiler\UnionScalars::__construct()" is type-hinted "int|float", you should configure its value explicitly.');
+        $container = new ContainerBuilder();
+
+        $container->register('union_scalars', UnionScalars::class)
+            ->setAutowired(true);
+
+        (new AutowirePass())->process($container);
+    }
+
     public function testNoTypeArgsCannotBeAutowired()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
index 8db7edf1a126e..42545c9c2b71c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -2,6 +2,10 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
+if (PHP_VERSION_ID >= 80000) {
+    require __DIR__.'/uniontype_classes.php';
+}
+
 class Foo
 {
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/uniontype_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/uniontype_classes.php
new file mode 100644
index 0000000000000..3a0c77c53941c
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/uniontype_classes.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+class UnionScalars
+{
+    public function __construct(int|float $timeout)
+    {
+    }
+}
+
+class UnionClasses
+{
+    public function __construct(CollisionA|CollisionB $collision)
+    {
+    }
+}
+
+class UnionNull
+{
+    public function __construct(CollisionInterface|null $c)
+    {
+    }
+}
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
index cbcb349d2e110..59af87584b464 100644
--- a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
+++ b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -243,12 +243,15 @@ private function extractFromReflectionType(\ReflectionType $reflectionType, \Ref
 
         foreach ($reflectionType instanceof \ReflectionUnionType ? $reflectionType->getTypes() : [$reflectionType] as $type) {
             $phpTypeOrClass = $reflectionType instanceof \ReflectionNamedType ? $reflectionType->getName() : (string) $type;
+            if ('null' === $phpTypeOrClass) {
+                continue;
+            }
 
             if (Type::BUILTIN_TYPE_ARRAY === $phpTypeOrClass) {
                 $types[] = new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true);
-            } elseif ('void' === $phpTypeOrClass || 'null' === $phpTypeOrClass) {
+            } elseif ('void' === $phpTypeOrClass) {
                 $types[] = new Type(Type::BUILTIN_TYPE_NULL, $nullable);
-            } elseif ($reflectionType->isBuiltin()) {
+            } elseif ($type->isBuiltin()) {
                 $types[] = new Type($phpTypeOrClass, $nullable);
             } else {
                 $types[] = new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, $this->resolveTypeName($phpTypeOrClass, $reflectionMethod));
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
index 36fc9d55e37f8..bac036aa5bf90 100644
--- a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
+++ b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -204,6 +204,26 @@ public function php71TypesProvider()
         ];
     }
 
+    /**
+     * @dataProvider php80TypesProvider
+     * @requires PHP 8
+     */
+    public function testExtractPhp80Type($property, array $type = null)
+    {
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php80Dummy', $property, []));
+    }
+
+    public function php80TypesProvider()
+    {
+        return [
+            ['foo', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]],
+            ['bar', [new Type(Type::BUILTIN_TYPE_INT, true)]],
+            ['timeout', [new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_FLOAT)]],
+            ['optional', [new Type(Type::BUILTIN_TYPE_INT, true), new Type(Type::BUILTIN_TYPE_FLOAT, true)]],
+            ['string', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Stringable'), new Type(Type::BUILTIN_TYPE_STRING)]],
+        ];
+    }
+
     /**
      * @dataProvider getReadableProperties
      */
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
new file mode 100644
index 0000000000000..484498f4a6c0e
--- /dev/null
+++ b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php80Dummy.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+class Php80Dummy
+{
+    public function getFoo(): array|null
+    {
+    }
+
+    public function setBar(int|null $bar)
+    {
+    }
+
+    public function setTimeout(int|float $timeout)
+    {
+    }
+
+    public function getOptional(): int|float|null
+    {
+    }
+
+    public function setString(string|\Stringable $string)
+    {
+    }
+}

From a9987ce3411f0f268b16b081994dc7fdad313441 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Thu, 18 Jun 2020 21:22:57 +0200
Subject: [PATCH 11/59] collect all transformation failures

---
 .../Validator/Constraints/FormValidator.php   |  5 +-
 .../FormValidatorFunctionalTest.php           | 60 +++++++++++++++++++
 .../Constraints/FormValidatorTest.php         | 34 -----------
 3 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
index 4447b2e54aa88..8f7acb35d86b7 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -147,7 +147,10 @@ public function validate($form, Constraint $formConstraint)
             foreach ($form as $child) {
                 if (!$child->isSynchronized()) {
                     $childrenSynchronized = false;
-                    break;
+
+                    $fieldFormConstraint = new Form();
+                    $this->context->setNode($this->context->getValue(), $child, $this->context->getMetadata(), $this->context->getPropertyPath());
+                    $validator->atPath(sprintf('children[%s]', $child->getName()))->validate($child, $fieldFormConstraint);
                 }
             }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
index b51b34bb32ab0..d4ca0cb1bfe21 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
@@ -13,6 +13,9 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\CallbackTransformer;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
@@ -329,6 +332,63 @@ public function testContextIsPopulatedWithFormBeingValidatedUsingGroupSequence()
 
         $this->assertCount(0, $violations);
     }
+
+    public function testSubmitFormChoiceInvalid()
+    {
+        $form = $this->formFactory->create(DateType::class, null, [
+            'widget' => 'choice',
+            'years' => [2021],
+        ]);
+
+        $form->submit([
+            'year' => '2020',
+            'month' => '13',
+            'day' => '13',
+        ]);
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertFalse($form->isValid());
+        $this->assertCount(2, $form->getErrors());
+        $this->assertSame('This value is not valid.', $form->getErrors()[0]->getMessage());
+        $this->assertSame($form->get('year'), $form->getErrors()[0]->getOrigin());
+        $this->assertSame('This value is not valid.', $form->getErrors()[1]->getMessage());
+        $this->assertSame($form->get('month'), $form->getErrors()[1]->getOrigin());
+    }
+
+    public function testDoNotAddInvalidMessageIfChildFormIsAlreadyNotSynchronized()
+    {
+        $formBuilder = $this->formFactory->createBuilder()
+            ->add('field1')
+            ->add('field2')
+            ->addModelTransformer(new CallbackTransformer(
+                function () {
+                },
+                function () {
+                    throw new TransformationFailedException('This value is invalid.');
+                }
+            ));
+        $formBuilder->get('field2')->addModelTransformer(new CallbackTransformer(
+                function () {
+                },
+                function () {
+                    throw new TransformationFailedException('This value is invalid.');
+                }
+            ));
+        $form = $formBuilder->getForm();
+
+        $form->submit([
+            'field1' => 'foo',
+            'field2' => 'bar',
+        ]);
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertFalse($form->isValid());
+        $this->assertCount(0, $form->getErrors());
+        $this->assertTrue($form->get('field1')->isValid());
+        $this->assertCount(0, $form->get('field1')->getErrors());
+        $this->assertFalse($form->get('field2')->isValid());
+        $this->assertCount(1, $form->get('field2')->getErrors());
+    }
 }
 
 class Foo
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
index f789fbe1e408d..69f4efac171fa 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -362,40 +362,6 @@ function () { throw new TransformationFailedException(); }
             ->assertRaised();
     }
 
-    // https://github.com/symfony/symfony/issues/4359
-    public function testDontMarkInvalidIfAnyChildIsNotSynchronized()
-    {
-        $object = new \stdClass();
-        $object->child = 'bar';
-
-        $failingTransformer = new CallbackTransformer(
-            function ($data) { return $data; },
-            function () { throw new TransformationFailedException(); }
-        );
-
-        $form = $this->getBuilder('name', '\stdClass')
-            ->setData($object)
-            ->addViewTransformer($failingTransformer)
-            ->setCompound(true)
-            ->setDataMapper(new PropertyPathMapper())
-            ->add(
-                $this->getBuilder('child')
-                    ->addViewTransformer($failingTransformer)
-            )
-            ->getForm();
-
-        // Launch transformer
-        $form->submit(['child' => 'foo']);
-
-        $this->assertTrue($form->isSubmitted());
-        $this->assertFalse($form->isSynchronized());
-        $this->expectNoValidate();
-
-        $this->validator->validate($form, new Form());
-
-        $this->assertNoViolation();
-    }
-
     public function testHandleGroupSequenceValidationGroups()
     {
         $object = new \stdClass();

From 223b405168f1355460b80203c9d3e42f57bda012 Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Sun, 21 Jun 2020 18:44:56 +0200
Subject: [PATCH 12/59] Avoid accessibility errors on debug toolbar

---
 .../Resources/views/Profiler/toolbar_js.html.twig               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
index 9da75d0559219..7366808d114d0 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -1,4 +1,4 @@
-<div id="sfwdt{{ token }}" class="sf-toolbar sf-display-none"></div>
+<div id="sfwdt{{ token }}" class="sf-toolbar sf-display-none" role="region" aria-label="Symfony Web Debug Toolbar"></div>
 {{ include('@WebProfiler/Profiler/base_js.html.twig') }}
 <style{% if csp_style_nonce %} nonce="{{ csp_style_nonce }}"{% endif %}>
     {{ include('@WebProfiler/Profiler/toolbar.css.twig', { 'position': position, 'floatable': true }) }}

From afe596e16a0e161fce72236f412c97029ae130fc Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 22 Jun 2020 09:47:42 +0200
Subject: [PATCH 13/59] Relax tests to unlock change on master

---
 .../DependencyInjection/Compiler/CachePoolClearerPassTest.php | 3 +++
 .../Component/Form/Tests/DependencyInjection/FormPassTest.php | 4 +++-
 .../DependencyInjection/AddConstraintValidatorsPassTest.php   | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
index 728595ae9f2b1..e690aa8651e7d 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php
@@ -32,9 +32,11 @@ public function testPoolRefsAreWeak()
         $container->setParameter('kernel.root_dir', 'foo');
 
         $globalClearer = new Definition(Psr6CacheClearer::class);
+        $globalClearer->setPublic(true);
         $container->setDefinition('cache.global_clearer', $globalClearer);
 
         $publicPool = new Definition();
+        $publicPool->setPublic(true);
         $publicPool->addArgument('namespace');
         $publicPool->addTag('cache.pool', ['clearer' => 'clearer_alias']);
         $container->setDefinition('public.pool', $publicPool);
@@ -46,6 +48,7 @@ public function testPoolRefsAreWeak()
         $container->setDefinition('private.pool', $privatePool);
 
         $clearer = new Definition();
+        $clearer->setPublic(true);
         $container->setDefinition('clearer', $clearer);
         $container->setAlias('clearer_alias', 'clearer');
 
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
index 64393a049840a..d3856a5c57543 100644
--- a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
+++ b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -57,12 +57,14 @@ public function testAddTaggedTypes()
 
         $extDefinition = $container->getDefinition('form.extension');
 
+        $locator = $extDefinition->getArgument(0);
+        $this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
         $this->assertEquals(
             (new Definition(ServiceLocator::class, [[
                 __CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),
                 __CLASS__.'_Type2' => new ServiceClosureArgument(new Reference('my.type2')),
             ]]))->addTag('container.service_locator')->setPublic(false),
-            $extDefinition->getArgument(0)
+            $locator->setPublic(false)
         );
     }
 
diff --git a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
index 9a2958364df17..45e73fc4341e3 100644
--- a/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
+++ b/src/Symfony/Component/Validator/Tests/DependencyInjection/AddConstraintValidatorsPassTest.php
@@ -35,12 +35,14 @@ public function testThatConstraintValidatorServicesAreProcessed()
         $addConstraintValidatorsPass = new AddConstraintValidatorsPass();
         $addConstraintValidatorsPass->process($container);
 
+        $locator = $container->getDefinition((string) $validatorFactory->getArgument(0));
+        $this->assertTrue(!$locator->isPublic() || $locator->isPrivate());
         $expected = (new Definition(ServiceLocator::class, [[
             Validator1::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
             'my_constraint_validator_alias1' => new ServiceClosureArgument(new Reference('my_constraint_validator_service1')),
             Validator2::class => new ServiceClosureArgument(new Reference('my_constraint_validator_service2')),
         ]]))->addTag('container.service_locator')->setPublic(false);
-        $this->assertEquals($expected, $container->getDefinition((string) $validatorFactory->getArgument(0)));
+        $this->assertEquals($expected, $locator->setPublic(false));
     }
 
     public function testAbstractConstraintValidator()

From 12ab96ec9b2c8520b62e545c0e66acfd081bc450 Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Mon, 22 Jun 2020 10:53:03 +0200
Subject: [PATCH 14/59] [DI][FrameworkBundle] Remove whitelist occurrences

---
 .../DependencyInjection/Compiler/UnusedTagsPass.php       | 8 ++++----
 ...sed-tags-whitelist.php => check-unused-known-tags.php} | 2 +-
 .../DependencyInjection/Compiler/UnusedTagsPassTest.php   | 8 ++++----
 .../Component/DependencyInjection/ContainerBuilder.php    | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename src/Symfony/Bundle/FrameworkBundle/Resources/bin/{check-unused-tags-whitelist.php => check-unused-known-tags.php} (82%)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
index 3cbe534fb99ed..f49f6a18c041f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -21,7 +21,7 @@
  */
 class UnusedTagsPass implements CompilerPassInterface
 {
-    private $whitelist = [
+    private $knownTags = [
         'annotations.cached_reader',
         'auto_alias',
         'cache.pool',
@@ -70,11 +70,11 @@ class UnusedTagsPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        $tags = array_unique(array_merge($container->findTags(), $this->whitelist));
+        $tags = array_unique(array_merge($container->findTags(), $this->knownTags));
 
         foreach ($container->findUnusedTags() as $tag) {
-            // skip whitelisted tags
-            if (\in_array($tag, $this->whitelist)) {
+            // skip known tags
+            if (\in_array($tag, $this->knownTags)) {
                 continue;
             }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php b/src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-known-tags.php
similarity index 82%
rename from src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php
rename to src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-known-tags.php
index 7f24973cd8f14..ec9ae1f97c0ff 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-known-tags.php
@@ -15,5 +15,5 @@
 
 $target = dirname(__DIR__, 2).'/DependencyInjection/Compiler/UnusedTagsPass.php';
 $contents = file_get_contents($target);
-$contents = preg_replace('{private \$whitelist = \[(.+?)\];}sm', "private \$whitelist = [\n        '".implode("',\n        '", UnusedTagsPassUtils::getDefinedTags())."',\n    ];", $contents);
+$contents = preg_replace('{private \$knownTags = \[(.+?)\];}sm', "private \$knownTags = [\n        '".implode("',\n        '", UnusedTagsPassUtils::getDefinedTags())."',\n    ];", $contents);
 file_put_contents($target, $contents);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
index a73cdd167133d..8343d0d997fc8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -35,21 +35,21 @@ public function testProcess()
         $this->assertSame([sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)], $container->getCompiler()->getLog());
     }
 
-    public function testMissingWhitelistTags()
+    public function testMissingKnownTags()
     {
         if (\dirname((new \ReflectionClass(ContainerBuilder::class))->getFileName(), 3) !== \dirname(__DIR__, 5)) {
             $this->markTestSkipped('Tests are not run from the root symfony/symfony metapackage.');
         }
 
-        $this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getWhitelistTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php.');
+        $this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getKnownTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-known-tags.php.');
     }
 
-    private function getWhitelistTags()
+    private function getKnownTags()
     {
         // get tags in UnusedTagsPass
         $target = \dirname(__DIR__, 3).'/DependencyInjection/Compiler/UnusedTagsPass.php';
         $contents = file_get_contents($target);
-        preg_match('{private \$whitelist = \[(.+?)\];}sm', $contents, $matches);
+        preg_match('{private \$knownTags = \[(.+?)\];}sm', $contents, $matches);
         $tags = array_values(array_filter(array_map(function ($str) {
             return trim(preg_replace('{^ +\'(.+)\',}', '$1', $str));
         }, explode("\n", $matches[1]))));
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 7c9860b4dc47a..f6568b3ea3c77 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1176,9 +1176,9 @@ private function createService(Definition $definition, array &$inlineServices, $
             $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
             // don't trigger deprecations for internal uses
             // @deprecated since version 3.3, to be removed in 4.0 along with the deprecated class
-            $deprecationWhitelist = ['event_dispatcher' => ContainerAwareEventDispatcher::class];
+            $deprecationAllowlist = ['event_dispatcher' => ContainerAwareEventDispatcher::class];
 
-            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ") && (!isset($deprecationWhitelist[$id]) || $deprecationWhitelist[$id] !== $class)) {
+            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ") && (!isset($deprecationAllowlist[$id]) || $deprecationAllowlist[$id] !== $class)) {
                 @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);
             }
         }

From 39c1a6373b52903d37106c784bd95ada48f6bb7e Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 22 Jun 2020 16:52:42 +0200
Subject: [PATCH 15/59] [VarDumper] Support for cURL handler objects.

---
 src/Symfony/Component/VarDumper/Caster/ResourceCaster.php | 5 +++++
 src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
index 3cdb27c30879b..eb11aee1f0264 100644
--- a/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
+++ b/src/Symfony/Component/VarDumper/Caster/ResourceCaster.php
@@ -20,6 +20,11 @@
  */
 class ResourceCaster
 {
+    /**
+     * @param \CurlHandle|resource $h
+     *
+     * @return array
+     */
     public static function castCurl($h, array $a, Stub $stub, $isNested)
     {
         return curl_getinfo($h);
diff --git a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
index f424cc4866d21..2e1af1d77625a 100644
--- a/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
+++ b/src/Symfony/Component/VarDumper/Cloner/AbstractCloner.php
@@ -117,7 +117,9 @@ abstract class AbstractCloner implements ClonerInterface
         'DateTimeZone' => ['Symfony\Component\VarDumper\Caster\DateCaster', 'castTimeZone'],
         'DatePeriod' => ['Symfony\Component\VarDumper\Caster\DateCaster', 'castPeriod'],
 
+        'CurlHandle' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
         ':curl' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castCurl'],
+
         ':dba' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
         ':dba persistent' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castDba'],
         ':gd' => ['Symfony\Component\VarDumper\Caster\ResourceCaster', 'castGd'],

From 76a744ad91f979d87d021d1bb165db73204d1401 Mon Sep 17 00:00:00 2001
From: YaFou <33806646+YaFou@users.noreply.github.com>
Date: Tue, 23 Jun 2020 08:49:14 +0200
Subject: [PATCH 16/59] [HttpFondation] Change file extension of "audio/mpeg"
 from "mpga" to "mp3"

---
 .../HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
index c0f9140c800a2..5a809a248630f 100644
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/MimeTypeExtensionGuesser.php
@@ -619,7 +619,7 @@ class MimeTypeExtensionGuesser implements ExtensionGuesserInterface
         'audio/basic' => 'au',
         'audio/midi' => 'mid',
         'audio/mp4' => 'm4a',
-        'audio/mpeg' => 'mpga',
+        'audio/mpeg' => 'mp3',
         'audio/ogg' => 'oga',
         'audio/s3m' => 's3m',
         'audio/silk' => 'sil',

From 968bd0ffec807e153fb7dd6b642d8a5d6432f0db Mon Sep 17 00:00:00 2001
From: Robin Chalas <robin.chalas@gmail.com>
Date: Tue, 23 Jun 2020 14:31:34 +0200
Subject: [PATCH 17/59] Fixed typo in test name

---
 .../Component/Console/Tests/Helper/QuestionHelperTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 93b762c26186d..f1a7676a07e64 100644
--- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -1014,7 +1014,7 @@ public function testTraversableAutocomplete()
         $this->assertEquals('FooBundle', $dialog->ask($this->createStreamableInputInterfaceMock($inputStream), $this->createOutputInterface(), $question));
     }
 
-    public function testDisableSttby()
+    public function testDisableStty()
     {
         if (!Terminal::hasSttyAvailable()) {
             $this->markTestSkipped('`stty` is required to test autocomplete functionality');

From 4a66a6098f6072df94edfbe074c15880db4931e2 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Tue, 23 Jun 2020 10:33:22 +0200
Subject: [PATCH 18/59] fix handling typed properties as constraint options

---
 .../Component/Validator/Constraint.php        |  2 +-
 .../Validator/Tests/ConstraintTest.php        | 24 +++++++++++++++++++
 .../Fixtures/ConstraintWithStaticProperty.php | 10 ++++++++
 .../Fixtures/ConstraintWithTypedProperty.php  | 10 ++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithStaticProperty.php
 create mode 100644 src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithTypedProperty.php

diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
index 693689b912c34..ab2d8822903e4 100644
--- a/src/Symfony/Component/Validator/Constraint.php
+++ b/src/Symfony/Component/Validator/Constraint.php
@@ -108,7 +108,7 @@ public function __construct($options = null)
         $defaultOption = $this->getDefaultOption();
         $invalidOptions = [];
         $missingOptions = array_flip((array) $this->getRequiredOptions());
-        $knownOptions = get_object_vars($this);
+        $knownOptions = get_class_vars(static::class);
 
         // The "groups" option is added to the object lazily
         $knownOptions['groups'] = true;
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintTest.php b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
index 6c481b00888ed..26cc460d39c8a 100644
--- a/src/Symfony/Component/Validator/Tests/ConstraintTest.php
+++ b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
@@ -13,10 +13,13 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Exception\InvalidOptionsException;
 use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintC;
+use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithStaticProperty;
+use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithTypedProperty;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValue;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithValueAsDefault;
 
@@ -245,4 +248,25 @@ public function testAnnotationSetUndefinedDefaultOption()
         $this->expectExceptionMessage('No default option is configured for constraint "Symfony\Component\Validator\Tests\Fixtures\ConstraintB".');
         new ConstraintB(['value' => 1]);
     }
+
+    public function testStaticPropertiesAreNoOptions()
+    {
+        $this->expectException(InvalidOptionsException::class);
+
+        new ConstraintWithStaticProperty([
+            'foo' => 'bar',
+        ]);
+    }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function testSetTypedProperty()
+    {
+        $constraint = new ConstraintWithTypedProperty([
+            'foo' => 'bar',
+        ]);
+
+        $this->assertSame('bar', $constraint->foo);
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithStaticProperty.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithStaticProperty.php
new file mode 100644
index 0000000000000..f8b21694089b3
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithStaticProperty.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+use Symfony\Component\Validator\Constraint;
+
+class ConstraintWithStaticProperty extends Constraint
+{
+    public static $foo;
+}
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithTypedProperty.php b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithTypedProperty.php
new file mode 100644
index 0000000000000..a4b4e64e8eb98
--- /dev/null
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/ConstraintWithTypedProperty.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+use Symfony\Component\Validator\Constraint;
+
+class ConstraintWithTypedProperty extends Constraint
+{
+    public string $foo;
+}

From 9ba90bf1f84816ad881e25a64eae66b031b3e6fd Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 26 Jun 2020 14:15:21 +0200
Subject: [PATCH 19/59] fix guessing form types for DateTime types

---
 .../Validator/ValidatorTypeGuesser.php        |  1 +
 .../Validator/ValidatorTypeGuesserTest.php    | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
index 80ec926a94b29..17009d205dd3f 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -97,6 +97,7 @@ public function guessTypeForConstraint(Constraint $constraint)
                     case 'long':
                         return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\IntegerType', [], Guess::MEDIUM_CONFIDENCE);
 
+                    case \DateTime::class:
                     case '\DateTime':
                         return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', [], Guess::MEDIUM_CONFIDENCE);
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
index 878bbfad21bc5..3ac27cdef73b4 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Validator/ValidatorTypeGuesserTest.php
@@ -12,9 +12,17 @@
 namespace Symfony\Component\Form\Tests\Extension\Validator;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\CollectionType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Validator\ValidatorTypeGuesser;
 use Symfony\Component\Form\Guess\Guess;
+use Symfony\Component\Form\Guess\TypeGuess;
 use Symfony\Component\Form\Guess\ValueGuess;
+use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\IsTrue;
 use Symfony\Component\Validator\Constraints\Length;
@@ -59,6 +67,35 @@ protected function setUp()
         $this->guesser = new ValidatorTypeGuesser($this->metadataFactory);
     }
 
+    /**
+     * @dataProvider guessTypeProvider
+     */
+    public function testGuessType(Constraint $constraint, TypeGuess $guess)
+    {
+        $this->metadata->addPropertyConstraint(self::TEST_PROPERTY, $constraint);
+
+        $this->assertEquals($guess, $this->guesser->guessType(self::TEST_CLASS, self::TEST_PROPERTY));
+    }
+
+    public function guessTypeProvider()
+    {
+        return [
+            [new Type('array'), new TypeGuess(CollectionType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('bool'), new TypeGuess(CheckboxType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('boolean'), new TypeGuess(CheckboxType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('double'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('float'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('numeric'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('real'), new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('int'), new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('integer'), new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('long'), new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('string'), new TypeGuess(TextType::class, [], Guess::LOW_CONFIDENCE)],
+            [new Type(\DateTime::class), new TypeGuess(DateType::class, [], Guess::MEDIUM_CONFIDENCE)],
+            [new Type('\DateTime'), new TypeGuess(DateType::class, [], Guess::MEDIUM_CONFIDENCE)],
+        ];
+    }
+
     public function guessRequiredProvider()
     {
         return [

From 7cb29c8b4b2990a2555d739ec11d7b9d0d46aff8 Mon Sep 17 00:00:00 2001
From: Juan Mrad <juansmrad@gmail.com>
Date: Tue, 23 Jun 2020 11:04:58 -0500
Subject: [PATCH 20/59] [MimeType] Duplicated MimeType due to PHP Bug

---
 .../File/MimeType/FileinfoMimeTypeGuesser.php    |   8 +++++++-
 .../HttpFoundation/Tests/File/Fixtures/test.docx | Bin 0 -> 6062 bytes
 .../Tests/File/MimeType/MimeTypeTest.php         |   8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/test.docx

diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
index fc4bc45024b11..fa4c962d7dd82 100644
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
@@ -63,7 +63,13 @@ public function guess($path)
         if (!$finfo = new \finfo(FILEINFO_MIME_TYPE, $this->magicFile)) {
             return null;
         }
+        $mimeType = $finfo->file($path);
 
-        return $finfo->file($path);
+        if ($mimeType && 0 === (\strlen($mimeType) % 2)) {
+            $mimeStart = substr($mimeType, 0, \strlen($mimeType) >> 1);
+            $mimeType = $mimeStart.$mimeStart === $mimeType ? $mimeStart : $mimeType;
+        }
+
+        return $mimeType;
     }
 }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/test.docx b/src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/test.docx
new file mode 100644
index 0000000000000000000000000000000000000000..2e86b6fcea03c679370c996ba200ccb39d1dd83b
GIT binary patch
literal 6062
zcma)A2Q*x3*B)Z@=q=Gj38IH6K@bcvdMC>0WiUF4PK+91h#o{2(OdN1d$iG_iy9?L
zw4dDXem6J&fA9MDS!>qJS+mbRXTSS7&+|UY&u*cS05CBz0i7xn%79;j==!^xy`w3Y
zoeLCV=4fSS!RZdQ&58jlwsI2$DK$|u>`pV1(vk3Q`(q1i`QECIjM1(T9iNn2--abM
zsxl&8X)K4&A9pOReLs5EowjNTTt~F^!qN2kx&k>>_fPjq-5LB`)GgHgS6PJ|pH(K+
zy2Px@ZwvkK@{_epx*r!kA`}ytZpNhbnX}npJ4`4oV}Pp!leAsRj0_i%uDBIMvP1DP
zWBrXY1xPMP_$vVp6NP`!ObR2`a*a{l*&%lF;<UVL6I*+Qh{&t1tX-6Hj-V1zaDUb*
zWJ+qI5l@AEYS*TZqzcz+Y3+ll&1Zl)x*yEuV*a@v6&&`^*q5a(Eq<g$X|RD<I*5il
z$64PGeK+fP=as8W1jZc;;}wJqawKW;Ui;E6=X$t@!A3+pVv*fns|Gvx$$&(0bjBu%
zBc24R$hWP8jYK@-flxVE1B01A8EA|`^~Gp^$FPR}+%xMF5c{R<3+dcGisLh(@-T7=
z@fmdO@4gNPx0Rn^V9F6o`B<U=0HQzuK=~iniSW;Lax!yvzFsA#pUV{6Z#T`2+xgCD
zmtZ~h<h`5#g^Q<l$#!w-h$!G*cO`+BMD)_iHcMyRSmu)j^Bj;*wD<@vSX}Ia^d&5#
zgO}+UqENLwjflO)^m&GOk$BwvP>XOBT6J{!Qw!_i(VbosE$xlu<5C=@s7iwBrx8w{
zKty4bY)u~#*&~$fW@v&w{4NYlRC@Jo@|F%;O@dBqj7p;%cX{%k7QShRYh%BPD9v~D
z0;T7N8Vg?rV)C)<66}9)V9#}a8y=EAGm(}Fjj!}$-pTSXA*RcDO|!`8{%!Lx*|zP;
z8YRa`RIb`9%lF(B;{}5OFb4Cl;pj(jR)`|jgpd>yYJ4*Hg~N<*_6+;G7q&<sDJ|ns
z%f3($Zub0^QB(4~7K+>90kqD%Ec@ium-qTM*?x5xew5stfD=))kKf)z@6su8-{#A+
zh&Z?%!kv2?E|__wc4Zqk7v9@|0=`#xDUMWnuS?zO<%Pf9PZ<vt!|1wYw5COuPFg-w
z-(tLrFmP_iIw$ezS3?}G8uzx3dQZkTb4}CvAn4AMoGJ(mNz&`{_-(ymUOmffERW8_
z;0?axQb?(kSa{hdn9iWvrOdfxgFc>%7;-<1gVy#fj?va}@-Yp*N^ihX$1c4kzKR|O
zl)3^uB%m^l4xP5?*HLRtc>F^k(4<H!)M-p*pB*_bXCmIBWqpi)GeePOt(ibn0AK_C
z-)88)SU0z~b5=Ko*qZ$uBE+v)&%`7MO;pE3qjYUTLGP6NfTXe6dU$wL{ZL%_2J48Q
zSSK%fM5`+;BB7YkJ!zd#45Ek(dZ^JcXFy9{^}vxv0R=mvYtlflvYTrhs++OLiS4+g
z+Rvx?!hTfHwT|rW3{fF>x;BH=w}sez?ORaF+Ap~r?x&owhi50ea(3Fm&Efo}BX}i4
z(Zs?JE+nEMI`W*KWQ)>R8)Un0?aSaSHBy-nu^sw$jE#Is&0ZUkEZL#2Z4@XO%{QDt
zvf2S9C<i19-m8SEYfEw_;~3ILw)<7fGvj{qr65t$J^4E2mLZXd;solzvixR%zH4V`
zm<zkN^dLELq^soc!914bRV_|D&)}{nJ4@C{Ac1;AI(?KAK^^+O=#zf>`^$PNGXYc0
z1gjZ|Bx}T~^yv&kCZJgzmRfnm#eLNP(tCwJXtzU(OH5{pR)-oc{0cS?0B=R<c6S<c
z!ME25E=8i#w3CaLb|8J?C^rjN7z_n?T!UZtU%`+6U+_D7*qZ%>{#e|$9g>^mRguxL
z?|vf~ges+CrBSgVkhhUtQR^FE0@vuQw8iN8=soa=F<t%^5%oEM_N=bc`&@WntY1$-
z*5(1}f~{Qy7qv~`oke=%f|~DZD+>_w2n0GA>I&{)A&2I8|M#~A;IzXy2tV(s0+1(B
z@69+vF*JyQD&W&HD&J_$GA}wb(b24v&X5@9=l<YH3^4tvJ#+$=tx4ayrpchA4AO5y
zllyq0n!}1>$cfd`u9QH3_PJkeM@Syh=d3v#7oRBPkj=oLo=1kS!Iz@KTIy|2xEUX}
zB#@z0q1@78E2D5ANy#ZiFVrHRu<kXd!y1`F15gWLdp}5WWE001;#VxsTp=Tso9|_1
zO+Lh%=Sk0xBYmd8xa-M?gXK7#3dH?Vlf(t$B7a1p5T|Hr)<sWrA2sh8ittlE$HUN8
z5hI)2KB|wNQ#I)%MA~w2o0xq3?X5|x$rT|~Kbwj%nDsoP(o?9L4;(pwMWrOh{3Q-`
zVikqL(fRe;DCNSD>~p3t^Wh$E8o^QPa;zuxlB?r|j7B~7sF|*JDG&`BXs(jO9BO0k
zBC)DIVE5arY1MXjYSj8EfR$_}@mV~z@!_+{8J3m2U=+A15h61fc_Ca8+OZp$2w+Sk
zFU^RWB`wv{FMZJhS})}OifX#SMVOVZGx6HNPBhEAZ=8BHVU?|if)5U>p^C%rv9ZX5
zdfdhdJ<c>70dZZ}F0bdw#_mYJ?2Ix<f-c<OrHDA-(DiLuP|`da2ZG7GN1yLOoD6u#
zltiSkn;)KA3V`?*zZ<lunmDONK4(eULrprck6REKID4TtRehAYTVDUR)AgkQTG9)G
zq_gf~kI{xnvaHh4$1Mh(gaanBkV8Dk;XnkeQfZi4o)Fe!wj#=PQJET57Rj=_h30+{
z;C?X}G?DVXy*Ah>(MwnG0x$Uz%Rv!uG5IBL@+B*brmpdIn~*5n=||%t<L!mAFJAP>
zI*sx<^3wH$8pY#k?{l$t&P|C_z)c~YbwvY>&V)A}J9OqOFJp@oW?kO9Bq2B5clYt?
z++wdje;2<&7JNV&m--d}Fn`UQ{|{O<wKs8rn%O!3L905~v`X+wX-I_PWfjvMMM})L
z1LgP9ewEy%RKCotA()SFSqpZ)KC}K#gciC<4ym;Feq-Wz@l7^#%Fk~_*X+Jdn`H;d
zFrt7#ifeFw_1My!T9X8)Q2SM6Uq*0$j!TLvn5`R;<l$eM$9RV=h0lsaN0m2ZTaq&S
zCHDkf$pJITo3?Md2|~joMxDp{4sPLbu=6`E6e;Q0>PY(4XyPHwHBLmP@Su?K?1)wq
zq5;}n88hP??u%6<!LH|M@*=S=b~V5ZU#RYw5QFtc9a7<|49di%V5TMI*xg(daD2sF
zEi~X3PY8>x(Gy%!HOA!Qtyoasm@if<4CSsT*UMeI(Yv2d=$8z%d89#<Ke~^77u*X`
z=ZoLve1D~sxQOFl<VcEp%LB(BL7|UNP(={PTomrzzTq2eoZX%YYoJq!#A$M*QawwL
z0WXHZJlIN%?-ibiBi)8#?{s>(;A}6`#?N@+7H^?Y`T%$MMPH5eZG4_jJLHjq9ZRLy
z^tM$vxovySlu~K6)DuoMC-CWHq2Iccz_1^I^N3*LY|$Y<ydU;f>Z0@?oOWq5hqdHT
zIW(nJN)uz*Ommy+$ml28hvqakq#YLZ%wFU#oYgYxaB6`)Kqo-~pXyx|&m_Q_(6~|a
zhiJXCmMC03#AT-Oyj;h<r94iB&+T2Qy|wmFE#vWj$l^*`vD8o8`JO`&!G&C<y_u>f
zy4;)O*F;N(@o!T__2>KA(9z7+iR;(d;=DOi7!9`mDX)h_;8PQ&qqOoN$zV)Vy_sA0
z_fLX#@6m(hz0N`rjCg3HL2q|MJP!K9$CGG9;P$vBZkcIajs&2NG0_Tav4YtpN_bbI
zwWy#Z@Se;h0)G>q>S0de<ae=95=j+_&aL^Z@NB69lhwzno>uzBi7~i^hsc*-$yV3~
z4b9@spLoQu9#!}k7vT_$t?!9XeYEln(6fjn3)wA?O19<!ZVWN73wDc_b*WNxo#7TR
z-C^L(S?OT!m`adx*Ck4awZ)3z#%Sn&5Q48U(XU(LQ;f`L!Nd45_Da`z+^HNqLu16M
z-adL)cMiO1T@;{TbMLw_53WJ^&w#|a{>L9(``M|8K@q$bZd~*)#16q-BH&(M0_zbV
zy^Hh;KxHwTuwP2f{qV@t2+-DKd3J13vrXg5{3yKJy)!M(nr=N)tHTO?ZJ~M&MNUVM
z$$U4e*&j=|!CFZ$Oy70HRFVM*3u#6;O{yg>2Wn>aU^tuc{;-thH2eGz(}VEt*X)l~
z4;v_(#1%%^(Mz;$M;T+Cyx#5{20eE7s94{BO>7v#5SGisSACY7>se9Ig1W+S;r`|i
zQs=N7WGK0Q4z_Dz|K}$q{c}j1EzO{2Tt7c~ZeBmzI?wE<1*jVFC*A0r?aih%H_%){
zCrhRa!IX@4!8BGOag)j!Pe$ZkQX-dpQCdG42a`@hgN^n4$R@MS9!?3{QV$gsH`2th
zCJnp?SK$@n3&>qu?qbND?#H&m)4doNS76hQoZ}CkLSCOe#6ym6OI%6zN~$hQc7}Im
zLc#Fzj~{$an$7C6C5Z^p4omb~q3r5xI%UwW&Af5s9+D7ufklQE>}-Z&FF$-=`?f95
z!b*s2d<R)549(U)Lgw>5%c#=w@tnRFxD61dQQ+&4=Ug$lYNpyggK|F0PhAt9oW)mg
zL@gZzpa`jxLA2T2hbpb7I!h<GrkM!Uo>}sL@;+i+$42!jN*xX{(k2qVSl!6#kM<E=
zYlLrp_nb{t+wTQT9yF<1piFO7B@ZBS(0hWz>T3C`#y>3bUq%4Wt#d|UTI?qsxbyl=
zRo3kN5uU*L<b_%33lYlM9eLpHz&CcBlgq5JSaZ^Mev&dv^+4ylgS@;<rfpOF_v(P(
z#vh`X-`DH?m@KB*>&Ve^T)lpa4u@0op^SBO6yXtIqCFfB2nK%P_pe|%jb<T_Q`G@^
z`ZMQ4y^@V`;dho-%4iM6Uie4uh>L!@>KzWikUjPhP=4MDOH->qxeRNh^$NZ8+@B2#
zHcZ%4?Yz1iwP?Kfk##56`O85O?bY7l-hsW?)j@DD`pK&%DQdAa!Z+*8LQg~<qqgFr
zb}1)EKnNiDYPM~DZ9Ixrxa+Cd?CVLyeZ?pf^cwhcghQwbO$AFYNQ2y@cr-r)>S$z0
zzmTncXbl?9-pqS2i?bxijYDoiT@|p`Am{4F*-#Hdtx*6!sHM-#t?8#*7Np}*x$o6+
zjL8!<n^nFz!LfnGc?wFeC2`^A|77|kxJSV`LWbaNh@1r6t^JXnn{qH8@fo<(P+C&M
z$Q&Z4-5#N}r@hdX%M%$NS?8x=sp{y)P#4;o<qyILgnd2;K`<xkK~z<ah0F1rCaWeH
z^BICNUNA4;?yHHMS$;7~ARD4$aW`1_=w1y5Yv{0mmJE}7h2)4(8%pQ1R<B?pmr7&<
zIAAE5?rTg5cP!e%m}hb^Av0`vfxTWhV-FS~;@=Q4SPPRXczL<~{z|2H4!{y`ZQh{5
z)!JXR#z`*bbyj=8Ow&1yhP~+J<UOA}-@aP+A$72kY4B5VA#FLI!0?FLF`T!ufH{07
zO6MxhD0M!#-8PyqHu#(|(3t+CKMvYJ2gu<&md1h|oS0zAln7O)7>`lDI<O$90^#N=
zo@L}zxvIz&>)T-+c6RD0)o2@MTdG6nA`yXTwhH3stWV`;!AMn2TuRKU>69<yx0jry
zOKy;N(A=o81d;T?-~AA^;J)2UiTg%v6hZ=dM-j(=mfS(Pm;Hj7X`r*a0?0BQHrBSd
zflFOps8O|}+tn&JeYe>P>y--Xxhc|$8)va{C2yuF#s)U9sNtk3#P62SOiCCMWlh}6
zozp`DHq2_{yV$hj``&s=VPwgiGnz5%cqzrPbvhJ140pHg?y=Q<yksKXX17k8Mo$?=
zjqCa7U~4}wP|@(6BHFTR8K};Bfvke(swX@5PG2+u`PAG9<XvkSEKf>c^mEzU^~=!g
zhXcbT$FuxQ{rZCM1kSfc&}yrj?)MK@wg+JgIj1vb8W=V;yz54-CqPK&6G6V>tgCC4
zif`%(y{_v9rX$l)h)9G}uz~c``Naol=8DhfX>!6t#nkfIW6s?`M_81ZW3|yp`*a5+
z7+cn~`ZR4Sd*d$pMb*idk(XH!7R<RGas5Sk{9aIYZ7)$$#WEC|#SQbY&7F}H3-1E(
zmpH!>F3TBpcU#xT)ZeJ#Vr<7AXd&+D8VJK0L9`UTL>Oy<&nC%dU83EC$0F7Pb`M}j
zdy59MQy-frcJ@A2l0W-AzC%A{yYTwHSRF>`qXkbs^V3iTqd5FZY4dMUXEBg2(>WqX
zSp_}eFt;vDl`Dt4<3g{=t_~4Nr;40(74?j^$qL$EERsNS`r--InelUb@{3z!7LX?M
zXs4GnE2YwLsgS+R>MfF<r03>+bEBWONc=p3Z}VE0o@=`I2r$tIsiV5(_&k@mM3y0*
zUt!!3E4^+;;DhUp|1|Z#(GBr6-RMbOZ~U)CuA#bzgPGIw8?vd00o%3QIDJDRPv<n-
zhNLw#(8w-yDxVMC!W}^S@IxupuVq^VD+-937n>MicGh2a?7^tCCbApKVP49kZmk-r
z;n&=Te5H{kMqczDLxVsnx4GRn7I`o4bj$qHBul1b;w=s9{$!d8<}w+4^^QOZ1hYB*
zgU-4UtUmG&%JUJO$H=xO3ir0c;6(7d62FM0#jg(Yx?0$(j^hBFw`6=8bz4s#8&z6d
zgf&2O2aRN8qj=wMT3bSiXHzlY^3axA1?K6yS0sc<9d|#xpK`ZiZ8Z6)7Kt8WnmZR8
z*jFl&?fqo+(KkrJw7i#U@6x?si7)l7Hh>fX%a`{IaI}T%6oz^OBm*N1A#oRGa042W
z46VnL4tFxSPG#}pUVECIq&RD{<bY-`j;4M(Eqq1zRS&LtodfNr*(j(afWLgzU!A-g
zujTLYzg^bf^M7@5Zv4K#BKNxD&-`EAzu(h;^%DMGe(PFt{Y?Lx@$-BBuREq2$KkKY
zx^^f2DF0vo;rHZUh4J6-{R;Cx$-m0r-_w5;hd1i^uh6(wgg<NlgO>jNO23M)8!`D;
zMB)BTTK=B+D~xWm*<ay#`#-nvyHfl862A_|4c`8Wuh&2S5A-QN16~6c0KmFFB(Jv>
Inm-Hw4?2y0ApigX

literal 0
HcmV?d00001

diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
index 0418726b5b905..e38816687fec7 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
@@ -60,6 +60,14 @@ public function testGuessFileWithUnknownExtension()
         $this->assertEquals('application/octet-stream', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/.unknownextension'));
     }
 
+    /**
+     * @requires PHP 7.0
+     */
+    public function testGuessWithDuplicatedFileType()
+    {
+        $this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
+    }
+
     public function testGuessWithIncorrectPath()
     {
         $this->expectException('Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException');

From b344f6d7db29f8b6c52a9425af84c29c798b5ed6 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 28 Jun 2020 17:22:27 +0200
Subject: [PATCH 21/59] Fix test that fails on old distros

---
 .../HttpFoundation/Tests/File/MimeType/MimeTypeTest.php   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
index e38816687fec7..aca05f2d96ca0 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/File/MimeType/MimeTypeTest.php
@@ -65,7 +65,13 @@ public function testGuessFileWithUnknownExtension()
      */
     public function testGuessWithDuplicatedFileType()
     {
-        $this->assertEquals('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
+        if ('application/zip' === MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx')) {
+            $this->addToAssertionCount(1);
+
+            return;
+        }
+
+        $this->assertSame('application/vnd.openxmlformats-officedocument.wordprocessingml.document', MimeTypeGuesser::getInstance()->guess(__DIR__.'/../Fixtures/test.docx'));
     }
 
     public function testGuessWithIncorrectPath()

From 776daf28b4e5240a830ff0c724604a4968e51b24 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Mon, 29 Jun 2020 12:48:16 +0200
Subject: [PATCH 22/59] fix validating lazy properties that evaluate to null

---
 .../Validator/Tests/Fixtures/EntityParent.php |  6 +++++
 .../Validator/RecursiveValidatorTest.php      | 27 +++++++++++++++++++
 .../RecursiveContextualValidator.php          |  4 +++
 3 files changed, 37 insertions(+)

diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php b/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php
index 4674f8b35a226..eb09e5a4b2375 100644
--- a/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php
+++ b/src/Symfony/Component/Validator/Tests/Fixtures/EntityParent.php
@@ -18,6 +18,7 @@ class EntityParent implements EntityInterfaceA
     protected $firstName;
     private $internal;
     private $data = 'Data';
+    private $child;
 
     /**
      * @NotNull
@@ -28,4 +29,9 @@ public function getData()
     {
         return 'Data';
     }
+
+    public function getChild()
+    {
+        return $this->child;
+    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
index 484236241c7fa..c9e30b458780f 100644
--- a/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
+++ b/src/Symfony/Component/Validator/Tests/Validator/RecursiveValidatorTest.php
@@ -21,6 +21,7 @@
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Optional;
 use Symfony\Component\Validator\Constraints\Required;
+use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\ConstraintValidatorFactory;
 use Symfony\Component\Validator\Context\ExecutionContextFactory;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
@@ -28,6 +29,7 @@
 use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildA;
 use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildB;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\EntityParent;
 use Symfony\Component\Validator\Tests\Fixtures\EntityWithGroupedConstraintOnMethods;
 use Symfony\Component\Validator\Validator\RecursiveValidator;
 
@@ -143,6 +145,31 @@ public function testGroupedMethodConstraintValidateInSequence()
         $this->assertInstanceOf(IsTrue::class, $violations->get(1)->getConstraint());
     }
 
+    public function testValidConstraintOnGetterReturningNull()
+    {
+        $metadata = new ClassMetadata(EntityParent::class);
+        $metadata->addGetterConstraint('child', new Valid());
+
+        $this->metadataFactory->addMetadata($metadata);
+
+        $violations = $this->validator->validate(new EntityParent());
+
+        $this->assertCount(0, $violations);
+    }
+
+    public function testNotNullConstraintOnGetterReturningNull()
+    {
+        $metadata = new ClassMetadata(EntityParent::class);
+        $metadata->addGetterConstraint('child', new NotNull());
+
+        $this->metadataFactory->addMetadata($metadata);
+
+        $violations = $this->validator->validate(new EntityParent());
+
+        $this->assertCount(1, $violations);
+        $this->assertInstanceOf(NotNull::class, $violations->get(0)->getConstraint());
+    }
+
     public function testAllConstraintValidateAllGroupsForNestedConstraints()
     {
         $this->metadata->addPropertyConstraint('data', new All(['constraints' => [
diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
index 24206bfc27d92..a51e66d2906d0 100644
--- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
+++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php
@@ -680,6 +680,10 @@ private function validateGenericNode($value, $object, $cacheKey, MetadataInterfa
 
         if ($value instanceof LazyProperty) {
             $value = $value->getPropertyValue();
+
+            if (null === $value) {
+                return;
+            }
         }
 
         if (\is_array($value)) {

From 5c5ea7500eea9c04b12f8d14adafb2f537b41e78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= <lyrixx@lyrixx.info>
Date: Tue, 30 Jun 2020 14:50:28 +0200
Subject: [PATCH 23/59] Removed comments and requirements relative to php <5.5
 (not supported anymore)

---
 src/Symfony/Component/Console/Command/Command.php              | 2 --
 .../DateTimeToHtml5LocalDateTimeTransformerTest.php            | 1 -
 src/Symfony/Component/HttpFoundation/Tests/CookieTest.php      | 3 ---
 3 files changed, 6 deletions(-)

diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 311fdb6a144ef..e39cc3ba41815 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -437,8 +437,6 @@ public function setName($name)
      * This feature should be used only when creating a long process command,
      * like a daemon.
      *
-     * PHP 5.5+ or the proctitle PECL library is required
-     *
      * @param string $title The process title
      *
      * @return $this
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
index 5fd6c69f5e11b..aef3e68829b13 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
@@ -63,7 +63,6 @@ public function testTransform($fromTz, $toTz, $from, $to)
 
     /**
      * @dataProvider transformProvider
-     * @requires PHP 5.5
      */
     public function testTransformDateTimeImmutable($fromTz, $toTz, $from, $to)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
index 169f9178751d4..637cff0d09ae4 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -115,9 +115,6 @@ public function testConstructorWithDateTime()
         $this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date');
     }
 
-    /**
-     * @requires PHP 5.5
-     */
     public function testConstructorWithDateTimeImmutable()
     {
         $expire = new \DateTimeImmutable();

From aeb46373410d168b995aeab34f725092616a67f0 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 30 Jun 2020 19:26:29 +0200
Subject: [PATCH 24/59] [ErrorHandler] fix throwing from __toString()

---
 src/Symfony/Component/Debug/ErrorHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
index 40a4b1758ce7c..1e60b5ca9803d 100644
--- a/src/Symfony/Component/Debug/ErrorHandler.php
+++ b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -401,7 +401,7 @@ public function handleError($type, $message, $file, $line)
         $scope = $this->scopedErrors & $type;
 
         if (4 < $numArgs = \func_num_args()) {
-            $context = $scope ? (func_get_arg(4) ?: []) : [];
+            $context = func_get_arg(4) ?: [];
             $backtrace = 5 < $numArgs ? func_get_arg(5) : null; // defined on HHVM
         } else {
             $context = [];

From 91f30e0b62dcc7bfa5c37c49cc2d25cfcab3419f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 30 Jun 2020 19:58:29 +0200
Subject: [PATCH 25/59] [Bridge/Twig] Relax tests

---
 src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
index 273ca922d6fe8..3125b88aad7fd 100644
--- a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php
@@ -82,6 +82,7 @@ public function testDump($context, $args, $expectedOutput, $debug = true)
             $this->assertStringStartsWith('<script>', $dump);
             $dump = preg_replace('/^.*?<pre/', '<pre', $dump);
             $dump = preg_replace('/sf-dump-\d+/', 'sf-dump', $dump);
+            $dump = preg_replace('/<samp [^>]++>/', '<samp>', $dump);
         }
         $this->assertEquals($expectedOutput, $dump);
     }

From 4288df4f74183b15b6a58a49920bc4ba713aa4e5 Mon Sep 17 00:00:00 2001
From: YaFou <33806646+YaFou@users.noreply.github.com>
Date: Wed, 1 Jul 2020 09:43:16 +0200
Subject: [PATCH 26/59] [Console] Fixes question input encoding on Windows

---
 src/Symfony/Component/Console/Helper/QuestionHelper.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index 80f6048b80740..ee6d4b6642544 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -158,6 +158,11 @@ private function doAsk(OutputInterface $output, Question $question)
         $inputStream = $this->inputStream ?: STDIN;
         $autocomplete = $question->getAutocompleterValues();
 
+        if (\function_exists('sapi_windows_cp_set')) {
+            // Codepage used by cmd.exe on Windows to allow special characters (éàüñ).
+            sapi_windows_cp_set(1252);
+        }
+
         if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
             $ret = false;
             if ($question->isHidden()) {

From 02124b6b3b781c8ba604c92aafc33c4dfb17681e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Wed, 1 Jul 2020 12:07:23 +0200
Subject: [PATCH 27/59] [Console] Do not check for "stty" using "exec" if that
 function is disabled

---
 src/Symfony/Component/Console/Terminal.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
index 43a31826270bc..774c5f76bddd5 100644
--- a/src/Symfony/Component/Console/Terminal.php
+++ b/src/Symfony/Component/Console/Terminal.php
@@ -66,6 +66,11 @@ public static function hasSttyAvailable()
             return self::$stty;
         }
 
+        // skip check if exec function is disabled
+        if (!\function_exists('exec')) {
+            return false;
+        }
+
         exec('stty 2>&1', $output, $exitcode);
 
         return self::$stty = 0 === $exitcode;

From b5b146de2cf1febfc4f230025ceaa96a5c7316a8 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Wed, 1 Jul 2020 14:29:51 +0200
Subject: [PATCH 28/59] No need to create an issue when creating a PR

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8da21ec1213f2..e5e58745ee337 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,7 @@
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
-| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", if any -->
+| Tickets       | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
 | License       | MIT
 | Doc PR        | symfony/symfony-docs#... <!-- required for new features -->
 <!--

From b5aa55dab9827fbda01230c0be1afceb9180ef52 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Mon, 6 Jul 2020 14:25:52 +0200
Subject: [PATCH 29/59] fix handling null as empty data

---
 .../NumberToLocalizedStringTransformer.php        |  4 ++--
 .../Tests/Extension/Core/Type/NumberTypeTest.php  | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
index a480b8312ba65..986458bbffe8d 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -143,11 +143,11 @@ public function transform($value)
      */
     public function reverseTransform($value)
     {
-        if (!\is_string($value)) {
+        if (null !== $value && !\is_string($value)) {
             throw new TransformationFailedException('Expected a string.');
         }
 
-        if ('' === $value) {
+        if (null === $value || '' === $value) {
             return null;
         }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
index 9cc2893c662dc..8246fdaef79bc 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/NumberTypeTest.php
@@ -85,4 +85,19 @@ public function testSubmitNullUsesDefaultEmptyData($emptyData = '10', $expectedD
         $this->assertSame($expectedData, $form->getNormData());
         $this->assertSame($expectedData, $form->getData());
     }
+
+    public function testSubmitNullWithEmptyDataSetToNull()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'empty_data' => null,
+        ]);
+        $form->submit(null);
+
+        $this->assertTrue($form->isSubmitted());
+        $this->assertTrue($form->isSynchronized());
+        $this->assertTrue($form->isValid());
+        $this->assertSame('', $form->getViewData());
+        $this->assertNull($form->getNormData());
+        $this->assertNull($form->getData());
+    }
 }

From 220be89f5c6150ccbde4f4273b5aa69153634916 Mon Sep 17 00:00:00 2001
From: Jason Stephens <jason.stephens@tamu.edu>
Date: Tue, 30 Jun 2020 09:19:23 -0500
Subject: [PATCH 30/59] [Process] Fix Permission Denied error when writing
 sf_proc_00 lock files on Windows

---
 src/Symfony/Component/Process/Pipes/WindowsPipes.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Symfony/Component/Process/Pipes/WindowsPipes.php b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
index 302b0509a86b7..8973f58bee619 100644
--- a/src/Symfony/Component/Process/Pipes/WindowsPipes.php
+++ b/src/Symfony/Component/Process/Pipes/WindowsPipes.php
@@ -56,6 +56,9 @@ public function __construct($input, $haveReadSupport)
                     $file = sprintf('%s\\sf_proc_%02X.%s', $tmpDir, $i, $name);
 
                     if (!$h = fopen($file.'.lock', 'w')) {
+                        if (file_exists($file.'.lock')) {
+                            continue 2;
+                        }
                         restore_error_handler();
                         throw new RuntimeException('A temporary file could not be opened to write the process output: '.$lastError);
                     }

From d08524330a5f0ae9d00d76dd2e6b877ad2ee071f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 7 Jul 2020 19:38:20 +0200
Subject: [PATCH 31/59] [Cache] Fix compat wth DBAL v3

---
 src/Symfony/Component/Cache/Traits/PdoTrait.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php
index d453904d44a81..aaf364304fe53 100644
--- a/src/Symfony/Component/Cache/Traits/PdoTrait.php
+++ b/src/Symfony/Component/Cache/Traits/PdoTrait.php
@@ -373,19 +373,25 @@ private function getConnection()
                     case $driver instanceof \Doctrine\DBAL\Driver\DrizzlePDOMySql\Driver:
                     case $driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver:
                     case $driver instanceof \Doctrine\DBAL\Driver\PDOMySql\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\MySQL\Driver:
                         $this->driver = 'mysql';
                         break;
                     case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLite\Driver:
                         $this->driver = 'sqlite';
                         break;
                     case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\PgSQL\Driver:
                         $this->driver = 'pgsql';
                         break;
                     case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
                     case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\OCI\Driver:
                         $this->driver = 'oci';
                         break;
                     case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlsrv\Driver:
+                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLSrv\Driver:
                         $this->driver = 'sqlsrv';
                         break;
                     default:

From b4616c810c4d837a707cca9a05b1c2dc1861696c Mon Sep 17 00:00:00 2001
From: Philipp Fritsche <ph.fritsche@gmail.com>
Date: Sun, 19 Apr 2020 13:05:28 +0200
Subject: [PATCH 32/59] silently ignore uninitialized properties when mapping
 data to forms

---
 .../Core/DataMapper/PropertyPathMapper.php    | 24 ++++++++++--
 .../DataMapper/PropertyPathMapperTest.php     | 37 ++++++++++++++++++-
 .../Fixtures/TypehintedPropertiesCar.php      | 18 +++++++++
 3 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 src/Symfony/Component/Form/Tests/Fixtures/TypehintedPropertiesCar.php

diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
index 657d9d63bec26..bc31505157f77 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
@@ -13,6 +13,8 @@
 
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
+use Symfony\Component\PropertyAccess\Exception\AccessException;
+use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 
@@ -46,7 +48,7 @@ public function mapDataToForms($data, $forms)
             $config = $form->getConfig();
 
             if (!$empty && null !== $propertyPath && $config->getMapped()) {
-                $form->setData($this->propertyAccessor->getValue($data, $propertyPath));
+                $form->setData($this->getPropertyValue($data, $propertyPath));
             } else {
                 $form->setData($config->getData());
             }
@@ -76,16 +78,32 @@ public function mapFormsToData($forms, &$data)
                 $propertyValue = $form->getData();
                 // If the field is of type DateTimeInterface and the data is the same skip the update to
                 // keep the original object hash
-                if ($propertyValue instanceof \DateTimeInterface && $propertyValue == $this->propertyAccessor->getValue($data, $propertyPath)) {
+                if ($propertyValue instanceof \DateTimeInterface && $propertyValue == $this->getPropertyValue($data, $propertyPath)) {
                     continue;
                 }
 
                 // If the data is identical to the value in $data, we are
                 // dealing with a reference
-                if (!\is_object($data) || !$config->getByReference() || $propertyValue !== $this->propertyAccessor->getValue($data, $propertyPath)) {
+                if (!\is_object($data) || !$config->getByReference() || $propertyValue !== $this->getPropertyValue($data, $propertyPath)) {
                     $this->propertyAccessor->setValue($data, $propertyPath, $propertyValue);
                 }
             }
         }
     }
+
+    private function getPropertyValue($data, $propertyPath)
+    {
+        try {
+            return $this->propertyAccessor->getValue($data, $propertyPath);
+        } catch (AccessException $e) {
+            if (!$e instanceof UninitializedPropertyException
+                // For versions without UninitializedPropertyException check the exception message
+                && (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(), 'You should initialize it'))
+            ) {
+                throw $e;
+            }
+
+            return null;
+        }
+    }
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
index da351295c381e..8f274ad929054 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormConfigBuilder;
+use Symfony\Component\Form\Tests\Fixtures\TypehintedPropertiesCar;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\PropertyAccess\PropertyPath;
@@ -113,6 +114,23 @@ public function testMapDataToFormsIgnoresUnmapped()
         $this->assertNull($form->getData());
     }
 
+    /**
+     * @requires PHP 7.4
+     */
+    public function testMapDataToFormsIgnoresUninitializedProperties()
+    {
+        $engineForm = new Form(new FormConfigBuilder('engine', null, $this->dispatcher));
+        $colorForm = new Form(new FormConfigBuilder('color', null, $this->dispatcher));
+
+        $car = new TypehintedPropertiesCar();
+        $car->engine = 'BMW';
+
+        $this->mapper->mapDataToForms($car, [$engineForm, $colorForm]);
+
+        $this->assertSame($car->engine, $engineForm->getData());
+        $this->assertNull($colorForm->getData());
+    }
+
     public function testMapDataToFormsSetsDefaultDataIfPassedDataIsNull()
     {
         $default = new \stdClass();
@@ -293,13 +311,28 @@ public function testMapFormsToDataIgnoresDisabled()
         $config->setPropertyPath($propertyPath);
         $config->setData($engine);
         $config->setDisabled(true);
-        $form = new Form($config);
+        $form = new SubmittedForm($config);
 
         $this->mapper->mapFormsToData([$form], $car);
 
         $this->assertSame($initialEngine, $car->engine);
     }
 
+    /**
+     * @requires PHP 7.4
+     */
+    public function testMapFormsToUninitializedProperties()
+    {
+        $car = new TypehintedPropertiesCar();
+        $config = new FormConfigBuilder('engine', null, $this->dispatcher);
+        $config->setData('BMW');
+        $form = new SubmittedForm($config);
+
+        $this->mapper->mapFormsToData([$form], $car);
+
+        $this->assertSame('BMW', $car->engine);
+    }
+
     /**
      * @dataProvider provideDate
      */
@@ -339,7 +372,7 @@ public function isSubmitted()
     }
 }
 
-class NotSynchronizedForm extends Form
+class NotSynchronizedForm extends SubmittedForm
 {
     public function isSynchronized()
     {
diff --git a/src/Symfony/Component/Form/Tests/Fixtures/TypehintedPropertiesCar.php b/src/Symfony/Component/Form/Tests/Fixtures/TypehintedPropertiesCar.php
new file mode 100644
index 0000000000000..6d88c4841ab34
--- /dev/null
+++ b/src/Symfony/Component/Form/Tests/Fixtures/TypehintedPropertiesCar.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures;
+
+class TypehintedPropertiesCar
+{
+    public ?string $engine;
+    public ?string $color;
+}

From d962202c5f6af1ef2d06a742fc0275094e70dd4c Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Wed, 8 Jul 2020 15:48:29 +0200
Subject: [PATCH 33/59] sync translations from master branch

---
 .../Component/Form/Resources/translations/validators.en.xlf   | 4 ++++
 .../Component/Form/Resources/translations/validators.fr.xlf   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.en.xlf b/src/Symfony/Component/Form/Resources/translations/validators.en.xlf
index b8542d319ddec..89814258d145a 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.en.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.en.xlf
@@ -14,6 +14,10 @@
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
                 <target>The CSRF token is invalid. Please try to resubmit the form.</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid HTML5 color.</source>
+                <target>This value is not a valid HTML5 color.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf b/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf
index 21f9010143afc..a32c83fc93026 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.fr.xlf
@@ -14,6 +14,10 @@
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
                 <target>Le jeton CSRF est invalide. Veuillez renvoyer le formulaire.</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid HTML5 color.</source>
+                <target>Cette valeur n'est pas une couleur HTML5 valide.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 81a4baf4baf606e313fa20c182a4f684159586e5 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Wed, 8 Jul 2020 16:52:52 +0200
Subject: [PATCH 34/59] clean up HHVM instructions

---
 .travis.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3d5253f077b03..0382b1646f7e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,7 +79,7 @@ before_install:
       export COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
       find ~/.phpenv -name xdebug.ini -delete
 
-      if [[ $TRAVIS_PHP_VERSION = 5.* || $TRAVIS_PHP_VERSION = hhvm* ]]; then
+      if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then
           composer () {
               $HOME/.phpenv/versions/7.1/bin/php $HOME/.phpenv/versions/7.1/bin/composer config platform.php $(echo ' <?php echo preg_replace("/-.*/", "", PHP_VERSION);' | php /dev/stdin)
               $HOME/.phpenv/versions/7.1/bin/php $HOME/.phpenv/versions/7.1/bin/composer $*
@@ -169,17 +169,12 @@ before_install:
     - |
       # php.ini configuration
       for PHP in $TRAVIS_PHP_VERSION $php_extra; do
-          if [[ $PHP = hhvm* ]]; then
-              INI=/etc/hhvm/php.ini
-          else
-              phpenv global $PHP 2>/dev/null || (cd / && wget https://s3.amazonaws.com/travis-php-archives/binaries/ubuntu/14.04/x86_64/php-$PHP.tar.bz2 -O - | tar -xj)
-              INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
-          fi
+          phpenv global $PHP 2>/dev/null || (cd / && wget https://s3.amazonaws.com/travis-php-archives/binaries/ubuntu/14.04/x86_64/php-$PHP.tar.bz2 -O - | tar -xj)
+          INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
           echo date.timezone = Europe/Paris >> $INI
           echo memory_limit = -1 >> $INI
           echo session.gc_probability = 0 >> $INI
           echo opcache.enable_cli = 1 >> $INI
-          echo hhvm.jit = 0 >> $INI
           echo apc.enable_cli = 1 >> $INI
           if [[ $PHP = 5.* ]]; then
               echo extension = redis.so >> $INI
@@ -195,9 +190,6 @@ before_install:
     - |
       # Install extra PHP extensions
       for PHP in $TRAVIS_PHP_VERSION $php_extra; do
-          if [[ $PHP = hhvm* ]]; then
-              continue
-          fi
           export PHP=$PHP
           phpenv global $PHP
           INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
@@ -304,7 +296,7 @@ install:
 
     - |
       # phpinfo
-      if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi
+      php -i
 
     - |
       run_tests () {
@@ -319,7 +311,7 @@ install:
               ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb ~1.5.0)
           fi
           tfold 'composer update' $COMPOSER_UP
-          if [[ $TRAVIS_PHP_VERSION = 5.* || $TRAVIS_PHP_VERSION = hhvm* ]]; then
+          if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then
               tfold 'phpunit install' 'composer global remove symfony/flex && ./phpunit install && composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master'
           else
               tfold 'phpunit install' ./phpunit install
@@ -332,9 +324,6 @@ install:
               php .github/rm-invalid-lowest-lock-files.php $COMPONENTS
               echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && ([ -e composer.lock ] && ${COMPOSER_UP/update/install} || $COMPOSER_UP --prefer-lowest --prefer-stable) && $PHPUNIT_X'"
               echo "$COMPONENTS" | xargs -n1 -I{} tar --append -f ~/php-ext/composer-lowest.lock.tar {}/composer.lock
-          elif [[ $PHP = hhvm* ]]; then
-              rm src/Symfony/Bridge/PhpUnit -Rf
-              $PHPUNIT --exclude-group no-hhvm,benchmark,intl-data
           else
               echo "$COMPONENTS" | parallel --gnu "tfold {} $PHPUNIT_X {}"
               tfold src/Symfony/Component/Console.tty $PHPUNIT src/Symfony/Component/Console --group tty

From 8ba34dafd335bfc91570274bc4517f4bdb7e46d4 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Wed, 8 Jul 2020 17:20:29 +0200
Subject: [PATCH 35/59] ensure compatibility with PHP 8 stack traces

---
 .../Component/Cache/Adapter/PhpArrayAdapter.php   | 13 ++++++++++---
 .../Config/Resource/ClassExistenceResource.php    | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
index 6df00d1d33712..b4f6a1334289b 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -275,10 +275,17 @@ public static function throwOnRequiredClass($class)
             'function' => 'spl_autoload_call',
             'args' => [$class],
         ];
-        $i = 1 + array_search($autoloadFrame, $trace, true);
 
-        if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
-            switch ($trace[$i]['function']) {
+        if (\PHP_VERSION_ID >= 80000 && isset($trace[1])) {
+            $callerFrame = $trace[1];
+        } elseif (false !== $i = array_search($autoloadFrame, $trace, true)) {
+            $callerFrame = $trace[++$i];
+        } else {
+            throw $e;
+        }
+
+        if (isset($callerFrame['function']) && !isset($callerFrame['class'])) {
+            switch ($callerFrame['function']) {
                 case 'get_class_methods':
                 case 'get_class_vars':
                 case 'get_parent_class':
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
index fc0259f418922..f58d2a6df5f8a 100644
--- a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
+++ b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -190,12 +190,17 @@ public static function throwOnRequiredClass($class, \Exception $previous = null)
             'args' => [$class],
         ];
 
-        if (false === $i = array_search($autoloadFrame, $trace, true)) {
+        if (\PHP_VERSION_ID >= 80000 && isset($trace[1])) {
+            $callerFrame = $trace[1];
+            $i = 2;
+        } elseif (false !== $i = array_search($autoloadFrame, $trace, true)) {
+            $callerFrame = $trace[++$i];
+        } else {
             throw $e;
         }
 
-        if (isset($trace[++$i]['function']) && !isset($trace[$i]['class'])) {
-            switch ($trace[$i]['function']) {
+        if (isset($callerFrame['function']) && !isset($callerFrame['class'])) {
+            switch ($callerFrame['function']) {
                 case 'get_class_methods':
                 case 'get_class_vars':
                 case 'get_parent_class':
@@ -214,8 +219,8 @@ public static function throwOnRequiredClass($class, \Exception $previous = null)
             }
 
             $props = [
-                'file' => isset($trace[$i]['file']) ? $trace[$i]['file'] : null,
-                'line' => isset($trace[$i]['line']) ? $trace[$i]['line'] : null,
+                'file' => isset($callerFrame['file']) ? $callerFrame['file'] : null,
+                'line' => isset($callerFrame['line']) ? $callerFrame['line'] : null,
                 'trace' => \array_slice($trace, 1 + $i),
             ];
 

From 3db0684037693e07cec361dd773efc8b43dbcae3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 8 Jul 2020 19:07:26 +0200
Subject: [PATCH 36/59] Fix PHP 8 deprecations

---
 .../SecurityBundle/DependencyInjection/SecurityExtension.php    | 2 +-
 .../Component/DependencyInjection/Compiler/AutowirePass.php     | 2 +-
 .../Component/HttpKernel/Controller/ControllerResolver.php      | 2 +-
 src/Symfony/Component/OptionsResolver/OptionsResolver.php       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index fce4bd95382e5..ca858f1204810 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -520,7 +520,7 @@ private function createContextListener($container, $contextKey, $logoutUserOnCha
         return $this->contextListeners[$contextKey] = $listenerId;
     }
 
-    private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider = null, array $providerIds, $defaultEntryPoint, $contextListenerId = null)
+    private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, array $providerIds, $defaultEntryPoint, $contextListenerId = null)
     {
         $listeners = [];
         $hasListeners = false;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index d97f121ab9c38..0b59ecdce94cd 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -528,7 +528,7 @@ private static function getResourceMetadataForMethod(\ReflectionMethod $method)
                 if (method_exists($parameter, 'getType')) {
                     $type = $parameter->getType();
                     if ($type && !$type->isBuiltin()) {
-                        $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);
+                        $class = new \ReflectionClass($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type);
                     } else {
                         $class = null;
                     }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
index 015448b510f00..8ed79ff7b2340 100644
--- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
+++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -274,7 +274,7 @@ private function typeMatchesRequestClass(\ReflectionParameter $param, Request $r
             return false;
         }
 
-        $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);
+        $class = new \ReflectionClass($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type);
 
         return $class && $class->isInstance($request);
     }
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index 7354caf8a6fe7..cf8c3664509b0 100644
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
+++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1080,6 +1080,6 @@ private function getParameterClassName(\ReflectionParameter $parameter)
             return null;
         }
 
-        return method_exists($type, 'getName') ? $type->getName() : (string) $type;
+        return $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
     }
 }

From f41c03b8aacce0e43356cca8f6c2783d32f73710 Mon Sep 17 00:00:00 2001
From: Ahmad El-Bardan <ahmad.elbardan@sensiolabs.de>
Date: Thu, 9 Jul 2020 10:22:35 +0200
Subject: [PATCH 37/59] add german translation of the html5 color validation

---
 .../Component/Form/Resources/translations/validators.de.xlf   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.de.xlf b/src/Symfony/Component/Form/Resources/translations/validators.de.xlf
index a9a183197edc6..fe4353120d256 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.de.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.de.xlf
@@ -14,6 +14,10 @@
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
                 <target>Der CSRF-Token ist ungültig. Versuchen Sie bitte das Formular erneut zu senden.</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid HTML5 color.</source>
+                <target>Dieser Wert ist keine gültige HTML5 Farbe.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 3a4303d30392444bec0487d24eb41fc22a932775 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 9 Jul 2020 10:07:44 +0200
Subject: [PATCH 38/59] cs fix

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 90efc97658a0d..27ea603711697 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -117,7 +117,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
         'requires' => array('php' => '*'),
     );
 
-    if (1 === \count($info['versions'])) {
+    if (1 === count($info['versions'])) {
         $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress -s dev phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");
     } else {
         $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");

From 89314b5992d0cf3c10d1e1f9554724c308e16041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= <jan.schaedlich@sensiolabs.de>
Date: Fri, 10 Jul 2020 08:34:45 +0200
Subject: [PATCH 39/59] add vietnamese translation for html5 color validation

---
 .../Component/Form/Resources/translations/validators.vi.xlf   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf b/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf
index b5b2f83a9a0dd..1b689fa3eea01 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf
@@ -14,6 +14,10 @@
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
                 <target>CSRF token không hợp lệ. Vui lòng thử lại.</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid HTML5 color.</source>
+                <target>Giá trị này không phải là màu HTML5 hợp lệ.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From acea9be6d3167e587f24a2f4a0a56cefaf2b7387 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Fri, 10 Jul 2020 16:23:16 +0200
Subject: [PATCH 40/59] sync translations from master

---
 .../Resources/translations/validators.en.xlf  | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.en.xlf b/src/Symfony/Component/Form/Resources/translations/validators.en.xlf
index 89814258d145a..97ed83fd47425 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.en.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.en.xlf
@@ -18,6 +18,102 @@
                 <source>This value is not a valid HTML5 color.</source>
                 <target>This value is not a valid HTML5 color.</target>
             </trans-unit>
+            <trans-unit id="100">
+                <source>Please enter a valid birthdate.</source>
+                <target>Please enter a valid birthdate.</target>
+            </trans-unit>
+            <trans-unit id="101">
+                <source>The selected choice is invalid.</source>
+                <target>The selected choice is invalid.</target>
+            </trans-unit>
+            <trans-unit id="102">
+                <source>The collection is invalid.</source>
+                <target>The collection is invalid.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>Please select a valid color.</source>
+                <target>Please select a valid color.</target>
+            </trans-unit>
+            <trans-unit id="104">
+                <source>Please select a valid country.</source>
+                <target>Please select a valid country.</target>
+            </trans-unit>
+            <trans-unit id="105">
+                <source>Please select a valid currency.</source>
+                <target>Please select a valid currency.</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>Please choose a valid date interval.</source>
+                <target>Please choose a valid date interval.</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Please enter a valid date and time.</source>
+                <target>Please enter a valid date and time.</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Please enter a valid date.</source>
+                <target>Please enter a valid date.</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Please select a valid file.</source>
+                <target>Please select a valid file.</target>
+            </trans-unit>
+            <trans-unit id="110">
+                <source>The hidden field is invalid.</source>
+                <target>The hidden field is invalid.</target>
+            </trans-unit>
+            <trans-unit id="111">
+                <source>Please enter an integer.</source>
+                <target>Please enter an integer.</target>
+            </trans-unit>
+            <trans-unit id="112">
+                <source>Please select a valid language.</source>
+                <target>Please select a valid language.</target>
+            </trans-unit>
+            <trans-unit id="113">
+                <source>Please select a valid locale.</source>
+                <target>Please select a valid locale.</target>
+            </trans-unit>
+            <trans-unit id="114">
+                <source>Please enter a valid money amount.</source>
+                <target>Please enter a valid money amount.</target>
+            </trans-unit>
+            <trans-unit id="115">
+                <source>Please enter a number.</source>
+                <target>Please enter a number.</target>
+            </trans-unit>
+            <trans-unit id="116">
+                <source>The password is invalid.</source>
+                <target>The password is invalid.</target>
+            </trans-unit>
+            <trans-unit id="117">
+                <source>Please enter a percentage value.</source>
+                <target>Please enter a percentage value.</target>
+            </trans-unit>
+            <trans-unit id="118">
+                <source>The values do not match.</source>
+                <target>The values do not match.</target>
+            </trans-unit>
+            <trans-unit id="119">
+                <source>Please enter a valid time.</source>
+                <target>Please enter a valid time.</target>
+            </trans-unit>
+            <trans-unit id="120">
+                <source>Please select a valid timezone.</source>
+                <target>Please select a valid timezone.</target>
+            </trans-unit>
+            <trans-unit id="121">
+                <source>Please enter a valid URL.</source>
+                <target>Please enter a valid URL.</target>
+            </trans-unit>
+            <trans-unit id="122">
+                <source>Please enter a valid search term.</source>
+                <target>Please enter a valid search term.</target>
+            </trans-unit>
+            <trans-unit id="123">
+                <source>Please provide a valid phone number.</source>
+                <target>Please provide a valid phone number.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 68e2b34a9f1ae1aba93013af8ab784f3bf68cacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Sch=C3=A4dlich?= <jan.schaedlich@sensiolabs.de>
Date: Sat, 11 Jul 2020 12:37:37 +0200
Subject: [PATCH 41/59] [Form] Add missing vietnamese translations

---
 .../Resources/translations/validators.vi.xlf  | 98 ++++++++++++++++++-
 1 file changed, 97 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf b/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf
index 1b689fa3eea01..4d060fbe0d96e 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.vi.xlf
@@ -4,7 +4,7 @@
         <body>
             <trans-unit id="28">
                 <source>This form should not contain extra fields.</source>
-                <target>Mẫu này không nên chứa trường mở rộng</target>
+                <target>Mẫu này không nên chứa trường mở rộng.</target>
             </trans-unit>
             <trans-unit id="29">
                 <source>The uploaded file was too large. Please try to upload a smaller file.</source>
@@ -18,6 +18,102 @@
                 <source>This value is not a valid HTML5 color.</source>
                 <target>Giá trị này không phải là màu HTML5 hợp lệ.</target>
             </trans-unit>
+            <trans-unit id="100">
+                <source>Please enter a valid birthdate.</source>
+                <target>Vui lòng nhập ngày sinh hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="101">
+                <source>The selected choice is invalid.</source>
+                <target>Lựa chọn không hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="102">
+                <source>The collection is invalid.</source>
+                <target>Danh sách không hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>Please select a valid color.</source>
+                <target>Vui lòng chọn một màu hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="104">
+                <source>Please select a valid country.</source>
+                <target>Vui lòng chọn đất nước hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="105">
+                <source>Please select a valid currency.</source>
+                <target>Vui lòng chọn tiền tệ hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>Please choose a valid date interval.</source>
+                <target>Vui lòng chọn một khoảng thời gian hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Please enter a valid date and time.</source>
+                <target>Vui lòng nhập ngày và thời gian hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Please enter a valid date.</source>
+                <target>Vui lòng nhập ngày hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Please select a valid file.</source>
+                <target>Vui lòng chọn tệp hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="110">
+                <source>The hidden field is invalid.</source>
+                <target>Phạm vi ẩn không hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="111">
+                <source>Please enter an integer.</source>
+                <target>Vui lòng nhập một số nguyên.</target>
+            </trans-unit>
+            <trans-unit id="112">
+                <source>Please select a valid language.</source>
+                <target>Vui lòng chọn ngôn ngữ hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="113">
+                <source>Please select a valid locale.</source>
+                <target>Vui lòng chọn miền hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="114">
+                <source>Please enter a valid money amount.</source>
+                <target>Vui lòng nhập một khoảng tiền hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="115">
+                <source>Please enter a number.</source>
+                <target>Vui lòng nhập một con số.</target>
+            </trans-unit>
+            <trans-unit id="116">
+                <source>The password is invalid.</source>
+                <target>Mật khẩu không hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="117">
+                <source>Please enter a percentage value.</source>
+                <target>Vui lòng nhập một giá trị phần trăm.</target>
+            </trans-unit>
+            <trans-unit id="118">
+                <source>The values do not match.</source>
+                <target>Các giá trị không phù hợp.</target>
+            </trans-unit>
+            <trans-unit id="119">
+                <source>Please enter a valid time.</source>
+                <target>Vui lòng nhập thời gian hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="120">
+                <source>Please select a valid timezone.</source>
+                <target>Vui lòng chọn múi giờ hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="121">
+                <source>Please enter a valid URL.</source>
+                <target>Vui lòng nhập một URL hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="122">
+                <source>Please enter a valid search term.</source>
+                <target>Vui lòng nhập chuỗi tìm kiếm hợp lệ.</target>
+            </trans-unit>
+            <trans-unit id="123">
+                <source>Please provide a valid phone number.</source>
+                <target>Vui lòng cung cấp số điện thoại hợp lệ.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 1809b7c5eb2d091809c5c627e8aadda2ff893afe Mon Sep 17 00:00:00 2001
From: Marco Petersen <m@rcopetersen.com>
Date: Fri, 10 Jul 2020 18:19:49 +0200
Subject: [PATCH 42/59] Add Tagalog translations for new form messages

---
 .../Resources/translations/validators.tl.xlf  | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf b/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf
index 02def0bf31f6f..950c4110d880a 100644
--- a/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf
+++ b/src/Symfony/Component/Form/Resources/translations/validators.tl.xlf
@@ -14,6 +14,106 @@
                 <source>The CSRF token is invalid. Please try to resubmit the form.</source>
                 <target>Hindi balido ang CSRF token. Maagpasa muli ng isang pang porma.</target>
             </trans-unit>
+            <trans-unit id="99">
+                <source>This value is not a valid HTML5 color.</source>
+                <target>Ang halagang ito ay hindi wastong HTML5 color.</target>
+            </trans-unit>
+            <trans-unit id="100">
+                <source>Please enter a valid birthdate.</source>
+                <target>Pakilagay ang tamang petsa ng kapanganakan.</target>
+            </trans-unit>
+            <trans-unit id="101">
+                <source>The selected choice is invalid.</source>
+                <target>Ang pinagpiliang sagot ay hindi tama.</target>
+            </trans-unit>
+            <trans-unit id="102">
+                <source>The collection is invalid.</source>
+                <target>Hindi balido ang koleksyon.</target>
+            </trans-unit>
+            <trans-unit id="103">
+                <source>Please select a valid color.</source>
+                <target>Pakipiliin ang nararapat na kulay.</target>
+            </trans-unit>
+            <trans-unit id="104">
+                <source>Please select a valid country.</source>
+                <target>Pakipiliin ang nararapat na bansa.</target>
+            </trans-unit>
+            <trans-unit id="105">
+                <source>Please select a valid currency.</source>
+                <target>Pakipiliin ang tamang pananalapi.</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>Please choose a valid date interval.</source>
+                <target>Piliin ang wastong agwat ng petsa.</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Please enter a valid date and time.</source>
+                <target>Piliin ang wastong petsa at oras.</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Please enter a valid date.</source>
+                <target>Ilagay ang wastong petsa.</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Please select a valid file.</source>
+                <target>Piliin ang balidong file.</target>
+            </trans-unit>
+            <trans-unit id="110">
+                <source>The hidden field is invalid.</source>
+                <target>Hindi balido ang field na nakatago.</target>
+            </trans-unit>
+            <trans-unit id="111">
+                <source>Please enter an integer.</source>
+                <target>Pakilagay ang integer.</target>
+            </trans-unit>
+            <trans-unit id="112">
+                <source>Please select a valid language.</source>
+                <target>Piliin ang nararapat na lengguwahe.</target>
+            </trans-unit>
+            <trans-unit id="113">
+                <source>Please select a valid locale.</source>
+                <target>Pakipili ang nararapat na locale.</target>
+            </trans-unit>
+            <trans-unit id="114">
+                <source>Please enter a valid money amount.</source>
+                <target>Pakilagay ang tamang halaga ng pera.</target>
+            </trans-unit>
+            <trans-unit id="115">
+                <source>Please enter a number.</source>
+                <target>Ilagay ang numero.</target>
+            </trans-unit>
+            <trans-unit id="116">
+                <source>The password is invalid.</source>
+                <target>Hindi balido ang password.</target>
+            </trans-unit>
+            <trans-unit id="117">
+                <source>Please enter a percentage value.</source>
+                <target>Pakilagay ang tamang porsyento ng halaga.</target>
+            </trans-unit>
+            <trans-unit id="118">
+                <source>The values do not match.</source>
+                <target>Hindi tugma ang mga halaga.</target>
+            </trans-unit>
+            <trans-unit id="119">
+                <source>Please enter a valid time.</source>
+                <target>Pakilagay ang tamang oras.</target>
+            </trans-unit>
+            <trans-unit id="120">
+                <source>Please select a valid timezone.</source>
+                <target>Pakilagay ang tamang sona ng oras.</target>
+            </trans-unit>
+            <trans-unit id="121">
+                <source>Please enter a valid URL.</source>
+                <target>Pakilagay ang balidong URL.</target>
+            </trans-unit>
+            <trans-unit id="122">
+                <source>Please enter a valid search term.</source>
+                <target>Pakilagay ang balidong katagang sinasaliksik.</target>
+            </trans-unit>
+            <trans-unit id="123">
+                <source>Please provide a valid phone number.</source>
+                <target>Pakilagay ang balidong numero ng telepono.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

From 2effda79ea4399883eaca11cdc47169c26280138 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <misterdeviling@gmail.com>
Date: Wed, 8 Jul 2020 12:13:35 +0200
Subject: [PATCH 43/59] [Form] Fix ChoiceType translation domain

---
 .../Form/Extension/Core/Type/ChoiceType.php    |  2 +-
 .../Extension/Core/Type/ChoiceTypeTest.php     | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 1e506bf168564..fccb64b39d0f4 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -386,7 +386,7 @@ private function addSubForm(FormBuilderInterface $builder, $name, ChoiceView $ch
             'value' => $choiceView->value,
             'label' => $choiceView->label,
             'attr' => $choiceView->attr,
-            'translation_domain' => $options['translation_domain'],
+            'translation_domain' => $options['choice_translation_domain'],
             'block_name' => 'entry',
         ];
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
index 9b2b0e64a576e..ce795517b8f0f 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -1994,6 +1994,24 @@ public function testStripLeadingUnderscoresAndDigitsFromId()
         $this->assertEquals('_09name', $view->vars['full_name']);
     }
 
+    public function testSubFormTranslationDomain()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'label' => 'label',
+            'translation_domain' => 'label_translation_domain',
+            'choices' => [
+                'choice1' => true,
+                'choice2' => false,
+            ],
+            'choice_translation_domain' => 'choice_translation_domain',
+            'expanded' => true,
+        ])->createView();
+
+        $this->assertCount(2, $form->children);
+        $this->assertSame('choice_translation_domain', $form->children[0]->vars['translation_domain']);
+        $this->assertSame('choice_translation_domain', $form->children[1]->vars['translation_domain']);
+    }
+
     /**
      * @dataProvider provideTrimCases
      */

From 4273aedfae3f29c72b8ee500fe28c651cf231dc6 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 12 Jul 2020 12:21:23 +0200
Subject: [PATCH 44/59] Fix DBAL deprecation

---
 .../RememberMe/DoctrineTokenProvider.php       | 18 +++++++++++++++---
 .../RememberMe/DoctrineTokenProviderTest.php   |  2 +-
 .../Component/Cache/Traits/PdoTrait.php        | 18 +++++++++++++++---
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
index c6e4ab3a308ba..d407f8e0e86e0 100644
--- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
+++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
@@ -81,7 +81,11 @@ public function deleteTokenBySeries($series)
         $sql = 'DELETE FROM rememberme_token WHERE series=:series';
         $paramValues = ['series' => $series];
         $paramTypes = ['series' => \PDO::PARAM_STR];
-        $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        if (method_exists($this->conn, 'executeStatement')) {
+            $this->conn->executeStatement($sql, $paramValues, $paramTypes);
+        } else {
+            $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        }
     }
 
     /**
@@ -101,7 +105,11 @@ public function updateToken($series, $tokenValue, \DateTime $lastUsed)
             'lastUsed' => self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE,
             'series' => \PDO::PARAM_STR,
         ];
-        $updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        if (method_exists($this->conn, 'executeStatement')) {
+            $updated = $this->conn->executeStatement($sql, $paramValues, $paramTypes);
+        } else {
+            $updated = $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        }
         if ($updated < 1) {
             throw new TokenNotFoundException('No token found.');
         }
@@ -129,6 +137,10 @@ public function createNewToken(PersistentTokenInterface $token)
             'value' => \PDO::PARAM_STR,
             'lastUsed' => self::$useDeprecatedConstants ? Type::DATETIME : Types::DATETIME_MUTABLE,
         ];
-        $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        if (method_exists($this->conn, 'executeStatement')) {
+            $this->conn->executeStatement($sql, $paramValues, $paramTypes);
+        } else {
+            $this->conn->executeUpdate($sql, $paramValues, $paramTypes);
+        }
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
index 9c86ecacb29cc..12db31ce8dfa5 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
@@ -72,7 +72,7 @@ private function bootstrapProvider()
             'driver' => 'pdo_sqlite',
             'url' => 'sqlite:///:memory:',
         ]);
-        $connection->executeUpdate(<<< 'SQL'
+        $connection->{method_exists($this->conn, 'executeStatement') ? 'executeStatement' : 'executeUpdate'}(<<< 'SQL'
             CREATE TABLE rememberme_token (
                 series   char(88)     UNIQUE PRIMARY KEY NOT NULL,
                 value    char(88)     NOT NULL,
diff --git a/src/Symfony/Component/Cache/Traits/PdoTrait.php b/src/Symfony/Component/Cache/Traits/PdoTrait.php
index aaf364304fe53..686d111d9b152 100644
--- a/src/Symfony/Component/Cache/Traits/PdoTrait.php
+++ b/src/Symfony/Component/Cache/Traits/PdoTrait.php
@@ -107,7 +107,11 @@ public function createTable()
             $table->setPrimaryKey([$this->idCol]);
 
             foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
-                $conn->exec($sql);
+                if (method_exists($conn, 'executeStatement')) {
+                    $conn->executeStatement($sql);
+                } else {
+                    $conn->exec($sql);
+                }
             }
 
             return;
@@ -138,7 +142,11 @@ public function createTable()
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
         }
 
-        $conn->exec($sql);
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
     }
 
     /**
@@ -238,7 +246,11 @@ protected function doClear($namespace)
             $sql = "DELETE FROM $this->table WHERE $this->idCol LIKE '$namespace%'";
         }
 
-        $conn->exec($sql);
+        if (method_exists($conn, 'executeStatement')) {
+            $conn->executeStatement($sql);
+        } else {
+            $conn->exec($sql);
+        }
 
         return true;
     }

From adc79e30351f4beb8a34e0321cc1455affc29007 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 12 Jul 2020 13:20:43 +0200
Subject: [PATCH 45/59] Fix typo

---
 .../Tests/Security/RememberMe/DoctrineTokenProviderTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
index 12db31ce8dfa5..73588ce2bba50 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
@@ -72,7 +72,7 @@ private function bootstrapProvider()
             'driver' => 'pdo_sqlite',
             'url' => 'sqlite:///:memory:',
         ]);
-        $connection->{method_exists($this->conn, 'executeStatement') ? 'executeStatement' : 'executeUpdate'}(<<< 'SQL'
+        $connection->{method_exists($connection, 'executeStatement') ? 'executeStatement' : 'executeUpdate'}(<<< 'SQL'
             CREATE TABLE rememberme_token (
                 series   char(88)     UNIQUE PRIMARY KEY NOT NULL,
                 value    char(88)     NOT NULL,

From 49e9f3229c1441398f30d45393a1a99219b65f1c Mon Sep 17 00:00:00 2001
From: Philipp Kolesnikov <kolesnikov.p@hotmail.com>
Date: Wed, 8 Jul 2020 16:33:42 +1000
Subject: [PATCH 46/59] [Cache] Use the default expiry when saving (not when
 creating) items

---
 .../Cache/Adapter/AbstractAdapter.php         |   9 +-
 .../Component/Cache/Adapter/ArrayAdapter.php  |   9 +-
 .../Component/Cache/Adapter/ChainAdapter.php  |   8 +-
 .../Component/Cache/Adapter/ProxyAdapter.php  |   9 +-
 .../Cache/Adapter/TagAwareAdapter.php         |   4 +-
 src/Symfony/Component/Cache/CacheItem.php     |   5 +-
 .../Cache/Tests/Adapter/ChainAdapterTest.php  | 120 +++++++++++++++++-
 .../Cache/Tests/Fixtures/ExternalAdapter.php  |   4 +-
 8 files changed, 141 insertions(+), 27 deletions(-)

diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
index ce1262ae17557..4022307284a9b 100644
--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -48,12 +48,11 @@ protected function __construct($namespace = '', $defaultLifetime = 0)
             throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
         }
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, $isHit) use ($defaultLifetime) {
+            static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
                 $item->isHit = $isHit;
-                $item->defaultLifetime = $defaultLifetime;
 
                 return $item;
             },
@@ -62,14 +61,16 @@ static function ($key, $value, $isHit) use ($defaultLifetime) {
         );
         $getId = function ($key) { return $this->getId((string) $key); };
         $this->mergeByLifetime = \Closure::bind(
-            static function ($deferred, $namespace, &$expiredIds) use ($getId) {
+            static function ($deferred, $namespace, &$expiredIds) use ($getId, $defaultLifetime) {
                 $byLifetime = [];
                 $now = time();
                 $expiredIds = [];
 
                 foreach ($deferred as $key => $item) {
                     if (null === $item->expiry) {
-                        $byLifetime[0 < $item->defaultLifetime ? $item->defaultLifetime : 0][$getId($key)] = $item->value;
+                        $byLifetime[0 < $defaultLifetime ? $defaultLifetime : 0][$getId($key)] = $item->value;
+                    } elseif (0 === $item->expiry) {
+                        $byLifetime[0][$getId($key)] = $item->value;
                     } elseif ($item->expiry > $now) {
                         $byLifetime[$item->expiry - $now][$getId($key)] = $item->value;
                     } else {
diff --git a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
index 4c6695e267def..ff826f47a2ffc 100644
--- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
@@ -25,6 +25,7 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
     use ArrayTrait;
 
     private $createCacheItem;
+    private $defaultLifetime;
 
     /**
      * @param int  $defaultLifetime
@@ -32,14 +33,14 @@ class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, Resettable
      */
     public function __construct($defaultLifetime = 0, $storeSerialized = true)
     {
+        $this->defaultLifetime = $defaultLifetime;
         $this->storeSerialized = $storeSerialized;
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, $isHit) use ($defaultLifetime) {
+            static function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
                 $item->isHit = $isHit;
-                $item->defaultLifetime = $defaultLifetime;
 
                 return $item;
             },
@@ -127,8 +128,8 @@ public function save(CacheItemInterface $item)
                 return false;
             }
         }
-        if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
-            $expiry = time() + $item["\0*\0defaultLifetime"];
+        if (null === $expiry && 0 < $this->defaultLifetime) {
+            $expiry = time() + $this->defaultLifetime;
         }
 
         $this->values[$key] = $value;
diff --git a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
index c2c9f4a8008ac..2bf89bcf96873 100644
--- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
@@ -61,14 +61,10 @@ public function __construct(array $adapters, $defaultLifetime = 0)
         $this->syncItem = \Closure::bind(
             static function ($sourceItem, $item) use ($defaultLifetime) {
                 $item->value = $sourceItem->value;
-                $item->expiry = $sourceItem->expiry;
                 $item->isHit = $sourceItem->isHit;
 
-                if (0 < $sourceItem->defaultLifetime && $sourceItem->defaultLifetime < $defaultLifetime) {
-                    $defaultLifetime = $sourceItem->defaultLifetime;
-                }
-                if (0 < $defaultLifetime && ($item->defaultLifetime <= 0 || $defaultLifetime < $item->defaultLifetime)) {
-                    $item->defaultLifetime = $defaultLifetime;
+                if (0 < $defaultLifetime) {
+                    $item->expiresAfter($defaultLifetime);
                 }
 
                 return $item;
diff --git a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
index f5748268440ab..c89a760ed2c16 100644
--- a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
@@ -29,6 +29,7 @@ class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableIn
     private $namespaceLen;
     private $createCacheItem;
     private $poolHash;
+    private $defaultLifetime;
 
     /**
      * @param string $namespace
@@ -40,11 +41,11 @@ public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defa
         $this->poolHash = $poolHash = spl_object_hash($pool);
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace);
         $this->namespaceLen = \strlen($namespace);
+        $this->defaultLifetime = $defaultLifetime;
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $innerItem) use ($defaultLifetime, $poolHash) {
+            static function ($key, $innerItem) use ($poolHash) {
                 $item = new CacheItem();
                 $item->key = $key;
-                $item->defaultLifetime = $defaultLifetime;
                 $item->poolHash = $poolHash;
 
                 if (null !== $innerItem) {
@@ -155,8 +156,8 @@ private function doSave(CacheItemInterface $item, $method)
         }
         $item = (array) $item;
         $expiry = $item["\0*\0expiry"];
-        if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
-            $expiry = time() + $item["\0*\0defaultLifetime"];
+        if (null === $expiry && 0 < $this->defaultLifetime) {
+            $expiry = time() + $this->defaultLifetime;
         }
 
         if ($item["\0*\0poolHash"] === $this->poolHash && $item["\0*\0innerItem"]) {
diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
index ecdd0d6991083..febe50900a7b7 100644
--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
@@ -46,7 +46,6 @@ static function ($key, $value, CacheItem $protoItem) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
-                $item->defaultLifetime = $protoItem->defaultLifetime;
                 $item->expiry = $protoItem->expiry;
                 $item->poolHash = $protoItem->poolHash;
 
@@ -90,8 +89,7 @@ static function ($deferred) {
         $this->invalidateTags = \Closure::bind(
             static function (AdapterInterface $tagsAdapter, array $tags) {
                 foreach ($tags as $v) {
-                    $v->defaultLifetime = 0;
-                    $v->expiry = null;
+                    $v->expiry = 0;
                     $tagsAdapter->saveDeferred($v);
                 }
 
diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php
index b16ad0faf7545..e802c30729b17 100644
--- a/src/Symfony/Component/Cache/CacheItem.php
+++ b/src/Symfony/Component/Cache/CacheItem.php
@@ -24,7 +24,6 @@ final class CacheItem implements CacheItemInterface
     protected $value;
     protected $isHit = false;
     protected $expiry;
-    protected $defaultLifetime;
     protected $tags = [];
     protected $prevTags = [];
     protected $innerItem;
@@ -74,7 +73,7 @@ public function set($value)
     public function expiresAt($expiration)
     {
         if (null === $expiration) {
-            $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
+            $this->expiry = null;
         } elseif ($expiration instanceof \DateTimeInterface) {
             $this->expiry = (int) $expiration->format('U');
         } else {
@@ -92,7 +91,7 @@ public function expiresAt($expiration)
     public function expiresAfter($time)
     {
         if (null === $time) {
-            $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
+            $this->expiry = null;
         } elseif ($time instanceof \DateInterval) {
             $this->expiry = (int) \DateTime::createFromFormat('U', time())->add($time)->format('U');
         } elseif (\is_int($time)) {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
index 5e48930dd1f93..be811d6fd736b 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
@@ -27,7 +27,7 @@ class ChainAdapterTest extends AdapterTestCase
 {
     public function createCachePool($defaultLifetime = 0)
     {
-        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter(), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
+        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter($defaultLifetime), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
     }
 
     public function testEmptyAdaptersException()
@@ -65,6 +65,124 @@ public function testPrune()
         $this->assertFalse($cache->prune());
     }
 
+    public function testMultipleCachesExpirationWhenCommonTtlIsNotSet()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $adapter1 = new ArrayAdapter(4);
+        $adapter2 = new ArrayAdapter(2);
+
+        $cache = new ChainAdapter([$adapter1, $adapter2]);
+
+        $cache->save($cache->getItem('key')->set('value'));
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        $adapter2->save($adapter2->getItem('key1')->set('value1'));
+
+        $item = $cache->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        $item = $adapter2->getItem('key1');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertFalse($item->isHit());
+    }
+
+    public function testMultipleCachesExpirationWhenCommonTtlIsSet()
+    {
+        if (isset($this->skippedTests[__FUNCTION__])) {
+            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
+        }
+
+        $adapter1 = new ArrayAdapter(4);
+        $adapter2 = new ArrayAdapter(2);
+
+        $cache = new ChainAdapter([$adapter1, $adapter2], 6);
+
+        $cache->save($cache->getItem('key')->set('value'));
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value', $item->get());
+
+        $item = $adapter2->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key');
+        $this->assertFalse($item->isHit());
+
+        $adapter2->save($adapter2->getItem('key1')->set('value1'));
+
+        $item = $cache->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        $item = $adapter2->getItem('key1');
+        $this->assertFalse($item->isHit());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertTrue($item->isHit());
+        $this->assertEquals('value1', $item->get());
+
+        sleep(2);
+
+        $item = $adapter1->getItem('key1');
+        $this->assertFalse($item->isHit());
+    }
+
     /**
      * @return MockObject|PruneableCacheInterface
      */
diff --git a/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php b/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
index 779a374ec7ab8..be1f99012109f 100644
--- a/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
+++ b/src/Symfony/Component/Cache/Tests/Fixtures/ExternalAdapter.php
@@ -24,9 +24,9 @@ class ExternalAdapter implements CacheItemPoolInterface
 {
     private $cache;
 
-    public function __construct()
+    public function __construct($defaultLifetime = 0)
     {
-        $this->cache = new ArrayAdapter();
+        $this->cache = new ArrayAdapter($defaultLifetime);
     }
 
     public function getItem($key)

From b352ff08ad2cf40d607ad5b787fb3bb1971a3516 Mon Sep 17 00:00:00 2001
From: Thomas Calvet <calvet.thomas@gmail.com>
Date: Thu, 16 Jul 2020 11:17:05 +0200
Subject: [PATCH 47/59] [SCA] Minor fixes on tests

---
 .../UserPasswordEncoderCommandTest.php        |  2 +-
 .../Tests/Exception/FlattenExceptionTest.php  |  8 +++---
 .../Tests/ContainerBuilderTest.php            |  4 +--
 .../Tests/DefinitionTest.php                  |  4 +--
 .../Component/DomCrawler/Tests/FormTest.php   | 25 +++++++++++--------
 .../ParserCache/ParserCacheAdapterTest.php    |  4 +--
 .../HttpFoundation/Tests/ResponseTest.php     |  8 +++---
 .../Handler/MongoDbSessionHandlerTest.php     |  2 +-
 .../Storage/PhpBridgeSessionStorageTest.php   |  8 +++---
 .../FilterControllerArgumentsEventTest.php    |  2 +-
 .../Profiler/FileProfilerStorageTest.php      |  6 ++---
 .../Tests/Adapter/ExtLdap/AdapterTest.php     |  8 +++---
 .../Tests/Adapter/ExtLdap/LdapManagerTest.php |  2 +-
 .../Process/Tests/PhpExecutableFinderTest.php |  6 ++---
 .../Templating/Tests/PhpEngineTest.php        |  4 +--
 .../Tests/PluralizationRulesTest.php          |  4 +--
 16 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
index be643c3c344f2..0e69963922ff9 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php
@@ -50,7 +50,7 @@ public function testEncodeNoPasswordNoInteraction()
         ], ['interactive' => false]);
 
         $this->assertStringContainsString('[ERROR] The password must not be empty.', $this->passwordEncoderCommandTester->getDisplay());
-        $this->assertEquals($statusCode, 1);
+        $this->assertEquals(1, $statusCode);
     }
 
     public function testEncodePasswordBcrypt()
diff --git a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
index 3d163eec7775f..431edb147ba4f 100644
--- a/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/Debug/Tests/Exception/FlattenExceptionTest.php
@@ -147,9 +147,9 @@ public function testPreviousError()
 
         $flattened = FlattenException::create($exception)->getPrevious();
 
-        $this->assertEquals($flattened->getMessage(), 'Parse error: Oh noes!', 'The message is copied from the original exception.');
-        $this->assertEquals($flattened->getCode(), 42, 'The code is copied from the original exception.');
-        $this->assertEquals($flattened->getClass(), 'Symfony\Component\Debug\Exception\FatalThrowableError', 'The class is set to the class of the original exception');
+        $this->assertEquals('Parse error: Oh noes!', $flattened->getMessage(), 'The message is copied from the original exception.');
+        $this->assertEquals(42, $flattened->getCode(), 'The code is copied from the original exception.');
+        $this->assertEquals('Symfony\Component\Debug\Exception\FatalThrowableError', $flattened->getClass(), 'The class is set to the class of the original exception');
     }
 
     /**
@@ -259,7 +259,7 @@ function () {},
         $this->assertSame(['float', INF], $array[$i++]);
 
         // assertEquals() does not like NAN values.
-        $this->assertEquals($array[$i][0], 'float');
+        $this->assertEquals('float', $array[$i][0]);
         $this->assertNan($array[$i][1]);
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 4ccab66339d53..fd33ce12b681b 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -846,12 +846,12 @@ public function testfindTaggedServiceIds()
             ->addTag('bar', ['bar' => 'bar'])
             ->addTag('foo', ['foofoo' => 'foofoo'])
         ;
-        $this->assertEquals($builder->findTaggedServiceIds('foo'), [
+        $this->assertEquals([
             'foo' => [
                 ['foo' => 'foo'],
                 ['foofoo' => 'foofoo'],
             ],
-        ], '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
+        ], $builder->findTaggedServiceIds('foo'), '->findTaggedServiceIds() returns an array of service ids and its tag attributes');
         $this->assertEquals([], $builder->findTaggedServiceIds('foobar'), '->findTaggedServiceIds() returns an empty array if there is annotated services');
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
index 1f1cd380f9386..63ca748eb00e1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -224,10 +224,10 @@ public function testTags()
         $def->addTag('foo', ['foo' => 'bar']);
         $this->assertEquals([[], ['foo' => 'bar']], $def->getTag('foo'), '->addTag() can adds the same tag several times');
         $def->addTag('bar', ['bar' => 'bar']);
-        $this->assertEquals($def->getTags(), [
+        $this->assertEquals([
             'foo' => [[], ['foo' => 'bar']],
             'bar' => [['bar' => 'bar']],
-        ], '->getTags() returns all tags');
+        ], $def->getTags(), '->getTags() returns all tags');
     }
 
     public function testSetArgument()
diff --git a/src/Symfony/Component/DomCrawler/Tests/FormTest.php b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
index f042513f8d685..19f704e5fd86f 100644
--- a/src/Symfony/Component/DomCrawler/Tests/FormTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/FormTest.php
@@ -170,25 +170,28 @@ public function testMultiValuedFields()
         ');
 
         $this->assertEquals(
-            array_keys($form->all()),
-            ['foo[2]', 'foo[3]', 'bar[foo][0]', 'bar[foo][foobar]']
+            ['foo[2]', 'foo[3]', 'bar[foo][0]', 'bar[foo][foobar]'],
+            array_keys($form->all())
         );
 
-        $this->assertEquals($form->get('foo[2]')->getValue(), 'foo');
-        $this->assertEquals($form->get('foo[3]')->getValue(), 'foo');
-        $this->assertEquals($form->get('bar[foo][0]')->getValue(), 'foo');
-        $this->assertEquals($form->get('bar[foo][foobar]')->getValue(), 'foo');
+        $this->assertEquals('foo', $form->get('foo[2]')->getValue());
+        $this->assertEquals('foo', $form->get('foo[3]')->getValue());
+        $this->assertEquals('foo', $form->get('bar[foo][0]')->getValue());
+        $this->assertEquals('foo', $form->get('bar[foo][foobar]')->getValue());
 
         $form['foo[2]'] = 'bar';
         $form['foo[3]'] = 'bar';
 
-        $this->assertEquals($form->get('foo[2]')->getValue(), 'bar');
-        $this->assertEquals($form->get('foo[3]')->getValue(), 'bar');
+        $this->assertEquals('bar', $form->get('foo[2]')->getValue());
+        $this->assertEquals('bar', $form->get('foo[3]')->getValue());
 
         $form['bar'] = ['foo' => ['0' => 'bar', 'foobar' => 'foobar']];
 
-        $this->assertEquals($form->get('bar[foo][0]')->getValue(), 'bar');
-        $this->assertEquals($form->get('bar[foo][foobar]')->getValue(), 'foobar');
+        $this->assertEquals('bar', $form->get('bar[foo][0]')->getValue());
+        $this->assertEquals(
+            'foobar',
+            $form->get('bar[foo][foobar]')->getValue()
+        );
     }
 
     /**
@@ -967,7 +970,7 @@ public function testGetPhpValuesWithEmptyTextarea()
 
         $nodes = $dom->getElementsByTagName('form');
         $form = new Form($nodes->item(0), 'http://example.com');
-        $this->assertEquals($form->getPhpValues(), ['example' => '']);
+        $this->assertEquals(['example' => ''], $form->getPhpValues());
     }
 
     public function testGetReturnTypes()
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php
index 2e9263307f0dd..f82af92e18817 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ParserCache/ParserCacheAdapterTest.php
@@ -38,8 +38,8 @@ public function testGetItem()
 
         $cacheItem = $parserCacheAdapter->getItem($key);
 
-        $this->assertEquals($cacheItem->get(), $value);
-        $this->assertEquals($cacheItem->isHit(), true);
+        $this->assertEquals($value, $cacheItem->get());
+        $this->assertTrue($cacheItem->isHit());
     }
 
     public function testSave()
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
index b846cdad3c3fe..43dfa8a8b32eb 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -592,20 +592,20 @@ public function testSetCache()
 
         $options = ['etag' => '"whatever"'];
         $response->setCache($options);
-        $this->assertEquals($response->getEtag(), '"whatever"');
+        $this->assertEquals('"whatever"', $response->getEtag());
 
         $now = $this->createDateTimeNow();
         $options = ['last_modified' => $now];
         $response->setCache($options);
-        $this->assertEquals($response->getLastModified()->getTimestamp(), $now->getTimestamp());
+        $this->assertEquals($now->getTimestamp(), $response->getLastModified()->getTimestamp());
 
         $options = ['max_age' => 100];
         $response->setCache($options);
-        $this->assertEquals($response->getMaxAge(), 100);
+        $this->assertEquals(100, $response->getMaxAge());
 
         $options = ['s_maxage' => 200];
         $response->setCache($options);
-        $this->assertEquals($response->getMaxAge(), 200);
+        $this->assertEquals(200, $response->getMaxAge());
 
         $this->assertTrue($response->headers->hasCacheControlDirective('public'));
         $this->assertFalse($response->headers->hasCacheControlDirective('private'));
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
index f0f43d05b4dc9..cbfda8e748a90 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
@@ -102,7 +102,7 @@ public function testRead()
             ->method('findOne')
             ->willReturnCallback(function ($criteria) use ($testTimeout) {
                 $this->assertArrayHasKey($this->options['id_field'], $criteria);
-                $this->assertEquals($criteria[$this->options['id_field']], 'foo');
+                $this->assertEquals('foo', $criteria[$this->options['id_field']]);
 
                 $this->assertArrayHasKey($this->options['expiry_field'], $criteria);
                 $this->assertArrayHasKey('$gte', $criteria[$this->options['expiry_field']]);
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
index 752be618bc1ee..700764840d75e 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/PhpBridgeSessionStorageTest.php
@@ -87,10 +87,10 @@ public function testClear()
         $_SESSION['drak'] = 'loves symfony';
         $storage->getBag('attributes')->set('symfony', 'greatness');
         $key = $storage->getBag('attributes')->getStorageKey();
-        $this->assertEquals($_SESSION[$key], ['symfony' => 'greatness']);
-        $this->assertEquals($_SESSION['drak'], 'loves symfony');
+        $this->assertEquals(['symfony' => 'greatness'], $_SESSION[$key]);
+        $this->assertEquals('loves symfony', $_SESSION['drak']);
         $storage->clear();
-        $this->assertEquals($_SESSION[$key], []);
-        $this->assertEquals($_SESSION['drak'], 'loves symfony');
+        $this->assertEquals([], $_SESSION[$key]);
+        $this->assertEquals('loves symfony', $_SESSION['drak']);
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php b/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php
index abc51ac51e777..53962347d0015 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Event/FilterControllerArgumentsEventTest.php
@@ -12,6 +12,6 @@ class FilterControllerArgumentsEventTest extends TestCase
     public function testFilterControllerArgumentsEvent()
     {
         $filterController = new FilterControllerArgumentsEvent(new TestHttpKernel(), function () {}, ['test'], new Request(), 1);
-        $this->assertEquals($filterController->getArguments(), ['test']);
+        $this->assertEquals(['test'], $filterController->getArguments());
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
index 1cc05e41ec854..7100659c4ddf6 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Profiler/FileProfilerStorageTest.php
@@ -205,9 +205,9 @@ public function testStoreTime()
 
         $records = $this->storage->find('', '', 3, 'GET', $start, time() + 3 * 60);
         $this->assertCount(3, $records, '->find() returns all previously added records');
-        $this->assertEquals($records[0]['token'], 'time_2', '->find() returns records ordered by time in descendant order');
-        $this->assertEquals($records[1]['token'], 'time_1', '->find() returns records ordered by time in descendant order');
-        $this->assertEquals($records[2]['token'], 'time_0', '->find() returns records ordered by time in descendant order');
+        $this->assertEquals('time_2', $records[0]['token'], '->find() returns records ordered by time in descendant order');
+        $this->assertEquals('time_1', $records[1]['token'], '->find() returns records ordered by time in descendant order');
+        $this->assertEquals('time_0', $records[2]['token'], '->find() returns records ordered by time in descendant order');
 
         $records = $this->storage->find('', '', 3, 'GET', $start, time() + 2 * 60);
         $this->assertCount(2, $records, '->find() should return only first two of the previously added records');
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
index 4a4fcfb0ad6c2..ed7fdecc40f5a 100644
--- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
+++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/AdapterTest.php
@@ -87,12 +87,12 @@ public function testLdapQueryScopeBase()
         $ldap->getConnection()->bind('cn=admin,dc=symfony,dc=com', 'symfony');
 
         $query = $ldap->createQuery('cn=Fabien Potencier,dc=symfony,dc=com', '(objectclass=*)', [
-           'scope' => Query::SCOPE_BASE,
+            'scope' => Query::SCOPE_BASE,
         ]);
         $result = $query->execute();
 
         $entry = $result[0];
-        $this->assertEquals($result->count(), 1);
+        $this->assertEquals(1, $result->count());
         $this->assertEquals(['Fabien Potencier'], $entry->getAttribute('cn'));
     }
 
@@ -109,7 +109,7 @@ public function testLdapQueryScopeOneLevel()
         $subtree_count = $ldap->createQuery('ou=Components,dc=symfony,dc=com', '(objectclass=*)')->execute()->count();
 
         $this->assertNotEquals($one_level_result->count(), $subtree_count);
-        $this->assertEquals($one_level_result->count(), 1);
-        $this->assertEquals($one_level_result[0]->getAttribute('ou'), ['Ldap']);
+        $this->assertEquals(1, $one_level_result->count());
+        $this->assertEquals(['Ldap'], $one_level_result[0]->getAttribute('ou'));
     }
 }
diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
index 48719a46b4672..07b8a92a11c3c 100644
--- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
+++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php
@@ -163,7 +163,7 @@ public function testLdapRename()
 
         $result = $this->executeSearchQuery(1);
         $renamedEntry = $result[0];
-        $this->assertEquals($renamedEntry->getAttribute('cn')[0], 'Kevin');
+        $this->assertEquals('Kevin', $renamedEntry->getAttribute('cn')[0]);
 
         $oldRdn = $entry->getAttribute('cn')[0];
         $entryManager->rename($renamedEntry, 'cn='.$oldRdn);
diff --git a/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
index 795be8fa24bfc..bf4d81a41b4a1 100644
--- a/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
+++ b/src/Symfony/Component/Process/Tests/PhpExecutableFinderTest.php
@@ -62,11 +62,11 @@ public function testFindArguments()
         $f = new PhpExecutableFinder();
 
         if (\defined('HHVM_VERSION')) {
-            $this->assertEquals($f->findArguments(), ['--php'], '::findArguments() returns HHVM arguments');
+            $this->assertEquals(['--php'], $f->findArguments(), '::findArguments() returns HHVM arguments');
         } elseif ('phpdbg' === \PHP_SAPI) {
-            $this->assertEquals($f->findArguments(), ['-qrr'], '::findArguments() returns phpdbg arguments');
+            $this->assertEquals(['-qrr'], $f->findArguments(), '::findArguments() returns phpdbg arguments');
         } else {
-            $this->assertEquals($f->findArguments(), [], '::findArguments() returns no arguments');
+            $this->assertEquals([], $f->findArguments(), '::findArguments() returns no arguments');
         }
     }
 }
diff --git a/src/Symfony/Component/Templating/Tests/PhpEngineTest.php b/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
index 5f43cb5f2416b..e99ccf4d14097 100644
--- a/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
+++ b/src/Symfony/Component/Templating/Tests/PhpEngineTest.php
@@ -179,9 +179,9 @@ public function testGlobalsGetPassedToTemplate()
 
         $this->loader->setTemplate('global.php', '<?php echo $global; ?>');
 
-        $this->assertEquals($engine->render('global.php'), 'global variable');
+        $this->assertEquals('global variable', $engine->render('global.php'));
 
-        $this->assertEquals($engine->render('global.php', ['global' => 'overwritten']), 'overwritten');
+        $this->assertEquals('overwritten', $engine->render('global.php', ['global' => 'overwritten']));
     }
 
     public function testGetLoader()
diff --git a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
index 287764327a42f..d93fab804ea91 100644
--- a/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
+++ b/src/Symfony/Component/Translation/Tests/PluralizationRulesTest.php
@@ -100,9 +100,9 @@ protected function validateMatrix($nplural, $matrix, $expectSuccess = true)
         foreach ($matrix as $langCode => $data) {
             $indexes = array_flip($data);
             if ($expectSuccess) {
-                $this->assertEquals($nplural, \count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
+                $this->assertCount((int) $nplural, $indexes, "Langcode '$langCode' has '$nplural' plural forms.");
             } else {
-                $this->assertNotEquals((int) $nplural, \count($indexes), "Langcode '$langCode' has '$nplural' plural forms.");
+                $this->assertNotCount((int) $nplural, $indexes, "Langcode '$langCode' has '$nplural' plural forms.");
             }
         }
     }

From 2bb3f08fba5617527e4ea2da476d58f708e009bc Mon Sep 17 00:00:00 2001
From: Colin O'Dell <colinodell@gmail.com>
Date: Sun, 19 Jul 2020 09:57:33 -0400
Subject: [PATCH 48/59] Fix checks for phpunit releases on Composer 2 (resolves
 #37601)

---
 src/Symfony/Bridge/PhpUnit/bin/simple-phpunit | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
index 27ea603711697..7b5e3b1675a7a 100755
--- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
+++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -117,7 +117,11 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
         'requires' => array('php' => '*'),
     );
 
-    if (1 === count($info['versions'])) {
+    $stableVersions = array_filter($info['versions'], function($v) {
+        return !preg_match('/-dev$|^dev-/', $v);
+    });
+
+    if (!$stableVersions) {
         $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress -s dev phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");
     } else {
         $passthruOrFail("$COMPOSER create-project --ignore-platform-reqs --no-install --prefer-dist --no-scripts --no-plugins --no-progress phpunit/phpunit phpunit-$PHPUNIT_VERSION \"$PHPUNIT_VERSION.*\"");

From 6a7685f3153cffc44dfecd3e4f1b9a292ac5b7d2 Mon Sep 17 00:00:00 2001
From: shreypuranik <code@shreypuranik.co.uk>
Date: Wed, 15 Jul 2020 17:19:14 +0100
Subject: [PATCH 49/59] Readability update

---
 .../Csp/ContentSecurityPolicyHandler.php                 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index f75d29aea78d6..d27db85c9cd3b 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -127,8 +127,15 @@ private function updateCspHeaders(Response $response, array $nonces = [])
 
         $headers = $this->getCspHeaders($response);
 
+        $types = [
+          'script-src'      => 'csp_script_nonce',
+          'script-src-elem' => 'csp_script_nonce',
+          'style-src'       => 'csp_style_nonce',
+          'style-src-elem'  => 'csp_style_nonce'
+        ];
+
         foreach ($headers as $header => $directives) {
-            foreach (['script-src' => 'csp_script_nonce', 'script-src-elem' => 'csp_script_nonce', 'style-src' => 'csp_style_nonce', 'style-src-elem' => 'csp_style_nonce'] as $type => $tokenName) {
+            foreach ($types as $type => $tokenName) {
                 if ($this->authorizesInline($directives, $type)) {
                     continue;
                 }

From 87a51353062621e28011ba27dd1a97ccd6ae9dba Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 23 Jul 2020 08:37:54 +0200
Subject: [PATCH 50/59] Fix CS

---
 .../WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
index d27db85c9cd3b..1742b32d12fa8 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Csp/ContentSecurityPolicyHandler.php
@@ -128,10 +128,10 @@ private function updateCspHeaders(Response $response, array $nonces = [])
         $headers = $this->getCspHeaders($response);
 
         $types = [
-          'script-src'      => 'csp_script_nonce',
+          'script-src' => 'csp_script_nonce',
           'script-src-elem' => 'csp_script_nonce',
-          'style-src'       => 'csp_style_nonce',
-          'style-src-elem'  => 'csp_style_nonce'
+          'style-src' => 'csp_style_nonce',
+          'style-src-elem' => 'csp_style_nonce',
         ];
 
         foreach ($headers as $header => $directives) {

From 46c8c3791b45ed595d6db3f0bee5de49b32b9771 Mon Sep 17 00:00:00 2001
From: Youssef BENHSSAIEN <youssef.benhssaien@gmail.com>
Date: Tue, 14 Jul 2020 10:49:26 +0200
Subject: [PATCH 51/59] [FrameworkBundle] set default session.handler alias if
 handler_id is not provided

---
 .../FrameworkBundle/DependencyInjection/FrameworkExtension.php   | 1 +
 .../Tests/DependencyInjection/FrameworkExtensionTest.php         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 09d06e41456b0..6c2bd1e11255c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -880,6 +880,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
             // Set the handler class to be null
             $container->getDefinition('session.storage.native')->replaceArgument(1, null);
             $container->getDefinition('session.storage.php_bridge')->replaceArgument(0, null);
+            $container->setAlias('session.handler', 'session.handler.native_file')->setPrivate(true);
         } else {
             $container->setAlias('session.handler', $config['handler_id'])->setPrivate(true);
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index bdbb8ba4022b5..2a9ab26696931 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -463,6 +463,7 @@ public function testNullSessionHandler()
         $this->assertTrue($container->hasDefinition('session'), '->registerSessionConfiguration() loads session.xml');
         $this->assertNull($container->getDefinition('session.storage.native')->getArgument(1));
         $this->assertNull($container->getDefinition('session.storage.php_bridge')->getArgument(0));
+        $this->assertEquals('session.handler.native_file', (string) $container->getAlias('session.handler'));
     }
 
     public function testRequest()

From e5543dc72dcb990c83614deaf5b01f3365fd008d Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Thu, 23 Jul 2020 08:46:18 +0200
Subject: [PATCH 52/59] Fix CS

---
 .../Tests/DependencyInjection/FrameworkExtensionTest.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
index 2a9ab26696931..2ecd0bad3eed0 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -463,7 +463,7 @@ public function testNullSessionHandler()
         $this->assertTrue($container->hasDefinition('session'), '->registerSessionConfiguration() loads session.xml');
         $this->assertNull($container->getDefinition('session.storage.native')->getArgument(1));
         $this->assertNull($container->getDefinition('session.storage.php_bridge')->getArgument(0));
-        $this->assertEquals('session.handler.native_file', (string) $container->getAlias('session.handler'));
+        $this->assertSame('session.handler.native_file', (string) $container->getAlias('session.handler'));
     }
 
     public function testRequest()

From ee6b5145bfe1bb83733c29f50dc1d3c38eba6dac Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 23 Jul 2020 10:10:45 +0200
Subject: [PATCH 53/59] [Cache] fix catching auth errors

---
 .../Component/Cache/Traits/RedisTrait.php     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 08aea83e78da7..a30d6d3fa52a0 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -119,26 +119,26 @@ public static function createConnection($dsn, array $options = [])
             $initializer = function ($redis) use ($connect, $params, $dsn, $auth) {
                 try {
                     @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
+
+                    set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
+                    $isConnected = $redis->isConnected();
+                    restore_error_handler();
+                    if (!$isConnected) {
+                        $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';
+                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
+                    }
+
+                    if ((null !== $auth && !$redis->auth($auth))
+                        || ($params['dbindex'] && !$redis->select($params['dbindex']))
+                        || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
+                    ) {
+                        $e = preg_replace('/^ERR /', '', $redis->getLastError());
+                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e.'.');
+                    }
                 } catch (\RedisException $e) {
                     throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
                 }
 
-                set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
-                $isConnected = $redis->isConnected();
-                restore_error_handler();
-                if (!$isConnected) {
-                    $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';
-                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
-                }
-
-                if ((null !== $auth && !$redis->auth($auth))
-                    || ($params['dbindex'] && !$redis->select($params['dbindex']))
-                    || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
-                ) {
-                    $e = preg_replace('/^ERR /', '', $redis->getLastError());
-                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e.'.');
-                }
-
                 return true;
             };
 

From ec525e6e04280335007365a270dc0563bdcf34e3 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 13 Jul 2020 00:27:19 +0200
Subject: [PATCH 54/59] Fix PHPUnit 8.5 deprecations.

---
 .../Tests/Loader/FilesystemLoaderTest.php     |  2 +-
 .../Tests/Resource/DirectoryResourceTest.php  |  2 +-
 .../Tests/Resource/FileResourceTest.php       |  2 +-
 .../Tests/Compiler/AutowirePassTest.php       |  2 +-
 .../Compiler/ResolveBindingsPassTest.php      |  2 +-
 .../ResolveChildDefinitionsPassTest.php       |  2 +-
 .../ResolveInstanceofConditionalsPassTest.php |  4 ++--
 .../Tests/Loader/FileLoaderTest.php           |  2 +-
 .../Tests/Loader/XmlFileLoaderTest.php        |  2 +-
 .../Tests/Loader/YamlFileLoaderTest.php       | 20 +++++++++----------
 .../Tests/ExpressionLanguageTest.php          |  2 +-
 .../Storage/Proxy/SessionHandlerProxyTest.php |  8 ++++++--
 .../ContainerControllerResolverTest.php       |  2 +-
 .../Tests/PropertyAccessorCollectionTest.php  |  2 +-
 .../Tests/Loader/XmlFileLoaderTest.php        |  4 ++--
 .../Tests/Loader/YamlFileLoaderTest.php       |  4 ++--
 .../GuardAuthenticationProviderTest.php       |  2 +-
 .../Component/Yaml/Tests/InlineTest.php       |  4 ++--
 .../Component/Yaml/Tests/ParserTest.php       |  8 ++++----
 19 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
index 7fa8dd2b42d03..c8958670afa9c 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
@@ -98,7 +98,7 @@ public function testTwigErrorIfLocatorReturnsFalse()
     public function testTwigErrorIfTemplateDoesNotExist()
     {
         $this->expectException('Twig\Error\LoaderError');
-        $this->expectExceptionMessageRegExp('/Unable to find template "name\.format\.engine" \(looked into: .*Tests.Loader.\.\..DependencyInjection.Fixtures.Resources.views\)/');
+        $this->expectExceptionMessageMatches('/Unable to find template "name\.format\.engine" \(looked into: .*Tests.Loader.\.\..DependencyInjection.Fixtures.Resources.views\)/');
         $parser = $this->getMockBuilder('Symfony\Component\Templating\TemplateNameParserInterface')->getMock();
         $locator = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
 
diff --git a/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
index 40b179010196d..700df45658d6a 100644
--- a/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
@@ -66,7 +66,7 @@ public function testGetPattern()
     public function testResourceDoesNotExist()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The directory ".*" does not exist./');
+        $this->expectExceptionMessageMatches('/The directory ".*" does not exist./');
         new DirectoryResource('/____foo/foobar'.mt_rand(1, 999999));
     }
 
diff --git a/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php
index 968c7e9266169..5b789700ad8c9 100644
--- a/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/FileResourceTest.php
@@ -56,7 +56,7 @@ public function testToString()
     public function testResourceDoesNotExist()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The file ".*" does not exist./');
+        $this->expectExceptionMessageMatches('/The file ".*" does not exist./');
         new FileResource('/____foo/foobar'.mt_rand(1, 999999));
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
index 2482db631403b..6c11a94c539b2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -434,7 +434,7 @@ public function testClassNotFoundThrowsException()
     public function testParentClassNotFoundThrowsException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\AutowiringFailedException');
-        $this->expectExceptionMessageRegExp('{^Cannot autowire service "a": argument "\$r" of method "(Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Compiler\\\\)BadParentTypeHintedArgument::__construct\(\)" has type "\1OptionalServiceClass" but this class is missing a parent class \(Class "?Symfony\\\\Bug\\\\NotExistClass"? not found}');
+        $this->expectExceptionMessageMatches('{^Cannot autowire service "a": argument "\$r" of method "(Symfony\\\\Component\\\\DependencyInjection\\\\Tests\\\\Compiler\\\\)BadParentTypeHintedArgument::__construct\(\)" has type "\1OptionalServiceClass" but this class is missing a parent class \(Class "?Symfony\\\\Bug\\\\NotExistClass"? not found}');
 
         $container = new ContainerBuilder();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
index bfd3d67238277..7e5994af86999 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -65,7 +65,7 @@ public function testUnusedBinding()
     public function testMissingParent()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Unused binding "\$quz" in service [\s\S]+/');
+        $this->expectExceptionMessageMatches('/Unused binding "\$quz" in service [\s\S]+/');
 
         $container = new ContainerBuilder();
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
index eee4cf730c881..f3cd9fa1c626a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveChildDefinitionsPassTest.php
@@ -435,7 +435,7 @@ protected function process(ContainerBuilder $container)
     public function testProcessDetectsChildDefinitionIndirectCircularReference()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException');
-        $this->expectExceptionMessageRegExp('/^Circular reference detected for service "c", path: "c -> b -> a -> c"./');
+        $this->expectExceptionMessageMatches('/^Circular reference detected for service "c", path: "c -> b -> a -> c"./');
         $container = new ContainerBuilder();
 
         $container->register('a');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
index 83be84bd0c37c..0d81cdf3d7f9a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveInstanceofConditionalsPassTest.php
@@ -201,7 +201,7 @@ public function testBadInterfaceForAutomaticInstanceofIsOk()
     public function testProcessThrowsExceptionForAutoconfiguredCalls()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines method calls but these are not supported and should be removed\./');
+        $this->expectExceptionMessageMatches('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines method calls but these are not supported and should be removed\./');
         $container = new ContainerBuilder();
         $container->registerForAutoconfiguration(parent::class)
             ->addMethodCall('setFoo');
@@ -212,7 +212,7 @@ public function testProcessThrowsExceptionForAutoconfiguredCalls()
     public function testProcessThrowsExceptionForArguments()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines arguments but these are not supported and should be removed\./');
+        $this->expectExceptionMessageMatches('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines arguments but these are not supported and should be removed\./');
         $container = new ContainerBuilder();
         $container->registerForAutoconfiguration(parent::class)
             ->addArgument('bar');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index 9fe075d8f14cb..d2850fcc05c3c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -194,7 +194,7 @@ public function testMissingParentClass()
     public function testRegisterClassesWithBadPrefix()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Expected to find class "Symfony\\\Component\\\DependencyInjection\\\Tests\\\Fixtures\\\Prototype\\\Bar" in file ".+" while importing services from resource "Prototype\/Sub\/\*", but it was not found\! Check the namespace prefix used with the resource/');
+        $this->expectExceptionMessageMatches('/Expected to find class "Symfony\\\Component\\\DependencyInjection\\\Tests\\\Fixtures\\\Prototype\\\Bar" in file ".+" while importing services from resource "Prototype\/Sub\/\*", but it was not found\! Check the namespace prefix used with the resource/');
         $container = new ContainerBuilder();
         $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 2b963968d8411..5fbb387bf903a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -336,7 +336,7 @@ public function testParseTagsWithoutNameThrowsException()
     public function testParseTagWithEmptyNameThrowsException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .* must be a non-empty string/');
+        $this->expectExceptionMessageMatches('/The tag name for service ".+" in .* must be a non-empty string/');
         $container = new ContainerBuilder();
         $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
         $loader->load('tag_with_empty_name.xml');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index 3059dd4d6cf5d..7280357a2d9aa 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -45,7 +45,7 @@ public static function setUpBeforeClass()
     public function testLoadUnExistFile()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The file ".+" does not exist./');
+        $this->expectExceptionMessageMatches('/The file ".+" does not exist./');
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/ini'));
         $r = new \ReflectionObject($loader);
         $m = $r->getMethod('loadFile');
@@ -57,7 +57,7 @@ public function testLoadUnExistFile()
     public function testLoadInvalidYamlFile()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The file ".+" does not contain valid YAML./');
+        $this->expectExceptionMessageMatches('/The file ".+" does not contain valid YAML./');
         $path = self::$fixturesPath.'/ini';
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator($path));
         $r = new \ReflectionObject($loader);
@@ -300,7 +300,7 @@ public function testLoadYamlOnlyWithKeys()
     public function testTagWithEmptyNameThrowsException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');
+        $this->expectExceptionMessageMatches('/The tag name for service ".+" in .+ must be a non-empty string/');
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('tag_name_empty_string.yml');
     }
@@ -308,7 +308,7 @@ public function testTagWithEmptyNameThrowsException()
     public function testTagWithNonStringNameThrowsException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The tag name for service ".+" in .+ must be a non-empty string/');
+        $this->expectExceptionMessageMatches('/The tag name for service ".+" in .+ must be a non-empty string/');
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('tag_name_no_string.yml');
     }
@@ -424,7 +424,7 @@ public function testPrototypeWithNamespace()
     public function testPrototypeWithNamespaceAndNoResource()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/A "resource" attribute must be set when the "namespace" attribute is set for service ".+" in .+/');
+        $this->expectExceptionMessageMatches('/A "resource" attribute must be set when the "namespace" attribute is set for service ".+" in .+/');
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services_prototype_namespace_without_resource.yml');
@@ -536,7 +536,7 @@ public function testDecoratedServicesWithWrongSyntaxThrowsException()
     public function testInvalidTagsWithDefaults()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Parameter "tags" must be an array for service "Foo\\\Bar" in ".+services31_invalid_tags\.yml"\. Check your YAML syntax./');
+        $this->expectExceptionMessageMatches('/Parameter "tags" must be an array for service "Foo\\\Bar" in ".+services31_invalid_tags\.yml"\. Check your YAML syntax./');
         $loader = new YamlFileLoader(new ContainerBuilder(), new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('services31_invalid_tags.yml');
     }
@@ -628,7 +628,7 @@ public function testAnonymousServicesInInstanceof()
     public function testAnonymousServicesWithAliases()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Creating an alias using the tag "!service" is not allowed in ".+anonymous_services_alias\.yml"\./');
+        $this->expectExceptionMessageMatches('/Creating an alias using the tag "!service" is not allowed in ".+anonymous_services_alias\.yml"\./');
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('anonymous_services_alias.yml');
@@ -637,7 +637,7 @@ public function testAnonymousServicesWithAliases()
     public function testAnonymousServicesInParameters()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Using an anonymous service in a parameter is not allowed in ".+anonymous_services_in_parameters\.yml"\./');
+        $this->expectExceptionMessageMatches('/Using an anonymous service in a parameter is not allowed in ".+anonymous_services_in_parameters\.yml"\./');
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('anonymous_services_in_parameters.yml');
@@ -656,7 +656,7 @@ public function testAutoConfigureInstanceof()
     public function testEmptyDefaultsThrowsClearException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Service "_defaults" key must be an array, "NULL" given in ".+bad_empty_defaults\.yml"\./');
+        $this->expectExceptionMessageMatches('/Service "_defaults" key must be an array, "NULL" given in ".+bad_empty_defaults\.yml"\./');
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('bad_empty_defaults.yml');
@@ -665,7 +665,7 @@ public function testEmptyDefaultsThrowsClearException()
     public function testEmptyInstanceofThrowsClearException()
     {
         $this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/Service "_instanceof" key must be an array, "NULL" given in ".+bad_empty_instanceof\.yml"\./');
+        $this->expectExceptionMessageMatches('/Service "_instanceof" key must be an array, "NULL" given in ".+bad_empty_instanceof\.yml"\./');
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
         $loader->load('bad_empty_instanceof.yml');
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
index 6c7a8025b17bd..5ee5c6e76c6d2 100644
--- a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
+++ b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -269,7 +269,7 @@ public function testRegisterAfterEval($registerCallback)
     public function testCallBadCallable()
     {
         $this->expectException('RuntimeException');
-        $this->expectExceptionMessageRegExp('/Unable to call method "\w+" of object "\w+"./');
+        $this->expectExceptionMessageMatches('/Unable to call method "\w+" of object "\w+"./');
         $el = new ExpressionLanguage();
         $el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
index 1457ebd70d1c4..3310cf9cb2533 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -127,7 +127,7 @@ public function testGc()
      */
     public function testValidateId()
     {
-        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+        $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
         $mock->expects($this->once())
             ->method('validateId');
 
@@ -142,7 +142,7 @@ public function testValidateId()
      */
     public function testUpdateTimestamp()
     {
-        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+        $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
         $mock->expects($this->once())
             ->method('updateTimestamp')
             ->willReturn(false);
@@ -156,3 +156,7 @@ public function testUpdateTimestamp()
         $this->proxy->updateTimestamp('id', 'data');
     }
 }
+
+abstract class TestSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
+{
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
index 4c4abf5aa4d42..ef1c82638b55a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php
@@ -232,7 +232,7 @@ public function testGetControllerOnNonUndefinedFunction($controller, $exceptionN
         // All this logic needs to be duplicated, since calling parent::testGetControllerOnNonUndefinedFunction will override the expected exception and not use the regex
         $resolver = $this->createControllerResolver();
         $this->expectException($exceptionName);
-        $this->expectExceptionMessageRegExp($exceptionMessage);
+        $this->expectExceptionMessageMatches($exceptionMessage);
 
         $request = Request::create('/');
         $request->attributes->set('_controller', $controller);
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
index 34173b4e5e9af..bf35b2c19519b 100644
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -149,7 +149,7 @@ public function testSetValueCallsAdderAndRemoverForNestedCollections()
     public function testSetValueFailsIfNoAdderNorRemoverFound()
     {
         $this->expectException('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException');
-        $this->expectExceptionMessageRegExp('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./');
+        $this->expectExceptionMessageMatches('/Could not determine access type for property "axes" in class "Mock_PropertyAccessorCollectionTest_CarNoAdderAndRemover_[^"]*"./');
         $car = $this->getMockBuilder(__CLASS__.'_CarNoAdderAndRemover')->getMock();
         $axesBefore = $this->getContainer([1 => 'second', 3 => 'fourth']);
         $axesAfter = $this->getContainer([0 => 'first', 1 => 'second', 2 => 'third']);
diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
index 128bb54fb0315..57d7697dd84e0 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -339,7 +339,7 @@ public function testLoadRouteWithControllerSetInDefaults()
     public function testOverrideControllerInDefaults()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for "app_blog"/');
         $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('override_defaults.xml');
     }
@@ -371,7 +371,7 @@ public function provideFilesImportingRoutesWithControllers()
     public function testImportWithOverriddenController()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" attribute and the defaults key "_controller" for the "import" tag/');
         $loader = new XmlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('import_override_defaults.xml');
     }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
index 2e3261a1ca676..5c8b52493dc8c 100644
--- a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
@@ -142,7 +142,7 @@ public function testLoadRouteWithControllerSetInDefaults()
     public function testOverrideControllerInDefaults()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "app_blog"/');
         $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('override_defaults.yml');
     }
@@ -174,7 +174,7 @@ public function provideFilesImportingRoutesWithControllers()
     public function testImportWithOverriddenController()
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessageRegExp('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');
+        $this->expectExceptionMessageMatches('/The routing file "[^"]*" must not specify both the "controller" key and the defaults key "_controller" for "_static"/');
         $loader = new YamlFileLoader(new FileLocator([__DIR__.'/../Fixtures/controller']));
         $loader->load('import_override_defaults.yml');
     }
diff --git a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
index c2c1dde623b93..4f9c8fdc7344a 100644
--- a/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
+++ b/src/Symfony/Component/Security/Guard/Tests/Provider/GuardAuthenticationProviderTest.php
@@ -216,7 +216,7 @@ public function testSupportsChecksGuardAuthenticatorsTokenOrigin()
     public function testAuthenticateFailsOnNonOriginatingToken()
     {
         $this->expectException('Symfony\Component\Security\Core\Exception\AuthenticationException');
-        $this->expectExceptionMessageRegExp('/second_firewall_0/');
+        $this->expectExceptionMessageMatches('/second_firewall_0/');
         $authenticatorA = $this->getMockBuilder(AuthenticatorInterface::class)->getMock();
         $authenticators = [$authenticatorA];
 
diff --git a/src/Symfony/Component/Yaml/Tests/InlineTest.php b/src/Symfony/Component/Yaml/Tests/InlineTest.php
index 0c6d509381fed..362421ff8e09d 100644
--- a/src/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/src/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -73,7 +73,7 @@ public function testParsePhpConstantThrowsExceptionWhenUndefined()
     public function testParsePhpConstantThrowsExceptionOnInvalidType()
     {
         $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
-        $this->expectExceptionMessageRegExp('#The string "!php/const PHP_INT_MAX" could not be parsed as a constant.*#');
+        $this->expectExceptionMessageMatches('#The string "!php/const PHP_INT_MAX" could not be parsed as a constant.*#');
         Inline::parse('!php/const PHP_INT_MAX', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE);
     }
 
@@ -675,7 +675,7 @@ public function getBinaryData()
     public function testParseInvalidBinaryData($data, $expectedMessage)
     {
         $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
-        $this->expectExceptionMessageRegExp($expectedMessage);
+        $this->expectExceptionMessageMatches($expectedMessage);
 
         Inline::parse($data);
     }
diff --git a/src/Symfony/Component/Yaml/Tests/ParserTest.php b/src/Symfony/Component/Yaml/Tests/ParserTest.php
index 6393b321fc1a4..b6cdb6a9aad44 100644
--- a/src/Symfony/Component/Yaml/Tests/ParserTest.php
+++ b/src/Symfony/Component/Yaml/Tests/ParserTest.php
@@ -706,7 +706,7 @@ public function testShortcutKeyUnindentedCollectionException()
     public function testMultipleDocumentsNotSupportedException()
     {
         $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
-        $this->expectExceptionMessageRegExp('/^Multiple documents are not supported.+/');
+        $this->expectExceptionMessageMatches('/^Multiple documents are not supported.+/');
         Yaml::parse(<<<'EOL'
 # Ranking of 1998 home runs
 ---
@@ -1468,7 +1468,7 @@ public function getBinaryData()
     public function testParseInvalidBinaryData($data, $expectedMessage)
     {
         $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
-        $this->expectExceptionMessageRegExp($expectedMessage);
+        $this->expectExceptionMessageMatches($expectedMessage);
 
         $this->parser->parse($data);
     }
@@ -2077,14 +2077,14 @@ public function testParseFile()
     public function testParsingNonExistentFilesThrowsException()
     {
         $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
-        $this->expectExceptionMessageRegExp('#^File ".+/Fixtures/nonexistent.yml" does not exist\.$#');
+        $this->expectExceptionMessageMatches('#^File ".+/Fixtures/nonexistent.yml" does not exist\.$#');
         $this->parser->parseFile(__DIR__.'/Fixtures/nonexistent.yml');
     }
 
     public function testParsingNotReadableFilesThrowsException()
     {
         $this->expectException('Symfony\Component\Yaml\Exception\ParseException');
-        $this->expectExceptionMessageRegExp('#^File ".+/Fixtures/not_readable.yml" cannot be read\.$#');
+        $this->expectExceptionMessageMatches('#^File ".+/Fixtures/not_readable.yml" cannot be read\.$#');
         if ('\\' === \DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('chmod is not supported on Windows');
         }

From 4b611015d58c921439b53db6edee797aa6cb004f Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Thu, 23 Jul 2020 14:17:19 +0200
Subject: [PATCH 55/59] [DoctrineBridge] Bump doctrine/data-fixtures.

---
 composer.json                             | 2 +-
 src/Symfony/Bridge/Doctrine/composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 9ad5e39ad2ca5..5bc6183823adb 100644
--- a/composer.json
+++ b/composer.json
@@ -90,7 +90,7 @@
         "cache/integration-tests": "dev-master",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.6",
-        "doctrine/data-fixtures": "1.0.*",
+        "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "~2.4",
         "doctrine/orm": "~2.4,>=2.4.5",
         "doctrine/doctrine-bundle": "~1.4",
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 1aa2315c609cb..d33ea16ea6920 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -34,7 +34,7 @@
         "symfony/expression-language": "~2.8|~3.0|~4.0",
         "symfony/validator": "^3.2.5|~4.0",
         "symfony/translation": "~2.8|~3.0|~4.0",
-        "doctrine/data-fixtures": "1.0.*",
+        "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "~2.4",
         "doctrine/orm": "^2.4.5"
     },

From f524c8516183bba400daed42c52023af8a693ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= <jeremy@derusse.com>
Date: Thu, 23 Jul 2020 14:42:41 +0200
Subject: [PATCH 56/59] Fix Redis tests

---
 .../Cache/Tests/Adapter/AbstractRedisAdapterTest.php       | 7 ++++---
 .../Cache/Tests/Simple/AbstractRedisCacheTest.php          | 7 ++++---
 .../Component/Lock/Tests/Store/RedisArrayStoreTest.php     | 7 ++++---
 src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php  | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
index d1fa9535cf5ca..0e8ed00128587 100644
--- a/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
+++ b/src/Symfony/Component/Cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -33,9 +33,10 @@ public static function setUpBeforeClass()
         if (!\extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 
diff --git a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
index e6d10284e50c0..7a6cabe8c760a 100644
--- a/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
+++ b/src/Symfony/Component/Cache/Tests/Simple/AbstractRedisCacheTest.php
@@ -33,9 +33,10 @@ public static function setUpBeforeClass()
         if (!\extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
index 6f50dcefa61e2..a15c02f7d5be9 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisArrayStoreTest.php
@@ -23,9 +23,10 @@ public static function setUpBeforeClass()
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 
diff --git a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
index fd35ab4f2f661..a7a3cbfb47961 100644
--- a/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
+++ b/src/Symfony/Component/Lock/Tests/Store/RedisStoreTest.php
@@ -20,9 +20,10 @@ class RedisStoreTest extends AbstractRedisStoreTest
 {
     public static function setUpBeforeClass()
     {
-        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
-            $e = error_get_last();
-            self::markTestSkipped($e['message']);
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
         }
     }
 

From 03c2b40d2fa68c277983da70e0667181810fb9f1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 24 Jul 2020 05:48:16 +0200
Subject: [PATCH 57/59] updated CHANGELOG for 3.4.43

---
 CHANGELOG-3.4.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG-3.4.md b/CHANGELOG-3.4.md
index a2da20414f835..a8fbf76a367ca 100644
--- a/CHANGELOG-3.4.md
+++ b/CHANGELOG-3.4.md
@@ -7,6 +7,34 @@ in 3.4 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.4.0...v3.4.1
 
+* 3.4.43 (2020-07-24)
+
+ * bug #37635 [Cache] fix catching auth errors (nicolas-grekas)
+ * bug #37572 [FrameworkBundle] set default session.handler alias if handler_id is not provided (Youssef BENHSSAIEN)
+ * bug #37607 Fix checks for phpunit releases on Composer 2 (colinodell)
+ * bug #37562 [Cache] Use the default expiry when saving (not when creating) items (philipp-kolesnikov)
+ * bug #37563 Fix DBAL deprecation (nicolas-grekas)
+ * bug #37521 [Form] Fix ChoiceType translation domain (VincentLanglet)
+ * bug #37520 [Form] silently ignore uninitialized properties when mapping data to forms (ph-fritsche)
+ * bug #37526 [Cache][Config] ensure compatibility with PHP 8 stack traces (xabbuh)
+ * bug #37461 [Process] Fix Permission Denied error when writing sf_proc_00 lock files on Windows (JasonStephensTAMU)
+ * bug #37505 [Form] fix handling null as empty data (xabbuh)
+ * bug #37385 [Console] Fixes question input encoding on Windows (YaFou)
+ * bug #37447 [Validator] fix validating lazy properties that evaluate to null (xabbuh)
+ * bug #37464 [ErrorHandler] fix throwing from __toString() (nicolas-grekas)
+ * bug #37291 [MimeType] Duplicated MimeType due to PHP Bug (juanmrad)
+ * bug #37425 [Form] fix guessing form types for DateTime types (xabbuh)
+ * bug #37392 [Validator] fix handling typed properties as constraint options (xabbuh)
+ * bug #37389 [HttpFondation] Change file extension of "audio/mpeg" from "mpga" to "mp3" (YaFou)
+ * bug #37383 [VarDumper] Support for cURL handler objects (derrabus)
+ * bug #37345 [Form] collect all transformation failures (xabbuh)
+ * bug #37340  Fix support for PHP8 union types (nicolas-grekas)
+ * bug #37275 [DI] tighten detection of local dirs to prevent false positives (nicolas-grekas)
+ * bug #37090 [PhpUnitBridge] Streamline ansi/no-ansi of composer according to phpunit --colors option (kick-the-bucket)
+ * bug #36230 [VarDumper] Fix CliDumper coloration on light arrays (l-vo)
+ * bug #37270 [FrameworkBundle] preserve dots in query-string when redirecting (nicolas-grekas)
+ * bug #37342 [Cache] fix compat with DBAL v3 (nicolas-grekas)
+
 * 3.4.42 (2020-06-12)
 
  * bug #37103 [Form] switch the context when validating nested forms (xabbuh)

From 583794039974664031786b38b68098250259c853 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 24 Jul 2020 05:48:58 +0200
Subject: [PATCH 58/59] update CONTRIBUTORS for 3.4.43

---
 CONTRIBUTORS.md | 115 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 77 insertions(+), 38 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index cd95879aaaa07..7b94a4e1e090e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -15,15 +15,15 @@ Symfony is the result of the work of many people who made the code better
  - Jordi Boggiano (seldaek)
  - Victor Berchet (victor)
  - Maxime Steinhausser (ogizanagi)
- - Ryan Weaver (weaverryan)
  - Grégoire Pineau (lyrixx)
+ - Ryan Weaver (weaverryan)
  - Javier Eguiluz (javier.eguiluz)
  - Roland Franssen (ro0)
  - Jakub Zalas (jakubzalas)
  - Johannes S (johannes)
  - Kris Wallsmith (kriswallsmith)
- - Yonel Ceruto (yonelceruto)
  - Wouter de Jong (wouterj)
+ - Yonel Ceruto (yonelceruto)
  - Hugo Hamon (hhamon)
  - Thomas Calvet (fancyweb)
  - Alexander M. Turek (derrabus)
@@ -35,21 +35,21 @@ Symfony is the result of the work of many people who made the code better
  - Karma Dordrak (drak)
  - Lukas Kahwe Smith (lsmith)
  - Jules Pietri (heah)
- - Hamza Amrouche (simperfit)
  - Martin Hasoň (hason)
+ - Hamza Amrouche (simperfit)
  - Jérémy DERUSSÉ (jderusse)
  - Jeremy Mikola (jmikola)
  - Jean-François Simon (jfsimon)
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
  - Eriksen Costa (eriksencosta)
- - Guilhem Niot (energetick)
  - Tobias Nyholm (tobias)
+ - Guilhem Niot (energetick)
  - Sarah Khalil (saro0h)
  - Jonathan Wage (jwage)
  - Lynn van der Berg (kjarli)
- - Diego Saint Esteben (dosten)
  - Matthias Pigulla (mpdude)
+ - Diego Saint Esteben (dosten)
  - Pierre du Plessis (pierredup)
  - Alexandre Salomé (alexandresalome)
  - William Durand (couac)
@@ -63,16 +63,16 @@ Symfony is the result of the work of many people who made the code better
  - Valentin Udaltsov (vudaltsov)
  - Bulat Shakirzyanov (avalanche123)
  - Kevin Bond (kbond)
+ - Jan Schädlich (jschaedl)
  - Saša Stamenković (umpirsky)
  - Peter Rehm (rpet)
- - Gábor Egyed (1ed)
  - Gabriel Ostrolucký (gadelat)
+ - Gábor Egyed (1ed)
  - Henrik Bjørnskov (henrikbjorn)
- - Miha Vrhovnik
  - David Maicher (dmaicher)
+ - Miha Vrhovnik
  - Titouan Galopin (tgalopin)
  - Diego Saint Esteben (dii3g0)
- - Jan Schädlich (jschaedl)
  - Konstantin Kudryashov (everzet)
  - Vladimir Reznichenko (kalessil)
  - Bilal Amarni (bamarni)
@@ -113,10 +113,11 @@ Symfony is the result of the work of many people who made the code better
  - Tim Nagel (merk)
  - Chris Wilkinson (thewilkybarkid)
  - Brice BERNARD (brikou)
+ - Jérôme Vasseur (jvasseur)
  - marc.weistroff
  - Tomáš Votruba (tomas_votruba)
  - Peter Kokot (maastermedia)
- - Jérôme Vasseur (jvasseur)
+ - Alex Pott
  - lenar
  - Alexander Schwenn (xelaris)
  - Włodzimierz Gajda (gajdaw)
@@ -128,7 +129,6 @@ Symfony is the result of the work of many people who made the code better
  - Oskar Stark (oskarstark)
  - Javier Spagnoletti (phansys)
  - Joshua Thijssen
- - Alex Pott
  - Daniel Wehner (dawehner)
  - Tugdual Saunier (tucksaun)
  - excelwebzone
@@ -137,6 +137,7 @@ Symfony is the result of the work of many people who made the code better
  - Joel Wurtz (brouznouf)
  - Fabien Pennequin (fabienpennequin)
  - Théo FIDRY (theofidry)
+ - Alexander Schranz (alexander-schranz)
  - Przemysław Bogusz (przemyslaw-bogusz)
  - Eric GELOEN (gelo)
  - Lars Strojny (lstrojny)
@@ -144,13 +145,13 @@ Symfony is the result of the work of many people who made the code better
  - Robert Schönthal (digitalkaoz)
  - Gregor Harlan (gharlan)
  - Florian Lonqueu-Brochard (florianlb)
- - Alexander Schranz (alexander-schranz)
  - Gabriel Caruso (carusogabriel)
  - Stefano Sala (stefano.sala)
  - Evgeniy (ewgraf)
  - Julien Falque (julienfalque)
  - Vincent AUBERT (vincent)
  - Juti Noppornpitak (shiroyuki)
+ - Laurent VOULLEMIER (lvo)
  - Anthony MARTIN (xurudragon)
  - Tigran Azatyan (tigranazatyan)
  - Sebastian Hörl (blogsh)
@@ -161,9 +162,9 @@ Symfony is the result of the work of many people who made the code better
  - Yanick Witschi (toflar)
  - Arnaud Kleinpeter (nanocom)
  - Guilherme Blanco (guilhermeblanco)
- - Laurent VOULLEMIER (lvo)
  - SpacePossum
  - Pablo Godel (pgodel)
+ - Richard van Laak (rvanlaak)
  - Jérémie Augustin (jaugustin)
  - François-Xavier de Guillebon (de-gui_f)
  - Oleg Voronkovich
@@ -171,26 +172,26 @@ Symfony is the result of the work of many people who made the code better
  - Rafael Dohms (rdohms)
  - jwdeitch
  - Ahmed TAILOULOUTE (ahmedtai)
+ - jeremyFreeAgent (jeremyfreeagent)
  - Mikael Pajunen
  - Arman Hosseini (arman)
  - Niels Keurentjes (curry684)
  - Vyacheslav Pavlov
- - Richard van Laak (rvanlaak)
+ - George Mponos (gmponos)
  - Richard Shank (iampersistent)
  - Thomas Rabaix (rande)
  - Vincent Touzet (vincenttouzet)
- - jeremyFreeAgent (jeremyfreeagent)
  - Rouven Weßling (realityking)
  - Jérôme Parmentier (lctrs)
  - Ben Davies (bendavies)
  - Andreas Schempp (aschempp)
  - Clemens Tolboom
  - Helmer Aaviksoo
+ - Antoine M (amakdessi)
  - Hiromi Hishida (77web)
  - Matthieu Ouellette-Vachon (maoueh)
  - Michał Pipa (michal.pipa)
  - Dawid Nowak
- - George Mponos (gmponos)
  - Amal Raghav (kertz)
  - Jonathan Ingram (jonathaningram)
  - Artur Kotyrba
@@ -202,7 +203,6 @@ Symfony is the result of the work of many people who made the code better
  - James Halsall (jaitsu)
  - Matthieu Napoli (mnapoli)
  - Florent Mata (fmata)
- - Antoine Makdessi (amakdessi)
  - Warnar Boekkooi (boekkooi)
  - Dmitrii Chekaliuk (lazyhammer)
  - Clément JOBEILI (dator)
@@ -220,6 +220,7 @@ Symfony is the result of the work of many people who made the code better
  - Dennis Benkert (denderello)
  - DQNEO
  - Andre Rømcke (andrerom)
+ - Mathias Arlaud (mtarld)
  - mcfedr (mcfedr)
  - Ruben Gonzalez (rubenrua)
  - Benjamin Dulau (dbenjamin)
@@ -247,10 +248,10 @@ Symfony is the result of the work of many people who made the code better
  - David Prévot
  - fivestar
  - Dominique Bongiraud
+ - Hidde Wieringa (hiddewie)
  - Jeremy Livingston (jeremylivingston)
  - Michael Lee (zerustech)
  - Matthieu Auger (matthieuauger)
- - Mathias Arlaud (mtarld)
  - Leszek Prabucki (l3l0)
  - Fabien Bourigault (fbourigault)
  - François Zaninotto (fzaninotto)
@@ -262,12 +263,14 @@ Symfony is the result of the work of many people who made the code better
  - Blanchon Vincent (blanchonvincent)
  - Michele Orselli (orso)
  - Sven Paulus (subsven)
+ - Baptiste Lafontaine (magnetik)
  - Maxime Veber (nek-)
  - Rui Marinho (ruimarinho)
  - Eugene Wissner
  - Edi Modrić (emodric)
  - Pascal Montoya
  - Julien Brochet (mewt)
+ - François Pluchino (francoispluchino)
  - Leo Feyer
  - Tristan Darricau (nicofuma)
  - Victor Bocharsky (bocharsky_bw)
@@ -279,7 +282,6 @@ Symfony is the result of the work of many people who made the code better
  - Pavel Batanov (scaytrase)
  - Mantis Development
  - Loïc Faugeron
- - Hidde Wieringa (hiddewie)
  - dFayet
  - Marco Pivetta (ocramius)
  - Rob Frawley 2nd (robfrawley)
@@ -315,7 +317,6 @@ Symfony is the result of the work of many people who made the code better
  - Kristen Gilden (kgilden)
  - Pierre-Yves LEBECQ (pylebecq)
  - Jordan Samouh (jordansamouh)
- - Baptiste Lafontaine (magnetik)
  - Jakub Kucharovic (jkucharovic)
  - Loick Piera (pyrech)
  - Uwe Jäger (uwej711)
@@ -328,7 +329,6 @@ Symfony is the result of the work of many people who made the code better
  - Jan Sorgalla (jsor)
  - Ray
  - Chekote
- - François Pluchino (francoispluchino)
  - Thomas Adam
  - Jhonny Lidfors (jhonne)
  - Diego Agulló (aeoris)
@@ -352,6 +352,7 @@ Symfony is the result of the work of many people who made the code better
  - Roumen Damianoff (roumen)
  - Emanuele Panzeri (thepanz)
  - Kim Hemsø Rasmussen (kimhemsoe)
+ - Alessandro Lai (jean85)
  - Pascal Luna (skalpa)
  - Wouter Van Hecke
  - Peter Kruithof (pkruithof)
@@ -409,6 +410,7 @@ Symfony is the result of the work of many people who made the code better
  - Berny Cantos (xphere81)
  - Thierry Thuon (lepiaf)
  - Guilhem N (guilhemn)
+ - Sebastien Morel (plopix)
  - Ricard Clau (ricardclau)
  - Mark Challoner (markchalloner)
  - Philippe Segatori
@@ -423,7 +425,6 @@ Symfony is the result of the work of many people who made the code better
  - Oleg Andreyev
  - Langlet Vincent (deviling)
  - Mateusz Sip (mateusz_sip)
- - Alessandro Lai (jean85)
  - Francesco Levorato
  - Vitaliy Zakharov (zakharovvi)
  - Tobias Sjösten (tobiassjosten)
@@ -439,9 +440,11 @@ Symfony is the result of the work of many people who made the code better
  - Felix Labrecque
  - Yaroslav Kiliba
  - Terje Bråten
+ - Daniel STANCU
  - Robbert Klarenbeek (robbertkl)
  - soyuka
  - Eric Masoero (eric-masoero)
+ - Ion Bazan (ionbazan)
  - Denis Brumann (dbrumann)
  - Gocha Ossinkine (ossinkine)
  - JhonnyL
@@ -510,19 +513,21 @@ Symfony is the result of the work of many people who made the code better
  - Sander Toonen (xatoo)
  - Anthon Pang (robocoder)
  - Marko Kaznovac (kaznovac)
+ - Thomas Landauer (thomas-landauer)
  - Sébastien Santoro (dereckson)
  - Brian King
  - Michel Salib (michelsalib)
+ - quentin neyrat (qneyrat)
  - Chris Tanaskoski
  - geoffrey
  - Steffen Roßkamp
  - Alexandru Furculita (afurculita)
  - Valentin Jonovs (valentins-jonovs)
- - Sebastien Morel (plopix)
  - Jeanmonod David (jeanmonod)
  - Christopher Davis (chrisguitarguy)
  - Webnet team (webnet)
  - Joe Bennett (kralos)
+ - Ahmed Raafat
  - Farhad Safarov
  - Jan Schumann
  - Niklas Fiekas
@@ -531,15 +536,18 @@ Symfony is the result of the work of many people who made the code better
  - Erkhembayar Gantulga (erheme318)
  - Islam93
  - lancergr
+ - Tri Pham (phamuyentri)
  - Mihai Stancu
  - Ivan Nikolaev (destillat)
  - Gildas Quéméner (gquemener)
+ - Claude Khedhiri (ck-developer)
  - Desjardins Jérôme (jewome62)
  - Arturs Vonda
  - Josip Kruslin
  - Matthew Smeets
  - Toni Rudolf (toooni)
  - Asmir Mustafic (goetas)
+ - DerManoMann
  - Nicolas Philippe (nikophil)
  - vagrant
  - Aurimas Niekis (gcds)
@@ -551,6 +559,7 @@ Symfony is the result of the work of many people who made the code better
  - Vlad Gregurco (vgregurco)
  - Boris Vujicic (boris.vujicic)
  - Artem Lopata
+ - Judicaël RUFFIEUX (axanagor)
  - Chris Sedlmayr (catchamonkey)
  - Kamil Kokot (pamil)
  - Seb Koelen
@@ -564,7 +573,6 @@ Symfony is the result of the work of many people who made the code better
  - Jonas Flodén (flojon)
  - Tobias Weichart
  - Gonzalo Vilaseca (gonzalovilaseca)
- - Daniel STANCU
  - Tarmo Leppänen (tarlepp)
  - Marcin Sikoń (marphi)
  - Dominik Zogg (dominik.zogg)
@@ -583,6 +591,7 @@ Symfony is the result of the work of many people who made the code better
  - Adam Harvey
  - Anton Bakai
  - Martin Auswöger
+ - Christian Scheb
  - Rhodri Pugh (rodnaph)
  - battye
  - Sam Fleming (sam_fleming)
@@ -685,7 +694,6 @@ Symfony is the result of the work of many people who made the code better
  - Jeremy Benoist
  - fritzmg
  - Lenar Lõhmus
- - Ion Bazan (ionbazan)
  - Benjamin Laugueux (yzalis)
  - Zach Badgett (zachbadgett)
  - Chi-teck
@@ -693,7 +701,6 @@ Symfony is the result of the work of many people who made the code better
  - Pavel Campr (pcampr)
  - Andrii Dembitskyi
  - Johnny Robeson (johnny)
- - Thomas Landauer (thomas-landauer)
  - Guilliam Xavier
  - Disquedur
  - Michiel Boeckaert (milio)
@@ -721,6 +728,7 @@ Symfony is the result of the work of many people who made the code better
  - Andrey Sevastianov
  - Sebastian Blum
  - Alexis Lefebvre
+ - Dmitriy Mamontov (mamontovdmitriy)
  - aubx
  - Julien Turby
  - Marvin Butkereit
@@ -772,7 +780,6 @@ Symfony is the result of the work of many people who made the code better
  - David Fuhr
  - Mathias STRASSER (roukmoute)
  - Max Grigorian (maxakawizard)
- - DerManoMann
  - Rostyslav Kinash
  - Dennis Fridrich (dfridrich)
  - Mardari Dorel (dorumd)
@@ -795,9 +802,11 @@ Symfony is the result of the work of many people who made the code better
  - umpirski
  - M. Vondano
  - Quentin de Longraye (quentinus95)
+ - Bohan Yang (brentybh)
  - Chris Heng (gigablah)
  - Shaun Simmons (simshaun)
  - Richard Bradley
+ - Mathieu Santostefano
  - Ulumuddin Yunus (joenoez)
  - rtek
  - Ivan Grigoriev
@@ -812,6 +821,7 @@ Symfony is the result of the work of many people who made the code better
  - Szijarto Tamas
  - Robin Lehrmann (robinlehrmann)
  - Catalin Dan
+ - Marco Petersen (ocrampete16)
  - Soner Sayakci
  - Jaroslav Kuba
  - Kristijan Kanalas
@@ -905,12 +915,10 @@ Symfony is the result of the work of many people who made the code better
  - Jonatan Männchen
  - Dennis Hotson
  - Andrew Tchircoff (andrewtch)
- - Ahmed Raafat
  - michaelwilliams
  - Martin Kirilov
  - 1emming
  - Nykopol (nykopol)
- - Tri Pham (phamuyentri)
  - Jordan Deitch
  - Casper Valdemar Poulsen
  - Laurent Masforné (heisenberg)
@@ -939,6 +947,7 @@ Symfony is the result of the work of many people who made the code better
  - Jon Dufresne
  - possum
  - Denis Zunke (donalberto)
+ - Phil Taylor (prazgod)
  - Ahmadou Waly Ndiaye (waly)
  - Jonathan Johnson (jrjohnson)
  - Olivier Maisonneuve (olineuve)
@@ -999,7 +1008,9 @@ Symfony is the result of the work of many people who made the code better
  - Mathieu MARCHOIS
  - Cyril Quintin (cyqui)
  - Gerard van Helden (drm)
+ - flack (flack)
  - Johnny Peck (johnnypeck)
+ - Michael Voříšek
  - Stefan Kruppa
  - Ivan Menshykov
  - David Romaní
@@ -1035,6 +1046,7 @@ Symfony is the result of the work of many people who made the code better
  - Jérémy M (th3mouk)
  - Simone Di  Maulo (toretto460)
  - Christian Morgan
+ - YaFou
  - Alexander Miehe (engerim)
  - Morgan Auchede (mauchede)
  - Sascha Dens (saschadens)
@@ -1064,6 +1076,7 @@ Symfony is the result of the work of many people who made the code better
  - Matthew Davis (mdavis1982)
  - Paulo Ribeiro (paulo)
  - Markus S. (staabm)
+ - Marc Laporte
  - Benjamin Morel
  - Maks
  - Antoine LA
@@ -1106,14 +1119,19 @@ Symfony is the result of the work of many people who made the code better
  - Renan Taranto (renan-taranto)
  - Rikijs Murgs
  - Uladzimir Tsykun
+ - iamvar
  - Ben Ramsey (ramsey)
  - Amaury Leroux de Lens (amo__)
  - Christian Jul Jensen
  - Alexandre GESLIN (alexandregeslin)
  - The Whole Life to Learn
+ - Alex Vo (votanlean)
  - Mikkel Paulson
  - ergiegonzaga
+ - Daniel González
  - Liverbool (liverbool)
+ - Malte Schlüter
+ - Jules Matsounga (hyoa)
  - Sam Malone
  - Phan Thanh Ha (haphan)
  - Chris Jones (leek)
@@ -1121,6 +1139,7 @@ Symfony is the result of the work of many people who made the code better
  - xaav
  - Mahmoud Mostafa (mahmoud)
  - Antonio Jose Cerezo (ajcerezo)
+ - Anthony Moutte
  - Ahmed Abdou
  - Daniel Iwaniec
  - Thomas Ferney
@@ -1141,9 +1160,11 @@ Symfony is the result of the work of many people who made the code better
  - Iliya Miroslavov Iliev (i.miroslavov)
  - Safonov Nikita (ns3777k)
  - Ross Motley (rossmotley)
+ - Krystian Marcisz (simivar)
  - ttomor
  - Mei Gwilym (meigwilym)
  - Michael H. Arieli (excelwebzone)
+ - Nicolas Martin (cocorambo)
  - Tom Panier (neemzy)
  - Fred Cox
  - Luciano Mammino (loige)
@@ -1156,6 +1177,7 @@ Symfony is the result of the work of many people who made the code better
  - Lorenzo Millucci
  - Andreas Kleemann
  - Manuele Menozzi
+ - Philipp Kolesnikov
  - zairig imad (zairigimad)
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
@@ -1166,6 +1188,7 @@ Symfony is the result of the work of many people who made the code better
  - Arnaud PETITPAS (apetitpa)
  - Ken Stanley
  - Zachary Tong (polyfractal)
+ - linh
  - Mario Blažek (marioblazek)
  - Ashura
  - Hryhorii Hrebiniuk
@@ -1199,11 +1222,11 @@ Symfony is the result of the work of many people who made the code better
  - Patrick Luca Fazzi (ap3ir0n)
  - Danijel Obradović
  - Pablo Borowicz
- - Mathieu Santostefano
  - Arjan Keeman
  - Máximo Cuadros (mcuadros)
  - Lukas Mencl
  - tamirvs
+ - Mohammad Emran Hasan (phpfour)
  - gauss
  - julien.galenski
  - Christian Neff
@@ -1230,7 +1253,6 @@ Symfony is the result of the work of many people who made the code better
  - gr1ev0us
  - mlazovla
  - Alejandro Diaz Torres
- - quentin neyrat (qneyrat)
  - Max Beutel
  - Jan Vernieuwe (vernija)
  - Antanas Arvasevicius
@@ -1259,10 +1281,12 @@ Symfony is the result of the work of many people who made the code better
  - Dominic Tubach
  - Nikita Konstantinov
  - Martijn Evers
+ - Philipp Fritsche
  - Vitaliy Ryaboy (vitaliy)
  - Benjamin Paap (benjaminpaap)
  - Claus Due (namelesscoder)
  - Christian
+ - Alexandru Patranescu
  - Denis Golubovskiy (bukashk0zzz)
  - Sergii Smertin (nfx)
  - Mikkel Paulson
@@ -1313,10 +1337,12 @@ Symfony is the result of the work of many people who made the code better
  - James Hudson
  - Stephen Clouse
  - e-ivanov
+ - Carlos Pereira De Amorim (epitre)
  - Benjamin Dos Santos
  - Einenlum
  - Jérémy Jarrié (gagnar)
  - Jochen Bayer (jocl)
+ - Tomas Javaisis
  - Patrick Carlo-Hickman
  - Bruno MATEU
  - Jeremy Bush
@@ -1334,7 +1360,6 @@ Symfony is the result of the work of many people who made the code better
  - Péter Buri (burci)
  - John VanDeWeghe
  - kaiwa
- - Claude Khedhiri (ck-developer)
  - Charles Sanquer (csanquer)
  - Albert Ganiev (helios-ag)
  - Neil Katin
@@ -1368,6 +1393,7 @@ Symfony is the result of the work of many people who made the code better
  - Nathan PAGE (nathix)
  - Ryan Rogers
  - Klaus Purer
+ - Dmitrii Lozhkin
  - arnaud (arnooo999)
  - Gilles Doge (gido)
  - Oscar Esteve (oesteve)
@@ -1382,6 +1408,7 @@ Symfony is the result of the work of many people who made the code better
  - Dmitriy Simushev
  - Pawel Smolinski
  - Tomasz (timitao)
+ - Nguyen Tuan Minh (tuanminhgp)
  - Oxan van Leeuwen
  - pkowalczyk
  - Soner Sayakci
@@ -1411,6 +1438,7 @@ Symfony is the result of the work of many people who made the code better
  - David Legatt (dlegatt)
  - Alain Flaus (halundra)
  - tsufeki
+ - dangkhoagms
  - Philipp Strube
  - Clement Herreman (clemherreman)
  - Dan Ionut Dumitriu (danionut90)
@@ -1473,6 +1501,7 @@ Symfony is the result of the work of many people who made the code better
  - Andrei Igna
  - Adam Prickett
  - azine
+ - Javier Espinosa
  - Anton Kroshilin
  - Dawid Sajdak
  - Ludek Stepan
@@ -1527,6 +1556,7 @@ Symfony is the result of the work of many people who made the code better
  - Jules Lamur
  - Renato Mendes Figueiredo
  - Benjamin RICHARD
+ - Gennadi Janzen
  - pdommelen
  - Eric Stern
  - ShiraNai7
@@ -1551,8 +1581,10 @@ Symfony is the result of the work of many people who made the code better
  - Philip Frank
  - David Brooks
  - Lance McNearney
+ - Florian Caron (shalalalala)
  - Serhiy Lunak (slunak)
  - Giorgio Premi
+ - Mikko Pesari
  - Aurélien Fontaine
  - ncou
  - Ian Carroll
@@ -1592,6 +1624,7 @@ Symfony is the result of the work of many people who made the code better
  - Jay Severson
  - Benny Born
  - Emirald Mateli
+ - Tristan Pouliquen
  - René Kerner
  - Nathaniel Catchpole
  - Adrien Samson (adriensamson)
@@ -1627,6 +1660,7 @@ Symfony is the result of the work of many people who made the code better
  - Peter Bouwdewijn
  - mlively
  - Wouter Diesveld
+ - Vincent Langlet
  - Amine Matmati
  - caalholm
  - Nouhail AL FIDI (alfidi)
@@ -1641,6 +1675,7 @@ Symfony is the result of the work of many people who made the code better
  - rkerner
  - Alex Silcock
  - Qingshan Luo
+ - Gijs van Lammeren
  - Ergie Gonzaga
  - Matthew J Mucklo
  - AnrDaemon
@@ -1691,6 +1726,7 @@ Symfony is the result of the work of many people who made the code better
  - LubenZA
  - Victor Garcia
  - Olivier
+ - Juan Mrad
  - Denis Yuzhanin
  - knezmilos13
  - Cyril PASCAL
@@ -1759,6 +1795,7 @@ Symfony is the result of the work of many people who made the code better
  - 2manypeople
  - Wing
  - Thomas Bibb
+ - kick-the-bucket
  - Matt Farmer
  - catch
  - Alexandre Segura
@@ -1812,6 +1849,7 @@ Symfony is the result of the work of many people who made the code better
  - Thomas Chmielowiec
  - shdev
  - Andrey Ryaguzov
+ - Gennadi Janzen
  - Stefan
  - Peter Bex
  - Manatsawin Hanmongkolchai
@@ -1822,7 +1860,6 @@ Symfony is the result of the work of many people who made the code better
  - Dennis Væversted
  - Timon van der Vorm
  - nuncanada
- - flack
  - František Bereň
  - Kamil Madejski
  - Jeremiah VALERIE
@@ -1833,6 +1870,7 @@ Symfony is the result of the work of many people who made the code better
  - Denys Voronin (hurricane)
  - Ionel Scutelnicu (ionelscutelnicu)
  - Mathieu Dewet (mdewet)
+ - none (nelexa)
  - Nicolas Tallefourtané (nicolab)
  - Botond Dani (picur)
  - Rémi Faivre (rfv)
@@ -1869,6 +1907,7 @@ Symfony is the result of the work of many people who made the code better
  - Adrien Wilmet
  - Martin
  - nietonfir
+ - Taylor Otwell
  - alefranz
  - David Barratt
  - Andrea Giannantonio
@@ -1954,7 +1993,6 @@ Symfony is the result of the work of many people who made the code better
  - Tim Strehle
  - Sébastien COURJEAN
  - Sam Ward
- - Michael Voříšek
  - Walther Lalk
  - Adam
  - Ivo
@@ -1964,7 +2002,6 @@ Symfony is the result of the work of many people who made the code better
  - Ali Tavafi
  - Trevor Suarez
  - gedrox
- - Bohan Yang
  - Alan Bondarchuk
  - Pchol
  - dropfen
@@ -1998,7 +2035,6 @@ Symfony is the result of the work of many people who made the code better
  - Andrew Marcinkevičius (ifdattic)
  - Ioana Hazsda (ioana-hazsda)
  - Jan Marek (janmarek)
- - Dmitriy Mamontov (mamontovdmitriy)
  - Mark de Haan (markdehaan)
  - Dan Patrick (mdpatrick)
  - naitsirch (naitsirch)
@@ -2082,7 +2118,7 @@ Symfony is the result of the work of many people who made the code better
  - Rowan Manning
  - Per Modin
  - David Windell
- - Christian Scheb
+ - Ondřej Frei
  - Gabriel Birke
  - skafandri
  - Derek Bonner
@@ -2120,6 +2156,7 @@ Symfony is the result of the work of many people who made the code better
  - Klaas Naaijkens
  - Daniel González Cerviño
  - Rafał
+ - Ahmad El-Bardan (absahmad)
  - Achilles Kaloeridis (achilles)
  - Adria Lopez (adlpz)
  - Aaron Scherer (aequasi)
@@ -2180,6 +2217,7 @@ Symfony is the result of the work of many people who made the code better
  - Ondrej Mirtes
  - akimsko
  - Youpie
+ - Jason Stephens
  - srsbiz
  - Taylan Kasap
  - Michael Orlitzky
@@ -2237,6 +2275,7 @@ Symfony is the result of the work of many people who made the code better
  - Nardberjean
  - Karolis
  - Myke79
+ - jersoe
  - Brian Debuire
  - Eric Grimois
  - Piers Warmers
@@ -2344,6 +2383,7 @@ Symfony is the result of the work of many people who made the code better
  - Sema
  - Elan Ruusamäe
  - Thorsten Hallwas
+ - Marco Pfeiffer
  - Alex Nostadt
  - Michael Squires
  - Egor Gorbachev
@@ -2480,7 +2520,6 @@ Symfony is the result of the work of many people who made the code better
  - Ala Eddine Khefifi (nayzo)
  - emilienbouard (neime)
  - Nicholas Byfleet (nickbyfleet)
- - Marco Petersen (ocrampete16)
  - ollie harridge (ollietb)
  - Paul Andrieux (paulandrieux)
  - Paweł Szczepanek (pauluz)
@@ -2491,7 +2530,6 @@ Symfony is the result of the work of many people who made the code better
  - Alex Carol (picard89)
  - Daniel Perez Pinazo (pitiflautico)
  - Igor Tarasov (polosatus)
- - Phil Taylor (prazgod)
  - Maxim Pustynnikov (pustynnikov)
  - Ralf Kuehnel (ralfkuehnel)
  - Brayden Williams (redstar504)
@@ -2570,6 +2608,7 @@ Symfony is the result of the work of many people who made the code better
  - Bogdan Rancichi (devck)
  - Daniel Kolvik (dkvk)
  - Marc Lemay (flug)
+ - Gabriel Solomon (gabrielsolomon)
  - Henne Van Och (hennevo)
  - Jeroen De Dauw (jeroendedauw)
  - Jonathan Scheiber (jmsche)

From 5012c9237fcfaa68ef53cf7082d7cd4f08031c17 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 24 Jul 2020 05:48:59 +0200
Subject: [PATCH 59/59] updated VERSION for 3.4.43

---
 src/Symfony/Component/HttpKernel/Kernel.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index 7fad1ee281311..e824fdcf72947 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -67,12 +67,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
     private $requestStackSize = 0;
     private $resetServices = false;
 
-    const VERSION = '3.4.43-DEV';
+    const VERSION = '3.4.43';
     const VERSION_ID = 30443;
     const MAJOR_VERSION = 3;
     const MINOR_VERSION = 4;
     const RELEASE_VERSION = 43;
-    const EXTRA_VERSION = 'DEV';
+    const EXTRA_VERSION = '';
 
     const END_OF_MAINTENANCE = '11/2020';
     const END_OF_LIFE = '11/2021';