From 1b4a1c465de57489016e30e94b0173d0396db853 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sun, 29 May 2022 16:30:34 +0100
Subject: [PATCH 01/41] First implementation of release builder workflow

---
 .github/workflows/release.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..ac1cae35d58
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,35 @@
+name: Release builder
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  release_build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Checkout repository"
+      uses: actions/checkout@master
+    - name: "Composer install"
+      uses: MilesChou/composer-action@master
+      with:
+        args: install --ignore-platform-reqs
+    - name: "Move Pelago_Emogrifier to /lib"
+      run: "mkdir -p lib/Pelago/Emogrifier; cp -R vendor/pelago/emogrifier/src/* lib/Pelago/Emogrifier/"
+    - name: "Move Cm_RedisSession to /lib and /app"
+      run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
+    - name: "Create Cm_RedisSession in app/etc/modules"
+      run: "echo '<config><modules><Cm_RedisSession><active>false</active><codePool>community</codePool></Cm_RedisSession></modules></config>'>app/etc/modules/Cm_RedisSession.xml"
+    - name: "Move Cm_Cache_Backend_Redis /lib"
+      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
+    - name: "Cleanup"
+      run: "git checkout composer.json composer.lock app/Mage.php; sudo rm -rf root vendor"
+    - name: "Create ZIP file"
+      run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x ".git/*"
+    - name: "Attach ZIP to GitHub release"
+      uses: svenstaro/upload-release-action@master
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: openmage-${{ github.event.release.tag_name }}.zip
+        tag: ${{ github.event.release.tag_name }}
+        overwrite: true

From 57baeb1fe49903751c59d9441694c25a6e1c6471 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sun, 29 May 2022 17:47:12 +0100
Subject: [PATCH 02/41] Removed Pelago_Emogrifier since it had to be removed
 from the composer.json

---
 .github/workflows/release.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac1cae35d58..0c3b0bea6e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,8 +14,6 @@ jobs:
       uses: MilesChou/composer-action@master
       with:
         args: install --ignore-platform-reqs
-    - name: "Move Pelago_Emogrifier to /lib"
-      run: "mkdir -p lib/Pelago/Emogrifier; cp -R vendor/pelago/emogrifier/src/* lib/Pelago/Emogrifier/"
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 3d85cc186d83847acd85ce59fc9711f0185435e6 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:11:31 +0100
Subject: [PATCH 03/41] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c3b0bea6e7..1642d840f53 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     - name: "Composer install"
       uses: MilesChou/composer-action@master
       with:
-        args: install --ignore-platform-reqs
+        args: install
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 8b28f327e2e7966c3247c1e31d297f5324b28ece Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:21:24 +0100
Subject: [PATCH 04/41] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1642d840f53..0c3b0bea6e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     - name: "Composer install"
       uses: MilesChou/composer-action@master
       with:
-        args: install
+        args: install --ignore-platform-reqs
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 5f12b109b0be09a12e7c41cab81a8e42dec7e4b9 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:24:12 +0100
Subject: [PATCH 05/41] Update release.yml

---
 .github/workflows/release.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c3b0bea6e7..3ce8e29fe3f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,9 +11,7 @@ jobs:
     - name: "Checkout repository"
       uses: actions/checkout@master
     - name: "Composer install"
-      uses: MilesChou/composer-action@master
-      with:
-        args: install --ignore-platform-reqs
+      uses: MilesChou/composer-action/8.0/install@master
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From db99d92e450aa11ac63313f613072e69aeb609a0 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:31:06 +0100
Subject: [PATCH 06/41] Update release.yml

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ce8e29fe3f..52e7d7c17f2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,6 +12,8 @@ jobs:
       uses: actions/checkout@master
     - name: "Composer install"
       uses: MilesChou/composer-action/8.0/install@master
+      with:
+        args: --ignore-platform-reqs
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 53f53eee2cc184f80ba3ac566d260ff107d97251 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:39:18 +0100
Subject: [PATCH 07/41] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 52e7d7c17f2..a9cf30d19c0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,9 +11,9 @@ jobs:
     - name: "Checkout repository"
       uses: actions/checkout@master
     - name: "Composer install"
-      uses: MilesChou/composer-action/8.0/install@master
+      uses: MilesChou/composer-action/8.0@master
       with:
-        args: --ignore-platform-reqs
+        args: install --ignore-platform-reqs
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 21ef6754200c5ed0f088d46a1cd181b910403c24 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sun, 29 May 2022 16:30:34 +0100
Subject: [PATCH 08/41] First implementation of release builder workflow

