Modify test scripts

Author: garbast

.github/workflows/ci.yml

@@ -24,53 +24,75 @@ jobs:
 
       - name: Cleanup
         run: |
-          Build/Scripts/runTests.sh -s clean ; \
-          Build/Scripts/additionalTests.sh -s clean ; \
+          Build/Scripts/runTests.sh -s clean
+          Build/Scripts/additionalTests.sh -s clean
           git checkout composer.json
 
   testsuite:
     name: All php tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.1', '8.2' ]
         packages:
-          - core: '^12.0'
+          - php: '8.1'
+            core: '^12.0'
+            framework: 'dev-main'
+            prefer: ''
+          - php: '8.1'
+            core: '^12.0'
+            framework: 'dev-main'
+            prefer: '--prefer-lowest'
+          - php: '8.2'
+            core: '^12.0'
             framework: 'dev-main'
             prefer: ''
-          - core: '^12.0'
+          - php: '8.2'
+            core: '^12.0'
             framework: 'dev-main'
             prefer: '--prefer-lowest'
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Composer
-        run: Build/Scripts/additionalTests.sh -p ${{ matrix.php }} -s lintPhp
+      - name: Lint php
+        run: |
+          Build/Scripts/additionalTests.sh \
+            -p ${{ matrix.packages.php }} \
+            -s lintPhp
 
       - name: Composer install
-        run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s composerInstall
+        run: |
+          Build/Scripts/runTests.sh \
+            -p ${{ matrix.packages.php }} \
+            -s composerInstall
 
       - name: Composer install core
         run: |
-          Build/Scripts/additionalTests.sh -p ${{ matrix.php }} \
+          Build/Scripts/additionalTests.sh \
+            -p ${{ matrix.packages.php }} \
             -s composerInstallPackage \
-            -q "typo3/cms-core:${{ matrix.packages.core }}"
+            -q "typo3/cms-core:${{ matrix.packages.core }}" \
+            -r " ${{ matrix.packages.prefer }}"
 
       - name: Composer install framework
         run: |
-          Build/Scripts/additionalTests.sh -p ${{ matrix.php }} \
+          Build/Scripts/additionalTests.sh \
+            -p ${{ matrix.packages.php }} \
             -s composerInstallPackage \
             -q "typo3/testing-framework:${{ matrix.packages.framework }}" \
-            -o " --dev ${{ matrix.packages.prefer }}"
+            -r " --dev ${{ matrix.packages.prefer }}"
 
       - name: Composer validate
-        run: Build/Scripts/runTests.sh -s composerValidate
+        run: |
+          Build/Scripts/runTests.sh \
+            -p ${{ matrix.packages.php }} \
+            -s composerValidate
 
       - name: Cleanup
         run: |
           Build/Scripts/runTests.sh -s clean
           Build/Scripts/additionalTests.sh -s clean
+          git checkout composer.json
 
   TERUpload:
     needs: [ resources, testsuite ]