Merge pull request #31 from netlogix/feature/typo3-v13-update

Author: saschanowak

.editorconfig

@@ -3,61 +3,17 @@
 # top-most EditorConfig file
 root = true
 
-# Unix-style newlines with a newline ending every file
 [*]
 charset = utf-8
 end_of_line = lf
-indent_style = space
 indent_size = 4
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
+max_line_length = 180
 
-# TS/JS-Files
-[*.{ts,js}]
-indent_size = 2
-
-# JSON-Files
-[*.json]
-indent_style = tab
-
-# ReST-Files
-[*.{rst,rst.txt}]
-indent_size = 4
-max_line_length = 80
-
-# Markdown-Files
-[*.md]
-max_line_length = 80
-
-# YAML-Files
-[*.{yaml,yml}]
-indent_size = 2
-
-# NEON-Files
-[*.neon]
-indent_size = 2
-indent_style = tab
-
-# package.json
-[package.json]
-indent_size = 2
-
-# TypoScript
-[*.{typoscript,tsconfig}]
-indent_size = 2
-
-# XLF-Files
-[*.xlf]
-indent_style = tab
-
-# SQL-Files
-[*.sql]
-indent_style = tab
-indent_size = 2
-
-# .htaccess
-[{_.htaccess,.htaccess}]
-indent_style = tab
+[*.php]
+max_line_length = 115
 
-[*.csv]
-insert_final_newline = false
+[{*.yml,*.yaml}]
+indent_size = 2

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+## code changes will send PR to following users
+* @saschanowak
+* @tweis

.github/workflows/apply-coding-standard.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - main
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   php-coding-standard:
     name: 'Apply PHP Coding Standard'
@@ -16,7 +20,7 @@ jobs:
       - name: 'Setup PHP'
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version-file: '.phprc'
           tools: composer
 
       - name: 'Get Composer Cache Directory'
@@ -37,25 +41,35 @@ jobs:
 
       - name: 'Rector PHP Code'
         shell: bash
-        run: composer rector-fix
+        run: composer rector:fix
+
+      - name: 'Normalize Composer files'
+        shell: bash
+        run: composer composer:normalize:fix
+
+      - name: 'PHP syntax checker'
+        shell: bash
+        run: composer php:lint
+
+      - name: 'Prettier'
+        shell: bash
+        continue-on-error: true
+        run: ./prettier.sh --write
+
+      - name: 'Run PHPUnit unit tests'
+        shell: bash
+        run: composer test:unit
 
-      - name: 'Lint PHP Code'
+      - name: 'Run PHPUnit functional tests'
         shell: bash
-        run: composer lint-fix
+        run: composer test:functional
 
       - name: 'Create pull-request'
-        uses: peter-evans/create-pull-request@v6.0.2
+        uses: peter-evans/create-pull-request@v7
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "[automated] Apply Coding Standard"
-          base: 'main'
+          commit-message: 'refactor: Apply Coding Standard'
           branch: 'automated-apply-coding-standards'
           title: '[automated] Apply Coding Standard'
           labels: 'automated'
           delete-branch: true
-
-      - name: 'Enable Pull Request Merge when ready'
-        if: steps.cpr.outputs.pull-request-operation == 'created'
-        run: gh pr merge --auto "${{ steps.cpr.outputs.pull-request-number }}"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -1,6 +1,17 @@
 name: Test TYPO3 Extension
 
-on: [ push, pull_request ]
+# Make sure only one build is running per branch at a time
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 
 permissions:
   contents: read
@@ -9,13 +20,12 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-latest
-    name: TYPO3 ${{ matrix.typo3}} tests on PHP ${{ matrix.php }}
+    name: TYPO3 v13.4 tests on PHP ${{ matrix.php }}
 
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2 ]
-        typo3: [ 12.4 ]
+        php: [8.3, 8.4]
 
     steps:
       - name: 'Checkout code'
@@ -39,46 +49,45 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: composer-php${{ matrix.php }}-typo3${{ matrix.typo3 }}
+          key: composer-php${{ matrix.php }}
 
       - name: 'Validate composer.json and composer.lock'
         shell: bash
         run: composer validate --strict
 
-      - name: 'Install TYPO3 core'
+      - name: 'Install Composer Dependencies'
         shell: bash
-        run: composer require typo3/cms-core="^${{ matrix.typo3 }}" -W
+        run: composer install --no-interaction
 
       - name: 'PHPUnit unit tests'
         shell: bash
-        run: composer test-unit
+        run: composer test:unit
 
       - name: 'PHPUnit functional tests'
         shell: bash
-        run: composer test-functional
+        run: composer test:functional
 
-      # merge result files from unit tests and functional tests
       - name: 'Merge Coverage Reports'
         shell: bash
-        run: .Build/bin/phpcov merge --php .Build/logs/coverage.php --html .Build/logs/coverage/merged --cobertura .Build/logs/cobertura.xml .Build/logs/coverage/
+        run: .Build/bin/phpcov merge --html .Build/artifacts/coverage/merged --clover .Build/artifacts/coverage/clover.xml .Build/artifacts/coverage/
 
-      # finally use the cobertura report and generate coverage summary
-      - name: 'Code Coverage Summary Report'
-        uses: irongut/[email protected]
+      - name: 'Generate code coverage summary report'
+        uses: saschanowak/[email protected]
         with:
-          filename: .Build/logs/cobertura.xml
-          badge: true
-          # there are not enough tests yet
-          fail_below_min: false
-          format: markdown
-          hide_branch_rate: true
-          hide_complexity: false
-          indicators: true
-          output: both
-          thresholds: '60 80'
-
-      - name: Add Coverage PR Comment
+          filename: .Build/artifacts/coverage/clover.xml
+
+      - name: 'Add code coverage summary as action run comment'
+        run: |
+          cat code-coverage-summary.md >> $GITHUB_STEP_SUMMARY
+          cat code-coverage-details.md >> $GITHUB_STEP_SUMMARY
+
+      - name: 'Add title to code coverage summary'
+        shell: bash
+        run: sed -i '1 i\## TYPO3 v13.4 tests on PHP ${{ matrix.php }}' code-coverage-summary.md
+
+      - name: 'Add code coverage summary as pr comment'
         uses: marocchino/sticky-pull-request-comment@v2
         with:
+          header: coverage-${{ matrix.php }}
           recreate: true
-          path: code-coverage-results.md
+          path: code-coverage-summary.md

.gitignore

@@ -1,6 +1,5 @@
 .Build/
 .idea/
-Build/testing-docker/.env
 composer.lock
 .phpunit.result.cache
-var
+var

.phprc

@@ -0,0 +1 @@
+8.3

.prettierrc.json

@@ -0,0 +1,15 @@
+{
+    "arrowParens": "avoid",
+    "quoteProps": "consistent",
+    "printWidth": 180,
+    "singleQuote": true,
+    "overrides": [
+        {
+            "files": ["*.php"],
+            "options": {
+                "printWidth": 115,
+                "plugins": ["@prettier/plugin-php"]
+            }
+        }
+    ]
+}