diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb238000a..92320f28a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: - name: "Set up PHP" uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action with: - php-version: "8.1" + php-version: "8.2" coverage: none - name: "Checkout code" @@ -41,20 +41,20 @@ jobs: run: "composer static" tests: - name: "Test: ${{ matrix.os }} / deps-${{ matrix.dependencies }}" - runs-on: "${{ matrix.os }}" + name: "Test: ${{ matrix.os }} / ${{ matrix.php }} / ${{ matrix.dependencies }}" + runs-on: "${{ matrix.os }}-latest" strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] - php: [ "8.1" ] + os: [ ubuntu, macos, windows ] + php: [ "8.1", "8.2" ] dependencies: [ lowest, highest ] steps: - name: "Install rsync" uses: GuillaumeFalourd/setup-rsync@v1.2 # https://github.com/marketplace/actions/setup-rsync - name: "Set up PHP w/ Coverage" - if: ${{ matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' }} + if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'highest' }} uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action with: php-version: "${{ matrix.php }}" @@ -62,7 +62,7 @@ jobs: ini-values: assert.active=1, assert.exception=1, zend.assertions=1 - name: "Set up PHP w/o Coverage" - if: ${{ !( matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' ) }} + if: ${{ !( matrix.os == 'ubuntu' && matrix.dependencies == 'highest' ) }} uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action with: php-version: "${{ matrix.php }}" @@ -85,12 +85,12 @@ jobs: - name: "Run core tests with coverage" run: "composer test" - if: ${{ matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' }} + if: ${{ matrix.os == 'ubuntu' && matrix.dependencies == 'highest' }} # There's no reason to generate coverage data on multiple jobs--the result should be the same. - name: "Run core tests without coverage" run: "./vendor/bin/phpunit --no-coverage --exclude-group=windows_only" - if: ${{ runner.os != 'Windows' && !( matrix.os == 'ubuntu-latest' && matrix.dependencies == 'highest' ) }} + if: ${{ runner.os != 'Windows' && !( matrix.os == 'ubuntu' && matrix.dependencies == 'highest' ) }} - name: "Run Windows tests" run: "./vendor/bin/phpunit --no-coverage --exclude-group=no_windows" @@ -98,12 +98,11 @@ jobs: performance: name: "Performance: ${{ matrix.os }}" - runs-on: "${{ matrix.os }}" + runs-on: "${{ matrix.os }}-latest" strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest ] - php: [ "8.1" ] + os: [ ubuntu, windows ] steps: - name: "Install rsync" uses: GuillaumeFalourd/setup-rsync@v1.2 # https://github.com/marketplace/actions/setup-rsync @@ -111,7 +110,7 @@ jobs: - name: "Set up PHP" uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action with: - php-version: "8.1" + php-version: "8.2" coverage: none - name: "Checkout code" @@ -130,7 +129,7 @@ jobs: - name: "Set up PHP" uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action with: - php-version: "8.1" + php-version: "8.2" extensions: gd ini-values: assert.active=1, assert.exception=1, zend.assertions=1 diff --git a/.idea/runConfigurations/PHPCS.xml b/.idea/runConfigurations/PHPCS.xml index 3dab64966..844942b7d 100644 --- a/.idea/runConfigurations/PHPCS.xml +++ b/.idea/runConfigurations/PHPCS.xml @@ -1,6 +1,6 @@ -