Skip to content

Commit 340a68d

Browse files
michielgerritsenmichielgerritsen
committed
Merge branch 'patch-versions'
2 parents a3dc880 + 3a55585 commit 340a68d

File tree

5 files changed

+98
-26
lines changed

5 files changed

+98
-26
lines changed

‎.github/workflows/magento-2.4.yml‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,18 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
cfg:
15+
- { PHP_VERSION: php83-fpm, MAGENTO_VERSION: 2.4.7-p1, SAMPLE_DATA: false }
16+
- { PHP_VERSION: php83-fpm, MAGENTO_VERSION: 2.4.7-p1, SAMPLE_DATA: true }
17+
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.7-p1, SAMPLE_DATA: false }
18+
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.7-p1, SAMPLE_DATA: true }
1519
- { PHP_VERSION: php83-fpm, MAGENTO_VERSION: 2.4.7, SAMPLE_DATA: false }
1620
- { PHP_VERSION: php83-fpm, MAGENTO_VERSION: 2.4.7, SAMPLE_DATA: true }
1721
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.7, SAMPLE_DATA: false }
1822
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.7, SAMPLE_DATA: true }
23+
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p6, SAMPLE_DATA: false }
24+
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p6, SAMPLE_DATA: true }
25+
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p6, SAMPLE_DATA: false }
26+
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p6, SAMPLE_DATA: true }
1927
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p5, SAMPLE_DATA: false }
2028
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6-p5, SAMPLE_DATA: true }
2129
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6-p5, SAMPLE_DATA: false }
@@ -42,6 +50,8 @@ jobs:
4250
- { PHP_VERSION: php82-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: true }
4351
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: false }
4452
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.6, SAMPLE_DATA: true }
53+
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p8, SAMPLE_DATA: false }
54+
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p8, SAMPLE_DATA: true }
4555
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p7, SAMPLE_DATA: false }
4656
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p7, SAMPLE_DATA: true }
4757
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p6, SAMPLE_DATA: false }
@@ -58,30 +68,44 @@ jobs:
5868
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5-p1, SAMPLE_DATA: true }
5969
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5, SAMPLE_DATA: false }
6070
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.5, SAMPLE_DATA: true }
61-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p8, SAMPLE_DATA: false }
62-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p8, SAMPLE_DATA: true }
63-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: false }
64-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: true }
65-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: false }
66-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: true }
67-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: false }
68-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: true }
71+
# 2.4.4 + 8.1 is disabled due to this bug:
72+
# https://github.com/magento/magento2/issues/35292
73+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p9, SAMPLE_DATA: false }
74+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p9, SAMPLE_DATA: true }
75+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p9, SAMPLE_DATA: false }
76+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p9, SAMPLE_DATA: true }
77+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p8, SAMPLE_DATA: false }
78+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p8, SAMPLE_DATA: true }
79+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p8, SAMPLE_DATA: false }
80+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p8, SAMPLE_DATA: true }
81+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: false }
82+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: true }
83+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: false }
84+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p7, SAMPLE_DATA: true }
85+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: false }
86+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: true }
87+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: false }
88+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p6, SAMPLE_DATA: true }
89+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: false }
90+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: true }
91+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: false }
92+
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p5, SAMPLE_DATA: true }
6993
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: false }
7094
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: true }
71-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: false }
72-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: true }
95+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: false }
96+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p4, SAMPLE_DATA: true }
7397
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: false }
7498
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: true }
75-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: false }
76-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: true }
99+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: false }
100+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p3, SAMPLE_DATA: true }
77101
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p2, SAMPLE_DATA: false }
78102
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p2, SAMPLE_DATA: true }
79-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p2, SAMPLE_DATA: false }
80-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p2, SAMPLE_DATA: true }
103+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p2, SAMPLE_DATA: false }
104+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p2, SAMPLE_DATA: true }
81105
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p1, SAMPLE_DATA: false }
82106
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4-p1, SAMPLE_DATA: true }
83-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p1, SAMPLE_DATA: false }
84-
- { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p1, SAMPLE_DATA: true }
107+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p1, SAMPLE_DATA: false }
108+
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4-p1, SAMPLE_DATA: true }
85109
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4, SAMPLE_DATA: false }
86110
- { PHP_VERSION: php74-fpm, MAGENTO_VERSION: 2.4.4, SAMPLE_DATA: true }
87111
# - { PHP_VERSION: php81-fpm, MAGENTO_VERSION: 2.4.4, SAMPLE_DATA: false }

