-

Author: nicolas-grekas

.github/patch-types.php

@@ -0,0 +1,43 @@
+<?php
+
+if (false === getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
+    putenv('SYMFONY_PATCH_TYPE_DECLARATIONS=force=1&php71-compat=0');
+}
+
+require __DIR__.'/../.phpunit/phpunit-8.3-0/vendor/autoload.php';
+
+file_put_contents(__DIR__.'/../vendor/autoload.php', preg_replace('/^return (Composer.*);/m', <<<'EOTXT'
+$loader = \1;
+$loader->addClassMap(['Symfony\Component\Debug\Exception\FlattenException' => \dirname(__DIR__).'/src/Symfony/Component/Debug/Exception/FlattenException.php']);
+
+return $loader;
+
+EOTXT
+, file_get_contents(__DIR__.'/../vendor/autoload.php')));
+
+$loader = require __DIR__.'/../vendor/autoload.php';
+
+Symfony\Component\ErrorHandler\DebugClassLoader::enable();
+
+foreach ($loader->getClassMap() as $class => $file) {
+    switch (true) {
+        case false !== strpos(realpath($file), '/vendor/');
+        case false !== strpos($file, '/src/Symfony/Bridge/PhpUnit/'):
+        case false !== strpos($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Debug/Tests/Fixtures/'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/'):
+        case false !== strpos($file, '/src/Symfony/Component/ErrorHandler/Tests/Fixtures/'):
+        case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/'):
+        case false !== strpos($file, '/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectOuter.php'):
+        case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
+            continue 2;
+    }
+
+    class_exists($class);
+}
+
+Symfony\Component\ErrorHandler\DebugClassLoader::disable();

.travis.yml

@@ -25,12 +25,7 @@ env:
 
 matrix:
     include:
-        - php: 7.1
-          env: php_extra="7.2"
-        - php: 7.3
-          env: deps=high
         - php: 7.4snapshot
-          env: deps=low
     fast_finish: true
 
 cache:
@@ -75,14 +70,12 @@ before_install:
       cp .composer/* ~/.composer/
       export PHPUNIT=$(readlink -f ./phpunit)
       export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
-      export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
+      export COMPOSER_UP='composer update --no-progress --no-suggest --ansi --optimize-autoloader'
       export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n')
       find ~/.phpenv -name xdebug.ini -delete
 
-      if [[ $TRAVIS_PHP_VERSION = 7.4* && $deps ]]; then
-          export PHPUNIT_X="$PHPUNIT_X,issue-32995"
-      elif [[ $TRAVIS_PHP_VERSION = 7.4* ]]; then
-          export PHPUNIT_X="$PHPUNIT --group issue-32995"
+      if [[ $TRAVIS_PHP_VERSION = 7.4* ]]; then
+          export PHPUNIT_X="$PHPUNIT_X,issue-32995,legacy"
       fi
 
       nanoseconds () {
@@ -163,6 +156,7 @@ before_install:
     - |
       # Install extra PHP extensions
       for PHP in $TRAVIS_PHP_VERSION $php_extra; do
+          continue
           export PHP=$PHP
           phpenv global $PHP
           INI=~/.phpenv/versions/$PHP/etc/conf.d/travis.ini
@@ -270,6 +264,9 @@ install:
           ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
           tfold 'composer update' $COMPOSER_UP
           tfold 'phpunit install' ./phpunit install
+
+          php .github/patch-types.php
+
           if [[ $deps = high ]]; then
               echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
           elif [[ $deps = low ]]; then

composer.json

@@ -142,7 +142,6 @@
             "src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php"
         ],
         "exclude-from-classmap": [
-            "**/Tests/"
         ]
     },
     "autoload-dev": {

src/Symfony/Component/ErrorHandler/DebugClassLoader.php

@@ -113,7 +113,7 @@ class DebugClassLoader
             'read' => 'string',
             'write' => 'bool',
             'destroy' => 'bool',
-            'gc' => 'int',
+            'gc' => 'bool',
         ],
         'SessionIdInterface' => [
             'create_sid' => 'string',

src/Symfony/Component/HttpFoundation/BinaryFileResponse.php

@@ -322,16 +322,16 @@ public function setContent($content)
         if (null !== $content) {
             throw new \LogicException('The content cannot be set on a BinaryFileResponse instance.');
         }
+
+        return $this;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return false
      */
     public function getContent()
     {
-        return false;
+        return null;
     }
 
     /**

src/Symfony/Component/HttpFoundation/FileBag.php

@@ -75,8 +75,8 @@ protected function convertFileInformation($file)
             return $file;
         }
 
-        $file = $this->fixPhpFilesArray($file);
         if (\is_array($file)) {
+            $file = $this->fixPhpFilesArray($file);
             $keys = array_keys($file);
             sort($keys);
 
@@ -109,14 +109,12 @@ protected function convertFileInformation($file)
      * It's safe to pass an already converted array, in which case this method
      * just returns the original array unmodified.
      *
+     * @param array $data
+     *
      * @return array
      */
     protected function fixPhpFilesArray($data)
     {
-        if (!\is_array($data)) {
-            return $data;
-        }
-
         $keys = array_keys($data);
         sort($keys);
 

src/Symfony/Component/HttpFoundation/HeaderBag.php

@@ -118,7 +118,7 @@ public function get($key, $default = null)
             }
         }
 
-        return $headers[0] ?? $default;
+        return isset($headers[0]) ? (string) $headers[0] : $default;
     }
 
     /**

src/Symfony/Component/HttpFoundation/Request.php

@@ -499,6 +499,10 @@ public function __toString()
         try {
             $content = $this->getContent();
         } catch (\LogicException $e) {
+            if (\PHP_VERSION_ID >= 70400) {
+                throw $e;
+            }
+
             return trigger_error($e, E_USER_ERROR);
         }
 

src/Symfony/Component/HttpFoundation/Response.php

@@ -409,7 +409,7 @@ public function setContent($content)
     /**
      * Gets the current response content.
      *
-     * @return string Content
+     * @return string|null
      */
     public function getContent()
     {

src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php

@@ -97,7 +97,7 @@ public function remove($name)
      * @param string $name         Key name
      * @param bool   $writeContext Write context, default false
      *
-     * @return array
+     * @return array|null
      */
     protected function &resolveAttributePath($name, $writeContext = false)
     {