Merge branch 'symfony:6.1' into 6.1

.appveyor.yml

@@ -22,6 +22,8 @@ install:
     - cd ext
     - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.21-8.0-ts-vs16-x86.zip
     - 7z x php_apcu-5.1.21-8.0-ts-vs16-x86.zip -y >nul
+    - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.5-8.0-ts-vs16-x86.zip
+    - 7z x php_redis-5.3.5-8.0-ts-vs16-x86.zip -y >nul
     - cd ..
     - copy /Y php.ini-development php.ini-min
     - echo memory_limit=-1 >> php.ini-min
@@ -37,6 +39,7 @@ install:
     - echo opcache.enable_cli=1 >> php.ini-max
     - echo extension=php_openssl.dll >> php.ini-max
     - echo extension=php_apcu.dll >> php.ini-max
+    - echo extension=php_redis.dll >> php.ini-max
     - echo apc.enable_cli=1 >> php.ini-max
     - echo extension=php_intl.dll >> php.ini-max
     - echo extension=php_mbstring.dll >> php.ini-max
@@ -55,6 +58,7 @@ install:
     - SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
     - php composer.phar update --no-progress --ansi
     - php phpunit install
+    - choco install memurai-developer
 
 test_script:
     - SET X=0

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,7 @@ Additionally (see https://symfony.com/releases):
  - Always add tests and ensure they pass.
  - 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 5.x.
+ - Features and deprecations must be submitted against the latest branch.
  - Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
  - Never break backward compatibility (see https://symfony.com/bc).
 -->

.github/workflows/integration-tests.yml

@@ -157,18 +157,13 @@ jobs:
       - name: Run tests
         run: ./phpunit --group integration -v
         env:
-          REDIS_HOST: localhost
           REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
           REDIS_SENTINEL_HOSTS: 'localhost:26379'
           REDIS_SENTINEL_SERVICE: redis_sentinel
           MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
           MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
           MESSENGER_SQS_DSN: "sqs://localhost:9494/messages?sslmode=disable&poll_timeout=0.01"
           MESSENGER_SQS_FIFO_QUEUE_DSN: "sqs://localhost:9494/messages.fifo?sslmode=disable&poll_timeout=0.01"
-          MEMCACHED_HOST: localhost
-          LDAP_HOST: localhost
-          LDAP_PORT: 3389
-          MONGODB_HOST: localhost
           KAFKA_BROKER: 127.0.0.1:9092
           POSTGRES_HOST: localhost
 

.github/workflows/package-tests.yml

@@ -82,7 +82,7 @@ jobs:
                 echo "Verifying new package"
                 _correct_license_file $DIR/LICENSE || localExit=1
 
-                if [ $TYPE == 'component_bridge' ]; then
+                if [ $TYPE != 'component_bridge' ]; then
                   if [ ! $(cat composer.json | jq -e ".replace.\"$NAME\"|test(\"self.version\")") ]; then
                     echo "Composer.json's replace section needs to contain $NAME"
                     localExit=1

.github/workflows/unit-tests.yml

@@ -20,21 +20,15 @@ jobs:
       matrix:
         include:
           - php: '8.1'
-            os: ubuntu-20.04
-          - php: '8.0'
-            os: macos-11
           - php: '8.0'
             mode: high-deps
-            os: ubuntu-20.04
           - php: '8.1'
             mode: low-deps
-            os: ubuntu-20.04
           - php: '8.2'
             mode: experimental
-            os: ubuntu-20.04
       fail-fast: false
 
-    runs-on: "${{ matrix.os }}"
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout
@@ -56,11 +50,6 @@ jobs:
           extensions: "${{ env.extensions }}"
           tools: flex
 
-      - name: Install Homebrew packages
-        if: "matrix.os == 'macos-11'"
-        run: |
-          brew install parallel
-
       - name: Configure environment
         run: |
           git config --global user.email ""
@@ -72,7 +61,7 @@ jobs:
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
 
           echo COLUMNS=120 >> $GITHUB_ENV
-          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data$([[ ${{ matrix.os }} = macos* ]] && echo ',transient-on-macos')" >> $GITHUB_ENV
+          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
           echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
@@ -146,7 +135,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Patch return types
-        if: "matrix.php == '8.1' && ! matrix.mode && matrix.os != 'macos-11'"
+        if: "matrix.php == '8.1' && ! matrix.mode"
         run: |
           patch -sp1 < .github/expected-missing-return-types.diff
           git add .
@@ -224,7 +213,7 @@ jobs:
           [[ ! $X ]] || (exit 1)
 
       - name: Run tests with SIGCHLD enabled PHP
-        if: "matrix.php == '8.0' && ! matrix.mode && matrix.os != 'macos-11'"
+        if: "matrix.php == '8.0' && ! matrix.mode"
         run: |
           mkdir build
           cd build

CHANGELOG-6.0.md

@@ -7,6 +7,72 @@ in 6.0 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/v6.0.0...v6.0.1
 
+* 6.0.2 (2021-12-29)
+
+ * bug #44828 [Lock] Release DoctrineDbalPostgreSqlStore connection lock on failure (simon-watiau)
+ * bug #44838 [DependencyInjection][HttpKernel] Fix enum typed bindings (ogizanagi)
+ * bug #44723 [Lock] Release PostgreSqlStore connection lock on failure (simon-watiau) * commit 'e5b2f9efba':   [Lock] Release PostgreSqlStore connection lock on failure
+ * bug #44826 [HttpKernel] Do not attempt to register enum arguments in controller service locator (ogizanagi)
+ * bug #44822 [Mime][Security] Fix missing sprintf and add tests (alamirault)
+ * bug #44824 [Mime] Fix missing sprintf in DkimSigner (alamirault)
+ * bug #44816 [Translation] [LocoProvider] Use rawurlencode and separate tag setting (danut007ro)
+ * bug #44805 [Security] fix unserializing session payloads from v4 (nicolas-grekas)
+ * bug #44820 [Cache] Don't lock when doing nested computations (nicolas-grekas)
+ * bug #44807 [Messenger] fix Redis support on 32b arch (nicolas-grekas)
+ * bug #44759 [HttpFoundation] Fix notice when HTTP_PHP_AUTH_USER passed without pass (Vitali Tsyrkin)
+ * bug #44809 [WebProfilerBundle] relax return type for memory data collector (94noni)
+ * bug #44799 [Cache] fix compat with apcu < 5.1.10 (nicolas-grekas)
+ * bug #44764 [Form] Expand FormView key to include int (biozshock)
+ * bug #44730 [Console] Fix autocompletion of argument with default value (GromNaN)
+ * bug #44637 [PropertyInfo] PhpStan extractor nested object fix (rmikalkenas)
+ * bug #44085 [Translation] Fix TranslationPullCommand with ICU translations (Kocal)
+ * bug #44578 [PropertyInfo] Fix phpstan extractor issues (ostrolucky)
+ * bug #44771 [Notifier] Use correct factory for the msteams transport (veewee)
+ * bug #44618 [HttpKernel] Fix SessionListener without session in request (shyim)
+ * bug #44743 [HttpClient] fix checking for recent curl consts (nicolas-grekas)
+ * bug #44752 [Security/Http] Fix cookie clearing on logout (maxhelias)
+ * bug #44745 [EventDispatcher][HttpFoundation] Restore return type to covariant IteratorAggregate implementations (derrabus)
+ * bug #44732 [Mime] Relaxing in-reply-to header validation (ThomasLandauer)
+ * bug #44714 [WebProfilerBundle] fix Email HTML preview (94noni)
+ * bug #44737 Fix Psr16Cache not being compatible with non-Symfony cache pools (colinodell)
+ * bug #44728 [Mime] Fix encoding filenames in multipart/form-data (nicolas-grekas)
+ * bug #44602 [Serializer] Improve UidNormalizer denormalize error message (fancyweb)
+ * bug #44383 [Lock] Create tables in transaction only if supported by driver (martinssipenko)
+ * bug #44518 [HttpFoundation] Take php session.cookie settings into account (simonchrz)
+ * bug #44719 [ErrorHandler] fix on patching return types on Windows (nicolas-grekas)
+ * bug #44710 [DependencyInjection] fix linting callable classes (nicolas-grekas)
+ * bug #44639 [DependencyInjection] Cast tag attribute value to string (ruudk)
+ * bug #44473 [Validator] Restore default locale in ConstraintValidatorTestCase (rodnaph)
+ * bug #44682 [FrameworkBundle] alias `cache.app.taggable` to `cache.app` if using `cache.adapter.redis_tag_aware` (kbond)
+ * bug #44649 [HttpKernel] fix how configuring log-level and status-code by exception works (nicolas-grekas)
+ * bug #44667 [Cache] Revert "feature #41989  make `LockRegistry` use semaphores when possible" (nicolas-grekas)
+ * bug #44671 [HttpClient] Fix tracing requests made after calling withOptions() (nicolas-grekas)
+ * bug #44577 [Cache] Fix proxy no expiration to the Redis (Sergey Belyshkin)
+ * bug #44669 [Cache] disable lock on CLI (nicolas-grekas)
+ * bug #44598 [Translation] Handle the blank-translation in Loco Adapter (kgonella)
+ * bug #44448 [Validator] Allow Sequence constraint to be applied onto class as an attribute (sidz)
+ * bug #44354 [RateLimiter] Make RateLimiter resilient to timeShifting (jderusse)
+ * bug #44600 [Serializer] Fix denormalizing custom class in UidNormalizer (fancyweb)
+ * bug #44537 [Config] In XmlUtils, avoid converting from octal every string starting with a 0 (alexandre-daubois)
+ * bug #44510 [Workflow] Fix eventsToDispatch parameter setup for StateMachine (Olexandr Kalaidzhy)
+ * bug #44625 [HttpClient] fix monitoring responses issued before reset() (nicolas-grekas)
+ * bug #44623 [HttpClient] Fix dealing with "HTTP/1.1 000 " responses (nicolas-grekas)
+ * bug #44430 [PropertyInfo] Fix aliased namespace matching (Korbeil)
+ * bug #44601 [HttpClient] Fix closing curl-multi handle too early on destruct (nicolas-grekas)
+ * bug #44554 Make enable_authenticator_manager true as there is no other way in Symfony 6 (alexander-schranz)
+ * bug #44571 [HttpClient] Don't reset timeout counter when initializing requests (nicolas-grekas)
+ * bug #44479 [HttpClient] Double check if handle is complete (Nyholm)
+ * bug #44418 [DependencyInjection] Resolve ChildDefinition in AbstractRecursivePass (fancyweb)
+ * bug #44474 [Translation] [Bridge] [Lokalise] Fix push keys to lokalise. Closes #… (olegmifle)
+ * bug #43164 [FrameworkBundle] Fix cache pool configuration with one adapter and one provider (fancyweb)
+ * bug #44419 [PropertyAccess] Fix accessing public property on Object (kevcomparadise)
+ * bug #44565 [FrameworkBundle] Use correct cookie domain in loginUser() (wouterj)
+ * bug #44538 [Process] fixed uppercase ARGC and ARGV should also be skipped (rbaarsma)
+ * bug #44438 [HttpClient] Fix handling thrown \Exception in \Generator in MockResponse (fancyweb)
+ * bug #44469 [String] Fix requiring wcswitch table several times (fancyweb)
+ * bug #44428 [HttpClient] Fix response id property check in MockResponse (fancyweb)
+ * bug #44539 [Lock] Fix missing argument in PostgreSqlStore::putOffExpiration with DBAL connection (GromNaN)
+
 * 6.0.1 (2021-12-09)
 
  * bug #44494 Remove FQCN type hints on properties (fabpot)