Merge branch '6.0' into 6.1

nicolas-grekas · nicolas-grekas · commit 41697e78a158 · 2022-01-17T15:37:41.000+01:00
* 6.0:
  Update expected-missing-return-types
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -6,10 +6,10 @@ head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
 (echo "$head" && echo && git diff -U2 composer.json src/) > .github/expected-missing-return-types.diff
 
 diff --git a/composer.json b/composer.json
-index 1750d55ee2..c18494167a 100644
+index 978743d34d..1f185f682c 100644
 --- a/composer.json
 +++ b/composer.json
-@@ -175,5 +175,5 @@
+@@ -180,5 +180,5 @@
          ],
          "exclude-from-classmap": [
 -            "**/Tests/"
@@ -155,7 +155,7 @@ index 6b1c6c5fbe..bb80ed461e 100644
 +    public function isFresh(ResourceInterface $resource, int $timestamp): bool;
  }
 diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
-index 0ed5649b8a..6c814bf82c 100644
+index 09234f5eb5..24d995ad6d 100644
 --- a/src/Symfony/Component/Console/Application.php
 +++ b/src/Symfony/Component/Console/Application.php
 @@ -218,5 +218,5 @@ class Application implements ResetInterface
@@ -208,7 +208,7 @@ index 0ed5649b8a..6c814bf82c 100644
      {
          foreach ($command->getHelperSet() as $helper) {
 diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
-index 0bd3426c07..b38caf989e 100644
+index e69bae0982..3390628d0d 100644
 --- a/src/Symfony/Component/Console/Command/Command.php
 +++ b/src/Symfony/Component/Console/Command/Command.php
 @@ -171,5 +171,5 @@ class Command
@@ -261,7 +261,7 @@ index 024da1884e..943790e875 100644
  
      /**
 diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
-index 326d8d4f5f..e62124c7af 100644
+index e9fa5a6808..016e9d893a 100644
 --- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
 +++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
 @@ -71,5 +71,5 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
@@ -383,7 +383,7 @@ index 479aeef880..272954c082 100644
 +    public function getFunctions(): array;
  }
 diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
-index 79d61e8bc0..7f34d95d84 100644
+index 5a077a42a6..62a234b116 100644
 --- a/src/Symfony/Component/Form/AbstractExtension.php
 +++ b/src/Symfony/Component/Form/AbstractExtension.php
 @@ -114,5 +114,5 @@ abstract class AbstractExtension implements FormExtensionInterface
@@ -525,10 +525,10 @@ index 2f442cb536..d98909cfae 100644
 +    public function warmUp(string $cacheDir): array;
  }
 diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
-index 3a3be3af49..971560c07b 100644
+index 1289cf0ea9..dabeec97ee 100644
 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
 +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
-@@ -59,5 +59,5 @@ abstract class DataCollector implements DataCollectorInterface
+@@ -58,5 +58,5 @@ abstract class DataCollector implements DataCollectorInterface
       * @return callable[] The casters to add to the cloner
       */
 -    protected function getCasters()
@@ -546,7 +546,7 @@ index 1cb865fd66..f6f4efe7a7 100644
 +    public function getName(): string;
  }
 diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
-index cf0e243c6b..292b907ea8 100644
+index eeec55593f..c12df944fc 100644
 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
 @@ -448,5 +448,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface
@@ -557,7 +557,7 @@ index cf0e243c6b..292b907ea8 100644
      {
          $this->surrogate?->addSurrogateCapability($request);
 diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
-index 3ecc2c739c..d50834b6d9 100644
+index fc70d8970d..9dde6d1f93 100644
 --- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
 +++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php
 @@ -61,5 +61,5 @@ class HttpKernelBrowser extends AbstractBrowser
@@ -711,6 +711,17 @@ index fbb37d9f94..522e0487a9 100644
 -    public function isIndex(int $index);
 +    public function isIndex(int $index): bool;
  }
+diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+index cfffdb2f71..3e2261898a 100644
+--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
++++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
+@@ -725,5 +725,5 @@ class PropertyAccessorTest extends TestCase
+              * @return mixed
+              */
+-            public function getFoo()
++            public function getFoo(): mixed
+             {
+                 return $this->foo;
 diff --git a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php b/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
 index f9ee787130..61f8b6d5be 100644
 --- a/src/Symfony/Component/PropertyInfo/PropertyAccessExtractorInterface.php
@@ -760,7 +771,7 @@ index 2dd0e5efbf..95e01d8955 100644
      {
          $name = str_replace('\\', '_', $class->name).'_'.$method->name;
 diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
-index 83c10427a1..e113d4a194 100644
+index be653e4f00..e46300d474 100644
 --- a/src/Symfony/Component/Routing/Router.php
 +++ b/src/Symfony/Component/Routing/Router.php
 @@ -178,5 +178,5 @@ class Router implements RouterInterface, RequestMatcherInterface
@@ -802,7 +813,7 @@ index 7e401c3ff3..6b446ff376 100644
 +    public function vote(TokenInterface $token, mixed $subject, array $attributes): int;
  }
 diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
-index 298bc78cd9..3ef4176dd8 100644
+index 9e2b02b603..c6a753f1f7 100644
 --- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
 +++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php
 @@ -89,5 +89,5 @@ class AuthenticationException extends RuntimeException
@@ -841,7 +852,7 @@ index 91271d14a3..100c2fb549 100644
 +    public function start(Request $request, AuthenticationException $authException = null): Response;
  }
 diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php
-index 0c313f8f09..acfc9f4b88 100644
+index 546b77d22f..24038d4b94 100644
 --- a/src/Symfony/Component/Security/Http/Firewall.php
 +++ b/src/Symfony/Component/Security/Http/Firewall.php
 @@ -106,5 +106,5 @@ class Firewall implements EventSubscriberInterface
@@ -879,7 +890,7 @@ index 84a84ad1f3..6f66b6d32a 100644
 +    public function supportsDecoding(string $format): bool;
  }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
