Conform to PSR-12

woohoolabs · Oct 4, 2019 · f7b4a90 · f7b4a90
1 parent 35848f0
commit f7b4a90
Show file tree

Hide file tree

Showing 46 changed files with 150 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,13 @@ DEPRECATED:
 
 FIXED:
 
+## 6.2.2 - 2019-10-04
+
+CHANGED:
+
+- Improved PSR-12 conformance
+- Added more property type declarations
+
 ## 6.2.1 - 2019-08-21
 
 CHANGED:

diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
         "phpstan/phpstan-phpunit": "^0.11.0",
         "phpstan/phpstan-strict-rules": "^0.11.0",
         "phpunit/phpunit": "^8.3.4",
-        "squizlabs/php_codesniffer": "^3.4.2",
-        "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",
         "zendframework/zend-httphandlerrunner": "^1.0.0"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/examples/Controller/GetBookAction.php b/examples/Controller/GetBookAction.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Examples\Controller;

diff --git a/examples/Controller/UserController.php b/examples/Controller/UserController.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Examples\Controller;

diff --git a/examples/Middleware/ExceptionHandlerMiddleware.php b/examples/Middleware/ExceptionHandlerMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Examples\Middleware;

diff --git a/examples/index.php b/examples/index.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 require_once "../vendor/autoload.php";

diff --git a/src/Condition/ConditionInterface.php b/src/Condition/ConditionInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Condition;

diff --git a/src/Condition/ExactPathCondition.php b/src/Condition/ExactPathCondition.php
@@ -1,10 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Condition;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+
 use function in_array;
 
 class ExactPathCondition implements ConditionInterface

diff --git a/src/Condition/HttpMethodCondition.php b/src/Condition/HttpMethodCondition.php
@@ -1,10 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Condition;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+
 use function in_array;
 
 class HttpMethodCondition implements ConditionInterface

diff --git a/src/Condition/PathPrefixCondition.php b/src/Condition/PathPrefixCondition.php
@@ -1,10 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Condition;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+
 use function strpos;
 
 class PathPrefixCondition implements ConditionInterface

diff --git a/src/Container/BasicContainer.php b/src/Container/BasicContainer.php
@@ -1,10 +1,12 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Container;
 
 use Psr\Container\ContainerInterface;
 use Throwable;
+
 use function class_exists;
 
 class BasicContainer implements ContainerInterface

diff --git a/src/Container/BasicContainerException.php b/src/Container/BasicContainerException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Container;

diff --git a/src/Container/BasicContainerNotFoundException.php b/src/Container/BasicContainerNotFoundException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Container;

diff --git a/src/Exception/DispatcherException.php b/src/Exception/DispatcherException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Exception;

diff --git a/src/Exception/FastRouteException.php b/src/Exception/FastRouteException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Exception;

diff --git a/src/Exception/MethodNotAllowed.php b/src/Exception/MethodNotAllowed.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Exception;

diff --git a/src/Exception/RouteNotFound.php b/src/Exception/RouteNotFound.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Exception;

