Merge branch 'main' into tinymce

OpenMage · Oct 30, 2024 · f3bc8d2 · f3bc8d2
2 parents 09586ab + 6654db1
commit f3bc8d2
Show file tree

Hide file tree

Showing 322 changed files with 5,345 additions and 484 deletions.
diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml
@@ -12,6 +12,9 @@ on:
       php:
         description: "Count changed PHP files"
         value: ${{ jobs.check.outputs.php }}
+      phtml:
+        description: "Count changed Template files"
+        value: ${{ jobs.check.outputs.phtml }}
       xml:
         description: "Count changed XML files"
         value: ${{ jobs.check.outputs.xml }}
@@ -44,6 +47,7 @@ jobs:
       composer: ${{ steps.changes-composer.outputs.composer }}
       js: ${{ steps.changes-js.outputs.js }}
       php: ${{ steps.changes-php.outputs.php }}
+      phtml: ${{ steps.all.outputs.phtml }}
       xml: ${{ steps.changes-xml.outputs.xml }}
       workflow: ${{ steps.changes-workflow.outputs.workflow }}
       phpcs: ${{ steps.changes-phpcs.outputs.phpcs }}
@@ -77,6 +81,7 @@ jobs:
             composer.*
             *.php
             **/*.php
+            **/*.phtml
             **/*.xml
             **/*.js
             .github/workflows/**
@@ -113,6 +118,14 @@ jobs:
           echo "$count PHP file(s) changed"
           echo "php=$count" >> $GITHUB_OUTPUT
 
+      - name: Check if Template files changed
+        id: changes-phtml
+        if: steps.changed-files-specific.outputs.any_modified == 'true'
+        run: |
+          count="$(grep -oE "*.phtml" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          echo "$count Template file(s) changed"
+          echo "phtml=$count" >> $GITHUB_OUTPUT
+
       - name: Check if XML files changed
         id: changes-xml
         if: steps.changed-files-specific.outputs.any_modified == 'true'

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -7,6 +7,7 @@ on:
       - 'composer.json'
       - 'composer.lock'
       - '**.php'
+      - '**.phtml'
       - '**.js'
       - '**.xml'
       - '.php-cs-fixer.dist.php'
@@ -22,6 +23,7 @@ on:
       - 'composer.json'
       - 'composer.lock'
       - '**.php'
+      - '**.phtml'
       - '**.js'
       - '**.xml'
       - '.php-cs-fixer.dist.php'
@@ -87,6 +89,7 @@ jobs:
     needs: [check, composer]
     if: |
       needs.check.outputs.php > 0 ||
+      needs.check.outputs.phtml > 0 ||
       needs.check.outputs.phpstan > 0 ||
       needs.check.outputs.composer > 0 ||
       needs.check.outputs.workflow > 0