[TASK] Remove support for v11.5 and add support for v13.0 (#22)

Additionally: - Add PHP 8.3 to workflow matrix - Use "ubuntu-latest" instead of "ubuntu-22.04" to avoid problems in the future - Update "actions/checkout" to version 4 - Update dev dependencies
TYPO3-Documentation · Apr 19, 2024 · 8a80ffb · 8a80ffb
1 parent 9c4c470
commit 8a80ffb
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 65 deletions.
diff --git a/.github/workflows/cgl.yml b/.github/workflows/cgl.yml
@@ -9,44 +9,46 @@ on:
 jobs:
   lint:
     name: Linting
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php:
-          # Testing with PHP 7.4 and PHP8.0 is not done by intention. The codesnippet package needs to
-          # handle PHP code and features only available in PHP8.1, thus this is the minimum version we
-          # can test.
           - '8.1'
           - '8.2'
+          - '8.3'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Lint PHP
         run: Build/Scripts/runTests.sh -p ${{ matrix.php }} -s lint
 
   code-quality:
     name: Code Quality
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           # Testing with PHP 7.4 and PHP8.0 is not done by intention. The codesnippet package needs to
           # handle PHP code and features only available in PHP8.1, thus this is the minimum version we
           # can test.
           - php: '8.1'
-            core: '11.5'
-          - php: '8.1'
-            core: '12.0'
+            core: '12.4'
           - php: '8.2'
-            core: '12.0'
-          - php: '8.1'
-            core: 'main'
+            core: '12.4'
+          - php: '8.3'
+            core: '12.4'
           - php: '8.2'
+            core: '13.0'
+          - php: '8.3'
+            core: '13.0'
+          - php: '8.2'
+            core: 'main'
+          - php: '8.3'
             core: 'main'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install testing system
         run: Build/Scripts/runTests.sh -t ${{ matrix.core }} -p ${{ matrix.php }} -s composerUpdate
@@ -62,10 +64,10 @@ jobs:
 
   xliff-lint:
     name: "XLIFF linter"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: "XLIFF lint"
         uses: TYPO3-Continuous-Integration/TYPO3-CI-Xliff-Lint@v1
diff --git a/.github/workflows/tests-11.5.yml b/.github/workflows/tests-11.5.yml
diff --git a/.github/workflows/tests-12.4.yml b/.github/workflows/tests-12.4.yml
@@ -0,0 +1,27 @@
+name: tests 12.4
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron:  '56 4 * * *'
+
+jobs:
+  unit:
+    name: Unit Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php:
+          - '8.1'
+          - '8.2'
+          - '8.3'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install testing system
+        run: Build/Scripts/runTests.sh -t 12.4 -p ${{ matrix.php }} -s composerUpdate
+
+      - name: Unit Tests
+        run: Build/Scripts/runTests.sh -t 12.4 -p ${{ matrix.php }} -s unit
diff --git a/.github/workflows/tests-12.0.yml → .github/workflows/tests-13.0.yml b/.github/workflows/tests-12.0.yml → .github/workflows/tests-13.0.yml
@@ -1,26 +1,26 @@
-name: tests 12.0
+name: tests 13.0
 
 on:
   push:
   pull_request:
   schedule:
     - cron:  '56 4 * * *'
-    
+
 jobs:
   unit:
     name: Unit Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php:
-          - '8.1'
           - '8.2'
+          - '8.3'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install testing system
-        run: Build/Scripts/runTests.sh -t 12.0 -p ${{ matrix.php }} -s composerUpdate
+        run: Build/Scripts/runTests.sh -t 13.0 -p ${{ matrix.php }} -s composerUpdate
 
       - name: Unit Tests
-        run: Build/Scripts/runTests.sh -t 12.0 -p ${{ matrix.php }} -s unit
+        run: Build/Scripts/runTests.sh -t 13.0 -p ${{ matrix.php }} -s unit
diff --git a/.github/workflows/tests-main.yml b/.github/workflows/tests-main.yml
@@ -5,22 +5,22 @@ on:
   pull_request:
   schedule:
     - cron:  '56 4 * * *'
-    
+
 jobs:
   unit:
     name: Unit Tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php:
-          - '8.1'
           - '8.2'
+          - '8.3'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install testing system
         run: Build/Scripts/runTests.sh -t main -p ${{ matrix.php }} -s composerUpdate
 
       - name: Unit Tests
-        run: Build/Scripts/runTests.sh -t main -p ${{ matrix.php }} -s unit
+        run: Build/Scripts/runTests.sh -t main -p ${{ matrix.php }} -s unit
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
@@ -67,11 +67,11 @@ Options:
         Example -e "-v --filter canRetrieveValueWithGP" to enable verbose output AND filter tests
         named "canRetrieveValueWithGP"
 
-    -t <11.5|12.0|main>
+    -t <12.4|13.0|main>
         Only with -s composerUpdate
         Specifies the TYPO3 core major version to be used
-            - 11.5 (default): use TYPO3 core v10
-            - 12.0: use TYPO3 core v12.0
+            - 12.4 (default): use TYPO3 core v12
+            - 13.0: use TYPO3 core v13.0
             - main: use TYPO3 core main
 
     -x
@@ -156,7 +156,7 @@ while getopts ":s:p:t:e:xynhuv" OPT; do
             ;;
         t)
             TYPO3_VERSION=${OPTARG}
-            if ! [[ ${TYPO3_VERSION} =~ ^(11.5|12.0|main)$ ]]; then
+            if ! [[ ${TYPO3_VERSION} =~ ^(12.4|13.0|main)$ ]]; then
                 INVALID_OPTIONS+=("t ${OPTARG}")
             fi
             ;;
@@ -166,7 +166,7 @@ while getopts ":s:p:t:e:xynhuv" OPT; do
             ;;
         p)
             PHP_VERSION=${OPTARG}
-            if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2)$ ]]; then
+            if ! [[ ${PHP_VERSION} =~ ^(8.1|8.2|8.3)$ ]]; then
                 INVALID_OPTIONS+=("p ${OPTARG}")
             fi
             ;;

diff --git a/Tests/Unit/Service/ClassDocsHelperTest.php b/Tests/Unit/Service/ClassDocsHelperTest.php
@@ -48,6 +48,8 @@ protected function setUp(): void
                 'MY_CONSTANT', 'myVariable', 'createMyFirstObject',
             ],
         ];
+
+        parent::setUp();
     }
     public function testExtractPhpDomainCreatesClass(): void
     {

diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
 	"require": {
 		"php": "^8.1",
 		"symfony/console": "^6.4 || ^7.0",
-		"typo3/cms-core": "^11.5 || ^12.4 || dev-main"
+		"typo3/cms-core": "^12.4 || ^13.0 || dev-main"
 	},
 	"require-dev": {
-		"ergebnis/composer-normalize": "^2.28",
-		"typo3/coding-standards": "^0.5.5",
-		"typo3/testing-framework": "~7.0@dev"
+		"ergebnis/composer-normalize": "^2.42",
+		"typo3/coding-standards": "^0.7.1",
+		"typo3/testing-framework": "^8.0"
 	},
 	"autoload": {
 		"psr-4": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,8 @@ protected function setUp(): void @@
                     'MY_CONSTANT', 'myVariable', 'createMyFirstObject',
                 ],
             ];
+            parent::setUp();
         }
         public function testExtractPhpDomainCreatesClass(): void
         {
@@ Expand Down @@