Merge branch 'cleanup'

Author: lkrms

.github/workflows/ci.yml

@@ -40,6 +40,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      # PHP 8.3 is needed to parse DNF types in test fixtures, and
+      # php-cs-fixer doesn't support PHP 8.4
       - name: Setup PHP and Composer
         uses: shivammathur/setup-php@v2
         with:
@@ -81,7 +83,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.3"
+          - "8.4"
           - "7.4"
 
     runs-on: ubuntu-latest
@@ -136,8 +138,10 @@ jobs:
           - windows-latest
           - macos-latest
         php-version:
-          - "8.3"
+          - "8.4"
         include:
+          - os: ubuntu-latest
+            php-version: "8.3"
           - os: ubuntu-latest
             php-version: "8.2"
           - os: ubuntu-latest
@@ -201,13 +205,20 @@ jobs:
         shell: bash
         run: |
           scripts/delete-covers.php --force
-          vendor/bin/phpunit ${RUNNER_DEBUG+--debug} --no-extensions --no-coverage --coverage-clover=coverage.xml && status=0 || status=$?
-          printf 'coverage_report_generated=%d\n' "$([[ -s coverage.xml ]] && echo 1 || echo 0)" >>"$GITHUB_OUTPUT"
+          vendor/bin/phpunit ${RUNNER_DEBUG+--debug} ${RUNNER_DEBUG+--no-extensions} --no-coverage --coverage-clover=coverage.xml --log-junit=junit.xml && status=0 || status=$?
+          printf 'coverage_generated=%d\n' "$([[ -s coverage.xml ]] && echo 1 || echo 0)" >>"$GITHUB_OUTPUT"
+          printf 'results_generated=%d\n' "$([[ -s junit.xml ]] && echo 1 || echo 0)" >>"$GITHUB_OUTPUT"
           (exit $status)
 
-      - name: Upload code coverage report to Codecov
-        if: ${{ !cancelled() && steps.run-phpunit-tests.outputs.coverage_report_generated == 1 }}
-        uses: codecov/codecov-action@v4
+      - name: Upload coverage to Codecov
+        if: ${{ !cancelled() && steps.run-phpunit-tests.outputs.coverage_generated == 1 }}
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Upload test results to Codecov
+        if: ${{ !cancelled() && steps.run-phpunit-tests.outputs.results_generated == 1 }}
+        uses: codecov/test-results-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 

phpstan-baseline-7.4.neon

@@ -20,7 +20,7 @@ function run() {
 
 function run_with_php_versions() {
     local php versions=()
-    while [[ $1 == [78][0-9] ]]; do
+    while [[ -z $1 ]] || [[ $1 == [78][0-9] ]]; do
         if type -P "php$1" >/dev/null; then
             versions[${#versions[@]}]=php$1
         fi
@@ -35,10 +35,10 @@ function run_with_php_versions() {
     die "must run from root of package folder"
 
 run scripts/generate.php --check
-run tools/php-cs-fixer check --diff --verbose
+run php83 tools/php-cs-fixer check --diff --verbose
 run tools/pretty-php --diff
-run_with_php_versions 83 74 vendor/bin/phpstan
+run_with_php_versions '' 74 vendor/bin/phpstan
 run scripts/stop-mockoon.sh || (($? == 1)) || die 'error stopping mockoon'
 run scripts/start-mockoon.sh >/dev/null
 trap 'run scripts/stop-mockoon.sh' EXIT
-run_with_php_versions 83 74 82 81 80 vendor/bin/phpunit
+run_with_php_versions 84 74 83 82 81 80 vendor/bin/phpunit

phpstan-baseline-8.3.neon

@@ -5,16 +5,14 @@
 use Salient\Contract\Collection\CollectionInterface;
 
 /**
- * An array-like collection of items
- *
  * @api
  *
  * @template TKey of array-key
  * @template TValue
  *
  * @implements CollectionInterface<TKey,TValue>
  */
-final class Collection implements CollectionInterface
+class Collection implements CollectionInterface
 {
     /** @use CollectionTrait<TKey,TValue> */
     use CollectionTrait;