PHP 8.3 compatibility (#5)

GetDKAN · Jun 12, 2024 · 9b421c9 · 9b421c9
1 parent 8a6b992
commit 9b421c9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -154,7 +154,7 @@ jobs:
       - when:
           condition:
             and:
-              - equal: [ "8.1", <<parameters.version>> ]
+              - equal: [ "8.3", <<parameters.version>> ]
               - equal: [ "", <<parameters.install-flags>> ]
           steps:
             - run-phpunit-tests:
@@ -164,7 +164,7 @@ jobs:
           condition:
             not:
               and:
-                - equal: [ "8.1", <<parameters.version>> ]
+                - equal: [ "8.3", <<parameters.version>> ]
                 - equal: [ "", <<parameters.install-flags>> ]
           steps:
             - run-phpunit-tests:
@@ -176,5 +176,5 @@ workflows:
       - matrix-conditions:
           matrix:
             parameters:
-              version: ["7.4", "8.0", "8.1", "8.2"]
+              version: ["7.4", "8.0", "8.1", "8.2", "8.3"]
               install-flags: ["", "--prefer-lowest"]
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "getdkan/pdlt",
     "description": "PHP Date Language Tool",
-    "type": "library",
     "license": "GPL-2.0-or-later",
+    "type": "library",
     "authors": [
         {
             "name": "Clayton Liddell",
@@ -13,10 +13,10 @@
         "php": ">=7.4"
     },
     "require-dev": {
+        "drupal/coder": "^8.3.14",
         "phpunit/phpunit": "^9.6",
         "rector/rector": "^0.15.17",
-        "squizlabs/php_codesniffer": "^3.7",
-        "drupal/coder": "^8.3.14"
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "autoload": {
         "psr-4": {
@@ -28,16 +28,16 @@
             "PDLT\\Tests\\": "tests/"
         }
     },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
     "scripts": {
         "phpcbf": "./vendor/bin/phpcbf",
         "phpcs": "./vendor/bin/phpcs",
         "rector": "./vendor/bin/rector process",
         "rector-dry-run": "./vendor/bin/rector process --dry-run",
         "test": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --testsuite all --coverage-html ./coverage"
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
-        }
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.4/phpunit.xsd">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
     <coverage processUncoveredFiles="true">
         <include>
             <directory suffix=".php">src</directory>

diff --git a/rector.php b/rector.php
@@ -20,24 +20,22 @@
   $rectorConfig->paths([
     __DIR__ . '/src',
     __DIR__ . '/tests',
+    __FILE__,
   ]);
 
   $rectorConfig->rules([
     CompleteDynamicPropertiesRector::class,
   ]);
 
   $rectorConfig->sets([
+    SetList::PHP_74,
     // Please no dead code or unneeded variables.
     SetList::DEAD_CODE,
     // Try to figure out type hints.
     SetList::TYPE_DECLARATION,
     // Interestingly, LevelSetList::UP_TO_PHP_82 does not preserve PHP 7.4,
     // so we have to specify all the PHP versions leading up to it if we
     // want to keep 7.4 idioms.
-    SetList::PHP_74,
-    SetList::PHP_80,
-    SetList::PHP_81,
-    SetList::PHP_82,
   ]);
 
   $rectorConfig->skip([