Merge pull request #16 from totten/master-sym5

PHP 8.4 - Fix sundry warnings, update some dependencies
totten · Aug 1, 2024 · 6e87d2e · 6e87d2e
2 parents 009abb4 + 32b088b
commit 6e87d2e
Show file tree

Hide file tree

Showing 8 changed files with 506 additions and 265 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,8 +12,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - php: 7.2
-            phpunit: 7
+          - php: 7.3
+            phpunit: 8
           - php: 7.4
             phpunit: 8
           - php: 8.2

diff --git a/composer.json b/composer.json
@@ -5,17 +5,16 @@
         "ext-json": "*",
         "ext-posix": "*",
         "ext-pcntl": "*",
-        "marcj/topsort": "^1.1",
-        "symfony/yaml": "~4.4",
-        "symfony/finder": "~4.4",
-        "symfony/console": "~4.4",
-        "symfony/filesystem": "~4.4",
+        "marcj/topsort": "^2.0",
+        "symfony/yaml": "~5.4",
+        "symfony/finder": "~5.4",
+        "symfony/console": "~5.4",
+        "symfony/filesystem": "~5.4",
         "symfony/event-dispatcher": "~4.4",
-        "symfony/cache": "~4.4",
+        "symfony/cache": "~5.4",
         "civicrm/composer-downloads-plugin": "~3.0",
         "lesser-evil/shell-verbosity-is-evil": "~1.0",
-        "psr/simple-cache": "^1.0",
-        "cweagans/composer-patches": "^1.7"
+        "psr/simple-cache": "^1.0"
     },
     "bin": ["bin/loco"],
     "autoload": {
@@ -28,12 +27,11 @@
     },
     "config": {
         "platform": {
-            "php": "7.1.4"
+            "php": "7.3.0"
         },
         "preferred-install": "source",
         "allow-plugins": {
-            "civicrm/composer-downloads-plugin": true,
-            "cweagans/composer-patches": true
+            "civicrm/composer-downloads-plugin": true
         }
     },
     "license": "MIT",
@@ -45,9 +43,6 @@
     ],
     "extra": {
         "patches": {
-            "marcj/topsort": {
-                "Fix PHP 8.x warnings": "patches/topsort-110-php8.diff"
-            }
         },
         "downloads": {
             "box": {