Merge master into bucket/order_modifiers_coupons_fees

.github/actions/process-changelog/action.yml

@@ -0,0 +1,52 @@
+name: "Process the changelog"
+description: "Generate or amend the changelog entries"
+
+inputs:
+  release-version:
+    description: "The release version for which the action should generate the changelog (e.g. 4.5.0)"
+    required: true
+  release-date:
+    description: "The release date (format: YYYY-MM-DD) for which the action should generate the changelog (default: unreleased)"
+    required: false
+    default: "unreleased"
+  action-type:
+    description: 'Whether this is to generate or amend the changelog entries (generate or amend)'
+    required: false
+    default: "generate"
+
+outputs:
+  changelog:
+    description: "The escaped changelog content"
+    value: ${{ steps.process_changelog.outputs.CHANGELOG }}
+
+runs:
+  using: composite
+  steps:
+    - name: "Verify the action type"
+      id: verify_action_type
+      if: ${{ inputs.action-type == 'generate' }}
+      shell: bash
+      env:
+        RELEASE_VERSION: ${{ inputs.release-version }}
+        RELEASE_DATE: ${{ inputs.release-date }}
+        ACTION_TYPE: ${{ inputs.action-type }}
+      run: |
+        FINAL_RELEASE_VERSION=$(echo "$RELEASE_VERSION" | grep -Po '\d+\.\d+\.\d+(\.\d+)?') # Keep only x.y.z(.k) from x.y.z(.k)(-test-n)
+        CURRENT_RELEASE_VERSION=$(jq '.version' package.json -r)
+
+        # If the changelog directory is empty (except .gitkeep) and the final release version is already defined in package.json, we need to switch to amend
+        # This use case is mainly for the last test package created from the release branch, to avoid an empty changelog
+        if [ "$(ls -A changelog | wc -l)" -eq 1 ] && [[ "$FINAL_RELEASE_VERSION" == "$CURRENT_RELEASE_VERSION" ]]; then
+          echo "ACTION_TYPE=amend-version" >> $GITHUB_OUTPUT
+          echo "CURRENT_VERSION=$CURRENT_RELEASE_VERSION" >> $GITHUB_OUTPUT
+        fi
+
+    - name: "Process changelog for changelog.md"
+      id: process_changelog
+      shell: bash
+      env:
+        ACTION_TYPE: ${{ steps.verify_action_type.outputs.ACTION_TYPE || inputs.action-type }}
+        CURRENT_VERSION: ${{ steps.verify_action_type.outputs.CURRENT_VERSION || 'dont-care' }}
+        RELEASE_VERSION: ${{ inputs.release-version }}
+        RELEASE_DATE: ${{ inputs.release-date }}
+      run: ./bin/process-changelog.sh $RELEASE_VERSION $CURRENT_VERSION $ACTION_TYPE $RELEASE_DATE

.github/workflows/phpcs.yml

@@ -1,9 +1,45 @@
 name: 'PHPCS'
 on: [pull_request]
 jobs:
+  conditional:
+    runs-on: ubuntu-latest
+    outputs:
+      has_no_php_changes: ${{ steps.skip.outputs.has_no_php_changes }}
+    steps:
+      # ------------------------------------------------------------------------------
+      # Checkout the repo
+      # ------------------------------------------------------------------------------
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1000
+          token: ${{ secrets.GH_BOT_TOKEN }}
+          submodules: recursive
+      # ------------------------------------------------------------------------------
+      # Check if any PHP files have changed
+      # ------------------------------------------------------------------------------
+      - name: Check PHP file changes
+        id: skip
+        run: |
+          php_files=$(git diff ${{ github.event.pull_request.base.sha }} HEAD --name-only | grep -E '\.php$' || true)
+          num_php_files=$(echo "$php_files" | grep -c '^' || echo 0)
+
+          if [[ -z "$php_files" || "$num_php_files" -eq 0 ]]; then
+            echo "has_no_php_changes=1" >> $GITHUB_OUTPUT
+            echo "## No PHP files changed" >> $GITHUB_STEP_SUMMARY
+            echo "PHPCS will not run." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "has_no_php_changes=0" >> $GITHUB_OUTPUT
+            echo "## Found PHP file changes" >> $GITHUB_STEP_SUMMARY
+            echo "Total changed PHP files: $num_php_files" >> $GITHUB_STEP_SUMMARY
+            echo "$php_files" | sed 's/^/- /' >> $GITHUB_STEP_SUMMARY
+          fi
   phpcs:
