Merge pull request #4909 from soyuka/2.7

2.7 small fixes and tests

Author: soyuka

phpstan.neon.dist

@@ -18,6 +18,7 @@ parameters:
 	excludePaths:
 		- src/deprecation.php
 		- src/Core/Bridge/Symfony/Bundle/Test/Constraint/ArraySubsetLegacy.php
+		- src/Util/ResponseTrait71.php
 		# Class ... extends final class cannot be ignored...
 		- src/Core/Action/EntrypointAction.php
 		- src/Core/Action/ExceptionAction.php

src/Core/Annotation/ApiFilter.php

@@ -22,6 +22,7 @@
  * @author Antoine Bluchet <[email protected]>
  *
  * @Annotation
+ *
  * @Target({"PROPERTY", "CLASS"})
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]

src/Core/Annotation/ApiProperty.php

@@ -21,6 +21,7 @@
  * @author Kévin Dunglas <[email protected]>
  *
  * @Annotation
+ *
  * @Target({"METHOD", "PROPERTY"})
  * @Attributes(
  *     @Attribute("deprecationReason", type="string"),

src/Core/Annotation/ApiResource.php

@@ -21,6 +21,7 @@
  * @author Kévin Dunglas <[email protected]>
  *
  * @Annotation
+ *
  * @Target({"CLASS"})
  * @Attributes(
  *     @Attribute("accessControl", type="string"),

src/Core/Annotation/ApiSubresource.php

@@ -19,6 +19,7 @@
  * @author Antoine Bluchet <[email protected]>
  *
  * @Annotation
+ *
  * @Target({"METHOD", "PROPERTY"})
  * @Attributes(
  *     @Attribute("maxDepth", type="int"),

src/Core/Bridge/Doctrine/Common/PropertyHelperTrait.php

@@ -128,7 +128,7 @@ protected function splitPropertyParts(string $property/* , string $resourceClass
     /**
      * Gets the Doctrine Type of a given property/resourceClass.
      *
-     * @return Type|string|null
+     * @return string|null
      */
     protected function getDoctrineFieldType(string $property, string $resourceClass)
     {

src/Core/Bridge/Doctrine/Orm/CollectionDataProvider.php

@@ -29,6 +29,7 @@
  *
  * @author Kévin Dunglas <[email protected]>
  * @author Samuel ROZE <[email protected]>
+ *
  * @final
  */
 class CollectionDataProvider implements ContextAwareCollectionDataProviderInterface, RestrictedDataProviderInterface

src/Core/Bridge/Doctrine/Orm/ItemDataProvider.php

@@ -37,6 +37,7 @@
  *
  * @author Kévin Dunglas <[email protected]>
  * @author Samuel ROZE <[email protected]>
+ *
  * @final
  */
 class ItemDataProvider implements DenormalizedIdentifiersAwareItemDataProviderInterface, RestrictedDataProviderInterface

src/Core/Upgrade/UpgradeApiFilterVisitor.php

@@ -95,15 +95,15 @@ public function enterNode(Node $node)
             ];
 
             foreach ($this->readApiFilters($this->reflectionClass) as $annotation) {
-                [$filterAnnotation,] = $annotation;
+                [$filterAnnotation] = $annotation;
                 if (isset($legacyNamespaces[$filterAnnotation->filterClass])) {
                     $namespaces[] = $legacyNamespaces[$filterAnnotation->filterClass];
                 }
             }
 
             foreach ($this->reflectionClass->getProperties() as $reflectionProperty) {
                 foreach ($this->readApiFilters($reflectionProperty) as $annotation) {
-                    [$filterAnnotation,] = $annotation;
+                    [$filterAnnotation] = $annotation;
                     if (isset($legacyNamespaces[$filterAnnotation->filterClass])) {
                         $namespaces[] = $legacyNamespaces[$filterAnnotation->filterClass];
                     }

src/Metadata/ApiResource.php

@@ -19,6 +19,7 @@
  * Resource metadata attribute.
  *
  * @author Antoine Bluchet <[email protected]>
+ *
  * @experimental
  */
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]