Merge branch '6.4' into 7.0

javiereguiluz · javiereguiluz · commit 8447ed4b5895 · 2023-07-04T10:49:00.000+02:00
* 6.4:
  Improve return types
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -228,7 +228,7 @@ class that will hold these objects:
             }
 
             /**
-             * @return Collection|Product[]
+             * @return Collection<int, Product>
              */
             public function getProducts(): Collection
             {
diff --git a/messenger/handler_results.rst b/messenger/handler_results.rst
@@ -90,7 +90,7 @@ wherever you need a query bus behavior instead of the ``MessageBusInterface``::
          *
          * @return mixed The handler returned value
          */
-        public function query($query)
+        public function query($query): mixed
         {
             return $this->handle($query);
         }
diff --git a/security/user_providers.rst b/security/user_providers.rst
@@ -311,8 +311,6 @@ command will generate a nice skeleton to get you started::
          *
          * If your firewall is "stateless: true" (for a pure API), this
          * method is not called.
-         *
-         * @return UserInterface
          */
         public function refreshUser(UserInterface $user): UserInterface
         {
diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst
@@ -180,8 +180,9 @@ In order to use this type of injection, don't forget to configure it:
 .. note::
 
     If you decide to use autowiring, this type of injection requires
-    that you add a ``@return static`` docblock in order for the container
-    to be capable of registering the method.
+    that you add a ``@return static`` docblock or the ``static`` return
+    type in order for the container to be capable of registering
+    the method.
 
 This approach is useful if you need to configure your service according to your needs,
 so, here's the advantages of immutable-setters:

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ class that will hold these objects:`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`/**`
`231`		`- * @return Collection\|Product[]`
	`231`	`+ * @return Collection<int, Product>`
`232`	`232`	`*/`
`233`	`233`	`public function getProducts(): Collection`
`234`	`234`	`{`
Original file line number	Diff line number	Diff line change
@@ -90,7 +90,7 @@ wherever you need a query bus behavior instead of the ``MessageBusInterface``::
`90`	`90`	`*`
`91`	`91`	`* @return mixed The handler returned value`
`92`	`92`	`*/`
`93`		`- public function query($query)`
	`93`	`+ public function query($query): mixed`
`94`	`94`	`{`
`95`	`95`	`return $this->handle($query);`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,6 @@ command will generate a nice skeleton to get you started::`
`311`	`311`	`*`
`312`	`312`	`* If your firewall is "stateless: true" (for a pure API), this`
`313`	`313`	`* method is not called.`
`314`		`- *`
`315`		`- * @return UserInterface`
`316`	`314`	`*/`
`317`	`315`	`public function refreshUser(UserInterface $user): UserInterface`
`318`	`316`	`{`