+    needs:
+      - conditional
+    if: needs.conditional.outputs.has_no_php_changes == '0'
     uses: stellarwp/github-actions/.github/workflows/phpcs.yml@main
     with:
       ref: ${{ github.event.inputs.ref }}
     secrets:
-      access-token: ${{ secrets.GH_BOT_TOKEN }}
+      access-token: ${{ secrets.GH_BOT_TOKEN }}

.github/workflows/process-changelog.yml

@@ -0,0 +1,140 @@
+name: "Release - Changelog"
+
+# This action will run when it is triggered manually
+on:
+  workflow_dispatch:
+    inputs:
+      release-version:
+        description: "The release version for which the action should process the changelog (e.g. 4.5.0) (default: will try to figure it out)"
+        default: 'figure-it-out'
+        required: true
+        type: string
+      release-date:
+        description: "The release date in human-readable format (default: 'today')."
+        required: false
+        default: "today"
+        type: string
+      action-type:
+        description: "Whether this is to amend or generate the changelog entries (default: 'generate')."
+        required: true
+        default: "generate"
+        type: choice
+        options:
+          - amend
+          - generate
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  process-changelog:
+    name: "Process the changelog"
+    runs-on: ubuntu-latest
+    env:
+      CHANGELOG_ACTION: ${{ inputs.action-type }}
+      RELEASE_VERSION: ${{ inputs.release-version }}
+      RELEASE_DATE: ${{ inputs.release-date }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+          fetch-depth: 0
+
+      - name: Configure PHP environment
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+
+      - name: Set up Composer
+        run: composer install
+
+      - name: Set Variables
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
+
+      - name: Set up Git configuration
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "github-actions"
+
+      - name: Check for .puprc file and paths.versions
+        id: check-puprc
+        run: |
+          if [ ! -f ".puprc" ]; then
+            echo "Error: .puprc file not found" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          if ! jq -e '.paths.versions' .puprc > /dev/null; then
+            echo "Error: paths.versions not found in .puprc" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+
+      - name: Figure out Version
+        id: figure_out_version
+        run: |
+          if [ "$RELEASE_VERSION" == "figure-it-out" ]; then
+            existing_version=""
+            while read -r version; do
+              echo "Processing version info: $version"
+              file=$(echo "$version" | jq -r '.file')
+              regex=$(echo "$version" | jq -r '.regex')
+
+              existing_version=$(grep -Po "$regex" "$file" | grep -Po '(\d+\.\d+\.\d+(\.\d+)?)')
+
+              if [ -n "$existing_version" ]; then
+                  echo "Release version: $existing_version"
+                  echo "RELEASE_VERSION=$existing_version" >> $GITHUB_OUTPUT
+                  break
+              fi
+            done < <(jq -c '.paths.versions[]' .puprc)
+          else
+            echo "Release version: $RELEASE_VERSION"
+            echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
+          fi
+
+      - name: "Format the release date"
+        id: format_date
+        run: |
+          RELEASE_DATE=$( date "+%Y-%m-%d" -d "$RELEASE_DATE" ) # Release date formatted as YYYY-MM-DD
+          echo "Release date: $RELEASE_DATE"
+          echo "RELEASE_DATE=$RELEASE_DATE" >> $GITHUB_OUTPUT
+
+      - name: Create new branch
+        id: versions
+        run: |
+          changeBranch="task/process-changelog/${{ steps.format_date.outputs.RELEASE_DATE }}/${{ steps.figure_out_version.outputs.RELEASE_VERSION }}/${{ steps.vars.outputs.sha_short }}"
+          git checkout -b "$changeBranch"
+          git push origin "$changeBranch"
+
+      - name: "Process changelog"
+        id: process_changelog
+        uses: ./.github/actions/process-changelog
+        with:
+          release-version: ${{ steps.figure_out_version.outputs.RELEASE_VERSION }}
+          release-date: ${{ steps.format_date.outputs.RELEASE_DATE }}
+          action-type: ${{ env.CHANGELOG_ACTION }}
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
+        id: cpr
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          base: ${{ github.ref }}
+          branch: "task/process-changelog/${{ steps.format_date.outputs.RELEASE_DATE }}/${{ steps.figure_out_version.outputs.RELEASE_VERSION }}/${{ steps.vars.outputs.sha_short }}"
+          title: "Process changelog for ${{ github.ref }}"
+          body: |
+            This is an automated PR created by ${{ github.actor }}.
+            It was generated by [this GitHub Action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
+          labels: "automation"
+          commit-message: |
+            Process changelog for ${{ github.ref }}
+            This is an automated PR created by ${{ github.actor }}.
+            Generated by: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      - name: Check outputs
+        if: ${{ steps.cpr.outputs.pull-request-number }}
+        run: |
+          echo "## Pull Request"  >> $GITHUB_STEP_SUMMARY
+          echo "* Number - ${{ steps.cpr.outputs.pull-request-number }}" >> $GITHUB_STEP_SUMMARY
+          echo "* URL - [${{ steps.cpr.outputs.pull-request-url }}](${{ steps.cpr.outputs.pull-request-url }})" >> $GITHUB_STEP_SUMMARY

.github/workflows/release-branch.yml

@@ -145,7 +145,7 @@ jobs:
         uses: peter-evans/create-pull-request@v6
         id: cpr
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GHA_BOT_TOKEN_MANAGER }}
           base: "${{ github.event.inputs.new-branch }}"
           branch: "task/version-bump-${{ github.event.inputs.new-branch }}-${{ steps.vars.outputs.sha_short }}"
           title: "Version bump for ${{ github.event.inputs.new-branch }}"

