Version 3.x prep. PHP 8.2 now min version

Author: rotexdegba

.github/workflows/php.yml

@@ -16,19 +16,19 @@ jobs:
 
     strategy:
         matrix:
-            php: [8.3, 8.2, 8.1]
+            php: [8.5, 8.4, 8.3, 8.2]
 # prefer-lowest is causing unit tests to fail when php 7.2 is run against PHPunit 7.x, 
 # PHPUnit 8.x is the latest stable release that supports PHP 7.2 and that runs fine
 #            dependency-version: [prefer-lowest, prefer-stable]
             dependency-version: [prefer-stable]
-            os: [ubuntu-20.04, ubuntu-22.04]
-            include:
-                - os: ubuntu-20.04
-                  php: 8.1
-                - os: ubuntu-22.04
-                  php: 8.1
-                - os: ubuntu-22.04
-                  php: 8.2
+            os: [ubuntu-latest]
+#            include:
+#                - os: ubuntu-20.04
+#                  php: 8.1
+#                - os: ubuntu-22.04
+#                  php: 8.1
+#                - os: ubuntu-22.04
+#                  php: 8.2
             #exclude:
                 #- os: ubuntu-20.04
                 #  php: 7.3

README.md

@@ -36,6 +36,7 @@ These are the branches in this repository:
 
 - **main:** contains code for the latest major version of this package
 - **1.x:** contains code for the **1.x** version of this package
+- **2.x:** contains code for the **1.x** version of this package
 
 ## Introduction
 

composer.json

@@ -11,13 +11,13 @@
         }
     ],
     "require": {
-        "php": ">=8.1.0"
+        "php": ">=8.2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.0",
+        "phpunit/phpunit": "^11.0",
         "php-coveralls/php-coveralls": "^2.0",
-        "rector/rector": "^1.0.0",
-        "vimeo/psalm": "^5.4"
+        "vimeo/psalm": "^6.0",
+        "rector/rector": "^2.0.17"
     },
     "autoload": {
         "classmap": [ "src/" ]
@@ -32,7 +32,7 @@
             "vendor/bin/phpunit --coverage-text"
         ],
         "rector-clear": "vendor/bin/rector --clear-cache",
-        "rector": "vendor/bin/rector process src --dry-run -vvv",
+        "rector": "vendor/bin/rector process src --dry-run",
         "psalm-clear-cache": "vendor/bin/psalm --clear-global-cache && vendor/bin/psalm --clear-cache",
         "psalm": "composer psalm-clear-cache && vendor/bin/psalm --threads=1",
         "qa": "composer test && composer rector && composer psalm"

rector.php

@@ -19,8 +19,9 @@
     $rectorConfigurator->import(SetList::PHP_74);
     $rectorConfigurator->import(SetList::PHP_80);
     $rectorConfigurator->import(SetList::PHP_81);
+    $rectorConfigurator->import(SetList::PHP_82);
     $rectorConfigurator->import(SetList::DEAD_CODE);
-    //$rectorConfigurator->import(SetList::PSR_4);
+    $rectorConfigurator->import(SetList::CODE_QUALITY);
     $rectorConfigurator->import(SetList::TYPE_DECLARATION);
 
     $rectorConfigurator->skip([

src/CallableExecutionTimer.php

@@ -6,6 +6,7 @@
 /**
  * A class that can be used to call any function or method while tracking the execution time of each call
  * 
+ * @psalm-suppress ClassMustBeFinal
  * @psalm-suppress MixedAssignment
  * 
  * 
@@ -74,6 +75,7 @@ public function getCalleeBacktraceData(): array {
      * 
      * @throws \Exception from ObjectifiedCallable::__call
      */
+    #[\Override]
     public function __call(string $method, array $args): mixed {
 
         if($this->calleeBacktraceData === []) {
@@ -101,6 +103,7 @@ public function __call(string $method, array $args): mixed {
      * 
      * @return mixed result returned from executing function / method registered on an instance of this class
      */
+    #[\Override]
     public function __invoke(array $args): mixed {
 
         $argsCopy = [];

src/Utils.php

@@ -5,6 +5,8 @@
 
 /**
  * Description of Utils
+ * 
+ * @psalm-suppress ClassMustBeFinal
  *
  * @author Rotimi Ade
  */