Merge pull request #341 from mimmi20/updates

upgrade to PHP 8.3

Author: mimmi20

.codeclimate.yml

@@ -1,21 +1,21 @@
 version: "2"
 checks:
   argument-count:
-    enabled: true
+    enabled: false
   complex-logic:
-    enabled: true
+    enabled: false
   file-lines:
     enabled: false
   method-complexity:
-    enabled: true
+    enabled: false
   method-count:
-    enabled: true
+    enabled: false
   method-lines:
-    enabled: true
+    enabled: false
   nested-control-flow:
     enabled: true
   return-statements:
-    enabled: true
+    enabled: false
   similar-code:
     enabled: false
   identical-code:

.github/workflows/continuous-integration.yml

@@ -19,7 +19,7 @@ jobs:
   validate:
     name: "Validate Project"
 
-    uses: "mimmi20/ci/.github/workflows/validate.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/validate.yml@8.3"
     with:
       extensions: "ctype, curl, dom, iconv, intl, mbstring, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
@@ -37,7 +37,7 @@ jobs:
 
     needs: "validate"
 
-    uses: "mimmi20/ci/.github/workflows/install.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/install.yml@8.3"
     with:
       extensions: "ctype, curl, dom, iconv, intl, mbstring, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
@@ -50,7 +50,7 @@ jobs:
 
     needs: "install"
 
-    uses: "mimmi20/ci/.github/workflows/analytics.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/analytics.yml@8.3"
     with:
       extensions: "ctype, curl, dom, iconv, intl, mbstring, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"
@@ -59,7 +59,7 @@ jobs:
       skip-phpcs: false
       skip-phpstan: false
       skip-rector: false
-      skip-phpmd: false
+      skip-phpmd: true
       skip-eslint: true
       skip-stylelint: true
       skip-prettier: true
@@ -70,7 +70,7 @@ jobs:
 
     needs: "analytics"
 
-    uses: "mimmi20/ci/.github/workflows/test.yml@8.1"
+    uses: "mimmi20/ci/.github/workflows/test.yml@8.3"
     with:
       extensions: "ctype, dom, fileinfo, intl, simplexml, tokenizer, xml, xmlwriter"
       ini-values: "opcache.enable=1, opcache.fast_shutdown=0, zend.assertions=1, assert.exception=On, intl.default_locale=de, intl.use_exceptions=1, zend.exception_ignore_args=0"

.php-cs-fixer.php

@@ -11,10 +11,12 @@
 
 declare(strict_types = 1);
 
-$header = <<<'EOF'
+$year = date('Y');
+
+$header = <<<EOF
     This file is part of the mimmi20/mezzio-generic-authorization-rbac package.
 
-    Copyright (c) 2020-2024, Thomas Mueller <[email protected]>
+    Copyright (c) 2020-{$year}, Thomas Mueller <[email protected]>
 
     For the full copyright and license information, please view the LICENSE
     file that was distributed with this source code.

codecov.yml

@@ -2,12 +2,16 @@ codecov:
   require_ci_to_pass: false
   notify:
     wait_for_ci: false
+
+coverage:
   status:
     project:
-      default:
+      default:   # default is the status check's name, not default settings
         target: 100%
         threshold: 1%
+        if_ci_failed: success #success, failure, error, ignore
         informational: true
+        only_pulls: false
     patch:
       default:
         informational: true

composer.json

@@ -23,7 +23,7 @@
     "source": "https://github.com/mimmi20/mezzio-generic-authorization"
   },
   "require": {
-    "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+    "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
     "mezzio/mezzio-authentication": "^1.10.0",
     "mezzio/mezzio-router": "^3.18.0",
     "psr/container": "^1.1.2 || ^2.0.2",
@@ -40,17 +40,17 @@
     "ext-xml": "*",
     "ext-xmlwriter": "*",
     "infection/infection": "^0.29.8",
-    "laminas/laminas-servicemanager": "^4.3.0",
-    "mimmi20/coding-standard": "^5.2.45",
+    "laminas/laminas-servicemanager": "^3.23.0",
+    "mimmi20/coding-standard": "^6.0.0",
     "nikic/php-parser": "^5.3.1",
     "phpstan/extension-installer": "^1.4.3",
     "phpstan/phpstan": "^1.12.9",
     "phpstan/phpstan-deprecation-rules": "^1.2.1",
     "phpstan/phpstan-phpunit": "^1.4.0",
-    "phpunit/phpunit": "^10.5.26",
+    "phpunit/phpunit": "^11.4.4",
     "rector/rector": "^1.2.10",
     "rector/type-perfect": "^1.0.0",
-    "symfony/process": "^6.4.15",
+    "symfony/process": "^7.2.0",
     "symplify/phpstan-rules": "^13.0.1",
     "tomasvotruba/cognitive-complexity": "^0.2.3",
     "tomasvotruba/type-coverage": "^1.0.0",

phpmd.ruleset.xml

@@ -1,6 +1,8 @@
 parameters:
   level: max
 
+  phpVersion: 80300 # PHP 8.3
+
   parallel:
     maximumNumberOfProcesses: 1
     processTimeout: 200.0
@@ -99,9 +101,10 @@ parameters:
     function: 16
 
   type_coverage:
-    return: 100
-    param: 100
-    property: 100
+    return_type: 100
+    param_type: 100
+    property_type: 100
+    constant_type: 100
     # also, how many files has declare strict types
     declare: 100
 

phpstan.neon

@@ -9,12 +9,14 @@
     beStrictAboutCoverageMetadata="false"
     beStrictAboutOutputDuringTests="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
+    displayDetailsOnPhpunitDeprecations="true"
     displayDetailsOnTestsThatTriggerWarnings="true"
     displayDetailsOnTestsThatTriggerNotices="true"
     displayDetailsOnTestsThatTriggerErrors="true"
     displayDetailsOnTestsThatTriggerDeprecations="true"
     displayDetailsOnSkippedTests="true"
     displayDetailsOnIncompleteTests="true"
+    failOnPhpunitDeprecation="true"
     failOnEmptyTestSuite="true"
     failOnIncomplete="true"
     failOnRisky="true"
@@ -51,7 +53,7 @@
         </testsuite>
     </testsuites>
 
-    <coverage includeUncoveredFiles="true">
+    <coverage>
         <report>
             <clover outputFile=".reports/clover.xml"/>
             <html outputDirectory=".reports/report/" lowUpperBound="50" highLowerBound="80"/>

phpunit.xml

@@ -30,7 +30,7 @@
 
     $rectorConfig->sets([
         SetList::DEAD_CODE,
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_83,
         PHPUnitSetList::PHPUNIT_100,
     ]);
 

rector.php

@@ -16,6 +16,7 @@
 use InvalidArgumentException;
 use Mezzio\Authentication\UserInterface;
 use Mezzio\Router\RouteResult;
+use Override;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -25,18 +26,19 @@
 use function count;
 use function sprintf;
 
-final class AuthorizationMiddleware implements MiddlewareInterface
+final readonly class AuthorizationMiddleware implements MiddlewareInterface
 {
     /** @throws void */
     public function __construct(
-        private readonly AuthorizationInterface $authorization,
-        private readonly ResponseFactoryInterface $responseFactory,
-        private readonly string | null $defaultPrivilege,
+        private AuthorizationInterface $authorization,
+        private ResponseFactoryInterface $responseFactory,
+        private string | null $defaultPrivilege,
     ) {
         // nothing to do
     }
 
     /** @throws Exception\RuntimeException */
+    #[Override]
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $user = $request->getAttribute(UserInterface::class);