‎README.md‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,16 @@ Special thanks to Fooman for providing a Magento 2 mirror that does not requires
8181

8282
| Magento version | PHP 8.3 | PHP 8.2 | PHP 8.1 | PHP 7.4 | PHP 7.3 | PHP 7.2 |
8383
|-----------------|---------|---------|---------|---------|---------|---------|
84+
| 2.4.7-p1 | x | x | - | - | - | - |
8485
| 2.4.7 | x | x | - | - | - | - |
86+
| 2.4.6-p6 | - | x | x | - | - | - |
8587
| 2.4.6-p5 | - | x | x | - | - | - |
8688
| 2.4.6-p4 | - | x | x | - | - | - |
8789
| 2.4.6-p3 | - | x | x | - | - | - |
8890
| 2.4.6-p2 | - | - | - | - | - | - |
8991
| 2.4.6-p1 | - | x | x | - | - | - |
9092
| 2.4.6 | - | x | x | - | - | - |
93+
| 2.4.5-p8 | - | - | x | - | - | - |
9194
| 2.4.5-p7 | - | - | x | - | - | - |
9295
| 2.4.5-p6 | - | - | x | - | - | - |
9396
| 2.4.5-p5 | - | - | x | - | - | - |
@@ -96,15 +99,16 @@ Special thanks to Fooman for providing a Magento 2 mirror that does not requires
9699
| 2.4.5-p2 | - | - | x | - | - | - |
97100
| 2.4.5-p1 | - | - | x | - | - | - |
98101
| 2.4.5 | - | - | x | - | - | - |
99-
| 2.4.4-p8 | - | - | x | x | - | - |
100-
| 2.4.4-p7 | - | - | x | x | - | - |
101-
| 2.4.4-p6 | - | - | x | x | - | - |
102-
| 2.4.4-p5 | - | - | x | x | - | - |
103-
| 2.4.4-p4 | - | - | x | x | - | - |
104-
| 2.4.4-p3 | - | - | x | x | - | - |
105-
| 2.4.4-p2 | - | - | x | x | - | - |
106-
| 2.4.4-p1 | - | - | x | x | - | - |
107-
| 2.4.4 | - | - | x | x | - | - |
102+
| 2.4.4-p9 | - | - | - | x | - | - |
103+
| 2.4.4-p8 | - | - | - | x | - | - |
104+
| 2.4.4-p7 | - | - | - | x | - | - |
105+
| 2.4.4-p6 | - | - | - | x | - | - |
106+
| 2.4.4-p5 | - | - | - | x | - | - |
107+
| 2.4.4-p4 | - | - | - | x | - | - |
108+
| 2.4.4-p3 | - | - | - | x | - | - |
109+
| 2.4.4-p2 | - | - | - | x | - | - |
110+
| 2.4.4-p1 | - | - | - | x | - | - |
111+
| 2.4.4 | - | - | - | x | - | - |
108112
| 2.4.3-p2 | - | - | - | x | - | - |
109113
| 2.4.3-p1 | - | - | - | x | x | - |
110114
| 2.4.3 | - | - | - | x | x | - |

‎magento/Dockerfile-2.4‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ COPY patches/ patches/
1515
COPY scripts/apply-2.4-patches.php scripts/apply-2.4-patches.php
1616
COPY scripts/downgrade-monolog.php scripts/downgrade-monolog.php
1717
COPY scripts/allow-composer-plugins.php scripts/allow-composer-plugins.php
18+
COPY scripts/remove-paypal-braintree.php scripts/remove-paypal-braintree.php
1819
COPY templates/memory-limit-php.ini /usr/local/etc/php/conf.d/memory-limit-php.ini
1920

