diff --git a/.github/workflows/test-config.yml b/.github/workflows/test-config.yml index d752146..e5f805b 100644 --- a/.github/workflows/test-config.yml +++ b/.github/workflows/test-config.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: true matrix: - php: [ '7.4', '8.0', '8.1' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] l5-swagger-flags: ['latest', 'swagger-php-3', 'swagger-ui-3'] name: PHP ${{ matrix.php }} - ${{ matrix.l5-swagger-flags }} @@ -64,7 +64,7 @@ jobs: curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter chmod +x ./cc-test-reporter ./cc-test-reporter before-build - if: matrix.php == '8.1' && matrix.l5-swagger-flags == 'latest' + if: matrix.php == '8.3' && matrix.l5-swagger-flags == 'latest' - name: Run test suite run: composer run-script phpunit @@ -77,10 +77,12 @@ jobs: cp ${{github.workspace}}/tests/storage/logs/test-reports/clover.xml ${{github.workspace}}/clover.xml ./cc-test-reporter after-build -t clover --exit-code 0 bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r ${{github.workspace}}/clover.xml - if: matrix.php == '8.1' && matrix.l5-swagger-flags == 'latest' + if: matrix.php == '8.3' && matrix.l5-swagger-flags == 'latest' && github.event_name != 'pull_request' - name: Publish coveralls report env: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: vendor/bin/php-coveralls --coverage_clover=clover.xml -v - if: matrix.php == '8.1' && matrix.l5-swagger-flags == 'latest' + run: | + cp ${{github.workspace}}/tests/storage/logs/test-reports/clover.xml ${{github.workspace}}/clover.xml + vendor/bin/php-coveralls --coverage_clover=clover.xml -v + if: matrix.php == '8.3' && matrix.l5-swagger-flags == 'latest' diff --git a/Dockerfile b/Dockerfile index 6df5a79..5d0203b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Base install # -FROM amd64/php:8.1-apache as base +FROM amd64/php:8.2-apache as base LABEL vendor="L5 Swagger" diff --git a/composer.json b/composer.json index 6564e6e..41c53fc 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "php": "^7.2 || ^8.0", - "laravel/framework": "^10.0 || ^9.0 || >=8.40.0 || ^7.0", + "laravel/framework": "^11.0 || ^10.0 || ^9.0 || >=8.40.0 || ^7.0", "zircote/swagger-php": "^3.2.0 || ^4.0.0", "swagger-api/swagger-ui": "^3.0 || >=4.1.3", "symfony/yaml": "^5.0 || ^6.0 || ^7.0", @@ -28,9 +28,9 @@ "doctrine/annotations": "^1.0 || ^2.0" }, "require-dev": { - "phpunit/phpunit": "^10.0 || ^9.5", + "phpunit/phpunit": "^11.0 || ^10.0 || ^9.5", "mockery/mockery": "1.*", - "orchestra/testbench": "^8.0 || 7.* || ^6.15 || 5.*", + "orchestra/testbench": "^9.0 || ^8.0 || 7.* || ^6.15 || 5.*", "php-coveralls/php-coveralls": "^2.0" }, "autoload": { diff --git a/phpunit.xml b/phpunit.xml index 11e592b..378379b 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,27 +1,28 @@ - - - - src/ - - - - - - - - tests/ - - - - - - + + + + + + + + tests/ + + + + + + + + + src/ + +