symfony · ArnaudTarroux · Jan 27, 2020 · Jan 27, 2020 · Jan 27, 2020 · Jan 27, 2020
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,25 +9,27 @@ cache:
 init:
     - SET PATH=c:\php;%PATH%
     - SET COMPOSER_NO_INTERACTION=1
-    - SET SYMFONY_DEPRECATIONS_HELPER=strict
-    - SET "SYMFONY_REQUIRE=>=4.2"
+    - SET SYMFONY_DEPRECATIONS_HELPER=max[indirect]=7
+    - 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
@@ -41,10 +43,12 @@ install:
     - echo extension=php_curl.dll >> php.ini-max
     - copy /Y php.ini-max php.ini
     - cd c:\projects\symfony
-    - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.7.1/composer.phar)
+    - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
     - php composer.phar self-update
-    - copy /Y .composer\* %APPDATA%\Composer\
+    - copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
     - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
+    - git config --global user.email ""
+    - git config --global user.name "Symfony"
     - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
     - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
     - php composer.phar update --no-progress --no-suggest --ansi
@@ -54,7 +58,8 @@ test_script:
     - SET X=0
     - SET SYMFONY_PHPUNIT_SKIPPED_TESTS=phpunit.skipped
     - copy /Y c:\php\php.ini-min c:\php\php.ini
-    - php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
+    - IF %APPVEYOR_REPO_BRANCH% neq master (rm -Rf src\Symfony\Bridge\PhpUnit)
+    - 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/.composer/config.json b/.composer/config.json
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,9 +2,11 @@
 /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
+/src/Symfony/Bridge/Twig/Form/ @xabbuh
 /src/Symfony/Bridge/Twig/Node/FormThemeNode.php @xabbuh
 /src/Symfony/Bridge/Twig/Node/RenderBlockNode.php @xabbuh
 /src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php @xabbuh
@@ -13,34 +15,36 @@
 /src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php @xabbuh
 /src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php @xabbuh
 /src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FormPass.php @xabbuh
-/src/Symfony/Bundle/FrameworkBundle/Resources/views/* @xabbuh
+/src/Symfony/Bundle/FrameworkBundle/Resources/views/ @xabbuh
 /src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php @xabbuh
 /src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
 /src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
 /src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
-/src/Symfony/Component/Form/* @xabbuh
+/src/Symfony/Component/Form/ @xabbuh
 # HttpKernel
 /src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
 # LDAP
-/src/Symfony/Component/Ldap/* @csarrazi
+/src/Symfony/Component/Ldap/ @csarrazi
 # Lock
-/src/Symfony/Component/Lock/* @jderusse
+/src/Symfony/Component/Lock/ @jderusse
 # Messenger
-/src/Symfony/Bridge/Doctrine/Messenger/* @sroze
-/src/Symfony/Component/Messenger/* @sroze
+/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
+/src/Symfony/Component/Messenger/ @sroze
 # PropertyInfo
-/src/Symfony/Component/PropertyInfo/* @dunglas
-/src/Symfony/Bridge/Doctrine/PropertyInfo/* @dunglas
+/src/Symfony/Component/PropertyInfo/ @dunglas
+/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
 # Serializer
-/src/Symfony/Component/Serializer/* @dunglas
+/src/Symfony/Component/Serializer/ @dunglas
+# TwigBundle
+/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
 # WebLink
-/src/Symfony/Component/WebLink/* @dunglas
+/src/Symfony/Component/WebLink/ @dunglas
 # Workflow
 /src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php @lyrixx
 /src/Symfony/Bridge/Twig/Tests/Extension/WorkflowExtensionTest.php @lyrixx
 /src/Symfony/Bundle/FrameworkBundle/Command/WorkflowDumpCommand.php @lyrixx
 /src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/ValidateWorkflowsPass.php @lyrixx
 /src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/WorkflowGuardListenerPass.php @lyrixx
-/src/Symfony/Component/Workflow/* @lyrixx
+/src/Symfony/Component/Workflow/ @lyrixx
 # Yaml
-/src/Symfony/Component/Yaml/* @xabbuh
+/src/Symfony/Component/Yaml/ @xabbuh
diff --git a/.github/ISSUE_TEMPLATE/5_Security_issue.md b/.github/ISSUE_TEMPLATE/5_Security_issue.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,20 +1,20 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | master for features / 3.4 up to 4.2 for bug fixes <!-- see below -->
+| Branch?       | master for features / 3.4, 4.4 or 5.0 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
-| New feature?  | yes/no <!-- don't forget to update src/**/CHANGELOG.md files -->
-| BC breaks?    | no     <!-- see https://symfony.com/bc -->
-| Deprecations? | yes/no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
-| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
-| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any -->
+| 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 -->
 | License       | MIT
 | Doc PR        | symfony/symfony-docs#... <!-- required for new features -->
