Conform to PSR-12

CHANGELOG.md

@@ -8,6 +8,13 @@ REMOVED:
 
 FIXED:
 
+## 4.1.1 - 2019-10-04
+
+CHANGED:
+
+- Improved conformance to PSR-12
+- Added more property type declarations
+
 ## 4.1.0 - 2019-08-21
 
 CHANGED:

composer.json

@@ -28,9 +28,9 @@
         "phpstan/phpstan-strict-rules": "^0.11.0",
         "phpunit/phpunit": "^8.3.4",
         "seld/jsonlint": "^1.7.1",
-        "squizlabs/php_codesniffer": "^3.4.0",
-        "woohoolabs/coding-standard": "^2.0.1",
-        "woohoolabs/releaser": "^1.1.0",
+        "squizlabs/php_codesniffer": "^3.5.0",
+        "woohoolabs/coding-standard": "^2.1.1",
+        "woohoolabs/releaser": "^1.2.0",
         "zendframework/zend-diactoros": "^2.0.0"
     },
     "autoload": {

src/Exception/JsonApiRequestException.php

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

src/Middleware/JsonApiDispatcherMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\YinMiddleware\Middleware;
@@ -15,16 +16,15 @@
 use WoohooLabs\Yin\JsonApi\Serializer\JsonSerializer;
 use WoohooLabs\Yin\JsonApi\Serializer\SerializerInterface;
 use WoohooLabs\YinMiddleware\Exception\JsonApiRequestException;
+
 use function is_array;
 use function is_callable;
 use function is_string;
 
 class JsonApiDispatcherMiddleware implements MiddlewareInterface
 {
     private ExceptionFactoryInterface $exceptionFactory;
-
-    /** @var ContainerInterface|null */
-    protected $container;
+    protected ?ContainerInterface $container;
     protected SerializerInterface $serializer;
     protected string $handlerAttributeName;
 

src/Middleware/JsonApiExceptionHandlerMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\YinMiddleware\Middleware;

src/Middleware/JsonApiRequestValidatorMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\YinMiddleware\Middleware;

src/Middleware/JsonApiResponseValidatorMiddleware.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\YinMiddleware\Middleware;

src/Utils/JsonApiMessageValidator.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\YinMiddleware\Utils;

tests/Middleware/JsonApiDispatcherMiddlewareTest.php

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

tests/Middleware/JsonApiErrorHandlerMiddlewareTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\YinMiddleware\Tests\Middleware;
@@ -14,6 +15,7 @@
 use WoohooLabs\YinMiddleware\Tests\Utils\DummyException;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
+
 use function json_decode;
 
 class JsonApiErrorHandlerMiddlewareTest extends TestCase

tests/Middleware/JsonApiRequestValidatorMiddlewareTest.php

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

tests/Middleware/JsonApiResponseValidatorMiddlewareTest.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\YinMiddleware\Tests\Middleware;
@@ -198,9 +199,8 @@ private function getRequest(): JsonApiRequestInterface
 
     private function createHandler(ResponseInterface $response): RequestHandlerInterface
     {
-        return new class($response) implements RequestHandlerInterface {
-            /** @var ResponseInterface */
-            private $response;
+        return new class ($response) implements RequestHandlerInterface {
+            private ResponseInterface $response;
 
             public function __construct(ResponseInterface $response)
             {

tests/Utils/DummyException.php

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

tests/Utils/FakeController.php

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