Merge branch '3.4' into 4.4

* 3.4:
  Move to the new default 5.x branch
  Use PHPUnit 9.4 to run the test suite.
  Fix type annotation

Author: fabpot

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | master for features / 3.4, 4.4 or 5.1 for bug fixes <!-- see below -->
+| Branch?       | 5.x for features / 3.4, 4.4 or 5.1 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
@@ -16,5 +16,5 @@ Additionally (see https://symfony.com/releases):
  - 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.
+ - Features and deprecations must be submitted against branch 5.x.
 -->

phpunit

@@ -15,7 +15,7 @@ if (!getenv('SYMFONY_PHPUNIT_VERSION')) {
         if (\PHP_VERSION_ID < 70300) {
             putenv('SYMFONY_PHPUNIT_VERSION=8.5');
         } else {
-            putenv('SYMFONY_PHPUNIT_VERSION=9.3');
+            putenv('SYMFONY_PHPUNIT_VERSION=9.4');
         }
     } elseif (\PHP_VERSION_ID >= 70000) {
         putenv('SYMFONY_PHPUNIT_VERSION=6.5');

src/Symfony/Component/ExpressionLanguage/Token.php

@@ -54,7 +54,7 @@ public function __toString()
     /**
      * Tests the current token for a type and/or a value.
      *
-     * @param array|int   $type  The type to test
+     * @param string      $type  The type to test
      * @param string|null $value The token value
      *
      * @return bool