symfony · fabpot · Nov 30, 2019 · Nov 11, 2019 · Nov 11, 2019 · Nov 11, 2019
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,25 +10,26 @@ init:
     - SET PATH=c:\php;%PATH%
     - SET COMPOSER_NO_INTERACTION=1
     - SET SYMFONY_DEPRECATIONS_HELPER=strict
-    - SET "SYMFONY_REQUIRE=>=4.2"
+    - SET "SYMFONY_REQUIRE=>=4.4"
     - SET ANSICON=121x90 (121x90)
     - SET SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
     - REG ADD "HKEY_CURRENT_USER\Software\Microsoft\Command Processor" /v DelayedExpansion /t REG_DWORD /d 1 /f
 
 install:
     - mkdir c:\php && cd c:\php
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
-    - 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.2.5-Win32-VC15-x86.zip
+    - 7z x php-7.2.5-Win32-VC15-x86.zip -y >nul
     - cd ext
-    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.8-7.1-ts-vc14-x86.zip
-    - 7z x php_apcu-5.1.8-7.1-ts-vc14-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.17-7.2-ts-vc15-x86.zip
+    - 7z x php_apcu-5.1.17-7.2-ts-vc15-x86.zip -y >nul
     - cd ..
     - copy /Y php.ini-development php.ini-min
     - echo memory_limit=-1 >> php.ini-min
     - echo serialize_precision=14 >> php.ini-min
     - echo max_execution_time=1200 >> php.ini-min
     - echo date.timezone="America/Los_Angeles" >> php.ini-min
     - echo extension_dir=ext >> php.ini-min
+    - echo extension=php_xsl.dll >> php.ini-min
     - copy /Y php.ini-min php.ini-max
     - echo zend_extension=php_opcache.dll >> php.ini-max
     - echo opcache.enable_cli=1 >> php.ini-max
@@ -58,7 +59,7 @@ test_script:
     - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
     - copy /Y c:\php\php.ini-min c:\php\php.ini
     - IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
-    - php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
+    - php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
     - copy /Y c:\php\php.ini-max c:\php\php.ini
-    - php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
+    - php phpunit src\Symfony --exclude-group tty,benchmark,intl-data || SET X=!errorlevel!
     - exit %X%
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,6 +2,8 @@
 /src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
 # DependencyInjection
 /src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
