From 72df71b637afa9b497eba8caccf77fc53dd15462 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 22 Aug 2022 09:16:34 +0200 Subject: [PATCH 1/4] cover php 8.2 in CI --- .github/workflows/phpstan.yml | 9 +++++++++ .github/workflows/tests.yml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 359f612d0..55266b392 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -40,6 +40,15 @@ jobs: reflector: "mysqli" mode: "recording" + - php-version: "8.2" + db-image: 'mysql:8.0' + reflector: "mysqli" + mode: "recording" + - php-version: '8.2' + db-image: 'mariadb:latest' + reflector: "mysqli" + mode: "recording" + - php-version: "8.1" db-image: 'mysql:8.0' reflector: "mysqli" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 438cf3787..0d7d1aa90 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,6 +42,15 @@ jobs: reflector: "mysqli" mode: "recording" + - php-version: "8.2" + db-image: 'mysql:8.0' + reflector: "mysqli" + mode: "recording" + - php-version: '8.2' + db-image: 'mariadb:latest' + reflector: "mysqli" + mode: "recording" + - php-version: "8.1" db-image: 'mysql:8.0' reflector: "pdo-mysql" From f087e0d1b319c8cddb7d4f366c15a8e49013d25c Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 22 Aug 2022 09:30:04 +0200 Subject: [PATCH 2/4] Update tests.yml --- .github/workflows/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0d7d1aa90..7fa72527a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,6 +81,8 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none + # ignore php8.2 requirement error https://github.com/sebastianbergmann/phpunit/issues/5033 + composer-options: "--ignore-platform-req=php+" - uses: "ramsey/composer-install@v2" with: @@ -128,6 +130,8 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none + # ignore php8.2 requirement error https://github.com/sebastianbergmann/phpunit/issues/5033 + composer-options: "--ignore-platform-req=php+" - uses: "ramsey/composer-install@v2" with: From a12a9b232f53465a151332101c9cbdadfc302094 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 22 Aug 2022 09:34:52 +0200 Subject: [PATCH 3/4] typo --- .github/workflows/tests.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7fa72527a..fe21e4f48 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,12 +81,11 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - # ignore php8.2 requirement error https://github.com/sebastianbergmann/phpunit/issues/5033 - composer-options: "--ignore-platform-req=php+" - uses: "ramsey/composer-install@v2" with: - composer-options: "--prefer-dist --no-progress" + # ignore php8.2 requirement error https://github.com/sebastianbergmann/phpunit/issues/5033 + composer-options: "--prefer-dist --no-progress --ignore-platform-req=php+" - name: Setup Problem Matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" @@ -130,12 +129,11 @@ jobs: with: php-version: "${{ matrix.php-version }}" coverage: none - # ignore php8.2 requirement error https://github.com/sebastianbergmann/phpunit/issues/5033 - composer-options: "--ignore-platform-req=php+" - uses: "ramsey/composer-install@v2" with: - composer-options: "--prefer-dist --no-progress" + # ignore php8.2 requirement error https://github.com/sebastianbergmann/phpunit/issues/5033 + composer-options: "--prefer-dist --no-progress --ignore-platform-req=php+" - name: Setup Problem Matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" From 69bc9a0bbe1dde8d16987f3c1626374574678b56 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 22 Aug 2022 09:40:55 +0200 Subject: [PATCH 4/4] Restore phpstan.yml --- .github/workflows/phpstan.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 55266b392..359f612d0 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -40,15 +40,6 @@ jobs: reflector: "mysqli" mode: "recording" - - php-version: "8.2" - db-image: 'mysql:8.0' - reflector: "mysqli" - mode: "recording" - - php-version: '8.2' - db-image: 'mariadb:latest' - reflector: "mysqli" - mode: "recording" - - php-version: "8.1" db-image: 'mysql:8.0' reflector: "mysqli"