symfony · linaori · Sep 19, 2019 · Sep 19, 2019 · Sep 19, 2019 · Sep 19, 2019
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -10,18 +10,18 @@ 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

diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -7,15 +7,6 @@
 
 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();
@@ -26,7 +17,6 @@
         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'):

diff --git a/.php_cs.dist b/.php_cs.dist
@@ -39,7 +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:7006/messages
         - SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
 
 matrix:
     include:
-        - php: 7.1
-          env: php_extra="7.2 7.4snapshot"
+        - php: 7.2
+          env: php_extra="7.4snapshot"
         - php: 7.3
           env: deps=high
         - php: 7.4snapshot
@@ -207,7 +207,6 @@ install:
 
       if [[ ! $deps ]]; then
           php .github/build-packages.php HEAD^ src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
-          composer remove --dev --no-update paragonie/sodium_compat
       else
           export SYMFONY_DEPRECATIONS_HELPER=weak &&
           cp composer.json composer.json.orig &&
@@ -242,7 +241,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
@@ -274,7 +273,7 @@ install:
               (cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json)
               COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
 
-              if [[ $COMPONENTS && $LEGACY && $TRAVIS_PULL_REQUEST != false ]]; then
+              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"