-
 <!--
-Write a short README entry for your feature/bugfix here (replace this comment block.)
-This will help people understand your PR and can be used as a start of the Doc PR.
-Additionally:
- - Bug fixes must be submitted against the lowest branch where they apply
-   (lowest branches are regularly merged to upper ones so they get the fixes too).
- - Features and deprecations must be submitted against the master branch.
+Replace this notice by a short README for your feature/bugfix. This will help people
+understand your PR and can be used as a start for the documentation.
+
+Additionally (see https://symfony.com/roadmap):
+ - Always add tests and ensure they pass.
+ - Never break backward compatibility (see https://symfony.com/bc).
+ - Bug fixes must be submitted against the lowest maintained branch where they apply
+   (lowest branches are regularly merged to upper ones so they get the fixes too.)
+ - Features and deprecations must be submitted against branch master.
 -->
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -0,0 +1,10 @@
+Security Policy
+===============
+
+If you found any issues that might have security implications,
+please send a report to security[at]symfony.com
+DO NOT PUBLISH SECURITY REPORTS PUBLICLY.
+
+The full [Security Policy][1] is described in the official documentation.
+
+  [1]: https://symfony.com/security
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -17,6 +17,7 @@
 
 $packages = array();
 $flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+$preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];
 
 foreach ($dirs as $k => $dir) {
     if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
@@ -42,7 +43,12 @@
         $json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
         file_put_contents($dir.'/composer.json', $json);
     }
-    passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
+
+    if (isset($preferredInstall[$package->name]) && 'source' === $preferredInstall[$package->name]) {
+        passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
+    } else {
+        passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
+    }
 
     if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
         echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
@@ -57,7 +63,7 @@
     $versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
     $versions = json_decode($versions)->packages->{$package->name};
 
-    if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
+    if (isset($versions->{'dev-master'}) && $package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
         unset($versions->{'dev-master'});
     }
 

diff --git a/.github/composer-config.json b/.github/composer-config.json
@@ -0,0 +1,10 @@
+{
+    "config": {
+        "preferred-install": {
+            "symfony/form": "source",
+            "symfony/http-kernel": "source",
+            "symfony/validator": "source",
+            "*": "dist"
+        }
+    }
+}
diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -0,0 +1,39 @@
+<?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/BadFileName.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Config/Tests/Fixtures/ParseError.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/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/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ vendor/
 composer.lock
 phpunit.xml
 .php_cs.cache
+.phpunit.result.cache
 composer.phar
 package.tar
 /packages.json

diff --git a/.php_cs.dist b/.php_cs.dist
@@ -8,50 +8,37 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        '@PHPUnit48Migration:risky' => true,
-        'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
+        '@PHPUnit75Migration:risky' => true,
+        'php_unit_dedicate_assert' => ['target' => '5.6'],
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => false,
-        'ordered_imports' => true,
         'protected_to_private' => false,
-        // Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
-        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
-        // Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
-        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'combine_nested_dirname' => true,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__.'/src')
             ->append([__FILE__])
+            ->notPath('#/Fixtures/#')
             ->exclude([
-                'Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures',
                 // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
-                'Symfony/Component/DependencyInjection/Tests/Fixtures',
-                'Symfony/Component/Routing/Tests/Fixtures/dumper',
                 // fixture templates
-                'Symfony/Component/Templating/Tests/Fixtures/templates',
-                'Symfony/Bundle/FrameworkBundle/Tests/Fixtures/TemplatePathsCache',
                 'Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom',
-                // generated fixtures
-                'Symfony/Component/VarDumper/Tests/Fixtures',
-                'Symfony/Component/VarExporter/Tests/Fixtures',
                 // resource templates
                 'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
                 // explicit trigger_error tests
                 'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
             ])
             // Support for older PHPunit version
             ->notPath('Symfony/Bridge/PhpUnit/SymfonyTestsListener.php')
+            ->notPath('#Symfony/Bridge/PhpUnit/.*Mock\.php#')
+            ->notPath('#Symfony/Bridge/PhpUnit/.*Legacy#')
             // file content autogenerated by `var_export`
             ->notPath('Symfony/Component/Translation/Tests/fixtures/resources.php')
             // test template
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
-            // explicit heredoc test
-            ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
             // explicit trigger_error tests
-            ->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
-            // invalid annotations on purpose
-            ->notPath('Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php')
+            ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
     )
 ;