Merge branch 'master' into master

.github/workflows/pr_tests.yml

@@ -9,26 +9,23 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- phpunit_version: [10]
- php_version: ["8.1", "8.2", "latest"]
- include:
- - phpunit_version: "9"
- php_version: "8.0"
+ php_version: ["7.4", "8.0", "8.1", "8.2", "latest"]
 
  runs-on: ubuntu-latest
 
  steps:
  - uses: actions/checkout@v3
 
+ - name: Setup PHP
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: ${{ matrix.php_version }}
+ coverage: xdebug
+
  - name: Install PHP Packages
- uses: php-actions/composer@v6
+ run: composer install --no-progress
 
  - name: Run Tests
- uses: php-actions/phpunit@v3
  env:
  XDEBUG_MODE: coverage
- with:
- version: ${{ matrix.phpunit_version }}
- php_version: ${{ matrix.php_version }}
- php_extensions: "xdebug"
- coverage_clover: "build/logs/clover.xml"
+ run: ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml

composer.json

@@ -15,7 +15,7 @@
  }
  ],
  "require": {
- "php": "^8.0"
+ "php": "^7.0|^8.0"
  },
  "require-dev": {
  "phpunit/phpunit": "^9|^10",