---
 .github/workflows/release.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000000..ac1cae35d58
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,35 @@
+name: Release builder
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  release_build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: "Checkout repository"
+      uses: actions/checkout@master
+    - name: "Composer install"
+      uses: MilesChou/composer-action@master
+      with:
+        args: install --ignore-platform-reqs
+    - name: "Move Pelago_Emogrifier to /lib"
+      run: "mkdir -p lib/Pelago/Emogrifier; cp -R vendor/pelago/emogrifier/src/* lib/Pelago/Emogrifier/"
+    - name: "Move Cm_RedisSession to /lib and /app"
+      run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
+    - name: "Create Cm_RedisSession in app/etc/modules"
+      run: "echo '<config><modules><Cm_RedisSession><active>false</active><codePool>community</codePool></Cm_RedisSession></modules></config>'>app/etc/modules/Cm_RedisSession.xml"
+    - name: "Move Cm_Cache_Backend_Redis /lib"
+      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
+    - name: "Cleanup"
+      run: "git checkout composer.json composer.lock app/Mage.php; sudo rm -rf root vendor"
+    - name: "Create ZIP file"
+      run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x ".git/*"
+    - name: "Attach ZIP to GitHub release"
+      uses: svenstaro/upload-release-action@master
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: openmage-${{ github.event.release.tag_name }}.zip
+        tag: ${{ github.event.release.tag_name }}
+        overwrite: true

From 32653dc341850cafca9e827e834419cee9f4cfa3 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sun, 29 May 2022 17:47:12 +0100
Subject: [PATCH 09/41] Removed Pelago_Emogrifier since it had to be removed
 from the composer.json

---
 .github/workflows/release.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac1cae35d58..0c3b0bea6e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,8 +14,6 @@ jobs:
       uses: MilesChou/composer-action@master
       with:
         args: install --ignore-platform-reqs
-    - name: "Move Pelago_Emogrifier to /lib"
-      run: "mkdir -p lib/Pelago/Emogrifier; cp -R vendor/pelago/emogrifier/src/* lib/Pelago/Emogrifier/"
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 7e8bb3f53d35cda17c2b361e0430a243dbffc6b6 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:11:31 +0100
Subject: [PATCH 10/41] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c3b0bea6e7..1642d840f53 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     - name: "Composer install"
       uses: MilesChou/composer-action@master
       with:
-        args: install --ignore-platform-reqs
+        args: install
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 197b68bb1232fd85cb20dd5990013a1ceacc98eb Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:21:24 +0100
Subject: [PATCH 11/41] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1642d840f53..0c3b0bea6e7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
     - name: "Composer install"
       uses: MilesChou/composer-action@master
       with:
-        args: install
+        args: install --ignore-platform-reqs
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 9dd9c9d8347b78de7bbc924f5f7d82562f783555 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:24:12 +0100
Subject: [PATCH 12/41] Update release.yml

---
 .github/workflows/release.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0c3b0bea6e7..3ce8e29fe3f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,9 +11,7 @@ jobs:
     - name: "Checkout repository"
       uses: actions/checkout@master
     - name: "Composer install"
-      uses: MilesChou/composer-action@master
-      with:
-        args: install --ignore-platform-reqs
+      uses: MilesChou/composer-action/8.0/install@master
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From ed890e12ad29777159874ecfdbe724ff02bf688a Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:31:06 +0100
Subject: [PATCH 13/41] Update release.yml

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ce8e29fe3f..52e7d7c17f2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,6 +12,8 @@ jobs:
       uses: actions/checkout@master
     - name: "Composer install"
       uses: MilesChou/composer-action/8.0/install@master
+      with:
+        args: --ignore-platform-reqs
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From cfc2278457cec4824ca3adac98b03c5f8930f365 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 27 Jul 2022 14:39:18 +0100
Subject: [PATCH 14/41] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 52e7d7c17f2..a9cf30d19c0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,9 +11,9 @@ jobs:
     - name: "Checkout repository"
       uses: actions/checkout@master
     - name: "Composer install"
-      uses: MilesChou/composer-action/8.0/install@master
+      uses: MilesChou/composer-action/8.0@master
       with:
-        args: --ignore-platform-reqs
+        args: install --ignore-platform-reqs
     - name: "Move Cm_RedisSession to /lib and /app"
       run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
     - name: "Create Cm_RedisSession in app/etc/modules"

From 23bcdc938251adb9df725bb9fd0761179052a198 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Thu, 11 Aug 2022 19:41:37 +0100
Subject: [PATCH 15/41] Update release.yml

---
 .github/workflows/release.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a9cf30d19c0..493fd8a560f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,29 +5,33 @@ on:
     types: [created]
 
 jobs:
-  release_build:
-    runs-on: ubuntu-latest
+  release_build_php72:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ubuntu-18.04, ubuntu-20.04]
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
     steps:
+    - name: Install PHP ${{ matrix.php-versions }}
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-versions }}
     - name: "Checkout repository"
       uses: actions/checkout@master
     - name: "Composer install"
       uses: MilesChou/composer-action/8.0@master
       with:
         args: install --ignore-platform-reqs