2021
RUN ./start-services && \
@@ -29,6 +30,7 @@ RUN ./start-services && \
2930
composer config repositories.fooman composer https://repo-magento-mirror.fooman.co.nz/ && \
3031
./retry "composer install" && \
3132
php scripts/downgrade-monolog.php && \
33+
php scripts/remove-paypal-braintree.php && \
3234
if [ -f "/data/vendor/magento/module-inventory-catalog/etc/communication.xml" ]; then sed -i 's/is_synchronous="false"//g' /data/vendor/magento/module-inventory-catalog/etc/communication.xml; fi && \
3335
if [ -f "/data/vendor/magento/module-inventory-sales/etc/communication.xml" ]; then sed -i 's/is_synchronous="false"//g' /data/vendor/magento/module-inventory-sales/etc/communication.xml; fi && \
3436
if [ -f "/data/vendor/magento/module-inventory-indexer/etc/communication.xml" ]; then sed -i 's/is_synchronous="false"//g' /data/vendor/magento/module-inventory-indexer/etc/communication.xml; fi && \

‎magento/scripts/downgrade-monolog.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@
1111
require '/data/vendor/autoload.php';
1212

1313
$version = getenv('MAGENTO_VERSION');
14+
$is240 = substr($version, 0, 5) == '2.4.0';
15+
$is241 = substr($version, 0, 5) == '2.4.1';
16+
$is242 = substr($version, 0, 5) == '2.4.2';
17+
$is243 = substr($version, 0, 5) == '2.4.3';
1418
$is244 = substr($version, 0, 5) == '2.4.4';
1519
$is245 = substr($version, 0, 5) == '2.4.5';
1620
$is246 = substr($version, 0, 5) == '2.4.6';
1721
$is247 = substr($version, 0, 5) == '2.4.7';
22+
$isP0 = strlen($version) == 5;
1823
$isP1 = substr($version, 6, 8) == 'p1';
1924
$isP2 = substr($version, 6, 8) == 'p2';
2025
$isP3 = substr($version, 6, 8) == 'p3';
@@ -23,8 +28,9 @@
2328
$isP6 = substr($version, 6, 8) == 'p6';
2429
$isP7 = substr($version, 6, 8) == 'p7';
2530
$isP8 = substr($version, 6, 8) == 'p8';
31+
$isP9 = substr($version, 6, 8) == 'p9';
2632

27-
if (($is244 && ($isP1 || $isP2 || $isP3 || $isP4 || $isP5 || $isP6 || $isP7 || $isP8)) || $is245 || $is246 || $is247) {
33+
if (($is244 && !$isP0) || $is245 || $is246 || $is247) {
2834
echo 'No monolog changes needed, skipping' . PHP_EOL;
2935
return;
3036
}

‎magento/scripts/remove-paypal-braintree.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
3+
require '/data/vendor/autoload.php';
4+
5+
$version = getenv('MAGENTO_VERSION');
6+
$is244 = substr($version, 0, 5) == '2.4.4';
7+
$isP0 = strlen($version) == 5;
8+
$isP1 = substr($version, 6, 8) == 'p1';
9+
$isP2 = substr($version, 6, 8) == 'p2';
10+
$isP3 = substr($version, 6, 8) == 'p3';
11+
$isP4 = substr($version, 6, 8) == 'p4';
12+
$isP5 = substr($version, 6, 8) == 'p5';
13+
$isP6 = substr($version, 6, 8) == 'p6';
14+
$isP7 = substr($version, 6, 8) == 'p7';
15+
$isP8 = substr($version, 6, 8) == 'p8';
16+
$isP9 = substr($version, 6, 8) == 'p9';
17+
18+
if (!$is244) {
19+
echo 'PayPal/Braintree can stay' . PHP_EOL;
20+
return;
21+
}
22+
23+
if ($isP0 || $isP1 || $isP2 || $isP3 || $isP4) {
24+
echo 'PayPal/Braintree can stay' . PHP_EOL;
25+
return;
26+
}
27+
28+
$output = null;
29+
$code = null;
30+
exec('jq \'. + {replace: {"paypal/module-braintree": "*"}}\' composer.json > composer.tmp.json && mv composer.tmp.json composer.json', $output, $code);
31+
exec('composer update paypal/module-braintree');
32+
33+
if ($code !== 0) {
34+
echo 'Unable to remove paypal/braintree' . PHP_EOL;
35+
die($code);
36+
}

0 commit comments

Comments
 (0)