.phpstorm.meta.php

@@ -37,7 +37,6 @@
 			'callback'                              => \Tribe__Utils__Callback::class,
 			'pue.notices'                           => \Tribe__PUE__Notices::class,
 			'admin.notice.php.version'              => \Tribe__Admin__Notice__Php_Version::class,
-			'admin.notice.marketing'                => \Tribe__Admin__Notice__Marketing::class,
 
 			// Custom alias with tribe namespace.
 			'tooltip.view'                          => \Tribe\Tooltip\View::class,

bin/clean-composer.sh

@@ -0,0 +1,5 @@
+files=("vendor/composer/autoload_files.php" "vendor/composer/autoload_static.php")
+search="symfony/deprecation-contracts/function.php"
+for file in "${files[@]}"; do
+    grep -v "$search" "$file" > temp && mv temp "$file"
+done

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### [6.1.1] 2024-10-17
+
+* Fix - allow more svg attributes through the fields sanitization. [TEC-5282]
+
 ### [6.1.0] 2024-09-26
 
 * Feature - Update core settings functionality and styles to allow for new plugin settings layout. [TEC-5124]
@@ -13,7 +17,7 @@
 
 * Feature - Adding the method `tec_copy_to_clipboard_button` which can be used to print a button which on click would copy a text to the user's clipboard. [ET-2158]
 * Fix - Bug when term slugs were numeric.
-* Fix - Optimized prime_term_cache to return early when no posts are provided [TECTRIA-229]
+* Fix - Optimized prime_term_cache to return early when no posts are provided [TEC-5150]
 
 ### [6.0.0.2] 2024-07-24
 
@@ -42,26 +46,26 @@
 
 ### [5.3.0.5] 2024-07-11
 
-* Fix - Ensure compatibility with WordPress 6.6 for removed polyfill `regenerator-runtime`. [TECTRIA-149]
+* Fix - Ensure compatibility with WordPress 6.6 for removed polyfill `regenerator-runtime`. [TEC-5120]
 
 ### [5.3.0.4] 2024-06-18
 
