Upgrade to coding-standard v8.6 (#54)

BrandEmbassy · Feb 25, 2022 · cdb2677 · cdb2677
1 parent 2e3bd96
commit cdb2677
Show file tree

Hide file tree

Showing 38 changed files with 150 additions and 41 deletions.
diff --git a/composer.json b/composer.json
@@ -22,15 +22,15 @@
         "slim/slim": "^3.12"
     },
     "require-dev": {
-        "brandembassy/coding-standard": "^8.1",
-        "brandembassy/mockery-tools": "^2.14",
+        "brandembassy/coding-standard": "^8.6",
+        "brandembassy/mockery-tools": "^3.8",
         "mockery/mockery": "^1.2",
         "phpunit/phpunit": "^8.5",
         "roave/security-advisories": "dev-master"
     },
     "scripts": {
-        "phpcs": "vendor/bin/phpcs --standard=BrandEmbassyCodingStandard src tests --ignore=tests/temp",
-        "phpcbf": "./vendor/bin/phpcbf --standard=BrandEmbassyCodingStandard src tests --ignore=tests/temp",
+        "phpcs": "vendor/bin/phpcs --standard=BrandEmbassyCodingStandard src tests --ignore=tests/temp --runtime-set php_version 70200",
+        "phpcbf": "./vendor/bin/phpcbf --standard=BrandEmbassyCodingStandard src tests --ignore=tests/temp --runtime-set php_version 70200",
         "phpstan": "./vendor/bin/phpstan analyse -c phpstan.neon src",
         "phpunit": "./vendor/bin/phpunit tests --no-coverage"
     },

diff --git a/src/DI/ServiceProvider.php b/src/DI/ServiceProvider.php
@@ -7,7 +7,10 @@
 use function assert;
 use function class_exists;
 