-    - name: "Move Cm_RedisSession to /lib and /app"
-      run: "mkdir -p lib/Credis; cp -R vendor/colinmollenhour/credis/* lib/Credis/; mkdir -p app/code/community/Cm/RedisSession; cp -R vendor/colinmollenhour/magento-redis-session/app/code/local/Cm/RedisSession/* app/code/community/Cm/RedisSession/"
-    - name: "Create Cm_RedisSession in app/etc/modules"
-      run: "echo '<config><modules><Cm_RedisSession><active>false</active><codePool>community</codePool></Cm_RedisSession></modules></config>'>app/etc/modules/Cm_RedisSession.xml"
     - name: "Move Cm_Cache_Backend_Redis /lib"
       run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
     - name: "Cleanup"
-      run: "git checkout composer.json composer.lock app/Mage.php; sudo rm -rf root vendor"
+      run: "git checkout composer.json composer.lock; sudo rm -rf vendor"
     - name: "Create ZIP file"
-      run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x ".git/*"
+      run: zip -rq openmage-${{ github.event.release.tag_name }}-${{ matrix.php-versions }}.zip . -x ".git/*"
     - name: "Attach ZIP to GitHub release"
       uses: svenstaro/upload-release-action@master
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: openmage-${{ github.event.release.tag_name }}.zip
+        file: openmage-${{ github.event.release.tag_name }}-${{ matrix.php-versions }}.zip
         tag: ${{ github.event.release.tag_name }}
         overwrite: true

From 9d1e652be56299b26a6f1ecc6951655e23a43db3 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Thu, 11 Aug 2022 19:42:07 +0100
Subject: [PATCH 16/41] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 493fd8a560f..996cefed259 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
     types: [created]
 
 jobs:
-  release_build_php72:
+  release_build:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:

From bc5b4eba6bbd97cbdad02463f0efb11de5b3825b Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Thu, 11 Aug 2022 19:43:40 +0100
Subject: [PATCH 17/41] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 996cefed259..f8409308baf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-18.04, ubuntu-20.04]
+        operating-system: [ubuntu-20.04]
         php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
     steps:
     - name: Install PHP ${{ matrix.php-versions }}

From 5d8ac4a3df89d347b2cfefc567346de37ec13dba Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Fri, 12 Aug 2022 00:16:26 +0100
Subject: [PATCH 18/41] Update release.yml

---
 .github/workflows/release.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f8409308baf..e4ca4802dc2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,14 +18,16 @@ jobs:
         php-version: ${{ matrix.php-versions }}
     - name: "Checkout repository"
       uses: actions/checkout@master
+    - name: "Remove composer.lock"
+      run: "rm composer.lock"
     - name: "Composer install"
       uses: MilesChou/composer-action/8.0@master
       with:
         args: install --ignore-platform-reqs
-    - name: "Move Cm_Cache_Backend_Redis /lib"
-      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
+#    - name: "Move Cm_Cache_Backend_Redis /lib"
+#      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
     - name: "Cleanup"
-      run: "git checkout composer.json composer.lock; sudo rm -rf vendor"
+      run: "git checkout composer.json composer.lock"
     - name: "Create ZIP file"
       run: zip -rq openmage-${{ github.event.release.tag_name }}-${{ matrix.php-versions }}.zip . -x ".git/*"
     - name: "Attach ZIP to GitHub release"

From 598c81ca9c9d561dbd801787eb5ed5c782de152a Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Fri, 12 Aug 2022 00:20:52 +0100
Subject: [PATCH 19/41] Update release.yml

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e4ca4802dc2..18b3d4f1ab5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,8 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
+    - name: Checking PHP version
+      run: "php -v"
     - name: "Checkout repository"
       uses: actions/checkout@master
     - name: "Remove composer.lock"

From 103044c31f1c0b92c3ff31f3d5f06b3d5c44acaa Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Fri, 12 Aug 2022 00:22:30 +0100
Subject: [PATCH 20/41] Update release.yml

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 18b3d4f1ab5..b7af90e04c9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,11 +31,11 @@ jobs:
     - name: "Cleanup"
       run: "git checkout composer.json composer.lock"
     - name: "Create ZIP file"
-      run: zip -rq openmage-${{ github.event.release.tag_name }}-${{ matrix.php-versions }}.zip . -x ".git/*"
+      run: zip -rq openmage-${{ github.event.release.tag_name }}-php${{ matrix.php-versions }}.zip . -x ".git/*"
     - name: "Attach ZIP to GitHub release"
       uses: svenstaro/upload-release-action@master
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: openmage-${{ github.event.release.tag_name }}-${{ matrix.php-versions }}.zip
+        file: openmage-${{ github.event.release.tag_name }}-php${{ matrix.php-versions }}.zip
         tag: ${{ github.event.release.tag_name }}
         overwrite: true

From e14bb34272aa44f5c98cd0b7b532d792e93c7e4d Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Fri, 12 Aug 2022 00:29:13 +0100
Subject: [PATCH 21/41] Update release.yml

