Update CI (#660)

Author: kubawerlos

.dev-tools/infection.json

@@ -72,7 +72,6 @@
         "LogicalLowerOr": true,
         "LogicalOr": true,
         "MBString": true,
-        "MethodCallRemoval": true,
         "MinusEqual": true,
         "ModEqual": true,
         "Modulus": true,

.dev-tools/src/InfectionConfigBuilder.php

@@ -31,6 +31,7 @@ final class InfectionConfigBuilder
         'LessThanOrEqualTo',
         'LogicalAnd',
         'LogicalNot',
+        'MethodCallRemoval',
         'Minus',
         'NotIdentical',
         'NotIdenticalNotEqual',

.github/workflows/ci.yaml

@@ -10,99 +10,57 @@ jobs:
     env:
       PHP_CS_FIXER_IGNORE_ENV: 1
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+      - uses: actions/checkout@v2
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: '8.1'
-          coverage: none
-
-      - name: Install dependencies
-        run: composer update --no-progress
-
-      - name: Analyse
-        run: composer analyse
+      - run: composer update --no-progress
+      - run: composer analyse
 
   test:
     strategy:
       fail-fast: false
       matrix:
         os: [ macos-latest, ubuntu-latest, windows-latest ]
-        php-version: [ '7.4', '8.0' ]
+        php-version: [ '7.4', '8.1' ]
         include:
-          - os: ubuntu-latest
-            php-version: '8.1'
-          - os: ubuntu-latest
-            php-version: '7.3'
           - os: ubuntu-latest
             php-version: '7.2'
+            composer_flags: '--prefer-lowest'
           - os: ubuntu-latest
             php-version: '7.2'
-            composer_flags: '--prefer-lowest'
-
+          - os: ubuntu-latest
+            php-version: '7.3'
+          - os: ubuntu-latest
+            php-version: '8.0'
     runs-on: ${{ matrix.os }}
-
     env:
       PHP_CS_FIXER_FUTURE_MODE: 1
-
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Get code coverage driver
-        uses: actions/github-script@v5
+      - uses: actions/checkout@v2
+      - uses: actions/github-script@v5
         id: coverage-driver
         with:
-          script: 'return "${{ matrix.os }}" == "ubuntu-latest" && "${{ matrix.php-version }}" == "8.0" ? "pcov" : "none"'
+          script: 'return "${{ matrix.os }}" == "ubuntu-latest" && "${{ matrix.php-version }}" == "8.1" ? "pcov" : "none"'
           result-encoding: string
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
           ini-values: pcov.directory=$GITHUB_WORKSPACE
           coverage: ${{ steps.coverage-driver.outputs.result }}
-
-      - name: Get Composer data directory
-        id: composer-data
-        run: echo '::set-output name=dir::$(composer config data-dir)'
-
-      - name: Cache Composer data
-        uses: actions/[email protected]
-        with:
-          path: ${{ steps.composer-data.outputs.dir }}
-          key: ${{ runner.os }}-composer-data-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-data-
-
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo '::set-output name=dir::$(composer config cache-files-dir)'
-
-      - name: Cache dependencies
-        uses: actions/[email protected]
+      - id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-cache-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-cache-
-
-      - name: Install dependencies
-        run: composer update --no-progress ${{ matrix.composer_flags }}
-
-      - name: Run tests
-        run: composer test -- --coverage-clover=./build/logs/clover.xml
-
-      - name: Upload coverage results to Coveralls
-        if: steps.coverage-driver.outputs.result != 'none'
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+      - run: composer update --no-progress ${{ matrix.composer_flags }}
+      - run: composer test -- --coverage-clover=./build/logs/clover.xml
+      - if: steps.coverage-driver.outputs.result != 'none'
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          composer require --dev php-coveralls/php-coveralls --quiet --with-all-dependencies
-          ./vendor/bin/php-coveralls --verbose || true
-
-      - name: Run Infection
-        if: steps.coverage-driver.outputs.result != 'none'
-        run: composer infection
+        run: composer require --dev php-coveralls/php-coveralls --quiet --with-all-dependencies && ./vendor/bin/php-coveralls --verbose
+      - if: steps.coverage-driver.outputs.result != 'none'
         env:
           STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
+        run: composer infection