Merge branch 'b-7.1.x' into b-7.2.x

.github/workflows/dispatch_module.yml → .github/workflows/dispatch_module.yaml

@@ -26,19 +26,19 @@ jobs:
           # shellcheck disable=SC2088
           case "${{ inputs.limit }}" in
             "no") LIMIT='';;
-            "PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yml,' ;;
-            "PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yml,' ;;
-            "PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yml,' ;;
-            "PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yml,' ;;
+            "PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yaml,' ;;
+            "PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yaml,' ;;
+            "PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yaml,' ;;
+            "PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yaml,' ;;
           esac
           
           # shellcheck disable=SC2088
-          TESTPLAN="~/defaults/7.2.x.yml,${LIMIT}~/module-wysiwyg.yml,~/_custom.yml"
+          TESTPLAN="~/defaults/7.2.x.yaml,${LIMIT}~/module-wysiwyg.yaml,~/_custom.yaml"
           echo "testplan=${TESTPLAN}" | tee -a "${GITHUB_OUTPUT}"
 
   dispatch_stable:
     needs: build_testplan
-    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yml@v4
+    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
       testplan: ${{ needs.build_testplan.outputs.testplan }}
       runs_on: '"ubuntu-latest"'

.github/workflows/schedule.yml → .github/workflows/schedule.yaml

@@ -6,9 +6,9 @@ on:
 
 jobs:
   schedule_matrix:
-    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yml@v4
+    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/7.2.x.yml,~/module-wysiwyg.yml,~/_custom.yml'
+      testplan: '~/defaults/7.2.x.yaml,~/module-wysiwyg.yaml,~/_custom.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'

.github/workflows/trigger.yml → .github/workflows/trigger.yaml

@@ -3,13 +3,15 @@ name: Auto trigger on push or pull requests
 
 on:
   pull_request: {}
-  push: {}
+  push:
+    branches:
+      - 'b-7.2.x*'
 
 jobs:
   php82_mysql80:
-    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yml@v4
+    uses: oxid-eSales/github-actions/.github/workflows/universal_workflow_light.yaml@v4
     with:
-      testplan: '~/defaults/7.2.x.yml,~/defaults/php8.2_mysql8.0_only.yml,~/module-wysiwyg.yml'
+      testplan: '~/defaults/7.2.x.yaml,~/defaults/php8.2_mysql8.0_only.yaml,~/module-wysiwyg.yaml'
       runs_on: '"ubuntu-latest"'
       defaults: 'v4'
       plan_folder: '.github/oxid-esales'

CHANGELOG.md

@@ -4,20 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [4.1.0] - Unreleased
-
-### Fixed
-- Pre-filter CMS content before it is passed to Summernote editor
-
-### Added
-- `HtmlFilter` and `HtmlTagRemover` class
+## [4.2.0] - Unreleased
 
 ### Changed
 - Upgrade phpunit to 11.x
 
 ### Removed
 - Support of PHP 8.1
 
+## [4.1.0] - 2024-10-10
+
+### Fixed
+- Pre-filter CMS content before it is passed to Summernote editor
+
+### Added
+- `HtmlFilter` and `HtmlTagRemover` class
+
 ## [4.0.0] - 2024-03-12
 
 ### Changed
@@ -127,6 +129,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Smarty tags are parsed correct now
 - Correct protocol usage for image urls
 
+[4.2.0]: https://github.com/OXID-eSales/ddoe-wysiwyg-editor-module/compare/v4.1.0...b-7.2.x
+[4.1.0]: https://github.com/OXID-eSales/ddoe-wysiwyg-editor-module/compare/v4.0.0...v4.1.0
 [4.0.0]: https://github.com/OXID-eSales/ddoe-wysiwyg-editor-module/compare/v3.0.2...v4.0.0
 [3.0.2]: https://github.com/OXID-eSales/ddoe-wysiwyg-editor-module/compare/v3.0.1...v3.0.2
 [3.0.1]: https://github.com/OXID-eSales/ddoe-wysiwyg-editor-module/compare/v3.0.0...v3.0.1

README.md

@@ -10,23 +10,23 @@
 
 # Compatibility
 
+### Versions
+* versions `4.x` - compatible with OXID eShop compilation 7.1.x and higher
+* versions `3.x` - compatible with OXID eShop compilation 7.0.x
+* versions `2.x` - compatible with OXID eShop compilation 6.0.x - 6.5.x
+
 ### Branches
 * `b-7.2.x` is compatible with OXID eShop b-7.2.x branch, works with **Twig engine** only
 * `b-7.1.x` is compatible with OXID eShop b-7.1.x branch, works with **Twig engine** only
 * `b-7.0.x` is compatible with OXID eShop b-7.0.x branch and supports **Legacy Smarty engine**
 * `b-2.x` is compatible with OXID eShop compilations: 6.2.x - 6.5.x
 
-### Versions
-* versions `4.x` - compatible with OXID eShop compilation 7.1.x
-* versions `3.x` - compatible with OXID eShop compilation 7.0.x
-* versions `2.x` - compatible with OXID eShop compilation 6.0.x - 6.5.x
-
 ### Module installation via composer
 
 In order to install the module via composer run one of the following commands in commandline in your shop base directory 
 (where the shop's composer.json file resides).
-* `composer require ddoe/wysiwyg-editor-module:^3.0.0`
-  to install the latest released version compatible with OXID eShop v6.0
+* `composer require ddoe/wysiwyg-editor-module:^4.1.0`
+  to install the latest released version compatible with OXID eShop v7.1.x
 * `composer require ddoe/wysiwyg-editor-module:dev-b-7.1.x`  
   to install the specific unreleased branch
 

metadata.php

@@ -23,7 +23,7 @@
         'en' => '',
     ],
     'thumbnail'   => 'logo.png',
-    'version'     => '4.0.0',
+    'version'     => '4.1.0',
     'author'      => 'OXID eSales AG & digidesk - media solutions',
     'url'         => 'https://www.oxid-esales.com',
     'email'       => 'info@oxid-esales.com',