---
 .github/workflows/release.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b7af90e04c9..7e56875a87e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,8 +28,6 @@ jobs:
         args: install --ignore-platform-reqs
 #    - name: "Move Cm_Cache_Backend_Redis /lib"
 #      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
-    - name: "Cleanup"
-      run: "git checkout composer.json composer.lock"
     - name: "Create ZIP file"
       run: zip -rq openmage-${{ github.event.release.tag_name }}-php${{ matrix.php-versions }}.zip . -x ".git/*"
     - name: "Attach ZIP to GitHub release"

From 6af62e6382d0dfd02fa34e875af51d448886adde Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Fri, 12 Aug 2022 08:59:42 +0100
Subject: [PATCH 22/41] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7e56875a87e..d174c88b22d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
     - name: "Composer install"
       uses: MilesChou/composer-action/8.0@master
       with:
-        args: install --ignore-platform-reqs
+        args: install --ignore-platform-req=ext-*
 #    - name: "Move Cm_Cache_Backend_Redis /lib"
 #      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
     - name: "Create ZIP file"

From f6a453e3f4cfc436c3b6ac0b32f97ceb3502100f Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Tue, 16 Aug 2022 18:47:49 +0100
Subject: [PATCH 23/41] added no-dev parameter to make the release smaller

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d174c88b22d..138433287c4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
     - name: "Composer install"
       uses: MilesChou/composer-action/8.0@master
       with:
-        args: install --ignore-platform-req=ext-*
+        args: install --ignore-platform-req=ext-* --no-dev
 #    - name: "Move Cm_Cache_Backend_Redis /lib"
 #      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
     - name: "Create ZIP file"

From e8386dcf68116f885d26139e5fe3861c811cc4df Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 10:15:18 +0100
Subject: [PATCH 24/41] removed php version output, changed php versions and
 ubuntu version

---
 .github/workflows/release.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 138433287c4..e2f4b85b02f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,15 +9,13 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-20.04]
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
     steps:
     - name: Install PHP ${{ matrix.php-versions }}
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
-    - name: Checking PHP version
-      run: "php -v"
     - name: "Checkout repository"
       uses: actions/checkout@master
     - name: "Remove composer.lock"

From 51e8f9c96d19a4555c6fd45837ce0629d6ed2f1d Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 10:56:28 +0100
Subject: [PATCH 25/41] Switched deploy strategy + cleaning vendor

---
 .github/workflows/release.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e2f4b85b02f..f9d45021987 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,14 +18,16 @@ jobs:
         php-version: ${{ matrix.php-versions }}
     - name: "Checkout repository"
       uses: actions/checkout@master
-    - name: "Remove composer.lock"
-      run: "rm composer.lock"
+    - name: "Switching to composer deploy strategy copy"
+      run: sed -i 's/"magento-root-dir"/"magento-deploystrategy":"copy","magento-root-dir"/' composer.json
     - name: "Composer install"
       uses: MilesChou/composer-action/8.0@master
       with:
         args: install --ignore-platform-req=ext-* --no-dev
-#    - name: "Move Cm_Cache_Backend_Redis /lib"
-#      run: "mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/"
+    - name: "Move Cm_Cache_Backend_Redis to /lib"
+      run: mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/
+    - name: "Removing vendor folder"
+      run: rm -rf vendor
     - name: "Create ZIP file"
       run: zip -rq openmage-${{ github.event.release.tag_name }}-php${{ matrix.php-versions }}.zip . -x ".git/*"
     - name: "Attach ZIP to GitHub release"

From 5b08583a615a606de55d6dd0968d10e992a4572b Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 11:04:03 +0100
Subject: [PATCH 26/41] Added phpseclib stuff

---
 .github/workflows/release.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f9d45021987..8fd3308a1ee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,6 +26,10 @@ jobs:
         args: install --ignore-platform-req=ext-* --no-dev
     - name: "Move Cm_Cache_Backend_Redis to /lib"
       run: mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/
