[PropertyInfo] Deprecate Type

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
+f4118e110a46de3ffb799e7d79bf15128d1646ea
+9519b54417c09c49496a4a6be238e63be9a73465
+ae0a783425b80b78376488619bf9106e69193fa4
+9c1e36257c4df0929179462d6b2bdd00453ac8aa
+6ae74d38e3d20d0ffcc66c7c3d28767fab76bdfb

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 7.1 for features / 5.4, 6.3, 6.4, or 7.0 for bug fixes <!-- see below -->
+| Branch?       | 7.1 for features / 5.4, 6.4, or 7.0 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 -->

.github/expected-missing-return-types.diff

@@ -22,7 +22,7 @@ diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/
       */
 -    abstract protected function doRequest(object $request);
 +    abstract protected function doRequest(object $request): object;
- 
+
      /**
 @@ -451,5 +451,5 @@ abstract class AbstractBrowser
       * @throws LogicException When this abstract class is not implemented
@@ -146,21 +146,21 @@ diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterf
       */
 -    public function load(array $configs, ContainerBuilder $container);
 +    public function load(array $configs, ContainerBuilder $container): void;
- 
+
      /**
 @@ -37,5 +37,5 @@ interface ExtensionInterface
       * @return string
       */
 -    public function getNamespace();
 +    public function getNamespace(): string;
- 
+
      /**
 @@ -44,5 +44,5 @@ interface ExtensionInterface
       * @return string|false
       */
 -    public function getXsdValidationBasePath();
 +    public function getXsdValidationBasePath(): string|false;
- 
+
      /**
 @@ -53,4 +53,4 @@ interface ExtensionInterface
       * @return string
@@ -249,35 +249,35 @@ diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Comp
       */
 -    public function getParent();
 +    public function getParent(): ?string;
- 
+
      /**
 @@ -34,5 +34,5 @@ interface FormTypeInterface
       * @return void
       */
 -    public function configureOptions(OptionsResolver $resolver);
 +    public function configureOptions(OptionsResolver $resolver): void;
- 
+
      /**
 @@ -48,5 +48,5 @@ interface FormTypeInterface
       * @see FormTypeExtensionInterface::buildForm()
       */
 -    public function buildForm(FormBuilderInterface $builder, array $options);
 +    public function buildForm(FormBuilderInterface $builder, array $options): void;
- 
+
      /**
 @@ -66,5 +66,5 @@ interface FormTypeInterface
       * @see FormTypeExtensionInterface::buildView()
       */
 -    public function buildView(FormView $view, FormInterface $form, array $options);
 +    public function buildView(FormView $view, FormInterface $form, array $options): void;
- 
+
      /**
 @@ -85,5 +85,5 @@ interface FormTypeInterface
       * @see FormTypeExtensionInterface::finishView()
       */
 -    public function finishView(FormView $view, FormInterface $form, array $options);
 +    public function finishView(FormView $view, FormInterface $form, array $options): void;
- 
+
      /**
 @@ -95,4 +95,4 @@ interface FormTypeInterface
       * @return string
@@ -324,21 +324,21 @@ diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/S
       */
 -    public function boot();
 +    public function boot(): void;
- 
+
      /**
 @@ -35,5 +35,5 @@ interface BundleInterface
       * @return void
       */
 -    public function shutdown();
 +    public function shutdown(): void;
- 
+
      /**
 @@ -44,5 +44,5 @@ interface BundleInterface
       * @return void
       */
 -    public function build(ContainerBuilder $container);
 +    public function build(ContainerBuilder $container): void;
- 
+
      /**
 diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
@@ -356,9 +356,9 @@ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterfa
 @@ -28,5 +28,5 @@ interface DataCollectorInterface extends ResetInterface
       * @return void
       */
--    public function collect(Request $request, Response $response, \Throwable $exception = null);
-+    public function collect(Request $request, Response $response, \Throwable $exception = null): void;
- 
+-    public function collect(Request $request, Response $response, ?\Throwable $exception = null);
++    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void;
+
      /**
 @@ -35,4 +35,4 @@ interface DataCollectorInterface extends ResetInterface
       * @return string
@@ -383,21 +383,21 @@ diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/
       */
 -    public function registerContainerConfiguration(LoaderInterface $loader);
 +    public function registerContainerConfiguration(LoaderInterface $loader): void;
- 
+
      /**
 @@ -44,5 +44,5 @@ interface KernelInterface extends HttpKernelInterface
       * @return void
       */
 -    public function boot();
 +    public function boot(): void;
- 
+
      /**
 @@ -53,5 +53,5 @@ interface KernelInterface extends HttpKernelInterface
       * @return void
       */
 -    public function shutdown();
 +    public function shutdown(): void;
- 
+
      /**
 diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
 --- a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
@@ -414,7 +414,7 @@ diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src
       */
 -    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot);
 +    abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void;
- 
+
      /**
 diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -424,21 +424,21 @@ diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/Token
       */
 -    public function loadTokenBySeries(string $series);
 +    public function loadTokenBySeries(string $series): PersistentTokenInterface;
