Update CS / phpstan changes (#1648)

zircote · Aug 28, 2024 · 1da72fc · 1da72fc
1 parent 7ae3dc5
commit 1da72fc
Show file tree

Hide file tree

Showing 38 changed files with 120 additions and 65 deletions.
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11",
         "doctrine/annotations": "^1.7 || ^2.0",
-        "friendsofphp/php-cs-fixer": "^2.17 || ^3.47.1",
+        "friendsofphp/php-cs-fixer": "^2.17 || 3.62.0",
         "phpstan/phpstan": "^1.6",
         "phpunit/phpunit": ">=8",
         "vimeo/psalm": "^4.23"

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -55,6 +55,16 @@ parameters:
 			count: 1
 			path: src/Generator.php
 
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 3
+			path: src/Processors/AugmentProperties.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between non\\-empty\\-string and '' will always evaluate to false\\.$#"
+			count: 1
+			path: src/Processors/AugmentProperties.php
+
 		-
 			message: "#^Call to function is_array\\(\\) with bool\\|OpenApi\\\\Annotations\\\\AdditionalProperties will always evaluate to false\\.$#"
 			count: 1

diff --git a/src/Attributes/AdditionalProperties.php b/src/Attributes/AdditionalProperties.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class AdditionalProperties extends \OpenApi\Annotations\AdditionalProperties
+class AdditionalProperties extends OA\AdditionalProperties
 {
     /**
      * @param string|non-empty-array<string>|null                           $type
@@ -19,9 +20,9 @@ class AdditionalProperties extends \OpenApi\Annotations\AdditionalProperties
      * @param int|float                                                     $maximum
      * @param int|float                                                     $minimum
      * @param array<string|int|float|bool|\UnitEnum|null>|class-string|null $enum
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $allOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $anyOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $oneOf
+     * @param array<Schema|OA\Schema>                                       $allOf
+     * @param array<Schema|OA\Schema>                                       $anyOf
+     * @param array<Schema|OA\Schema>                                       $oneOf
      * @param array<string,mixed>|null                                      $x
      * @param Attachable[]|null                                             $attachables
      */

diff --git a/src/Attributes/Attachable.php b/src/Attributes/Attachable.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_ALL | \Attribute::IS_REPEATABLE)]
-class Attachable extends \OpenApi\Annotations\Attachable
+class Attachable extends OA\Attachable
 {
     public function __construct(array $properties = [])
     {

diff --git a/src/Attributes/Components.php b/src/Attributes/Components.php
@@ -7,21 +7,22 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class Components extends \OpenApi\Annotations\Components
+class Components extends OA\Components
 {
     /**
-     * @param array<Schema|\OpenApi\Annotations\Schema>|null $schemas
-     * @param Response[]|null                                $responses
-     * @param Parameter[]|null                               $parameters
-     * @param RequestBody[]|null                             $requestBodies
-     * @param array<Examples>|null                           $examples
-     * @param Header[]|null                                  $headers
-     * @param SecurityScheme[]|null                          $securitySchemes
-     * @param Link[]|null                                    $links
-     * @param array<string,mixed>|null                       $x
-     * @param Attachable[]|null                              $attachables
+     * @param array<Schema|OA\Schema>|null $schemas
+     * @param Response[]|null              $responses
+     * @param Parameter[]|null             $parameters
+     * @param RequestBody[]|null           $requestBodies
+     * @param array<Examples>|null         $examples
+     * @param Header[]|null                $headers
+     * @param SecurityScheme[]|null        $securitySchemes
+     * @param Link[]|null                  $links
+     * @param array<string,mixed>|null     $x
+     * @param Attachable[]|null            $attachables
      */
     public function __construct(
         ?array $schemas = null,

diff --git a/src/Attributes/Contact.php b/src/Attributes/Contact.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class Contact extends \OpenApi\Annotations\Contact
+class Contact extends OA\Contact
 {
     /**
      * @param array<string,mixed>|null $x

diff --git a/src/Attributes/Delete.php b/src/Attributes/Delete.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Delete extends \OpenApi\Annotations\Delete
+class Delete extends OA\Delete
 {
     use OperationTrait;
 }
diff --git a/src/Attributes/Discriminator.php b/src/Attributes/Discriminator.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class Discriminator extends \OpenApi\Annotations\Discriminator
+class Discriminator extends OA\Discriminator
 {
     /**
      * @param string[]|null            $mapping

diff --git a/src/Attributes/Examples.php b/src/Attributes/Examples.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::IS_REPEATABLE)]
-class Examples extends \OpenApi\Annotations\Examples
+class Examples extends OA\Examples
 {
     /**
      * @param string|class-string|object|null $ref

diff --git a/src/Attributes/ExternalDocumentation.php b/src/Attributes/ExternalDocumentation.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class ExternalDocumentation extends \OpenApi\Annotations\ExternalDocumentation
+class ExternalDocumentation extends OA\ExternalDocumentation
 {
     /**
      * @param array<string,mixed>|null $x

diff --git a/src/Attributes/Flow.php b/src/Attributes/Flow.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class Flow extends \OpenApi\Annotations\Flow
+class Flow extends OA\Flow
 {
     /**
      * @param array<string,mixed>|null $x

diff --git a/src/Attributes/Get.php b/src/Attributes/Get.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Get extends \OpenApi\Annotations\Get
+class Get extends OA\Get
 {
     use OperationTrait;
 }
diff --git a/src/Attributes/Head.php b/src/Attributes/Head.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Head extends \OpenApi\Annotations\Head
+class Head extends OA\Head
 {
     use OperationTrait;
 }
diff --git a/src/Attributes/Header.php b/src/Attributes/Header.php
@@ -6,9 +6,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Header extends \OpenApi\Annotations\Header
+class Header extends OA\Header
 {
     /**
      * @param string|class-string|object|null $ref

diff --git a/src/Attributes/Info.php b/src/Attributes/Info.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class Info extends \OpenApi\Annotations\Info
+class Info extends OA\Info
 {
     /**
      * @param array<string,mixed>|null $x

diff --git a/src/Attributes/Items.php b/src/Attributes/Items.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
-class Items extends \OpenApi\Annotations\Items
+class Items extends OA\Items
 {
     /**
      * @param string|non-empty-array<string>|null                           $type
@@ -19,9 +20,9 @@ class Items extends \OpenApi\Annotations\Items
      * @param int|float                                                     $maximum
      * @param int|float                                                     $minimum
      * @param array<string|int|float|bool|\UnitEnum|null>|class-string|null $enum
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $allOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $anyOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $oneOf
+     * @param array<Schema|OA\Schema>                                       $allOf
+     * @param array<Schema|OA\Schema>                                       $anyOf
+     * @param array<Schema|OA\Schema>                                       $oneOf
      * @param array<string,mixed>|null                                      $x
      * @param Attachable[]|null                                             $attachables
      */

diff --git a/src/Attributes/JsonContent.php b/src/Attributes/JsonContent.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class JsonContent extends \OpenApi\Annotations\JsonContent
+class JsonContent extends OA\JsonContent
 {
     /**
      * @param string|non-empty-array<string>|null                           $type
@@ -20,9 +21,9 @@ class JsonContent extends \OpenApi\Annotations\JsonContent
      * @param int|float                                                     $maximum
      * @param int|float                                                     $minimum
      * @param array<string|int|float|bool|\UnitEnum|null>|class-string|null $enum
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $allOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $anyOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $oneOf
+     * @param array<Schema|OA\Schema>                                       $allOf
+     * @param array<Schema|OA\Schema>                                       $anyOf
+     * @param array<Schema|OA\Schema>                                       $oneOf
      * @param array<string,mixed>|null                                      $x
      * @param Attachable[]|null                                             $attachables
      */

diff --git a/src/Attributes/License.php b/src/Attributes/License.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class License extends \OpenApi\Annotations\License
+class License extends OA\License
 {
     /**
      * @param array<string,mixed>|null $x

diff --git a/src/Attributes/Link.php b/src/Attributes/Link.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
-class Link extends \OpenApi\Annotations\Link
+class Link extends OA\Link
 {
     /**
      * @param string|class-string|object|null $ref

diff --git a/src/Attributes/MediaType.php b/src/Attributes/MediaType.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class MediaType extends \OpenApi\Annotations\MediaType
+class MediaType extends OA\MediaType
 {
     /**
      * @param array<Examples>          $examples

diff --git a/src/Attributes/OpenApi.php b/src/Attributes/OpenApi.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class OpenApi extends \OpenApi\Annotations\OpenApi
+class OpenApi extends OA\OpenApi
 {
     /**
      * @param Server[]|null            $servers

diff --git a/src/Attributes/Options.php b/src/Attributes/Options.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Options extends \OpenApi\Annotations\Options
+class Options extends OA\Options
 {
     use OperationTrait;
 }
diff --git a/src/Attributes/Parameter.php b/src/Attributes/Parameter.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER | \Attribute::IS_REPEATABLE)]
-class Parameter extends \OpenApi\Annotations\Parameter
+class Parameter extends OA\Parameter
 {
     use ParameterTrait;
 }
diff --git a/src/Attributes/Patch.php b/src/Attributes/Patch.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Patch extends \OpenApi\Annotations\Patch
+class Patch extends OA\Patch
 {
     use OperationTrait;
 }
diff --git a/src/Attributes/PathItem.php b/src/Attributes/PathItem.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class PathItem extends \OpenApi\Annotations\PathItem
+class PathItem extends OA\PathItem
 {
     /**
      * @param string|class-string|object|null $ref

diff --git a/src/Attributes/Post.php b/src/Attributes/Post.php
@@ -6,8 +6,10 @@
 
 namespace OpenApi\Attributes;
 
+use OpenApi\Annotations as OA;
+
 #[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class Post extends \OpenApi\Annotations\Post
+class Post extends OA\Post
 {
     use OperationTrait;
 }
diff --git a/src/Attributes/Property.php b/src/Attributes/Property.php
@@ -7,9 +7,10 @@
 namespace OpenApi\Attributes;
 
 use OpenApi\Generator;
+use OpenApi\Annotations as OA;
 
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER | \Attribute::TARGET_CLASS_CONSTANT | \Attribute::IS_REPEATABLE)]
-class Property extends \OpenApi\Annotations\Property
+class Property extends OA\Property
 {
     /**
      * @param string|non-empty-array<string>|null                           $type
@@ -19,9 +20,9 @@ class Property extends \OpenApi\Annotations\Property
      * @param int|float                                                     $maximum
      * @param int|float                                                     $minimum
      * @param array<string|int|float|bool|\UnitEnum|null>|class-string|null $enum
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $allOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $anyOf
-     * @param array<Schema|\OpenApi\Annotations\Schema>                     $oneOf
+     * @param array<Schema|OA\Schema>                                       $allOf
+     * @param array<Schema|OA\Schema>                                       $anyOf
+     * @param array<Schema|OA\Schema>                                       $oneOf
      * @param array<string,mixed>|null                                      $x
      * @param Attachable[]|null                                             $attachables
      */