Merge pull request #340 from cakephp/updates

Updates

Author: dereuromark

composer.json

@@ -19,7 +19,7 @@
     },
     "require-dev": {
         "cakephp/cakephp": "^4.0",
-        "cakephp/cakephp-codesniffer": "dev-next",
+        "cakephp/cakephp-codesniffer": "^4.0",
         "phpunit/phpunit": "^8.0",
         "firebase/php-jwt": "^5.0"
     },
@@ -31,8 +31,6 @@
         "cakephp/utility": "Provides CakePHP security methods. Required for the JWT adapter and Legacy password hasher."
     },
     "license": "MIT",
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Authentication\\": "src/"
@@ -72,7 +70,7 @@
             "@phpstan",
             "@psalm"
         ],
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan-shim:^0.11 psalm/phar:^3.5 && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 psalm/phar:^3.7 && mv composer.backup composer.json",
         "test": "phpunit",
         "test-coverage": "phpunit --coverage-clover=clover.xml"
     },

phpstan.neon

@@ -1,5 +1,44 @@
 parameters:
-    level: 5
+    level: 6
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
-        - '#Result of && is always false#'
-        - '#Else branch is unreachable because ternary operator condition is always true#'
+        -
+            message: "#^Strict comparison using \\=\\=\\= between string and false will always evaluate to false\\.$#"
+            count: 1
+            path: src/Authenticator/HttpDigestAuthenticator.php
+
+        -
+            message: "#^Result of && is always false\\.$#"
+            count: 1
+            path: src/Authenticator/Result.php
+
+        -
+            message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+            count: 1
+            path: src/Authenticator/Result.php
+
+        -
+            message: "#^Result of && is always false\\.$#"
+            count: 1
+            path: src/Identity.php
+
+        -
+            message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+            count: 1
+            path: src/Identity.php
+
+        -
+            message: "#^Result of && is always false\\.$#"
+            count: 1
+            path: src/Middleware/AuthenticationMiddleware.php
+
+        -
+            message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+            count: 2
+            path: src/Middleware/AuthenticationMiddleware.php
+
+        -
+            message: "#^Method Authentication\\\\UrlChecker\\\\DefaultUrlChecker\\:\\:check\\(\\) has parameter \\$urls with no typehint specified\\.$#"
+            count: 1
+            path: src/UrlChecker/DefaultUrlChecker.php

src/Middleware/AuthenticationMiddleware.php

@@ -50,6 +50,8 @@ class AuthenticationMiddleware implements MiddlewareInterface
      *    AuthenticationComponent::allowUnauthenticated()
      * - `queryParam` - Set to true to have unauthenticated redirects contain a `redirect` query string
      *   parameter with the previously blocked URL.
+     *
+     * @var array
      */
     protected $_defaultConfig = [];
 

src/UrlChecker/DefaultUrlChecker.php

@@ -38,7 +38,7 @@ class DefaultUrlChecker implements UrlCheckerInterface
     ];
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function check(ServerRequestInterface $request, $urls, array $options = []): bool
     {