Allow PHP 8.2, drop PHP 8.0

Slamdunk · Dec 12, 2022 · bf32b39 · bf32b39
1 parent f3fa53f
commit bf32b39
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 38 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -42,8 +42,8 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
           - "8.1"
+          - "8.2"
         dependencies:
           - "highest"
 
@@ -69,6 +69,9 @@ jobs:
           key: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: ${{ runner.os }}-php-${{ matrix.php-version }}-${{ matrix.dependencies }}-composer-
 
+      - name: "Remove PHP-CS-Fixer not ready for PHP 8.2 yet"
+        run: "composer remove --dev slam/php-cs-fixer-extensions"
+
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}
         run: "composer update --no-interaction --no-progress --prefer-lowest"
@@ -89,7 +92,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -117,7 +120,7 @@ jobs:
         run: "composer update --no-interaction --no-progress"
 
       - name: "Run tests"
-        timeout-minutes: 3
+        timeout-minutes: 10
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
 
       - name: "Send code coverage report to Codecov.io"
@@ -135,7 +138,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"
@@ -172,7 +175,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout"

diff --git a/Makefile b/Makefile
@@ -2,12 +2,12 @@ all: csfix static-analysis test
 	@echo "Done."
 
 vendor: composer.json
-	composer update
+	composer update --ignore-platform-req=php
 	touch vendor
 
 .PHONY: csfix
 csfix: vendor
-	vendor/bin/php-cs-fixer fix --verbose
+	php8.1 vendor/bin/php-cs-fixer fix --verbose
 
 .PHONY: static-analysis
 static-analysis: vendor

diff --git a/composer.json b/composer.json
@@ -18,41 +18,39 @@
         }
     ],
     "require": {
-        "php": "~8.0.0 || ~8.1.0",
+        "php": "~8.1.0 || ~8.2.0",
         "phpstan/phpstan": "^1.9.2"
     },
     "require-dev": {
-        "laminas/laminas-cache": "^3.8.0",
+        "laminas/laminas-cache": "^3.9.0",
         "laminas/laminas-cache-storage-adapter-memory": "^2.2.0",
-        "laminas/laminas-filter": "^2.28.1",
-        "laminas/laminas-form": "^3.7.0",
-        "laminas/laminas-hydrator": "^4.8.0",
-        "laminas/laminas-i18n": "^2.19.0",
+        "laminas/laminas-filter": "^2.29.0",
+        "laminas/laminas-form": "^3.8.0",
+        "laminas/laminas-hydrator": "^4.10.0",
+        "laminas/laminas-i18n": "^2.21.0",
         "laminas/laminas-inputfilter": "^2.22.1",
         "laminas/laminas-log": "^2.16.0",
-        "laminas/laminas-mail": "^2.20.0",
-        "laminas/laminas-mvc": "^3.5.0",
-        "laminas/laminas-paginator": "^2.15.1",
+        "laminas/laminas-mail": "^2.21.0",
+        "laminas/laminas-mvc": "^3.6.0",
+        "laminas/laminas-paginator": "^2.17.0",
         "laminas/laminas-validator": "^2.28.0",
-        "malukenho/mcbumpface": "^1.1.5",
         "phpstan/phpstan-deprecation-rules": "^1.0.0",
-        "phpstan/phpstan-phpunit": "^1.2.2",
-        "phpunit/phpunit": "^9.5.26",
-        "slam/php-cs-fixer-extensions": "^v3.2.1",
+        "phpstan/phpstan-phpunit": "^1.3.0",
+        "phpunit/phpunit": "^9.5.27",
         "slam/php-debug-r": "^v1.7.0"
     },
     "conflict": {
-        "laminas/laminas-cache": "<3.1",
-        "laminas/laminas-filter": "<2.14",
-        "laminas/laminas-form": "<3.1",
-        "laminas/laminas-hydrator": "<4.3",
-        "laminas/laminas-i18n": "<2.15",
-        "laminas/laminas-inputfilter": "<2.13",
-        "laminas/laminas-log": "<2.15",
-        "laminas/laminas-mail": "<2.16",
-        "laminas/laminas-mvc": "<3.3",
-        "laminas/laminas-paginator": "<2.12",
-        "laminas/laminas-validator": "<2.17"
+        "laminas/laminas-cache": "<3.9",
+        "laminas/laminas-filter": "<2.29",
+        "laminas/laminas-form": "<3.8",
+        "laminas/laminas-hydrator": "<4.10",
+        "laminas/laminas-i18n": "<2.21",
+        "laminas/laminas-inputfilter": "<2.22",
+        "laminas/laminas-log": "<2.16",
+        "laminas/laminas-mail": "<2.21",
+        "laminas/laminas-mvc": "<3.6",
+        "laminas/laminas-paginator": "<2.17",
+        "laminas/laminas-validator": "<2.28"
     },
     "autoload": {
         "psr-4": {
@@ -64,11 +62,6 @@
             "tests/"
         ]
     },
-    "config": {
-        "allow-plugins": {
-            "malukenho/mcbumpface": true
-        }
-    },
     "extra": {
         "phpstan": {
             "includes": [

diff --git a/tests/LaminasIntegration/data/stdlibArrayObjectCrate-2.json b/tests/LaminasIntegration/data/stdlibArrayObjectCrate-2.json
@@ -1,6 +1,6 @@
 [
     {
-        "message": "Call to an undefined method Laminas\\Stdlib\\ArrayObject::foo().",
+        "message": "Call to an undefined method Laminas\\Stdlib\\ArrayObject<*NEVER*, *NEVER*>::foo().",
         "line": 15,
         "ignorable": true
     }