[TASK] Add PHP 8.2 to test matrix (#394)

Releases: main, 7, 6
TYPO3 · Aug 1, 2022 · 92ca043 · 92ca043
1 parent 0059255
commit 92ca043
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.1' ]
+        php: [ '8.1' , '8.2' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -22,6 +22,7 @@ jobs:
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerUpdate
 
       - name: CGL
+        if: ${{ matrix.php <= '8.1' }}
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s cgl -n
 
       - name: Lint PHP

diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
@@ -48,9 +48,10 @@ Options:
             - phpstanGenerateBaseline: regenerate phpstan baseline, handy after phpstan updates
             - unit (default): PHP unit tests
 
-    -p <8.1>
+    -p <8.1|8.2>
         Specifies the PHP minor version to be used
             - 8.1 (default): use PHP 8.1
+            - 8.2: use PHP 8.2
 
     -x
         Only with -s cgl|unit

diff --git a/Build/testing-docker/docker-compose.yml b/Build/testing-docker/docker-compose.yml
@@ -49,7 +49,12 @@ services:
           set -x
         fi
         php -v | grep '^PHP';
-        composer update --no-progress --no-interaction;
+        if [ ${DOCKER_PHP_IMAGE} = "php82" ]; then
+            # @todo: Needed until prophecy (req by phpunit) allows PHP 8.2, https://github.com/phpspec/prophecy/issues/556
+            composer update --no-progress --no-interaction --ignore-platform-req=php+
+        else
+            composer update --no-progress --no-interaction;
+        fi
       "
   lint:
     image: typo3/core-testing-${DOCKER_PHP_IMAGE}:latest