-* Fix - In installations where the plugins or wp-content directories were symbolic linked, assets would fail to be located. [TECTRIA-91]
+* Fix - In installations where the plugins or wp-content directories were symbolic linked, assets would fail to be located. [TEC-5106]
 * Language - 0 new strings added, 0 updated, 0 fuzzied, and 0 obsoleted
 
 ### [5.3.0.3] 2024-06-14
 
-* Fix - Issue where scripts would not be enqueued as modules. [TECTRIA-86]
+* Fix - Issue where scripts would not be enqueued as modules. [ET-2136]
 * Language - 0 new strings added, 0 updated, 1 fuzzied, and 0 obsoleted
 
 ### [5.3.0.2] 2024-06-14
 
-* Fix - Windows Server compatibility issues with updated Assets handling. [TECTRIA-83]
+* Fix - Windows Server compatibility issues with updated Assets handling. [TEC-5104]
 * Language - 0 new strings added, 0 updated, 1 fuzzied, and 0 obsoleted
 
 ### [5.3.0.1] 2024-06-13
 
-* Fix - Issue on which some assets (css,js) would not be located in WP installs which could have some WP constant modified (WP_CONTENT_DIR, WP_PLUGIN_DIR)[TECTRIA-83]
+* Fix - Issue on which some assets (css,js) would not be located in WP installs which could have some WP constant modified (WP_CONTENT_DIR, WP_PLUGIN_DIR)[TEC-5104]
 * Language - 0 new strings added, 0 updated, 1 fuzzied, and 0 obsoleted
 
 ### [5.3.0] 2024-06-11

composer.json

@@ -25,13 +25,15 @@
     "lucatume/di52": "^3.3.7",
     "monolog/monolog": "1.24.*",
     "psr/container": "^1.0.0",
+    "stellarwp/arrays": "1.2.2",
     "stellarwp/container-contract": "^1.0.4",
     "stellarwp/db": "^1.0.3",
     "stellarwp/installer": "^1.1.0",
     "stellarwp/models": "dev-main",
     "stellarwp/schema": "^1.1.3",
     "stellarwp/telemetry": "^2.3.1",
-    "stellarwp/assets": "^1.2.6"
+    "stellarwp/assets": "^1.2.6",
+    "stellarwp/uplink": "2.2.1"
   },
   "require-dev": {
     "automattic/vipwpcs": "^3.0",
@@ -63,16 +65,24 @@
     }
   },
   "scripts": {
+    "clean-strauss-static-function-autoload": "bash bin/clean-composer.sh",
     "strauss": [
-      "test -f ./bin/strauss.phar || curl -o bin/strauss.phar -L -C - https://github.com/BrianHenryIE/strauss/releases/download/0.19.2/strauss.phar",
+      "test -f ./bin/strauss.phar || curl -o bin/strauss.phar -L -C - https://github.com/BrianHenryIE/strauss/releases/download/0.19.4/strauss.phar",
       "vendor/stellarwp/installer/bin/set-domain domain=tribe-common",
-      "@php bin/strauss.phar"
+      "@php -d display_errors=on bin/strauss.phar",
+      "@composer dump-autoload",
+      "@clean-strauss-static-function-autoload"
     ],
     "post-install-cmd": [
-      "@strauss"
+      "@strauss",
+      "@stellar-uplink"
     ],
     "post-update-cmd": [
-      "@strauss"
+      "@strauss",
+      "@stellar-uplink"
+    ],
+    "stellar-uplink": [
+      "vendor/bin/stellar-uplink domain=tribe-common"
     ]
   },
   "extra": {
@@ -82,12 +92,15 @@
       "classmap_prefix": "TEC__Common__",
       "constant_prefix": "TEC_COMMON_",
       "packages": [
+        "stellarwp/arrays",
+        "stellarwp/assets",
         "stellarwp/container-contract",
         "stellarwp/db",
         "stellarwp/models",
         "stellarwp/schema",
         "stellarwp/installer",
         "stellarwp/telemetry",
+        "stellarwp/uplink",
         "lucatume/di52",
         "monolog/monolog",
         "firebase/php-jwt",