Upgrade coding-standard

lcobucci · lcobucci · commit 49af5f2a6fd7 · 2020-02-26T22:54:21.000+01:00
diff --git a/composer.json b/composer.json
@@ -22,14 +22,14 @@
     "require-dev": {
         "infection/infection": "^0.13",
         "laminas/laminas-diactoros": "^2.2",
-        "lcobucci/coding-standard": "^3.0",
+        "lcobucci/coding-standard": "^4.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-deprecation-rules": "^0.12",
         "phpstan/phpstan-phpunit": "^0.12",
         "phpstan/phpstan-strict-rules": "^0.12",
         "phpunit/phpunit": "^8.2",
-        "squizlabs/php_codesniffer": "^3.4"
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/ErrorConversionMiddleware.php b/src/ErrorConversionMiddleware.php
@@ -24,20 +24,9 @@ final class ErrorConversionMiddleware implements MiddlewareInterface
 
     private const STATUS_URL = 'https://httpstatuses.com/';
 
-    /**
-     * @var ResponseFactoryInterface
-     */
-    private $responseFactory;
-
-    /**
-     * @var DebugInfoStrategy
-     */
-    private $debugInfoStrategy;
-
-    /**
-     * @var StatusCodeExtractionStrategy
-     */
-    private $statusCodeExtractor;
+    private ResponseFactoryInterface $responseFactory;
+    private DebugInfoStrategy $debugInfoStrategy;
+    private StatusCodeExtractionStrategy $statusCodeExtractor;
 
     public function __construct(
         ResponseFactoryInterface $responseFactory,
diff --git a/src/ErrorLoggingMiddleware.php b/src/ErrorLoggingMiddleware.php
@@ -12,10 +12,7 @@
 
 final class ErrorLoggingMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
+    private LoggerInterface $logger;
 
     public function __construct(LoggerInterface $logger)
     {
diff --git a/src/StatusCodeExtractionStrategy/ClassMap.php b/src/StatusCodeExtractionStrategy/ClassMap.php
@@ -24,7 +24,7 @@ final class ClassMap implements StatusCodeExtractionStrategy
     /**
      * @var array<string, int>
      */
-    private $conversionMap;
+    private array $conversionMap;
 
     /**
      * @param array<string, int> $conversionMap
diff --git a/tests/ErrorConversionMiddlewareTest.php b/tests/ErrorConversionMiddlewareTest.php
@@ -29,15 +29,8 @@
  */
 final class ErrorConversionMiddlewareTest extends TestCase
 {
-    /**
-     * @var ResponseFactory
-     */
-    private $responseFactory;
-
-    /**
-     * @var ClassMap
-     */
-    private $statusCodeExtractor;
+    private ResponseFactory $responseFactory;
+    private ClassMap $statusCodeExtractor;
 
     /**
      * @before
diff --git a/tests/ErrorLoggingMiddlewareTest.php b/tests/ErrorLoggingMiddlewareTest.php
@@ -20,7 +20,7 @@ final class ErrorLoggingMiddlewareTest extends TestCase
     /**
      * @var LoggerInterface&MockObject
      */
-    private $logger;
+    private LoggerInterface $logger;
 
     /**
      * @before

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,7 @@`
`12`	`12`
`13`	`13`	`final class ErrorLoggingMiddleware implements MiddlewareInterface`
`14`	`14`	`{`
`15`		`- /**`
`16`		`- * @var LoggerInterface`
`17`		`- */`
`18`		`- private $logger;`
	`15`	`+ private LoggerInterface $logger;`
`19`	`16`
`20`	`17`	`public function __construct(LoggerInterface $logger)`
`21`	`18`	`{`