-index b0a1f3218b..893fe59e2f 100644
+index 7f86ed8d78..cf084423ec 100644
 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 @@ -223,5 +223,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn
@@ -1017,31 +1028,31 @@ index 4c088b94f9..86107a636d 100644
 +    abstract protected function extractFromDirectory(string|array $resource): iterable;
  }
 diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
-index d6dcdf178f..0ab8d9c10e 100644
+index 46432f2f4c..47ac39d5e3 100644
 --- a/src/Symfony/Component/Validator/Constraint.php
 +++ b/src/Symfony/Component/Validator/Constraint.php
-@@ -239,5 +239,5 @@ abstract class Constraint
+@@ -243,5 +243,5 @@ abstract class Constraint
       * @see __construct()
       */
 -    public function getDefaultOption()
 +    public function getDefaultOption(): ?string
      {
          return null;
-@@ -253,5 +253,5 @@ abstract class Constraint
+@@ -257,5 +257,5 @@ abstract class Constraint
       * @see __construct()
       */
 -    public function getRequiredOptions()
 +    public function getRequiredOptions(): array
      {
          return [];
-@@ -267,5 +267,5 @@ abstract class Constraint
+@@ -271,5 +271,5 @@ abstract class Constraint
       * @return string
       */
 -    public function validatedBy()
 +    public function validatedBy(): string
      {
          return static::class.'Validator';
-@@ -281,5 +281,5 @@ abstract class Constraint
+@@ -285,5 +285,5 @@ abstract class Constraint
       * @return string|string[] One or more constant values
       */
 -    public function getTargets()
diff --git a/.github/patch-types.php b/.github/patch-types.php
@@ -13,36 +13,37 @@
 
 foreach ($loader->getClassMap() as $class => $file) {
     switch (true) {
-        case str_contains($file = realpath($file), '/vendor/'):
-        case str_contains($file, '/src/Symfony/Bridge/PhpUnit/'):
-        case str_contains($file, '/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Validation/Article.php'):
-        case str_contains($file, '/src/Symfony/Component/Cache/Tests/Fixtures/DriverWrapper.php'):
-        case str_contains($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadFileName.php'):
-        case str_contains($file, '/src/Symfony/Component/Config/Tests/Fixtures/BadParent.php'):
-        case str_contains($file, '/src/Symfony/Component/Config/Tests/Fixtures/ParseError.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/intersectiontype_classes.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/IntersectionConstructor.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NewInInitializer.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Preload/'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php'):
-        case str_contains($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/'):
-        case str_contains($file, '/src/Symfony/Component/ErrorHandler/Tests/Fixtures/'):
-        case str_contains($file, '/src/Symfony/Component/Form/Tests/Fixtures/Answer.php'):
-        case str_contains($file, '/src/Symfony/Component/Form/Tests/Fixtures/Number.php'):
-        case str_contains($file, '/src/Symfony/Component/Form/Tests/Fixtures/Suit.php'):
-        case str_contains($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/'):
-        case str_contains($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php'):
-        case str_contains($file, '/src/Symfony/Component/Runtime/Internal/ComposerPlugin.php'):
-        case str_contains($file, '/src/Symfony/Component/Serializer/Tests/Fixtures/'):
-        case str_contains($file, '/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectOuter.php'):
-        case str_contains($file, '/src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/Entity.php'):
-        case str_contains($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
-        case str_contains($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
+        case false !== strpos($file = 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/Cache/Tests/Fixtures/DriverWrapper.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/DependencyInjection/Dumper/PhpDumper.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Compiler/OptionalServiceClass.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/intersectiontype_classes.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/CheckTypeDeclarationsPass/IntersectionConstructor.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NewInInitializer.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ParentNotExists.php'):
+        case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Preload/'):
+        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/DependencyInjection/Tests/Fixtures/TestServiceSubscriberIntersectionWithTrait.php'):
+        case false !== strpos($file, '/src/Symfony/Component/ErrorHandler/Tests/Fixtures/'):
+        case false !== strpos($file, '/src/Symfony/Component/Form/Tests/Fixtures/Answer.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Form/Tests/Fixtures/Number.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Form/Tests/Fixtures/Suit.php'):
+        case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/'):
+        case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php81Dummy.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Runtime/Internal/ComposerPlugin.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Serializer/Tests/Fixtures/'):
+        case false !== strpos($file, '/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectOuter.php'):
+        case false !== strpos($file, '/src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/Entity.php'):
+        case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
+        case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
             continue 2;
     }
 