+    - name: "Move mcryptcompat to /lib"
+      run: mkdir -p lib/mcryptcompat; cp vendor/phpseclib/mcrypt_compat/lib/* lib/mcryptcompat/
+    - name: "Move Crypt to /lib"
+      run: mkdir -p lib/phpseclib; cp -R vendor/phpseclib/phpseclib/phpseclib/Crypt lib/phpseclib
     - name: "Removing vendor folder"
       run: rm -rf vendor
     - name: "Create ZIP file"

From 35cd0f147050e760f0bfe974c2e8d6541c8b7abc Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 11:08:38 +0100
Subject: [PATCH 27/41] reset composer.json

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8fd3308a1ee..44280e33ac6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,8 @@ jobs:
       run: mkdir -p lib/mcryptcompat; cp vendor/phpseclib/mcrypt_compat/lib/* lib/mcryptcompat/
     - name: "Move Crypt to /lib"
       run: mkdir -p lib/phpseclib; cp -R vendor/phpseclib/phpseclib/phpseclib/Crypt lib/phpseclib
+    - name: "Reset composer.json"
+      run: git checkout composer.json
     - name: "Removing vendor folder"
       run: rm -rf vendor
     - name: "Create ZIP file"

From df2ad525377ca7474510deefdee9aa7fd6072905 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 11:16:33 +0100
Subject: [PATCH 28/41] removing vendor as root

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 44280e33ac6..db510ee7b57 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
     - name: "Switching to composer deploy strategy copy"
       run: sed -i 's/"magento-root-dir"/"magento-deploystrategy":"copy","magento-root-dir"/' composer.json
     - name: "Composer install"
-      uses: MilesChou/composer-action/8.0@master
+      uses: MilesChou/composer-action/8.1@master
       with:
         args: install --ignore-platform-req=ext-* --no-dev
     - name: "Move Cm_Cache_Backend_Redis to /lib"
@@ -33,7 +33,7 @@ jobs:
     - name: "Reset composer.json"
       run: git checkout composer.json
     - name: "Removing vendor folder"
-      run: rm -rf vendor
+      run: sudo rm -rf vendor
     - name: "Create ZIP file"
       run: zip -rq openmage-${{ github.event.release.tag_name }}-php${{ matrix.php-versions }}.zip . -x ".git/*"
     - name: "Attach ZIP to GitHub release"

From 99ba78efc46db85a156fd9c95729741d946dfc50 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 12:59:46 +0100
Subject: [PATCH 29/41] added emogrifier

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index db510ee7b57..7046f1bbec6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,8 @@ jobs:
       run: mkdir -p lib/mcryptcompat; cp vendor/phpseclib/mcrypt_compat/lib/* lib/mcryptcompat/
     - name: "Move Crypt to /lib"
       run: mkdir -p lib/phpseclib; cp -R vendor/phpseclib/phpseclib/phpseclib/Crypt lib/phpseclib
+    - name: "Move Emogrifier to /lib"
+      run: mkdir -p lib/Pelago; cp -R vendor/pelago/emogrifier/src/* lib/Pelago/
     - name: "Reset composer.json"
       run: git checkout composer.json
     - name: "Removing vendor folder"

From 081d8782e931d0637b983bdfbf45b3b1dac88444 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 13:58:52 +0100
Subject: [PATCH 30/41] fixed emogrifier path

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7046f1bbec6..8a4d83db77d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
     - name: "Move Crypt to /lib"
       run: mkdir -p lib/phpseclib; cp -R vendor/phpseclib/phpseclib/phpseclib/Crypt lib/phpseclib
     - name: "Move Emogrifier to /lib"
-      run: mkdir -p lib/Pelago; cp -R vendor/pelago/emogrifier/src/* lib/Pelago/
+      run: mkdir -p lib/Pelago; cp -R vendor/pelago/emogrifier/src lib/Pelago/Emogrifier
     - name: "Reset composer.json"
       run: git checkout composer.json
     - name: "Removing vendor folder"

From 95cf9ff139aeec6c473041f2b724c92acdcf8655 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 14:14:13 +0100
Subject: [PATCH 31/41] added sabberworm

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8a4d83db77d..f084ec6a470 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,6 +32,8 @@ jobs:
       run: mkdir -p lib/phpseclib; cp -R vendor/phpseclib/phpseclib/phpseclib/Crypt lib/phpseclib
     - name: "Move Emogrifier to /lib"
       run: mkdir -p lib/Pelago; cp -R vendor/pelago/emogrifier/src lib/Pelago/Emogrifier
+    - name: "Move Sabberworm to /lib"
+      run: mkdir -p lib/Sabberworm; cp -R vendor/sabberworm/php-css-parser/src lib/Sabberworm/CSS
     - name: "Reset composer.json"
       run: git checkout composer.json
     - name: "Removing vendor folder"

From f3ec453df9afce18430cc438e2666fa68878002f Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 14:14:38 +0100
Subject: [PATCH 32/41] fixed autoloader for namespaces

---
 lib/Varien/Autoload.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Varien/Autoload.php b/lib/Varien/Autoload.php
index cb61ce45046..0998683acd8 100644
--- a/lib/Varien/Autoload.php
+++ b/lib/Varien/Autoload.php
@@ -57,6 +57,8 @@ public static function register()
      */
     public function autoload($class)
     {
-        return @include str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class))) . '.php';
+        return @include str_replace(' ', DIRECTORY_SEPARATOR, ucwords(
+            str_replace(['_', '\\'], [' ', DIRECTORY_SEPARATOR], $class)
+            )) . '.php';
     }
 }

From c5f0ace0b9ef01f6641cd166415c3f9ca90f9c57 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 3 Dec 2022 14:19:13 +0100
Subject: [PATCH 33/41] fixed phpcs

---
 lib/Varien/Autoload.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Varien/Autoload.php b/lib/Varien/Autoload.php
