Merge branch 'master' into polyfill-php80

nanasess · Dec 18, 2024 · 0c29710 · 0c29710
2 parents 24941e2 + 88f0721
commit 0c29710
Show file tree

Hide file tree

Showing 20 changed files with 1,589 additions and 1,338 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -105,7 +105,7 @@ jobs:
         mv data/config/config.php.bak data/config/config.php
 
     - name: Upload coverage
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         files: ./coverage1.xml,./coverage2.xml,./coverage3.xml
         token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
         "nanasess/eccube2-fixture-generator": "^2.0",
         "phpdocumentor/reflection-docblock": "~5.5.1",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^9.6",
         "symfony/yaml": "^5.4 || ^6.4"
     },