Switch to php8 only

- Add rector
- Enhance code style rules

Author: usox

.php-cs-fixer.dist.php

@@ -4,8 +4,13 @@
     ->in(['src', 'tests'])
 ;
 $config = new PhpCsFixer\Config();
-$config
-    ->setFinder($finder)
+$config->setRules(
+    [
+        '@PSR12' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline', 'keep_multiple_spaces_after_comma' => false],
+    ]
+)->setFinder($finder)
 ;
 
 return $config;

README.md

@@ -7,7 +7,6 @@
 This library provides a simple way to create a json api using [json-schema](http://json-schema.org/) to validate the request.
 You can leverage most of the input validation tasks (variables types, length/content-constraints, lists containing just certain items, etc.)
 to the json schema validator and work with the data right away.
-[![Code Coverage](https://scrutinizer-ci.com/g/usox/json-schema-api/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/usox/json-schema-api/?branch=master)
 ## Json-schema
 
 Every method needs a corresponding schema-file which describes, how the request data should like alike.

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": "^7.4 || ^8.0",
+    "php": "^8.0",
     "ext-json": "*",
     "opis/json-schema": "^2.1",
     "php-http/discovery": "^1.13",
@@ -39,7 +39,8 @@
     "phpstan/phpstan": "^0.12.80",
     "phpstan/phpstan-mockery": "^0.12.12",
     "phpstan/phpstan-strict-rules": "^0.12.9",
-    "phpunit/phpunit": "^9.5"
+    "phpunit/phpunit": "^9.5",
+    "rector/rector": "^0.11.21"
   },
   "config": {
     "sort-packages": true

composer.lock

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
+use Rector\Core\Configuration\Option;
+use Rector\Php74\Rector\Property\TypedPropertyRector;
+use Rector\Php80\Rector\Catch_\RemoveUnusedVariableInCatchRector;
+use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
+use Rector\Php80\Rector\If_\NullsafeOperatorRector;
+use Rector\Set\ValueObject\SetList;
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $containerConfigurator): void {
+    $parameters = $containerConfigurator->parameters();
+
+    $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, getcwd() . '/phpstan.neon');
+    $parameters->set(Option::PATHS, [__DIR__ . '/src', __DIR__ . '/tests']);
+    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
+
+    $containerConfigurator->import(SetList::CODE_QUALITY_STRICT);
+    $containerConfigurator->import(SetList::DEAD_CODE);
+    $containerConfigurator->import(SetList::PHP_80);
+
+    $services = $containerConfigurator->services();
+    $services->set(TypedPropertyRector::class);
+    $services->set(ClassPropertyAssignToConstructorPromotionRector::class);
+    $services->set(RemoveUnusedVariableInCatchRector::class);
+    $services->set(MoveVariableDeclarationNearReferenceRector::class);
+};

rector.php

@@ -4,6 +4,7 @@
 
 namespace Usox\JsonSchemaApi\Dispatch;
 
+use Usox\JsonSchemaApi\Contract\ApiMethodInterface;
 use Opis\JsonSchema\Helper;
 use Psr\Http\Message\ServerRequestInterface;
 use stdClass;
@@ -19,20 +20,12 @@
 
 final class MethodDispatcher implements MethodDispatcherInterface
 {
-    private SchemaLoaderInterface $schemaLoader;
-
-    private MethodValidatorInterface $methodValidator;
-
-    private MethodProviderInterface $methodProvider;
-
     public function __construct(
-        SchemaLoaderInterface $schemaLoader,
-        MethodValidatorInterface $methodValidator,
-        MethodProviderInterface $methodProvider
-    ) {
-        $this->schemaLoader = $schemaLoader;
-        $this->methodValidator = $methodValidator;
-        $this->methodProvider = $methodProvider;
+        private SchemaLoaderInterface $schemaLoader,
+        private MethodValidatorInterface $methodValidator,
+        private MethodProviderInterface $methodProvider
+    )
+    {
     }
 
     /**
@@ -59,7 +52,7 @@ public function dispatch(
         }
 
         $handler = $this->methodProvider->lookup($methodName);
-        if ($handler === null) {
+        if (!$handler instanceof ApiMethodInterface) {
             throw new MethodNotFoundException(
                 'Method not found',
                 StatusCode::BAD_REQUEST

src/Dispatch/MethodDispatcher.php

@@ -14,16 +14,8 @@
 
 final class MethodValidator implements MethodValidatorInterface
 {
-    private Validator $schemaValidator;
-
-    private ErrorFormatter $errorFormatter;
-
-    public function __construct(
-        Validator $schemaValidator,
-        ErrorFormatter $errorFormatter
-    ) {
-        $this->schemaValidator = $schemaValidator;
-        $this->errorFormatter = $errorFormatter;
+    public function __construct(private Validator $schemaValidator, private ErrorFormatter $errorFormatter)
+    {
     }
 
     /**

src/Dispatch/MethodValidator.php

@@ -4,6 +4,9 @@
 
 namespace Usox\JsonSchemaApi\Dispatch;
 
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaInvalidException;
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotFoundException;
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotLoadableException;
 use Opis\JsonSchema\Validator;
 use Psr\Http\Message\ServerRequestInterface;
 use stdClass;
@@ -13,22 +16,14 @@
 
 final class RequestValidator implements RequestValidatorInterface
 {
-    private SchemaLoaderInterface $schemaLoader;
-
-    private Validator $schemaValidator;
-
-    public function __construct(
-        SchemaLoaderInterface $schemaLoader,
-        Validator $schemaValidator
-    ) {
-        $this->schemaLoader = $schemaLoader;
-        $this->schemaValidator = $schemaValidator;
+    public function __construct(private SchemaLoaderInterface $schemaLoader, private Validator $schemaValidator)
+    {
     }
 
     /**
-     * @throws Exception\SchemaInvalidException
-     * @throws Exception\SchemaNotFoundException
-     * @throws Exception\SchemaNotLoadableException
+     * @throws SchemaInvalidException
+     * @throws SchemaNotFoundException
+     * @throws SchemaNotLoadableException
      * @throws JsonInvalidException
      * @throws RequestMalformedException
      */

src/Dispatch/RequestValidator.php

@@ -2,6 +2,9 @@
 
 namespace Usox\JsonSchemaApi\Dispatch;
 
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaInvalidException;
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotFoundException;
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotLoadableException;
 use Psr\Http\Message\ServerRequestInterface;
 use stdClass;
 use Usox\JsonSchemaApi\Dispatch\Exception\JsonInvalidException;
@@ -10,9 +13,9 @@
 interface RequestValidatorInterface
 {
     /**
-     * @throws Exception\SchemaInvalidException
-     * @throws Exception\SchemaNotFoundException
-     * @throws Exception\SchemaNotLoadableException
+     * @throws SchemaInvalidException
+     * @throws SchemaNotFoundException
+     * @throws SchemaNotLoadableException
      * @throws JsonInvalidException
      * @throws RequestMalformedException
      */

src/Dispatch/RequestValidatorInterface.php

@@ -4,6 +4,8 @@
 
 namespace Usox\JsonSchemaApi\Dispatch;
 
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotFoundException;
+use Usox\JsonSchemaApi\Dispatch\Exception\SchemaNotLoadableException;
 use stdClass;
 use Teapot\StatusCode;
 use Usox\JsonSchemaApi\Dispatch\Exception\SchemaInvalidException;
@@ -13,15 +15,15 @@ final class SchemaLoader implements SchemaLoaderInterface
     /**
      * Loads and returns the schema content
      *
-     * @throws Exception\SchemaInvalidException
-     * @throws Exception\SchemaNotFoundException
-     * @throws Exception\SchemaNotLoadableException
+     * @throws SchemaInvalidException
+     * @throws SchemaNotFoundException
+     * @throws SchemaNotLoadableException
      */
     public function load(
         string $schemaFilePath
     ): stdClass {
         if (file_exists($schemaFilePath) === false) {
-            throw new Exception\SchemaNotFoundException(
+            throw new SchemaNotFoundException(
                 sprintf('Schema file `%s` not found', $schemaFilePath),
                 StatusCode::INTERNAL_SERVER_ERROR
             );
@@ -30,7 +32,7 @@ public function load(
         $fileContent = @file_get_contents($schemaFilePath);
 
         if ($fileContent === false) {
-            throw new Exception\SchemaNotLoadableException(
+            throw new SchemaNotLoadableException(
                 sprintf('Schema file `%s` not loadable', $schemaFilePath),
                 StatusCode::INTERNAL_SERVER_ERROR
             );