index 0998683acd8..c86218cd167 100644
--- a/lib/Varien/Autoload.php
+++ b/lib/Varien/Autoload.php
@@ -59,6 +59,6 @@ public function autoload($class)
     {
         return @include str_replace(' ', DIRECTORY_SEPARATOR, ucwords(
             str_replace(['_', '\\'], [' ', DIRECTORY_SEPARATOR], $class)
-            )) . '.php';
+        )) . '.php';
     }
 }

From 6797ff19e736b2ff11009721d1c7c1d27cac87d0 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sun, 4 Dec 2022 23:05:35 +0000
Subject: [PATCH 34/41] deploy strategy in composer.json + only one php version

---
 .github/workflows/release.yml | 12 ++++--------
 composer.json                 |  5 ++++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f084ec6a470..6f5d08bb83a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.3']
     steps:
     - name: Install PHP ${{ matrix.php-versions }}
       uses: shivammathur/setup-php@v2
@@ -18,8 +18,6 @@ jobs:
         php-version: ${{ matrix.php-versions }}
     - name: "Checkout repository"
       uses: actions/checkout@master
-    - name: "Switching to composer deploy strategy copy"
-      run: sed -i 's/"magento-root-dir"/"magento-deploystrategy":"copy","magento-root-dir"/' composer.json
     - name: "Composer install"
       uses: MilesChou/composer-action/8.1@master
       with:
@@ -32,18 +30,16 @@ jobs:
       run: mkdir -p lib/phpseclib; cp -R vendor/phpseclib/phpseclib/phpseclib/Crypt lib/phpseclib
     - name: "Move Emogrifier to /lib"
       run: mkdir -p lib/Pelago; cp -R vendor/pelago/emogrifier/src lib/Pelago/Emogrifier
-    - name: "Move Sabberworm to /lib"
+    - name: "Move Sabberworm (needed for Emogrifier) to /lib"
       run: mkdir -p lib/Sabberworm; cp -R vendor/sabberworm/php-css-parser/src lib/Sabberworm/CSS
     - name: "Reset composer.json"
       run: git checkout composer.json
-    - name: "Removing vendor folder"
-      run: sudo rm -rf vendor
     - name: "Create ZIP file"
-      run: zip -rq openmage-${{ github.event.release.tag_name }}-php${{ matrix.php-versions }}.zip . -x ".git/*"
+      run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x '.git/*' 'vendor/*'
     - name: "Attach ZIP to GitHub release"
       uses: svenstaro/upload-release-action@master
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: openmage-${{ github.event.release.tag_name }}-php${{ matrix.php-versions }}.zip
+        file: openmage-${{ github.event.release.tag_name }}.zip
         tag: ${{ github.event.release.tag_name }}
         overwrite: true
diff --git a/composer.json b/composer.json
index e2dd0df3719..ce043487a25 100644
--- a/composer.json
+++ b/composer.json
@@ -76,7 +76,10 @@
     "branch-alias": {
       "dev-main": "1.9.4.x-dev"
     },
