CS fixes

PabloKowalczyk · PabloKowalczyk · commit 207c903f83dc · 2022-11-30T10:47:35.000+01:00
diff --git a/src/Encoder/Encoder.php b/src/Encoder/Encoder.php
@@ -314,9 +314,6 @@ protected function encodeErrorsToArray(iterable $errors): array
         return $array;
     }
 
-    /**
-     * @param $meta
-     */
     protected function encodeMetaToArray($meta): array
     {
         $this->withMeta($meta);
diff --git a/src/Exceptions/BaseJsonApiException.php b/src/Exceptions/BaseJsonApiException.php
@@ -20,8 +20,6 @@
  * limitations under the License.
  */
 
-use RuntimeException;
-
-abstract class BaseJsonApiException extends RuntimeException
+abstract class BaseJsonApiException extends \RuntimeException
 {
 }
diff --git a/src/Exceptions/JsonApiException.php b/src/Exceptions/JsonApiException.php
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-use Exception;
 use Neomerx\JsonApi\Contracts\Schema\ErrorInterface;
 use Neomerx\JsonApi\Schema\ErrorCollection;
 
@@ -57,7 +56,7 @@ class JsonApiException extends BaseJsonApiException
      * @SuppressWarnings(PHPMD.StaticAccess)
      * @SuppressWarnings(PHPMD.ElseExpression)
      */
-    public function __construct($errors, int $httpCode = self::DEFAULT_HTTP_CODE, Exception $previous = null)
+    public function __construct($errors, int $httpCode = self::DEFAULT_HTTP_CODE, \Exception $previous = null)
     {
         parent::__construct('JSON API error', 0, $previous);
 
diff --git a/src/Http/Headers/AcceptMediaType.php b/src/Http/Headers/AcceptMediaType.php
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-use Closure;
 use Neomerx\JsonApi\Contracts\Http\Headers\AcceptMediaTypeInterface;
 use Neomerx\JsonApi\Exceptions\InvalidArgumentException;
 
@@ -76,7 +75,7 @@ public function getQuality(): float
         return $this->quality;
     }
 
-    public static function getCompare(): Closure
+    public static function getCompare(): \Closure
     {
         return function (AcceptMediaTypeInterface $lhs, AcceptMediaTypeInterface $rhs) {
             $qualityCompare = self::compareQuality($lhs->getQuality(), $rhs->getQuality());
diff --git a/src/Parser/IdentifierAndResource.php b/src/Parser/IdentifierAndResource.php
@@ -186,7 +186,7 @@ public function getRelationships(): iterable
 
             \assert(
                 $hasData || $hasMeta || $hasLinks,
-                "Relationship `${name}` for type `" . $this->getType() .
+                "Relationship `{$name}` for type `" . $this->getType() .
                 '` MUST contain at least one of the following: links, data or meta.'
             );
 
@@ -270,7 +270,7 @@ private function assertRelationshipNameAndDescription(string $name, array $descr
         );
         \assert(
             true === \is_array($description) && false === empty($description),
-            "Relationship `${name}` for type `" . $this->getType() . '` should be a non-empty array.'
+            "Relationship `{$name}` for type `" . $this->getType() . '` should be a non-empty array.'
         );
 
         return true;
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-use IteratorAggregate;
 use Neomerx\JsonApi\Contracts\Factories\FactoryInterface;
 use Neomerx\JsonApi\Contracts\Parser\DocumentDataInterface;
 use Neomerx\JsonApi\Contracts\Parser\EditableContextInterface;
@@ -33,8 +32,8 @@
 use Neomerx\JsonApi\Contracts\Schema\PositionInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
 use Neomerx\JsonApi\Exceptions\InvalidArgumentException;
+
 use function Neomerx\JsonApi\I18n\format as _;
-use Traversable;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -104,8 +103,8 @@ public function parse($data, array $paths = []): iterable
         } elseif (true === \is_array($data)) {
             yield $this->createDocumentDataIsCollection($rootPosition);
             yield from $this->parseAsResourcesOrIdentifiers($rootPosition, $data);
-        } elseif ($data instanceof Traversable) {
-            $data = $data instanceof IteratorAggregate ? $data->getIterator() : $data;
+        } elseif ($data instanceof \Traversable) {
+            $data = $data instanceof \IteratorAggregate ? $data->getIterator() : $data;
             yield $this->createDocumentDataIsCollection($rootPosition);
             yield from $this->parseAsResourcesOrIdentifiers($rootPosition, $data);
         } elseif (null === $data) {
diff --git a/src/Parser/RelationshipData/ParseRelationshipDataTrait.php b/src/Parser/RelationshipData/ParseRelationshipDataTrait.php
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-use IteratorAggregate;
 use Neomerx\JsonApi\Contracts\Factories\FactoryInterface;
 use Neomerx\JsonApi\Contracts\Parser\EditableContextInterface;
 use Neomerx\JsonApi\Contracts\Parser\RelationshipDataInterface;
@@ -29,9 +28,10 @@
 use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaInterface;
 use Neomerx\JsonApi\Exceptions\InvalidArgumentException;
+
 use function Neomerx\JsonApi\I18n\format as _;
+
 use Neomerx\JsonApi\Parser\IdentifierAndResource;
-use Traversable;
 
 trait ParseRelationshipDataTrait
 {
@@ -98,12 +98,12 @@ private function parseData(
             return $factory->createRelationshipDataIsIdentifier($container, $context, $position, $data);
         } elseif (true === \is_array($data)) {
             return $factory->createRelationshipDataIsCollection($container, $context, $position, $data);
-        } elseif ($data instanceof Traversable) {
+        } elseif ($data instanceof \Traversable) {
             return $factory->createRelationshipDataIsCollection(
                 $container,
                 $context,
                 $position,
-                $data instanceof IteratorAggregate ? $data->getIterator() : $data
+                $data instanceof \IteratorAggregate ? $data->getIterator() : $data
             );
         } elseif (null === $data) {
             return $factory->createRelationshipDataIsNull();
diff --git a/src/Parser/RelationshipData/RelationshipDataIsCollection.php b/src/Parser/RelationshipData/RelationshipDataIsCollection.php
@@ -29,6 +29,7 @@
 use Neomerx\JsonApi\Contracts\Schema\PositionInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
 use Neomerx\JsonApi\Exceptions\LogicException;
+
 use function Neomerx\JsonApi\I18n\format as _;
 
 class RelationshipDataIsCollection extends BaseRelationshipData implements RelationshipDataInterface
diff --git a/src/Parser/RelationshipData/RelationshipDataIsIdentifier.php b/src/Parser/RelationshipData/RelationshipDataIsIdentifier.php
@@ -29,6 +29,7 @@
 use Neomerx\JsonApi\Contracts\Schema\PositionInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
 use Neomerx\JsonApi\Exceptions\LogicException;
+
 use function Neomerx\JsonApi\I18n\format as _;
 
 class RelationshipDataIsIdentifier extends BaseRelationshipData implements RelationshipDataInterface
diff --git a/src/Parser/RelationshipData/RelationshipDataIsNull.php b/src/Parser/RelationshipData/RelationshipDataIsNull.php
@@ -24,6 +24,7 @@
 use Neomerx\JsonApi\Contracts\Parser\RelationshipDataInterface;
 use Neomerx\JsonApi\Contracts\Parser\ResourceInterface;
 use Neomerx\JsonApi\Exceptions\LogicException;
+
 use function Neomerx\JsonApi\I18n\format as _;
 
 class RelationshipDataIsNull implements RelationshipDataInterface
diff --git a/src/Parser/RelationshipData/RelationshipDataIsResource.php b/src/Parser/RelationshipData/RelationshipDataIsResource.php
@@ -28,6 +28,7 @@
 use Neomerx\JsonApi\Contracts\Schema\PositionInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
 use Neomerx\JsonApi\Exceptions\LogicException;
+
 use function Neomerx\JsonApi\I18n\format as _;
 
 class RelationshipDataIsResource extends BaseRelationshipData implements RelationshipDataInterface
diff --git a/src/Schema/ErrorCollection.php b/src/Schema/ErrorCollection.php
@@ -20,20 +20,15 @@
  * limitations under the License.
  */
 
-use ArrayAccess;
-use ArrayIterator;
-use Countable;
-use IteratorAggregate;
 use Neomerx\JsonApi\Contracts\Schema\DocumentInterface;
 use Neomerx\JsonApi\Contracts\Schema\ErrorInterface;
 use Neomerx\JsonApi\Contracts\Schema\LinkInterface;
-use Serializable;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
  */
-class ErrorCollection implements IteratorAggregate, ArrayAccess, Serializable, Countable
+class ErrorCollection implements \IteratorAggregate, \ArrayAccess, \Serializable, \Countable
 {
     private array $items = [];
 
@@ -52,7 +47,7 @@ public function __unserialize(array $data): void
      */
     public function getIterator(): \Traversable
     {
-        return new ArrayIterator($this->items);
+        return new \ArrayIterator($this->items);
     }
 
     /**
diff --git a/src/Schema/SchemaContainer.php b/src/Schema/SchemaContainer.php
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-use Closure;
 use Neomerx\JsonApi\Contracts\Factories\FactoryInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaContainerInterface;
 use Neomerx\JsonApi\Contracts\Schema\SchemaInterface;
 use Neomerx\JsonApi\Exceptions\InvalidArgumentException;
+
 use function Neomerx\JsonApi\I18n\format as _;
 
 class SchemaContainer implements SchemaContainerInterface
@@ -62,7 +62,7 @@ public function __construct(FactoryInterface $factory, iterable $schemas)
     /**
      * Register provider for resource type.
      *
-     * @param string|Closure $schema
+     * @param string|\Closure $schema
      *
      * @SuppressWarnings(PHPMD.StaticAccess)
      * @SuppressWarnings(PHPMD.ElseExpression)
@@ -171,7 +171,7 @@ protected function getProviderMapping(string $type)
     }
 
     /**
-     * @param string|Closure $schema
+     * @param string|\Closure $schema
      */
     protected function setProviderMapping(string $type, $schema): void
     {
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-use Mockery;
 use Neomerx\JsonApi\Contracts\Factories\FactoryInterface;
 use Neomerx\JsonApi\Factories\Factory;
 use PHPUnit\Framework\TestCase;
@@ -33,7 +32,7 @@ abstract class BaseTestCase extends TestCase
     protected function tearDown(): void
     {
         parent::tearDown();
-        Mockery::close();
+        \Mockery::close();
     }
 
     protected function createFactory(): FactoryInterface
diff --git a/tests/Data/Collection.php b/tests/Data/Collection.php
@@ -20,11 +20,7 @@
  * limitations under the License.
  */
 
-use ArrayAccess;
-use ArrayIterator;
-use IteratorAggregate;
-
-class Collection implements ArrayAccess, IteratorAggregate
+class Collection implements \ArrayAccess, \IteratorAggregate
 {
     private array $data = [];
 
@@ -63,6 +59,6 @@ public function offsetUnset($offset): void
      */
     public function getIterator(): \Traversable
     {
-        return new ArrayIterator($this->data);
+        return new \ArrayIterator($this->data);
     }
 }
diff --git a/tests/Data/Models/Author.php b/tests/Data/Models/Author.php
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-use stdClass;
-
-class Author extends stdClass
+class Author extends \stdClass
 {
     public const ATTRIBUTE_ID = 'author_id';
     public const ATTRIBUTE_FIRST_NAME = 'first_name';
diff --git a/tests/Data/Models/AuthorCModel.php b/tests/Data/Models/AuthorCModel.php
@@ -20,11 +20,7 @@
  * limitations under the License.
  */
 
-use ArrayAccess;
-use ArrayIterator;
-use IteratorAggregate;
-
-class AuthorCModel implements ArrayAccess, IteratorAggregate
+class AuthorCModel implements \ArrayAccess, \IteratorAggregate
 {
     public const ATTRIBUTE_ID = 'author_id';
     public const ATTRIBUTE_FIRST_NAME = 'first_name';
@@ -52,7 +48,7 @@ public function __construct(int $identity, string $firstName, string $lastName,
      */
     public function getIterator(): \Traversable
     {
-        return new ArrayIterator($this->properties);
+        return new \ArrayIterator($this->properties);
     }
 
     /**
diff --git a/tests/Data/Models/Comment.php b/tests/Data/Models/Comment.php
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-use stdClass;
-
-class Comment extends stdClass
+class Comment extends \stdClass
 {
     public const ATTRIBUTE_ID = 'comment_id';
     public const ATTRIBUTE_BODY = 'body';
diff --git a/tests/Data/Models/Post.php b/tests/Data/Models/Post.php
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-use stdClass;
-
-class Post extends stdClass
+class Post extends \stdClass
 {
     public const ATTRIBUTE_ID = 'post_id';
     public const ATTRIBUTE_TITLE = 'title';
diff --git a/tests/Data/Models/Site.php b/tests/Data/Models/Site.php
@@ -20,9 +20,7 @@
  * limitations under the License.
  */
 
-use stdClass;
-
-class Site extends stdClass
+class Site extends \stdClass
 {
     public const ATTRIBUTE_ID = 'site_id';
     public const ATTRIBUTE_NAME = 'name';
diff --git a/tests/Data/Schemas/DevSchema.php b/tests/Data/Schemas/DevSchema.php
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-use Closure;
 use Neomerx\JsonApi\Contracts\Schema\LinkInterface;
 use Neomerx\JsonApi\Schema\BaseSchema;
 
@@ -36,7 +35,7 @@ abstract class DevSchema extends BaseSchema
     private array $relationshipToRemove = [];
 
     /**
-     * @var Closure
+     * @var \Closure
      */
     private $resourceLinksClosure = null;
 
@@ -52,7 +51,7 @@ public function getLinks($resource): array
         return $linksClosure($resource);
     }
 
-    public function setResourceLinksClosure(Closure $linksClosure): void
+    public function setResourceLinksClosure(\Closure $linksClosure): void
     {
         $this->resourceLinksClosure = $linksClosure;
     }
@@ -157,7 +156,7 @@ protected function fixDescriptions($resource, array $descriptions): array
         foreach ($this->addToRelationship as [$name, $key, $value]) {
             if (self::RELATIONSHIP_LINKS === $key) {
                 foreach ($value as $linkKey => $linkOrClosure) {
-                    $link = $linkOrClosure instanceof Closure ? $linkOrClosure(
+                    $link = $linkOrClosure instanceof \Closure ? $linkOrClosure(
                         $this,
                         $resource
                     ) : $linkOrClosure;
diff --git a/tests/Encoder/EncodeSimpleObjectsTest.php b/tests/Encoder/EncodeSimpleObjectsTest.php
@@ -20,7 +20,6 @@
  * limitations under the License.
  */
 
-use ArrayIterator;
 use Neomerx\JsonApi\Encoder\Encoder;
 use Neomerx\JsonApi\Factories\Factory;
 use Neomerx\JsonApi\Schema\Link;
@@ -94,7 +93,7 @@ public function test_encode_empty_iterator(): void
             ]
         );
 
-        $actual = $encoder->encodeData(new ArrayIterator([]));
+        $actual = $encoder->encodeData(new \ArrayIterator([]));
 
         $expected = <<<EOL
         {
diff --git a/tests/Encoder/EncodeSparseAndFieldSetsTest.php b/tests/Encoder/EncodeSparseAndFieldSetsTest.php
@@ -311,7 +311,7 @@ public function test_include_and_sparse_field_sets(): void
     public function test_meta_not_loaded_in_lazy_relationships(): void
     {
         $throwExClosure = function () {
-            throw new Exception();
+            throw new \Exception();
         };
 
         $actual = Encoder::instance(
diff --git a/tests/Encoder/EncoderTest.php b/tests/Encoder/EncoderTest.php
diff --git a/tests/Extensions/Issue154/CustomContainerInterface.php b/tests/Extensions/Issue154/CustomContainerInterface.php
diff --git a/tests/Extensions/Issue154/CustomEncoderInterface.php b/tests/Extensions/Issue154/CustomEncoderInterface.php
diff --git a/tests/Extensions/Issue169/CustomEncoder.php b/tests/Extensions/Issue169/CustomEncoder.php
diff --git a/tests/Extensions/Issue47/CustomFieldsFilter.php b/tests/Extensions/Issue47/CustomFieldsFilter.php
diff --git a/tests/Http/Query/BaseQueryParserTest.php b/tests/Http/Query/BaseQueryParserTest.php
diff --git a/tests/Http/ResponsesTest.php b/tests/Http/ResponsesTest.php
diff --git a/tests/I18n/MessagesTest.php b/tests/I18n/MessagesTest.php
diff --git a/tests/Parser/RelationshipDataTest.php b/tests/Parser/RelationshipDataTest.php

Original file line number	Diff line number	Diff line change
`@@ -314,9 +314,6 @@ protected function encodeErrorsToArray(iterable $errors): array`
`314`	`314`	`return $array;`
`315`	`315`	`}`
`316`	`316`
`317`		`- /**`
`318`		`- * @param $meta`
`319`		`- */`
`320`	`317`	`protected function encodeMetaToArray($meta): array`
`321`	`318`	`{`
`322`	`319`	`$this->withMeta($meta);`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`* limitations under the License.`
`21`	`21`	`*/`
`22`	`22`
`23`		`-use RuntimeException;`
`24`		`-`
`25`		`-abstract class BaseJsonApiException extends RuntimeException`
	`23`	`+abstract class BaseJsonApiException extends \RuntimeException`
`26`	`24`	`{`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`* limitations under the License.`
`21`	`21`	`*/`
`22`	`22`
`23`		`-use Closure;`
`24`	`23`	`use Neomerx\JsonApi\Contracts\Http\Headers\AcceptMediaTypeInterface;`
`25`	`24`	`use Neomerx\JsonApi\Exceptions\InvalidArgumentException;`
`26`	`25`
`@@ -76,7 +75,7 @@ public function getQuality(): float`
`76`	`75`	`return $this->quality;`
`77`	`76`	`}`
`78`	`77`
`79`		`- public static function getCompare(): Closure`
	`78`	`+ public static function getCompare(): \Closure`
`80`	`79`	`{`
`81`	`80`	`return function (AcceptMediaTypeInterface $lhs, AcceptMediaTypeInterface $rhs) {`
`82`	`81`	`$qualityCompare = self::compareQuality($lhs->getQuality(), $rhs->getQuality());`