- 
+
      /**
 @@ -35,5 +35,5 @@ interface TokenProviderInterface
       * @return void
       */
 -    public function deleteTokenBySeries(string $series);
 +    public function deleteTokenBySeries(string $series): void;
- 
+
      /**
 @@ -44,5 +44,5 @@ interface TokenProviderInterface
       * @throws TokenNotFoundException if the token is not found
       */
 -    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTimeInterface $lastUsed);
 +    public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTimeInterface $lastUsed): void;
- 
+
      /**
 @@ -51,4 +51,4 @@ interface TokenProviderInterface
       * @return void
@@ -485,7 +485,7 @@ diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
       */
 -    public function extract(string|iterable $resource, MessageCatalogue $catalogue);
 +    public function extract(string|iterable $resource, MessageCatalogue $catalogue): void;
- 
+
      /**
 @@ -36,4 +36,4 @@ interface ExtractorInterface
       * @return void
@@ -501,7 +501,7 @@ diff --git a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php b/
       */
 -    public function initialize(ExecutionContextInterface $context);
 +    public function initialize(ExecutionContextInterface $context): void;
- 
+
      /**
 @@ -31,4 +31,4 @@ interface ConstraintValidatorInterface
       * @return void
@@ -526,7 +526,7 @@ diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Sy
       */
 -    public function setLocale(string $locale);
 +    public function setLocale(string $locale): void;