-    "magento-root-dir": "."
+    "magento-root-dir": ".",
+    "magento-deploystrategy": "copy",
+    "magento-deploystrategy-dev": "symlink"
+
   },
   "config": {
     "allow-plugins": {

From bac8738a79d350f74584962b0109062bd03630cd Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sun, 4 Dec 2022 23:24:25 +0000
Subject: [PATCH 35/41] updated composer lock

---
 composer.json | 1 -
 composer.lock | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index ce043487a25..633c2072f8a 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,6 @@
     "magento-root-dir": ".",
     "magento-deploystrategy": "copy",
     "magento-deploystrategy-dev": "symlink"
-
   },
   "config": {
     "allow-plugins": {
diff --git a/composer.lock b/composer.lock
index 542e04b535b..38a16ab2a74 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d42d1f7b72063046f689a1fcb8bf3fd4",
+    "content-hash": "a52504d1b3fd25559e79fde0e4b92ecc",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-redis",

From 4e9f8724ab029ad97dadda8f00e199315422df5f Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Mon, 5 Dec 2022 09:09:07 +0000
Subject: [PATCH 36/41] now vendor is included in the zip

---
 .github/workflows/release.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6f5d08bb83a..064a6e269b4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,20 +22,8 @@ jobs:
       uses: MilesChou/composer-action/8.1@master
       with:
         args: install --ignore-platform-req=ext-* --no-dev
-    - name: "Move Cm_Cache_Backend_Redis to /lib"
-      run: mkdir -p lib/Cm/Cache/Backend; cp vendor/colinmollenhour/cache-backend-redis/Cm/Cache/Backend/* lib/Cm/Cache/Backend/
-    - name: "Move mcryptcompat to /lib"
-      run: mkdir -p lib/mcryptcompat; cp vendor/phpseclib/mcrypt_compat/lib/* lib/mcryptcompat/
-    - name: "Move Crypt to /lib"
-      run: mkdir -p lib/phpseclib; cp -R vendor/phpseclib/phpseclib/phpseclib/Crypt lib/phpseclib
-    - name: "Move Emogrifier to /lib"
-      run: mkdir -p lib/Pelago; cp -R vendor/pelago/emogrifier/src lib/Pelago/Emogrifier
-    - name: "Move Sabberworm (needed for Emogrifier) to /lib"
-      run: mkdir -p lib/Sabberworm; cp -R vendor/sabberworm/php-css-parser/src lib/Sabberworm/CSS
-    - name: "Reset composer.json"
-      run: git checkout composer.json
     - name: "Create ZIP file"
-      run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x '.git/*' 'vendor/*'
+      run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x '.git/*'
     - name: "Attach ZIP to GitHub release"
       uses: svenstaro/upload-release-action@master
       with:

From 2aac0b07bfcfac57dc60ae4efd677e6cf551933b Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Mon, 5 Dec 2022 09:10:52 +0000
Subject: [PATCH 37/41] reverted patch to autoloader

---
 lib/Varien/Autoload.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/Varien/Autoload.php b/lib/Varien/Autoload.php
index c86218cd167..cb61ce45046 100644
--- a/lib/Varien/Autoload.php
+++ b/lib/Varien/Autoload.php
@@ -57,8 +57,6 @@ public static function register()
      */
     public function autoload($class)
     {
-        return @include str_replace(' ', DIRECTORY_SEPARATOR, ucwords(
-            str_replace(['_', '\\'], [' ', DIRECTORY_SEPARATOR], $class)
-        )) . '.php';
+        return @include str_replace(' ', DIRECTORY_SEPARATOR, ucwords(str_replace('_', ' ', $class))) . '.php';
     }
 }

From 7317b5ee9eddff05ff64cf5eb89ebed5d9879b8e Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Tue, 6 Dec 2022 02:15:44 +0000
Subject: [PATCH 38/41] rewrote

---
 .github/workflows/release.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 064a6e269b4..d18fb9ca50b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,19 +12,27 @@ jobs:
         operating-system: [ubuntu-latest]
         php-versions: ['7.3']
     steps:
-    - name: Install PHP ${{ matrix.php-versions }}
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-    - name: "Checkout repository"
+    - name: Checkout repository
       uses: actions/checkout@master
-    - name: "Composer install"
-      uses: MilesChou/composer-action/8.1@master
+
+    - name: Get composer cache directory
+      id: composer-cache
+      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
       with:
-        args: install --ignore-platform-req=ext-* --no-dev
-    - name: "Create ZIP file"
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: ${{ runner.os }}-composer-
+
+    - name: Composer install
+      run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
+
+    - name: Create ZIP file
       run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x '.git/*'
-    - name: "Attach ZIP to GitHub release"
+
+    - name: Attach ZIP to GitHub release
       uses: svenstaro/upload-release-action@master
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}

From 293deb2292db31e010dd4eaff17571a90de7ec6d Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Tue, 6 Dec 2022 02:18:25 +0000
Subject: [PATCH 39/41] no-dev

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d18fb9ca50b..640090719a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         restore-keys: ${{ runner.os }}-composer-
 
     - name: Composer install
-      run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
+      run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-* --no-dev
 
     - name: Create ZIP file
       run: zip -rq openmage-${{ github.event.release.tag_name }}.zip . -x '.git/*'

From 99be3b61a7e37daef418d17a0e6e65e954c4f4d8 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 14 Dec 2022 14:43:19 +0000
Subject: [PATCH 40/41] added magento-force

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3d5cbc52ef2..fd45e8c2029 100644
--- a/composer.json
+++ b/composer.json
@@ -78,7 +78,8 @@
     },
     "magento-root-dir": ".",
     "magento-deploystrategy": "copy",