diff --git a/src/Harmony.php b/src/Harmony.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony;
@@ -8,16 +9,14 @@
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use WoohooLabs\Harmony\Condition\ConditionInterface;
+
 use function array_key_exists;
 
 class Harmony implements RequestHandlerInterface
 {
     protected ServerRequestInterface $request;
-
     protected ResponseInterface $response;
-
     protected array $middleware = [];
-
     protected int $currentMiddleware = -1;
 
     public function __construct(ServerRequestInterface $request, ResponseInterface $response)

diff --git a/src/Middleware/DispatcherMiddleware.php b/src/Middleware/DispatcherMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Middleware;
@@ -10,15 +11,14 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use WoohooLabs\Harmony\Container\BasicContainer;
 use WoohooLabs\Harmony\Exception\DispatcherException;
+
 use function is_array;
 use function is_callable;
 use function is_string;
 
 class DispatcherMiddleware implements MiddlewareInterface
 {
-    /** @var ContainerInterface */
-    protected $container;
-
+    protected ContainerInterface $container;
     protected string $actionAttributeName;
 
     public function __construct(?ContainerInterface $container = null, string $actionAttributeName = "__action")

diff --git a/src/Middleware/FastRouteMiddleware.php b/src/Middleware/FastRouteMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Middleware;
@@ -14,9 +15,7 @@
 
 class FastRouteMiddleware implements MiddlewareInterface
 {
-    /** @var Dispatcher|null */
-    protected $fastRoute;
-
+    protected ?Dispatcher $fastRoute;
     protected string $actionAttributeName;
 
     public function __construct(?Dispatcher $fastRoute = null, string $actionAttributeName = "__action")

diff --git a/src/Middleware/HttpHandlerRunnerMiddleware.php b/src/Middleware/HttpHandlerRunnerMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Middleware;
@@ -9,12 +10,12 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
+
 use function headers_sent;
 
 class HttpHandlerRunnerMiddleware implements MiddlewareInterface
 {
     protected EmitterInterface $emitter;
-
     protected bool $checkOutputStart;
 
     public function __construct(?EmitterInterface $emitter = null, bool $checkOutputStart = false)

diff --git a/tests/Condition/ExactPathConditionTest.php b/tests/Condition/ExactPathConditionTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Condition;

diff --git a/tests/Condition/HttpMethodConditionTest.php b/tests/Condition/HttpMethodConditionTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Condition;

diff --git a/tests/Condition/PathPrefixConditionTest.php b/tests/Condition/PathPrefixConditionTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Condition;

diff --git a/tests/Container/BasicContainerTest.php b/tests/Container/BasicContainerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Container;

diff --git a/tests/HarmonyTest.php b/tests/HarmonyTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests;

diff --git a/tests/Middleware/DispatcherMiddlewareTest.php b/tests/Middleware/DispatcherMiddlewareTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Middleware;

diff --git a/tests/Middleware/FastRouteMiddlewareTest.php b/tests/Middleware/FastRouteMiddlewareTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Middleware;

diff --git a/tests/Middleware/HttpHandlerRunnerMiddlewareTest.php b/tests/Middleware/HttpHandlerRunnerMiddlewareTest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Middleware;

diff --git a/tests/Utils/Condition/StubCondition.php b/tests/Utils/Condition/StubCondition.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Condition;

diff --git a/tests/Utils/Container/DummyContainer.php b/tests/Utils/Container/DummyContainer.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Container;

diff --git a/tests/Utils/Controller/DummyController.php b/tests/Utils/Controller/DummyController.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Controller;

diff --git a/tests/Utils/Controller/ExceptionController.php b/tests/Utils/Controller/ExceptionController.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Controller;

diff --git a/tests/Utils/Controller/InvokableExceptionController.php b/tests/Utils/Controller/InvokableExceptionController.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Controller;

diff --git a/tests/Utils/Emitter/DummyHttpHandlerRunnerEmitter.php b/tests/Utils/Emitter/DummyHttpHandlerRunnerEmitter.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Emitter;

diff --git a/tests/Utils/Exception/TestException.php b/tests/Utils/Exception/TestException.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Exception;

diff --git a/tests/Utils/FastRoute/StubDispatcher.php b/tests/Utils/FastRoute/StubDispatcher.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\FastRoute;

diff --git a/tests/Utils/Middleware/ExceptionMiddleware.php b/tests/Utils/Middleware/ExceptionMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Middleware;

diff --git a/tests/Utils/Middleware/FakeMiddleware.php b/tests/Utils/Middleware/FakeMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Middleware;

diff --git a/tests/Utils/Middleware/HeaderMiddleware.php b/tests/Utils/Middleware/HeaderMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Middleware;

diff --git a/tests/Utils/Middleware/InternalServerErrorMiddleware.php b/tests/Utils/Middleware/InternalServerErrorMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Middleware;

diff --git a/tests/Utils/Middleware/SpyMiddleware.php b/tests/Utils/Middleware/SpyMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Middleware;

diff --git a/tests/Utils/Psr7/DummyResponse.php b/tests/Utils/Psr7/DummyResponse.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Psr7;
@@ -7,6 +8,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Zend\Diactoros\Stream;
+
 use function is_array;
 
 class DummyResponse implements ResponseInterface

diff --git a/tests/Utils/Psr7/DummyServerRequest.php b/tests/Utils/Psr7/DummyServerRequest.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Psr7;

diff --git a/tests/Utils/Psr7/DummyUri.php b/tests/Utils/Psr7/DummyUri.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace WoohooLabs\Harmony\Tests\Utils\Psr7;