Magento 2.4.6-p4, 2.4.5-p6, 2.4.4-p7

michielgerritsen · Feb 14, 2024 · 7de8e3f · 7de8e3f
1 parent 6da20c7
commit 7de8e3f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/magento-2.4.yml b/.github/workflows/magento-2.4.yml
@@ -16,6 +16,10 @@ jobs:
           - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.7-beta2, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.7-beta2, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.7-beta2, SAMPLE_DATA: true }
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p4, SAMPLE_DATA: false }
+          - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p4, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p4, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p4, SAMPLE_DATA: true }
           - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p3, SAMPLE_DATA: false }
           - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p3, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p3, SAMPLE_DATA: false }
@@ -34,6 +38,8 @@ jobs:
           - { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p6, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p6, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p5, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p5, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p4, SAMPLE_DATA: false }
@@ -46,6 +52,8 @@ jobs:
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p1, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5, SAMPLE_DATA: true }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: false }
+          - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: false }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: true }
           - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: false }

diff --git a/README.md b/README.md
@@ -82,18 +82,21 @@ Special thanks to Fooman for providing a Magento 2 mirror that does not requires
 | Magento version | PHP 8.2 | PHP 8.1 | PHP 7.4 | PHP 7.3 | PHP 7.2 |
 |-----------------|---------|---------|---------|---------|---------|
 | 2.4.7-beta2     | x       | x       | -       | -       | -       |
+| 2.4.6-p4        | x       | x       | -       | -       | -       |
 | 2.4.6-p3        | x       | x       | -       | -       | -       |
 | 2.4.6-p2        | -       | -       | -       | -       | -       |
 | 2.4.6-p1        | x       | x       | -       | -       | -       |
 | 2.4.6           | x       | x       | -       | -       | -       |
+| 2.4.5-p6        | -       | x       | -       | -       | -       |
 | 2.4.5-p5        | -       | x       | -       | -       | -       |
 | 2.4.5-p4        | -       | x       | -       | -       | -       |
 | 2.4.5-p3        | -       | x       | -       | -       | -       |
 | 2.4.5-p2        | -       | x       | -       | -       | -       |
 | 2.4.5-p1        | -       | x       | -       | -       | -       |
 | 2.4.5           | -       | x       | -       | -       | -       |
-| 2.4.4-p6        | -       | x       | -       | -       | -       |
-| 2.4.4-p5        | -       | x       | -       | -       | -       |
+| 2.4.4-p7        | -       | x       | x       | -       | -       |
+| 2.4.4-p6        | -       | x       | x       | -       | -       |
+| 2.4.4-p5        | -       | x       | x       | -       | -       |
 | 2.4.4-p4        | -       | x       | x       | -       | -       |
 | 2.4.4-p3        | -       | x       | x       | -       | -       |
 | 2.4.4-p2        | -       | x       | x       | -       | -       |

diff --git a/magento/scripts/downgrade-monolog.php b/magento/scripts/downgrade-monolog.php
@@ -21,8 +21,9 @@
 $isP4 = substr($version, 6, 8) == 'p4';
 $isP5 = substr($version, 6, 8) == 'p5';
 $isP6 = substr($version, 6, 8) == 'p6';
+$isP7 = substr($version, 6, 8) == 'p7';
 
-if (($is244 && ($isP1 || $isP2 || $isP3 || $isP4 || $isP5 || $isP6)) || $is245 || $is246 || $is247) {
+if (($is244 && ($isP1 || $isP2 || $isP3 || $isP4 || $isP5 || $isP6 || $isP7)) || $is245 || $is246 || $is247) {
     echo 'No monolog changes needed, skipping' . PHP_EOL;
     return;
 }