minor #52544 [Routing] Extend old Annotations from new Attributes (curry684)

fabpot · fabpot · commit 6c9107334da9 · 2023-11-12T21:48:35.000+01:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [Routing] Extend old Annotations from new Attributes If the base class is missing PHPStan fails to recognize the aliasing correctly. | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | sort of | New feature? | no | Deprecations? | no | License | MIT Due to a shortcoming in PHPStan it does not pick up the previous aliasing correctly (ref. https://phpstan.org/r/2c7a9166-e8e1-42e5-8448-54c7d814e7d9). This will cause projects to start failing their static analysis when they upgrade to 6.4. Explicitly extending the new attribute in the Attribute namespace has no runtime impact and shuts up PHPStan. Commits ------- 2d9eb7b [Routing] Extend old Annotations from new Attributes
diff --git a/src/Symfony/Component/Routing/Annotation/Route.php b/src/Symfony/Component/Routing/Annotation/Route.php
@@ -17,7 +17,7 @@ class_exists(\Symfony\Component\Routing\Attribute\Route::class);
 
 if (false) {
     #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
-    class Route
+    class Route extends \Symfony\Component\Routing\Attribute\Route
     {
     }
 }
diff --git a/src/Symfony/Component/Routing/Attribute/Route.php b/src/Symfony/Component/Routing/Attribute/Route.php
@@ -20,6 +20,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Alexander M. Turek <me@derrabus.de>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class Route
diff --git a/src/Symfony/Component/Serializer/Annotation/Context.php b/src/Symfony/Component/Serializer/Annotation/Context.php
@@ -17,7 +17,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\Context::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-    class Context
+    class Context extends \Symfony\Component\Serializer\Attribute\Context
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php b/src/Symfony/Component/Serializer/Annotation/DiscriminatorMap.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\DiscriminatorMap::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_CLASS)]
-    class DiscriminatorMap
+    class DiscriminatorMap extends \Symfony\Component\Serializer\Attribute\DiscriminatorMap
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/Groups.php b/src/Symfony/Component/Serializer/Annotation/Groups.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\Groups::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS)]
-    class Groups
+    class Groups extends \Symfony\Component\Serializer\Attribute\Groups
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/Ignore.php b/src/Symfony/Component/Serializer/Annotation/Ignore.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\Ignore::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    final class Ignore
+    class Ignore extends \Symfony\Component\Serializer\Attribute\Ignore
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/MaxDepth.php b/src/Symfony/Component/Serializer/Annotation/MaxDepth.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\MaxDepth::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    class MaxDepth
+    class MaxDepth extends \Symfony\Component\Serializer\Attribute\MaxDepth
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/SerializedName.php b/src/Symfony/Component/Serializer/Annotation/SerializedName.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\SerializedName::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    final class SerializedName
+    class SerializedName extends \Symfony\Component\Serializer\Attribute\SerializedName
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Annotation/SerializedPath.php b/src/Symfony/Component/Serializer/Annotation/SerializedPath.php
@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\SerializedPath::class);
 
 if (false) {
     #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-    final class SerializedPath
+    class SerializedPath extends \Symfony\Component\Serializer\Attribute\SerializedPath
     {
     }
 }
diff --git a/src/Symfony/Component/Serializer/Attribute/Context.php b/src/Symfony/Component/Serializer/Attribute/Context.php
@@ -21,6 +21,8 @@
  * @Target({"PROPERTY", "METHOD"})
  *
  * @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
 class Context
diff --git a/src/Symfony/Component/Serializer/Attribute/DiscriminatorMap.php b/src/Symfony/Component/Serializer/Attribute/DiscriminatorMap.php
@@ -21,6 +21,8 @@
  * @Target({"CLASS"})
  *
  * @author Samuel Roze <samuel.roze@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_CLASS)]
 class DiscriminatorMap
diff --git a/src/Symfony/Component/Serializer/Attribute/Groups.php b/src/Symfony/Component/Serializer/Attribute/Groups.php
@@ -21,6 +21,8 @@
  * @Target({"PROPERTY", "METHOD", "CLASS"})
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS)]
 class Groups
diff --git a/src/Symfony/Component/Serializer/Attribute/Ignore.php b/src/Symfony/Component/Serializer/Attribute/Ignore.php
@@ -18,9 +18,11 @@
  * @Target({"PROPERTY", "METHOD"})
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-final class Ignore
+class Ignore
 {
 }
 
diff --git a/src/Symfony/Component/Serializer/Attribute/MaxDepth.php b/src/Symfony/Component/Serializer/Attribute/MaxDepth.php
@@ -21,6 +21,8 @@
  * @Target({"PROPERTY", "METHOD"})
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
 class MaxDepth
diff --git a/src/Symfony/Component/Serializer/Attribute/SerializedName.php b/src/Symfony/Component/Serializer/Attribute/SerializedName.php
@@ -21,9 +21,11 @@
  * @Target({"PROPERTY", "METHOD"})
  *
  * @author Fabien Bourigault <bourigaultfabien@gmail.com>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-final class SerializedName
+class SerializedName
 {
     public function __construct(private readonly string $serializedName)
     {
diff --git a/src/Symfony/Component/Serializer/Attribute/SerializedPath.php b/src/Symfony/Component/Serializer/Attribute/SerializedPath.php
@@ -23,9 +23,11 @@
  * @Target({"PROPERTY", "METHOD"})
  *
  * @author Tobias Bönner <tobi@boenner.family>
+ *
+ * @final since Symfony 6.4
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-final class SerializedPath
+class SerializedPath
 {
     private PropertyPath $serializedPath;
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class_exists(\Symfony\Component\Routing\Attribute\Route::class);`
`17`	`17`
`18`	`18`	`if (false) {`
`19`	`19`	`#[\Attribute(\Attribute::IS_REPEATABLE \| \Attribute::TARGET_CLASS \| \Attribute::TARGET_METHOD)]`
`20`		`- class Route`
	`20`	`+ class Route extends \Symfony\Component\Routing\Attribute\Route`
`21`	`21`	`{`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@`
`20`	`20`	`*`
`21`	`21`	`* @author Fabien Potencier <[email protected]>`
`22`	`22`	`* @author Alexander M. Turek <[email protected]>`
	`23`	`+ *`
	`24`	`+ * @final since Symfony 6.4`
`23`	`25`	`*/`
`24`	`26`	`#[\Attribute(\Attribute::IS_REPEATABLE \| \Attribute::TARGET_CLASS \| \Attribute::TARGET_METHOD)]`
`25`	`27`	`class Route`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class_exists(\Symfony\Component\Serializer\Attribute\DiscriminatorMap::class);`
`15`	`15`
`16`	`16`	`if (false) {`
`17`	`17`	`#[\Attribute(\Attribute::TARGET_CLASS)]`
`18`		`- class DiscriminatorMap`
	`18`	`+ class DiscriminatorMap extends \Symfony\Component\Serializer\Attribute\DiscriminatorMap`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`* @Target({"PROPERTY", "METHOD"})`
`22`	`22`	`*`
`23`	`23`	`* @author Maxime Steinhausser <[email protected]>`
	`24`	`+ *`
	`25`	`+ * @final since Symfony 6.4`
`24`	`26`	`*/`
`25`	`27`	`#[\Attribute(\Attribute::TARGET_CLASS \| \Attribute::TARGET_PROPERTY \| \Attribute::TARGET_METHOD \| \Attribute::IS_REPEATABLE)]`
`26`	`28`	`class Context`