symfony · nicolas-grekas · Feb 16, 2023 · Feb 16, 2023
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -3,6 +3,7 @@ sed -i 's/ *"\*\*\/Tests\/"//' composer.json
 composer u -o
 SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
 head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
+git checkout src/Symfony/Contracts/Service/ResetInterface.php
 (echo "$head" && echo && git diff -U2 src/) > .github/expected-missing-return-types.diff
 git checkout composer.json src/
 
@@ -13417,6 +13418,17 @@ index c1a77ad157..1e926dc83a 100644
 +    public function setParsedLine(int $parsedLine): void
      {
          $this->parsedLine = $parsedLine;
+diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
+index db40ba13e0..48928ca959 100644
+--- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
++++ b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
+@@ -21,5 +21,5 @@ interface LocaleAwareInterface
+      * @throws \InvalidArgumentException If the locale contains invalid characters
+      */
+-    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
 index e3b0adff05..19d90162ab 100644
 --- a/src/Symfony/Contracts/Translation/TranslatorTrait.php

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -143,7 +143,9 @@ jobs:
           git add .
           composer install -q --optimize-autoloader
           SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
+          git checkout src/Symfony/Contracts/Service/ResetInterface.php
           SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php # ensure the script is idempotent
+          git checkout src/Symfony/Contracts/Service/ResetInterface.php
           git diff --exit-code
 
       - name: Run tests

@@ -42,7 +42,7 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
         return 'translated max {{ max }}!';
     }
 
-    public function setLocale($locale)
+    public function setLocale($locale): void
     {
     }
 

diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -26,9 +26,7 @@
 class MockResponse implements ResponseInterface, StreamableInterface
 {
     use CommonResponseTrait;
-    use TransportResponseTrait {
-        doDestruct as public __destruct;
-    }
+    use TransportResponseTrait;
 
     private string|iterable $body;
     private array $requestOptions = [];
@@ -106,6 +104,11 @@ public function cancel(): void
         }
     }
 
+    public function __destruct()
+    {
+        $this->doDestruct();
+    }
+
     protected function close(): void
     {
         $this->inflate = null;

diff --git a/src/Symfony/Contracts/Service/ResetInterface.php b/src/Symfony/Contracts/Service/ResetInterface.php
@@ -26,5 +26,8 @@
  */
 interface ResetInterface
 {
+    /**
+     * @return void
+     */
     public function reset();
 }
diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
@@ -16,6 +16,8 @@ interface LocaleAwareInterface
     /**
      * Sets the current locale.
      *
+     * @return void
+     *
      * @throws \InvalidArgumentException If the locale contains invalid characters
      */
     public function setLocale(string $locale);
-Original file line number
+Diff line change
@@ Expand Up @@
             return 'translated max {{ max }}!';
         }
-        public function setLocale($locale)
+        public function setLocale($locale): void
         {
         }
@@ Expand Down @@