-    "magento-deploystrategy-dev": "symlink"
+    "magento-deploystrategy-dev": "symlink",
+    "magento-force": true
   },
   "config": {
     "allow-plugins": {

From 5e77c747c149bb03c65cc82d6d849801f1dde343 Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Wed, 14 Dec 2022 14:50:58 +0000
Subject: [PATCH 41/41] composer update, forced by workflow

---
 composer.lock | 128 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 88 insertions(+), 40 deletions(-)

diff --git a/composer.lock b/composer.lock
index c7bfc4b0a04..0748bc354b7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "94c136927cbd55766b8fad853056a8cc",
+    "content-hash": "487e203e3423385057b2b77ca8a2a36b",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-redis",
@@ -2118,32 +2118,35 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.13.3",
+            "version": "1.14.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
+                "reference": "9e034d7a70032d422169f27d8759e8d84abb4f51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
-                "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/9e034d7a70032d422169f27d8759e8d84abb4f51",
+                "reference": "9e034d7a70032d422169f27d8759e8d84abb4f51",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "1.*",
+                "doctrine/lexer": "^1 || ^2",
                 "ext-tokenizer": "*",
                 "php": "^7.1 || ^8.0",
                 "psr/cache": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "doctrine/cache": "^1.11 || ^2.0",
-                "doctrine/coding-standard": "^6.0 || ^8.1",
-                "phpstan/phpstan": "^1.4.10 || ^1.8.0",
-                "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
-                "symfony/cache": "^4.4 || ^5.2",
+                "doctrine/coding-standard": "^9 || ^10",
+                "phpstan/phpstan": "~1.4.10 || ^1.8.0",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "symfony/cache": "^4.4 || ^5.4 || ^6",
                 "vimeo/psalm": "^4.10"
             },
+            "suggest": {
+                "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -2185,9 +2188,52 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.13.3"
+                "source": "https://github.com/doctrine/annotations/tree/1.14.1"
             },
-            "time": "2022-07-02T10:48:51+00:00"
+            "time": "2022-12-12T12:46:12+00:00"
+        },
+        {
+            "name": "doctrine/deprecations",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/deprecations.git",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+                "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^9",
+                "phpunit/phpunit": "^7.5|^8.5|^9.5",
+                "psr/log": "^1|^2|^3"
+            },
+            "suggest": {
+                "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.",
+            "homepage": "https://www.doctrine-project.org/",
+            "support": {
+                "issues": "https://github.com/doctrine/deprecations/issues",
+                "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
+            },
+            "time": "2022-05-02T15:47:09+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -2261,31 +2307,33 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.3",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
+                "reference": "3cf140b81e55d5d640f73367d829db7e3023ef69"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
-                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/3cf140b81e55d5d640f73367d829db7e3023ef69",
+                "reference": "3cf140b81e55d5d640f73367d829db7e3023ef69",
                 "shasum": ""
             },
             "require": {
+                "doctrine/deprecations": "^1.0",
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0",
+                "doctrine/coding-standard": "^9 || ^10",
                 "phpstan/phpstan": "^1.3",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.11"
+                "psalm/plugin-phpunit": "^0.18.3",
+                "vimeo/psalm": "^4.11 || ^5.0"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                    "Doctrine\\Common\\Lexer\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2317,7 +2365,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.3"
+                "source": "https://github.com/doctrine/lexer/tree/2.0.0"
             },
             "funding": [
                 {
@@ -2333,7 +2381,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-28T11:07:21+00:00"
+            "time": "2022-12-11T10:51:23+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -2464,20 +2512,20 @@
         },
         {
             "name": "magento-ecg/coding-standard",
-            "version": "4.5.1",
+            "version": "4.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento-ecg/coding-standard.git",
-                "reference": "ab09fd7f66ac15f8cd599be5cbacabd011d42798"
+                "reference": "4269fe560c0b20b30ccfdb76b745d23f34996b0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento-ecg/coding-standard/zipball/ab09fd7f66ac15f8cd599be5cbacabd011d42798",
-                "reference": "ab09fd7f66ac15f8cd599be5cbacabd011d42798",
+                "url": "https://api.github.com/repos/magento-ecg/coding-standard/zipball/4269fe560c0b20b30ccfdb76b745d23f34996b0c",
+                "reference": "4269fe560c0b20b30ccfdb76b745d23f34996b0c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1||^8.1"
+                "php": "^7.1 || ^8.0"
             },
             "type": "phpcodesniffer-standard",
             "notification-url": "https://packagist.org/downloads/",
@@ -2495,9 +2543,9 @@
             "homepage": "https://github.com/magento-ecg/coding-standard",
             "support": {
                 "issues": "https://github.com/magento-ecg/coding-standard/issues",
-                "source": "https://github.com/magento-ecg/coding-standard/tree/4.5.1"
+                "source": "https://github.com/magento-ecg/coding-standard/tree/4.5.2"
             },
-            "time": "2022-09-02T08:03:44+00:00"
+            "time": "2022-12-06T11:33:03+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -3041,16 +3089,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.19",
+            "version": "9.2.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
+                "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3f893e19712bb0c8bc86665d1562e9fd509c4ef0",
+                "reference": "3f893e19712bb0c8bc86665d1562e9fd509c4ef0",
                 "shasum": ""
             },
             "require": {
@@ -3106,7 +3154,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.21"
             },
             "funding": [
                 {
@@ -3114,7 +3162,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-11-18T07:47:47+00:00"
+            "time": "2022-12-14T13:26:54+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -3359,16 +3407,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.26",
+            "version": "9.5.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2"
+                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2",
-                "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
+                "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
                 "shasum": ""
             },
             "require": {
@@ -3441,7 +3489,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
             },
             "funding": [
                 {
@@ -3457,7 +3505,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-28T06:00:21+00:00"
+            "time": "2022-12-09T07:31:23+00:00"
         },
         {
             "name": "psr/cache",