refactor: linting

Author: Matej Grgić

composer.json

@@ -41,6 +41,9 @@
         "lint": [
             "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --diff --ansi --dry-run"
         ],
+        "lint:fix": [
+            "php-cs-fixer fix --diff --ansi --using-cache=no"
+        ],
         "phpstan": [
             "php -d memory_limit=-1 vendor/bin/phpstan analyse -n --ansi --no-progress"
         ],
@@ -49,6 +52,7 @@
         ],
         "qc": [
             "@lint",
+            "@lint-fix",
             "@phpstan",
             "@test"
         ]

src/Http/Service/Factory/RequestFactory.php

@@ -69,7 +69,7 @@ public function createResourceRequest(): CreateResourceRequest
          * can already have ID as a property. Consider having ID strategy
          * set through configuration.
          */
-        if (false === array_key_exists('id', $requestPrimaryData)) {
+        if (false === \array_key_exists('id', $requestPrimaryData)) {
             $requestPrimaryData['id'] = (string) Uuid::uuid4();
         }
 

tests/Bridge/OpenAPI/Model/Article.php

@@ -65,6 +65,7 @@ class Article implements ApiModel
      * @var string
      *
      * @ToOne(name="category", type="category", nullable=true)
+     *
      * @Assert\Type(type="string")
      */
     private $categoryId;
@@ -73,6 +74,7 @@ class Article implements ApiModel
      * @var string[]
      *
      * @ToMany(name="tags", type="tag", nullable=false)
+     *
      * @Assert\Type(type="array")
      */
     private $tagIds;
@@ -81,6 +83,7 @@ class Article implements ApiModel
      * @var string
      *
      * @Attribute(format="datetime", example="2001")
+     *
      * @Assert\NotBlank
      */
     private $createdAt;

tests/Bridge/OpenAPI/ResourceReadSchema/ResourceReadSchemaTest.php

@@ -54,30 +54,35 @@ public function testResourceAttributesAreCorrectlyConverted(): void
 
             /**
              * @JsonApi\Attribute
+             *
              * @Assert\Type(type="integer")
              */
             public int $integerProperty;
 
             /**
              * @JsonApi\Attribute(nullable=true)
+             *
              * @Assert\Type(type="integer")
              */
             public ?int $nullableIntegerProperty;
 
             /**
              * @JsonApi\Attribute
+             *
              * @Assert\Type(type="boolean")
              */
             public bool $booleanProperty1;
 
             /**
              * @JsonApi\Attribute
+             *
              * @Assert\Type(type="bool")
              */
             public bool $booleanProperty2;
 
             /**
              * @JsonApi\Attribute
+             *
              * @Assert\Type(type="float")
              */
             public float $floatProperty;

tests/Integration/Resource/Denormalizer/ResourceDenormalizerTest.php

@@ -7,7 +7,6 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Undabot\JsonApi\Implementation\Model\Resource\Resource;

tests/Integration/Resource/Denormalizer/ResourceWithAliasesDenormalizerTest.php

@@ -7,7 +7,6 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
-use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\Normalizer\ObjectNormalizer;
 use Undabot\JsonApi\Implementation\Model\Resource\Resource;

tests/Integration/Resource/Factory/ResourceFactoryTest.php

@@ -275,6 +275,7 @@ final class ResourceDto implements ApiModel
 
     /**
      * @JsonApi\Attribute
+     *
      * @Assert\NotBlank
      */
     public string $title;
@@ -292,8 +293,11 @@ final class ResourceDto implements ApiModel
      * @var array<int,string>
      *
      * @JsonApi\ToMany(type="tags")
+     *
      * @Assert\All({
+     *
      *     @Assert\NotBlank,
+     *
      *     @Assert\Type("string")
      * })
      */
@@ -303,8 +307,11 @@ final class ResourceDto implements ApiModel
      * @var array<int,string>
      *
      * @JsonApi\ToMany(type="comments")
+     *
      * @Assert\All({
+     *
      *     @Assert\NotBlank,
+     *
      *     @Assert\Type("string")
      * })
      */

tests/Integration/Resource/Metadata/ResourceAttributesMetadataTest.php

@@ -200,8 +200,11 @@ private function getResource()
              * @var string
              *
              * @JsonApi\Attribute
+             *
              * @Assert\NotBlank
+             *
              * @Assert\Length(min=100, max=200)
+             *
              * @Assert\Type(type="string")
              */
             public $name;
@@ -210,6 +213,7 @@ private function getResource()
              * @var null|string
              *
              * @JsonApi\Attribute
+             *
              * @Assert\Type(type="string")
              */
             public $summary;
@@ -218,7 +222,9 @@ private function getResource()
              * @var \DateTimeImmutable
              *
              * @JsonApi\Attribute
+             *
              * @Assert\NotBlank
+             *
              * @Assert\Type(type="datetime")
              */
             public $publishedAt;
@@ -227,7 +233,9 @@ private function getResource()
              * @var bool
              *
              * @JsonApi\Attribute
+             *
              * @Assert\NotBlank
+             *
              * @Assert\Type(type="bool")
              */
             public $active;

tests/Integration/Resource/Validation/ResourceValidationTest.php

@@ -28,8 +28,11 @@ class ResourceDto
      * @var string
      *
      * @JsonApi\Attribute
+     *
      * @Assert\NotBlank
+     *
      * @Assert\Length(min=10, max=100)
+     *
      * @Assert\Type(type="string")
      */
     public $title;
@@ -38,7 +41,9 @@ class ResourceDto
      * @var string
      *
      * @JsonApi\Attribute
+     *
      * @Assert\Type(type="string")
+     *
      * @Assert\Regex(pattern="/^\d+-\d+-\d+$/")
      */
     public $date;
@@ -47,7 +52,9 @@ class ResourceDto
      * @var string
      *
      * @JsonApi\Attribute
+     *
      * @Assert\Type(type="string")
+     *
      * @Assert\NotNull
      */
     public $summary;
@@ -56,6 +63,7 @@ class ResourceDto
      * @var null|string
      *
      * @JsonApi\ToOne(type="people")
+     *
      * @Assert\NotBlank
      */
     public $author;
@@ -64,6 +72,7 @@ class ResourceDto
      * @var string[]
      *
      * @JsonApi\ToMany(type="tags")
+     *
      * @Assert\NotBlank
      */
     public $tags = [];

tests/Unit/Http/Model/Response/ResourceCollectionResponseTest.php

@@ -147,15 +147,15 @@ public function testFromArrayWillThrowExceptionGivenInvalidArgumentsPresent(
         $resourceMocks = [];
         $includeMocks = [];
         foreach ($resources as $resource) {
-            if (true === is_string($resource)) {
+            if (true === \is_string($resource)) {
                 $resourceMocks[] = $this->createMock($resource);
             } else {
                 $resourceMocks[] = $resource;
             }
         }
 
         foreach ($included as $include) {
-            if (true === is_string($include)) {
+            if (true === \is_string($include)) {
                 $includeMocks[] = $this->createMock($include);
             } else {
                 $includeMocks[] = $include;