-final class ServiceProvider
+/**
+ * @final
+ */
+class ServiceProvider
 {
     /**
      * @return object

diff --git a/src/DI/SlimApiExtension.php b/src/DI/SlimApiExtension.php
@@ -22,7 +22,10 @@
 use Slim\Container;
 use Slim\Router;
 
-final class SlimApiExtension extends CompilerExtension
+/**
+ * @final
+ */
+class SlimApiExtension extends CompilerExtension
 {
     public function getConfigSchema(): Schema
     {

diff --git a/src/Middleware/BeforeRouteMiddlewares.php b/src/Middleware/BeforeRouteMiddlewares.php
@@ -2,7 +2,10 @@
 
 namespace BrandEmbassy\Slim\Middleware;
 
-final class BeforeRouteMiddlewares
+/**
+ * @final
+ */
+class BeforeRouteMiddlewares
 {
     /**
      * @var callable[]

diff --git a/src/Middleware/MiddlewareFactory.php b/src/Middleware/MiddlewareFactory.php
@@ -8,7 +8,10 @@
 use function assert;
 use function is_callable;
 
-final class MiddlewareFactory
+/**
+ * @final
+ */
+class MiddlewareFactory
 {
     /**
      * @var Container

diff --git a/src/Middleware/MiddlewareGroups.php b/src/Middleware/MiddlewareGroups.php
@@ -5,7 +5,10 @@
 use function array_map;
 use function array_merge_recursive;
 
-final class MiddlewareGroups
+/**
+ * @final
+ */
+class MiddlewareGroups
 {
     /**
      * @var array<string, callable[]>

diff --git a/src/Request/DefaultRequestFactory.php b/src/Request/DefaultRequestFactory.php
@@ -4,7 +4,10 @@
 
 use Slim\Http\Environment;
 
-final class DefaultRequestFactory implements RequestFactory
+/**
+ * @final
+ */
+class DefaultRequestFactory implements RequestFactory
 {
     public function create(): RequestInterface
     {

diff --git a/src/Request/QueryParamMissingException.php b/src/Request/QueryParamMissingException.php
@@ -4,7 +4,10 @@
 
 use function sprintf;
 
-final class QueryParamMissingException extends RequestException
+/**
+ * @final
+ */
+class QueryParamMissingException extends RequestException
 {
     public static function create(string $key): self
     {

diff --git a/src/Request/Request.php b/src/Request/Request.php
@@ -18,8 +18,10 @@
 /**
  * @method string[]|string[][] getQueryParams()
  * @method string|string[]|null getQueryParam(string $key, ?string $default = null)
+ *
+ * @final
  */
-final class Request extends SlimRequest implements RequestInterface
+class Request extends SlimRequest implements RequestInterface
 {
     private const ROUTE_INFO_ATTRIBUTE = 'routeInfo';
     private const ROUTE_ATTRIBUTE = 'route';

diff --git a/src/Request/RequestAttributeMissingException.php b/src/Request/RequestAttributeMissingException.php
@@ -4,7 +4,10 @@
 
 use function sprintf;
 
-final class RequestAttributeMissingException extends RequestException
+/**
+ * @final
+ */
+class RequestAttributeMissingException extends RequestException
 {
     public static function create(string $requestAttributeName): self
     {

diff --git a/src/Request/RequestFieldMissingException.php b/src/Request/RequestFieldMissingException.php
@@ -4,7 +4,10 @@
 
 use function sprintf;
 
-final class RequestFieldMissingException extends RequestException
+/**
+ * @final
+ */
+class RequestFieldMissingException extends RequestException
 {
     public static function create(string $fieldName): self
     {

diff --git a/src/Request/RouteArgumentMissingException.php b/src/Request/RouteArgumentMissingException.php
@@ -4,7 +4,10 @@
 
 use function sprintf;
 
-final class RouteArgumentMissingException extends RequestException
+/**
+ * @final
+ */
+class RouteArgumentMissingException extends RequestException
 {
     public static function create(string $argument): self
     {

diff --git a/src/Response/DefaultResponseFactory.php b/src/Response/DefaultResponseFactory.php
@@ -2,7 +2,10 @@
 
 namespace BrandEmbassy\Slim\Response;
 
-final class DefaultResponseFactory implements ResponseFactory
+/**
+ * @final
+ */
+class DefaultResponseFactory implements ResponseFactory
 {
     public function create(): ResponseInterface
     {

diff --git a/src/Response/Response.php b/src/Response/Response.php
@@ -8,7 +8,10 @@
 use function assert;
 use function is_array;
 
-final class Response extends SlimResponse implements ResponseInterface
+/**
+ * @final
+ */
+class Response extends SlimResponse implements ResponseInterface
 {
     /**
      * @return mixed[]

diff --git a/src/Route/InvalidRouteDefinitionException.php b/src/Route/InvalidRouteDefinitionException.php
@@ -6,7 +6,10 @@
 use function implode;
 use function sprintf;
 
-final class InvalidRouteDefinitionException extends RuntimeException
+/**
+ * @final
+ */
+class InvalidRouteDefinitionException extends RuntimeException
 {
     /**
      * @param string[] $path

diff --git a/src/Route/RouteDefinition.php b/src/Route/RouteDefinition.php
@@ -2,7 +2,10 @@
 
 namespace BrandEmbassy\Slim\Route;
 
-final class RouteDefinition
+/**
+ * @final
+ */
+class RouteDefinition
 {
     public const SERVICE = 'service';
     public const MIDDLEWARES = 'middlewares';

diff --git a/src/Route/RouteDefinitionFactory.php b/src/Route/RouteDefinitionFactory.php
@@ -7,7 +7,10 @@
 use LogicException;
 use Nette\DI\Container;
 
-final class RouteDefinitionFactory
+/**
+ * @final
+ */
+class RouteDefinitionFactory
 {
     /**
      * @var Container

diff --git a/src/Route/RouteRegister.php b/src/Route/RouteRegister.php
@@ -9,7 +9,10 @@
 use function array_merge_recursive;
 use function levenshtein;
 
-final class RouteRegister
+/**
+ * @final
+ */
+class RouteRegister
 {
     /**
      * @var RouterInterface

diff --git a/src/Route/UrlPatternResolver.php b/src/Route/UrlPatternResolver.php
@@ -4,7 +4,10 @@
 
 use function trim;
 
-final class UrlPatternResolver
+/**
+ * @final
+ */
+class UrlPatternResolver
 {
     /**
      * @var string

diff --git a/src/SlimApplicationFactory.php b/src/SlimApplicationFactory.php
@@ -14,7 +14,10 @@
 use function is_callable;
 use function sprintf;
 
-final class SlimApplicationFactory
+/**
+ * @final
+ */
+class SlimApplicationFactory
 {
     public const SLIM_CONFIGURATION = 'slimConfiguration';
     public const BEFORE_ROUTE_MIDDLEWARES = 'beforeRouteMiddlewares';

diff --git a/src/SlimContainerFactory.php b/src/SlimContainerFactory.php
@@ -7,7 +7,10 @@
 use Slim\Container;
 use Slim\Interfaces\RouterInterface;
 
-final class SlimContainerFactory
+/**
+ * @final
+ */
+class SlimContainerFactory
 {
     /**
      * @var ResponseFactory

diff --git a/tests/MiddlewareInvocationCounter.php b/tests/MiddlewareInvocationCounter.php
@@ -4,7 +4,10 @@
 
 use BrandEmbassy\Slim\Response\ResponseInterface;
 
-final class MiddlewareInvocationCounter
+/**
+ * @final
+ */
+class MiddlewareInvocationCounter
 {
     /**
      * @var int

diff --git a/tests/Request/RequestTest.php b/tests/Request/RequestTest.php
@@ -13,7 +13,10 @@
 use PHPUnit\Framework\TestCase;
 use function urlencode;
 
-final class RequestTest extends TestCase
+/**
+ * @final
+ */
+class RequestTest extends TestCase
 {
     private const PARAM_NAME = 'dateFrom';
     private const DATE_TIME_STRING = '2017-06-10T01:00:00+01:00';

diff --git a/tests/Response/ResponseTest.php b/tests/Response/ResponseTest.php
@@ -6,7 +6,10 @@
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\TestCase;
 
-final class ResponseTest extends TestCase
+/**
+ * @final
+ */
+class ResponseTest extends TestCase
 {
     public function testGetParsedBodyAsArray(): void
     {

diff --git a/tests/Sample/ApiErrorHandler.php b/tests/Sample/ApiErrorHandler.php
@@ -7,7 +7,10 @@
 use BrandEmbassy\Slim\Response\ResponseInterface;
 use Throwable;
 
-final class ApiErrorHandler implements ErrorHandler
+/**
+ * @final
+ */
+class ApiErrorHandler implements ErrorHandler
 {
     public function __invoke(
         RequestInterface $request,

diff --git a/tests/Sample/CreateChannelRoute.php b/tests/Sample/CreateChannelRoute.php
@@ -6,7 +6,10 @@
 use BrandEmbassy\Slim\Response\ResponseInterface;
 use BrandEmbassy\Slim\Route\Route;
 
-final class CreateChannelRoute implements Route
+/**
+ * @final
+ */
+class CreateChannelRoute implements Route
 {
     /**
      * @param string[] $arguments

diff --git a/tests/Sample/CreateChannelUserRoute.php b/tests/Sample/CreateChannelUserRoute.php
@@ -7,7 +7,10 @@
 use BrandEmbassy\Slim\Route\Route;
 use function assert;
 
-final class CreateChannelUserRoute implements Route
+/**
+ * @final
+ */
+class CreateChannelUserRoute implements Route
 {
     /**
      * @var RequestInterface

diff --git a/tests/Sample/ErrorThrowingRoute.php b/tests/Sample/ErrorThrowingRoute.php
@@ -7,7 +7,10 @@
 use BrandEmbassy\Slim\Route\Route;
 use LogicException;
 
-final class ErrorThrowingRoute implements Route
+/**
+ * @final
+ */
+class ErrorThrowingRoute implements Route
 {
     public function __invoke(RequestInterface $request, ResponseInterface $response): ResponseInterface
     {

diff --git a/tests/Sample/GoldenKeyAuthMiddleware.php b/tests/Sample/GoldenKeyAuthMiddleware.php
@@ -6,7 +6,10 @@
 use BrandEmbassy\Slim\Request\RequestInterface;
 use BrandEmbassy\Slim\Response\ResponseInterface;
 
-final class GoldenKeyAuthMiddleware implements Middleware
+/**
+ * @final
+ */
+class GoldenKeyAuthMiddleware implements Middleware
 {
     public const ACCESS_TOKEN = 'uber-secret-token-made-of-pure-gold';
 

diff --git a/tests/Sample/GroupMiddleware.php b/tests/Sample/GroupMiddleware.php
@@ -7,7 +7,10 @@
 use BrandEmbassy\Slim\Response\ResponseInterface;
 use BrandEmbassyTest\Slim\MiddlewareInvocationCounter;
 
-final class GroupMiddleware implements Middleware
+/**
+ * @final
+ */
+class GroupMiddleware implements Middleware
 {
     public const HEADER_NAME = 'group-middleware';
 

diff --git a/tests/Sample/HelloWorldRoute.php b/tests/Sample/HelloWorldRoute.php
@@ -6,7 +6,10 @@
 use BrandEmbassy\Slim\Response\ResponseInterface;
 use BrandEmbassy\Slim\Route\Route;
 
-final class HelloWorldRoute implements Route
+/**
+ * @final
+ */
+class HelloWorldRoute implements Route
 {
     public function __invoke(RequestInterface $request, ResponseInterface $response): ResponseInterface
     {

diff --git a/tests/Sample/InvokeCounterMiddleware.php b/tests/Sample/InvokeCounterMiddleware.php
@@ -7,7 +7,10 @@
 use BrandEmbassy\Slim\Response\ResponseInterface;
 use BrandEmbassyTest\Slim\MiddlewareInvocationCounter;
 
-final class InvokeCounterMiddleware implements Middleware
+/**
+ * @final
+ */
+class InvokeCounterMiddleware implements Middleware
 {
     public const HEADER_NAME_PREFIX = 'invoke-counter-';