- 
+
      /**
 diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
 --- a/src/Symfony/Contracts/Translation/TranslatorTrait.php

.github/sync-translations.php

@@ -33,6 +33,9 @@ function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, string $d
         $metadata = $messages->getMetadata($source, $domain);
 
         $translation->setAttribute('id', $metadata['id']);
+        if (isset($metadata['resname'])) {
+            $translation->setAttribute('resname', $metadata['resname']);
+        }
 
         $s = $translation->appendChild($dom->createElement('source'));
         $s->appendChild($dom->createTextNode($source));
@@ -64,23 +67,32 @@ function dumpXliff1(string $defaultLocale, MessageCatalogue $messages, string $d
     $dir = __DIR__.'/../src/Symfony/Component/'.$component.'/Resources/translations';
 
     $enCatalogue = (new XliffFileLoader())->load($dir.'/'.$domain.'.en.xlf', 'en', $domain);
+    file_put_contents($dir.'/'.$domain.'.en.xlf', dumpXliff1('en', $enCatalogue, $domain));
+
     $finder = new Finder();
 
     foreach ($finder->files()->in($dir)->name('*.xlf') as $file) {
         $locale = substr($file->getBasename(), 1 + strlen($domain), -4);
 
+        if ('en' === $locale) {
+            continue;
+        }
+
         $catalogue = (new XliffFileLoader())->load($file, $locale, $domain);
         $localeCatalogue = new MessageCatalogue($locale);
 
-        foreach ($enCatalogue->all($domain) as $id => $translation) {
+        foreach ($enCatalogue->all($domain) as $resname => $source) {
             $metadata = [];
-            if ($catalogue->defines($id, $domain)) {
-                $translation = $catalogue->get($id, $domain);
-                $metadata = $catalogue->getMetadata($id, $domain);
+            if ($catalogue->defines($resname, $domain)) {
+                $translation = $catalogue->get($resname, $domain);
+                $metadata = $catalogue->getMetadata($resname, $domain);
+            }
+            $metadata['id'] = $enCatalogue->getMetadata($resname, $domain)['id'];
+            if ($resname !== $source) {
+                $metadata['resname'] = $resname;
             }
-            $metadata['id'] = $enCatalogue->getMetadata($id, $domain)['id'];
-            $localeCatalogue->set($id, $translation, $domain);
-            $localeCatalogue->setMetadata($id, $metadata, $domain);
+            $localeCatalogue->set($source, $translation, $domain);
+            $localeCatalogue->setMetadata($source, $metadata, $domain);
         }
 
         file_put_contents($file, dumpXliff1('en', $localeCatalogue, $domain));

.github/workflows/integration-tests.yml

@@ -95,9 +95,9 @@ jobs:
           - 8094:8094
           - 11210:11210
       sqs:
-        image: asyncaws/testing-sqs
+        image: localstack/localstack:3.0.2
         ports:
-          - 9494:9494
+          - 4566:4566
       zookeeper:
         image: wurstmeister/zookeeper:3.4.6
       kafka:
@@ -182,8 +182,8 @@ jobs:
           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"
+          MESSENGER_SQS_DSN: "sqs://localhost:4566/messages?sslmode=disable&poll_timeout=0.01"
+          MESSENGER_SQS_FIFO_QUEUE_DSN: "sqs://localhost:4566/messages.fifo?sslmode=disable&poll_timeout=0.01"
           KAFKA_BROKER: 127.0.0.1:9092
           POSTGRES_HOST: localhost
 

.github/workflows/intl-data-tests.yml

@@ -1,15 +1,21 @@
-name: Intl data
+name: Intl/Emoji data
 
 on:
   push:
     paths:
+      - 'src/Symfony/Component/Emoji/*.php'
+      - 'src/Symfony/Component/Emoji/Resources/data/**'
+      - 'src/Symfony/Component/Emoji/Tests/*Test.php'
       - 'src/Symfony/Component/Intl/*.php'
       - 'src/Symfony/Component/Intl/Util/GitRepository.php'
       - 'src/Symfony/Component/Intl/Resources/data/**'
       - 'src/Symfony/Component/Intl/Tests/*Test.php'
       - 'src/Symfony/Component/Intl/Tests/Util/GitRepositoryTest.php'
   pull_request:
     paths:
+      - 'src/Symfony/Component/Emoji/*.php'
+      - 'src/Symfony/Component/Emoji/Resources/data/**'
+      - 'src/Symfony/Component/Emoji/Tests/*Test.php'
       - 'src/Symfony/Component/Intl/*.php'
       - 'src/Symfony/Component/Intl/Util/GitRepository.php'
       - 'src/Symfony/Component/Intl/Resources/data/**'
@@ -29,7 +35,7 @@ permissions:
 
 jobs:
   tests:
-    name: Intl data
+    name: Intl/Emoji data
     runs-on: Ubuntu-20.04
 
     steps:
@@ -80,15 +86,23 @@ jobs:
       - name: Run intl-data tests
         run: ./phpunit --group intl-data -v
 
-      - name: Test with compressed data
+      - name: Test intl-data with compressed data
         run: |
           [ -f src/Symfony/Component/Intl/Resources/data/locales/en.php ]
           [ ! -f src/Symfony/Component/Intl/Resources/data/locales/en.php.gz ]
-          [ -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php ]
-          [ ! -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php.gz ]
           src/Symfony/Component/Intl/Resources/bin/compress
           [ ! -f src/Symfony/Component/Intl/Resources/data/locales/en.php ]
           [ -f src/Symfony/Component/Intl/Resources/data/locales/en.php.gz ]
-          [ ! -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php ]
-          [ -f src/Symfony/Component/Intl/Resources/data/transliterator/emoji/emoji-en.php.gz ]
           ./phpunit src/Symfony/Component/Intl
+
+      - name: Run Emoji tests
+        run: ./phpunit src/Symfony/Component/Emoji -v
+
+      - name: Test Emoji with compressed data
+        run: |
+          [ -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php ]
+          [ ! -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php.gz ]
+          src/Symfony/Component/Emoji/Resources/bin/compress
+          [ ! -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php ]
+          [ -f src/Symfony/Component/Emoji/Resources/data/emoji-en.php.gz ]
+          ./phpunit src/Symfony/Component/Emoji

.github/workflows/package-tests.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Find packages
         id: find-packages
-        run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Intl/Resources/emoji |jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
+        run: echo "packages=$(php .github/get-modified-packages.php $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin |jq -R -s -c 'split("\n")[:-1]') $(git diff --name-only origin/${{ github.base_ref }} HEAD | grep src/ | jq -R -s -c 'split("\n")[:-1]'))" >> $GITHUB_OUTPUT
 
       - name: Verify meta files are correct
         run: |

.github/workflows/unit-tests.yml

@@ -95,7 +95,7 @@ jobs:
             echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV
             cp composer.json composer.json.orig
             echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json
-            php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Intl/Resources/emoji)
+            php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin)
             mv composer.json composer.json.phpunit
             mv composer.json.orig composer.json
           fi
@@ -129,7 +129,7 @@ jobs:
           [[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true
 
           if [[ "${{ matrix.mode }}" = low-deps ]]; then
-            echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:^4.16" >> $GITHUB_ENV
+            echo SYMFONY_PHPUNIT_REQUIRE="nikic/php-parser:^4.18" >> $GITHUB_ENV
           fi
 
       - name: Install dependencies

.php-cs-fixer.dist.php

@@ -34,10 +34,12 @@
             'remove_inheritdoc' => true,
             'allow_unused_params' => true, // for future-ready params, to be replaced with https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7377
         ],
+        'nullable_type_declaration_for_default_null_value' => true,
         'header_comment' => ['header' => $fileHeaderComment],
         'modernize_strpos' => true,
         'get_class_to_class_keyword' => true,
         'nullable_type_declaration' => true,
+        'ordered_types' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
         'trailing_comma_in_multiline' => ['elements' => ['arrays', 'match', 'parameters']],
     ])
     ->setRiskyAllowed(true)
@@ -54,6 +56,7 @@
                 'Symfony/Bundle/FrameworkBundle/Resources/views/Form',
                 // explicit trigger_error tests
                 'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
+                'Symfony/Component/Emoji/Resources/',
                 'Symfony/Component/Intl/Resources/data/',
             ])
             // explicit tests for ommited @param type, against `no_superfluous_phpdoc_tags`