Merge pull request #139 from imbo/php83-and-more

Bump dependencies and library requirements

.github/CONTRIBUTING.md

@@ -15,9 +15,9 @@ After this has been started you can execute the test suites by running:
     ./vendor/bin/behat --strict
     ./vendor/bin/phpunit
 
-Psalm is used for static code analysis:
+[PHPStan](https://phpstan.org/) is used for static code analysis:
 
-    vendor/bin/psalm
+    vendor/bin/phpstan
 
 ## Documentation
 

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['8.1', '8.2']
+        php: ['8.3', '8.4']
     name: Validate and test on PHP ${{ matrix.php }}
     steps:
       - uses: actions/checkout@v4
@@ -51,10 +51,12 @@ jobs:
         run: vendor/bin/behat --strict
 
       - name: Run static code analysis
-        run: vendor/bin/psalm
+        run: vendor/bin/phpstan
 
       - name: Check coding standard
         run: php-cs-fixer fix --dry-run --diff
+        env:
+          PHP_CS_FIXER_IGNORE_ENV: 1
 
       - uses: actions/upload-artifact@v4
         if: always()

.readthedocs.yaml

@@ -0,0 +1,12 @@
+version: 2
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.12"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+    - requirements: docs/requirements.txt

ChangeLog.md

@@ -1,6 +1,13 @@
 Changelog for Behat API Extension
 =================================
 
+v6.0.0
+------
+__N/A__
+
+* [#139](https://github.com/imbo/behat-api-extension/pull/139): Require PHP >= 8.3
+- [#138](https://github.com/imbo/behat-api-extension/pull/138): Support for PHP 8.4 ([@LenaDooms](https://github.com/LenaDooms))
+
 v5.0.0
 ------
 __2023-03-27__

composer.json

@@ -19,23 +19,24 @@
     "issues": "https://github.com/imbo/behat-api-extension/issues"
   },
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.3",
     "ext-json": "*",
     "beberlei/assert": "^3.3",
     "behat/behat": "^3.8",
     "firebase/php-jwt": "^6.4",
     "guzzlehttp/guzzle": "^7.3"
   },
   "require-dev": {
-    "alexeyshockov/guzzle-psalm-plugin": "^1.0",
     "imbo/imbo-coding-standard": "^2.0",
-    "phpunit/phpunit": "^10.0",
-    "psalm/plugin-phpunit": "^0.18.4",
+    "phpstan/extension-installer": "^1.4",
+    "phpstan/phpstan": "^2.1",
+    "phpstan/phpstan-deprecation-rules": "^2.0",
+    "phpstan/phpstan-phpunit": "^2.0",
+    "phpunit/phpunit": "^11.5",
     "slim/psr7": "^1.3",
     "slim/slim": "^4.7",
-    "symfony/process": "^6.2",
-    "tuupola/slim-basic-auth": "^3.3",
-    "vimeo/psalm": "^5.8"
+    "symfony/process": "^7.2",
+    "tuupola/slim-basic-auth": "^3.3"
   },
   "autoload": {
     "psr-4": {
@@ -61,12 +62,15 @@
     "phpunit": "vendor/bin/phpunit",
     "phpunit:coverage": "vendor/bin/phpunit --coverage-html build/coverage",
     "behat": "vendor/bin/behat --strict",
-    "sa": "vendor/bin/psalm",
+    "sa": "vendor/bin/phpstan",
     "cs": "php-cs-fixer fix --dry-run --diff",
     "dev": "php -S localhost:8080 -t ./features/bootstrap > server.log 2>&1",
     "docs": "cd docs; make html"
   },
   "config": {
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "phpstan/extension-installer": true
+    }
   }
 }