Fix PSR-12 conformance

CHANGELOG.md

@@ -10,7 +10,7 @@ REMOVED:
 
 FIXED:
 
-## 2.2.1 - 2019-10-19
+## 2.2.1 - 2019-10-20
 
 FIXED:
 

composer.json

@@ -25,7 +25,7 @@
         "phpstan/phpstan-phpunit": "^0.11.2",
         "phpstan/phpstan-strict-rules": "^0.11.0",
         "phpunit/phpunit": "^7.0.0||^8.2.0",
-        "squizlabs/php_codesniffer": "^3.4.0",
+        "squizlabs/php_codesniffer": "^3.5.1",
         "woohoolabs/coding-standard": "^1.0.0",
         "woohoolabs/releaser": "^1.1.0"
     },

phpcs.xml

@@ -18,4 +18,21 @@
     <file>tests/</file>
 
     <rule ref="WoohooLabs"/>
+
+    <rule ref="SlevomatCodingStandard.Namespaces.UseSpacing">
+        <properties>
+            <property name="linesCountAfterLastUse" value="1"/>
+            <property name="linesCountBeforeFirstUse" value="1"/>
+            <property name="linesCountBetweenUseTypes" value="1"/>
+        </properties>
+    </rule>
+
+    <!-- Require presence of declare(strict_types=1) -->
+    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+        <properties>
+            <property name="newlinesCountBetweenOpenTagAndDeclare" value="2"/>
+            <property name="spacesCountAroundEqualsSign" value="0"/>
+            <property name="newlinesCountAfterDeclare" value="2"/>
+        </properties>
+    </rule>
 </ruleset>

src/JsonApi/Client/JsonApiAsyncClient.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Client;

src/JsonApi/Client/JsonApiClient.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Client;

src/JsonApi/Exception/DocumentException.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Exception;

src/JsonApi/Exception/JsonApiExceptionInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Exception;

src/JsonApi/Exception/ResponseException.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Exception;

src/JsonApi/Exception/SerializationException.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Exception;

src/JsonApi/Hydrator/AbstractClassDocumentHydrator.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Hydrator;

src/JsonApi/Hydrator/ClassDocumentHydrator.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Hydrator;

src/JsonApi/Hydrator/ClassHydrator.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Hydrator;

src/JsonApi/Hydrator/DocumentHydratorInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Hydrator;

src/JsonApi/Hydrator/HydratorInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Hydrator;

src/JsonApi/Request/JsonApiRequestBuilder.php

@@ -1,11 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Request;
 
 use Psr\Http\Message\RequestInterface;
 use WoohooLabs\Yang\JsonApi\Serializer\JsonSerializer;
 use WoohooLabs\Yang\JsonApi\Serializer\SerializerInterface;
+
 use function array_key_exists;
 use function http_build_query;
 use function implode;

src/JsonApi/Request/RelationshipInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Request;

src/JsonApi/Request/ResourceObject.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Request;

src/JsonApi/Request/ToManyRelationship.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Request;

src/JsonApi/Request/ToOneRelationship.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Request;

src/JsonApi/Response/AbstractResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Response;

src/JsonApi/Response/JsonApiResponse.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Response;
@@ -8,6 +9,7 @@
 use WoohooLabs\Yang\JsonApi\Schema\Document;
 use WoohooLabs\Yang\JsonApi\Serializer\DeserializerInterface;
 use WoohooLabs\Yang\JsonApi\Serializer\JsonDeserializer;
+
 use function in_array;
 use function is_array;
 

src/JsonApi/Schema/Document.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema;
@@ -8,6 +9,7 @@
 use WoohooLabs\Yang\JsonApi\Schema\Link\DocumentLinks;
 use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObject;
 use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObjects;
+
 use function array_filter;
 use function array_keys;
 use function count;

src/JsonApi/Schema/Error/Error.php

@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Error;
 
 use WoohooLabs\Yang\JsonApi\Schema\Link\ErrorLinks;
+
 use function is_array;
 use function is_scalar;
 use function is_string;

src/JsonApi/Schema/Error/ErrorSource.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Error;

src/JsonApi/Schema/JsonApiObject.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema;

src/JsonApi/Schema/Link/AbstractLink.php

@@ -1,11 +1,9 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;
 
-use function is_array;
-use function is_string;
-
 abstract class AbstractLink
 {
     /**

src/JsonApi/Schema/Link/AbstractLinks.php

@@ -1,11 +1,10 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;
 
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
-use function is_array;
-use function is_string;
 
 abstract class AbstractLinks
 {

src/JsonApi/Schema/Link/DocumentLinks.php

@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;
 
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
+
 use function array_values;
 use function is_array;
 use function is_string;

src/JsonApi/Schema/Link/ErrorLinks.php

@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;
 
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
+
 use function array_values;
 use function is_array;
 use function is_string;

src/JsonApi/Schema/Link/Link.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;

src/JsonApi/Schema/Link/ProfileLink.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;

src/JsonApi/Schema/Link/RelationshipLinks.php

@@ -1,10 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;
 
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
 
+use function is_array;
+use function is_string;
+
 final class RelationshipLinks extends AbstractLinks
 {
     public function hasSelf(): bool

src/JsonApi/Schema/Link/ResourceLinks.php

@@ -1,10 +1,14 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Link;
 
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
 
+use function is_array;
+use function is_string;
+
 final class ResourceLinks extends AbstractLinks
 {
     public function hasSelf(): bool

src/JsonApi/Schema/Relationship.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema;
@@ -7,6 +8,7 @@
 use WoohooLabs\Yang\JsonApi\Schema\Link\RelationshipLinks;
 use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObject;
 use WoohooLabs\Yang\JsonApi\Schema\Resource\ResourceObjects;
+
 use function array_filter;
 use function array_key_exists;
 use function array_keys;

src/JsonApi/Schema/Resource/ResourceObject.php

@@ -1,11 +1,13 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Resource;
 
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
 use WoohooLabs\Yang\JsonApi\Schema\Link\ResourceLinks;
 use WoohooLabs\Yang\JsonApi\Schema\Relationship;
+
 use function array_key_exists;
 use function array_merge;
 use function is_array;

src/JsonApi/Schema/Resource/ResourceObjects.php

@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Schema\Resource;
 
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
+
 use function array_values;
 use function key;
 use function reset;

src/JsonApi/Serializer/DeserializerInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Serializer;

src/JsonApi/Serializer/JsonDeserializer.php

@@ -1,9 +1,11 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Serializer;
 
 use Psr\Http\Message\ResponseInterface;
+
 use function json_decode;
 
 final class JsonDeserializer implements DeserializerInterface

src/JsonApi/Serializer/JsonSerializer.php

@@ -1,10 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Serializer;
 
 use Psr\Http\Message\RequestInterface;
 use WoohooLabs\Yang\JsonApi\Exception\SerializationException;
+
 use function is_array;
 use function is_string;
 use function json_encode;

src/JsonApi/Serializer/SerializerInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\JsonApi\Serializer;

tests/JsonApi/Hydrator/ClassDocumentHydratorTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\Tests\JsonApi\Hydrator;
@@ -8,6 +9,7 @@
 use WoohooLabs\Yang\JsonApi\Exception\DocumentException;
 use WoohooLabs\Yang\JsonApi\Hydrator\ClassDocumentHydrator;
 use WoohooLabs\Yang\JsonApi\Schema\Document;
+
 use function end;
 use function reset;
 

tests/JsonApi/Hydrator/ClassHydratorTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\Tests\JsonApi\Hydrator;

tests/JsonApi/Hydrator/CustomHydratorTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Yang\Tests\JsonApi\Hydrator;