+# ErrorRenderer
+/src/Symfony/Component/ErrorRenderer/* @yceruto
 # Form
 /src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
 /src/Symfony/Bridge/Twig/Form/ @xabbuh
@@ -33,6 +35,8 @@
 /src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
 # Serializer
 /src/Symfony/Component/Serializer/ @dunglas
+# TwigBundle
+/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
 # WebLink
 /src/Symfony/Component/WebLink/ @dunglas
 # Workflow

diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -0,0 +1,36 @@
+<?php
+
+if (false === getenv('SYMFONY_PATCH_TYPE_DECLARATIONS')) {
+    echo "Please define the SYMFONY_PATCH_TYPE_DECLARATIONS env var when running this script.\n";
+    exit(1);
+}
+
+require __DIR__.'/../.phpunit/phpunit-8.3-0/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/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/Dummy.php'):
+        case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php'):
+        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'):
+        case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/Php74.php') && \PHP_VERSION_ID < 70400:
+            continue 2;
+    }
+
+    class_exists($class);
+}
+
+Symfony\Component\ErrorHandler\DebugClassLoader::checkClasses();
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -39,6 +39,6 @@ return PhpCsFixer\Config::create()
             // test template
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
             // explicit trigger_error tests
-            ->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
+            ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
     )
 ;
diff --git a/.travis.yml b/.travis.yml
@@ -17,16 +17,16 @@ addons:
 
 env:
     global:
-        - MIN_PHP=7.1.3
+        - MIN_PHP=7.2.5
         - SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
         - MESSENGER_AMQP_DSN=amqp://localhost/%2f/messages
-        - MESSENGER_REDIS_DSN=redis://127.0.0.1:7001/messages
+        - MESSENGER_REDIS_DSN=redis://127.0.0.1:7006/messages
         - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
 
 matrix:
     include:
-        - php: 7.1
-          env: php_extra="7.2"
+        - php: 7.2
+          env: php_extra="7.4snapshot"
         - php: 7.3
           env: deps=high
         - php: 7.4snapshot
@@ -59,7 +59,7 @@ before_install:
     - |
       # Start Redis cluster
       docker pull grokzen/redis-cluster:5.0.4
-      docker run -d -p 7000:7000 -p 7001:7001 -p 7002:7002 -p 7003:7003 -p 7004:7004 -p 7005:7005 --name redis-cluster grokzen/redis-cluster:5.0.4
+      docker run -d -p 7000:7000 -p 7001:7001 -p 7002:7002 -p 7003:7003 -p 7004:7004 -p 7005:7005 -p 7006:7006 -p 7007:7007 -e "STANDALONE=true" --name redis-cluster grokzen/redis-cluster:5.0.4
       export REDIS_CLUSTER_HOSTS='localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
 
     - |
@@ -150,7 +150,7 @@ before_install:
     - |
       # php.ini configuration
       for PHP in $TRAVIS_PHP_VERSION $php_extra; do
-          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)
+          phpenv global $PHP 2>/dev/null || (cd / && wget https://storage.googleapis.com/travis-ci-language-archives/php/binaries/ubuntu/16.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
@@ -247,7 +247,7 @@ install:
     - |
       # Install symfony/flex
       if [[ $deps = low ]]; then
-          export SYMFONY_REQUIRE='>=2.3'
+          export SYMFONY_REQUIRE='>=3.4'
       else
           export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
       fi
@@ -266,23 +266,52 @@ install:
       run_tests () {
           set -e
           export PHP=$1
-          if [[ $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then
+          if [[ $PHP != 7.4* && $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then
               echo -e "\\n\\e[33;1mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
               return
           fi
           phpenv global $PHP
-          ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
+          ([[ $deps ]] && cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; 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
           if [[ $deps = high ]]; then
-              echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'"
+              echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
+              (cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
+              COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
+
+              if [[ $COMPONENTS && $LEGACY && $TRAVIS_BRANCH != master && $TRAVIS_PULL_REQUEST != false ]]; then
+                  export FLIP='🙃'
+                  SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
+                  echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
+                  export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
+                  export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev
+                  git fetch --depth=2 origin $SYMFONY_VERSION
+                  git checkout -m FETCH_HEAD
+                  COMPONENTS=$(echo "$COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort)
+                  (cd src/Symfony/Component/HttpFoundation; composer config platform.ext-mongodb 1.6.0; composer require --dev --no-update mongodb/mongodb)
+                  [[ ! $COMPONENTS ]] || tfold 'phpunit install' SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 ./phpunit install
+                  [[ ! $COMPONENTS ]] || echo "$COMPONENTS" | parallel --gnu "tfold {} 'cd {} && rm composer.lock vendor/ -Rf && $COMPOSER_UP && $PHPUNIT_X$LEGACY'" || X=1
+              fi
+
+              [[ ! $X ]] || (exit 1)
           elif [[ $deps = low ]]; then
               [[ -e ~/php-ext/composer-lowest.lock.tar ]] && tar -xf ~/php-ext/composer-lowest.lock.tar
               tar -cf ~/php-ext/composer-lowest.lock.tar --files-from /dev/null
               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
           else
+              if [[ $PHP = 7.4* ]]; then
+                  # add return types before running the test suite
+                  rm vendor/symfony/contracts -Rf
+                  ln -sd $(realpath src/Symfony/Contracts) vendor/symfony/contracts
+                  sed -i 's/"\*\*\/Tests\/"//' composer.json
+                  composer install --optimize-autoloader
+                  SYMFONY_PATCH_TYPE_DECLARATIONS=force=object php .github/patch-types.php
+                  SYMFONY_PATCH_TYPE_DECLARATIONS=force=object php .github/patch-types.php # ensure the script is idempotent
+                  PHPUNIT_X="$PHPUNIT_X,legacy"
+              fi
+
               if [[ $PHP = ${MIN_PHP%.*} ]]; then
                   tfold src/Symfony/Component/HttpClient.h2push docker run -it --rm -v $(pwd):/app -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
               fi