Add PHP 8.2 & 8.3

mayflower · Dec 8, 2023 · b860a21 · b860a21
1 parent b1e0972
commit b860a21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,6 +45,8 @@ jobs:
           - 7.4
           - 8.0
           - 8.1
+          - 8.2
+          - 8.3
         dependencies_level:
           - --prefer-lowest
           - ""
@@ -66,23 +68,23 @@ jobs:
         with:
           coverage: 'xdebug'
           php-version: ${{ matrix.php_version }}
-          extensions: ast-1.0.14
+          extensions: ast-1.1.1
       - name: Cache dependencies
         uses: actions/cache@v3
         with:
           path: '~/.cache/composer'
           key: "cache-composer-${{ hashFiles('composer.json') }}"
           restore-keys: 'cache-composer-'
       - name: Run composer
-        if: ${{ matrix.php_version != '8.0' && matrix.php_version != '8.1' }}
+        if: ${{ matrix.php_version != '8.0' && matrix.php_version != '8.1' && matrix.php_version != '8.2' && matrix.php_version != '8.3' }}
         run: composer update ${{ matrix.dependencies_level }} --prefer-dist --no-interaction --no-progress
       - name: Run composer with workaround for PHP 8 and incompatible PHPUnit
-        if: ${{ matrix.php_version == '8.0' || matrix.php_version == '8.1' }}
+        if: ${{ matrix.php_version == '8.0' || matrix.php_version == '8.1' || matrix.php_version == '8.2' || matrix.php_version == '8.3' }}
         run: composer update ${{ matrix.dependencies_level }} --ignore-platform-reqs --prefer-dist --no-interaction --no-progress
       - name: Check composer.json
         run: composer normalize --dry-run
       - name: Run tests with coverage
-        if: ${{ matrix.php_version != '8.0' && matrix.php_version != '8.1' }}
+        if: ${{ matrix.php_version != '8.0' && matrix.php_version != '8.1' && matrix.php_version != '8.2' && matrix.php_version != '8.3' }}
         run: php vendor/bin/phpunit --coverage-clover=coverage.xml
       - name: Run tests
         if: ${{ matrix.php_version == '8.0' }}
@@ -95,8 +97,10 @@ jobs:
       - name: Run PHPStan
         run: vendor/bin/phpstan analyse --no-progress
       - name: Run psalm
+        if: ${{ matrix.os != 'windows-latest' }}
         run: vendor/bin/psalm --show-info=true
       - name: Run phan
+        if: ${{ matrix.os != 'windows-latest' }}
         run: vendor/bin/phan
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3

diff --git a/composer.json b/composer.json
@@ -31,12 +31,12 @@
     },
     "require-dev": {
         "ergebnis/composer-normalize": ">=2.19 <2.30",
-        "phan/phan": "^5.1.0",
+        "phan/phan": "^5.4.2",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpunit/phpunit": "^7.0",
-        "psalm/plugin-phpunit": "^0.17",
-        "vimeo/psalm": "^4.5.2"
+        "psalm/plugin-phpunit": "^0.18",
+        "vimeo/psalm": "^4.30"
     },
     "config": {
         "allow-plugins": {