From 8b49b168d0e3e5585d474e3c26fb1050a1187870 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 24 Apr 2023 10:22:17 +0100 Subject: [PATCH 1/5] Added patch for Zend_Mail and "emails are displayed incorrectly" problem (#3202) --- composer.json | 3 ++- composer.lock | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index efaba0b1d80..b366530bbc7 100644 --- a/composer.json +++ b/composer.json @@ -105,7 +105,8 @@ "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-918.patch", "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-1081.patch", "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch", - "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2050.patch" + "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2050.patch", + "OM-ZF1F-344 - Emails are displayed incorrectly in PHP 8.1+": "https://raw.githubusercontent.com/OpenMage/composer-patches/52f16eda0dc78ba95945ccab8e47f4c642584333/patches/OM-ZF1F-344.patch" } } }, diff --git a/composer.lock b/composer.lock index 36b15fbd827..3c50adc0c60 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": "7f7c043dbf19e76df3065091ecf2b217", + "content-hash": "e73fdcac234fc7d39e4487ab1e2d80a3", "packages": [ { "name": "colinmollenhour/cache-backend-redis", From c518acda0e0826429295dffa454356b5b4aeb48d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:24:32 +0100 Subject: [PATCH 2/5] Bump phpstan/phpstan from 1.10.13 to 1.10.14 (#3211) --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 3c50adc0c60..bc07386c91c 100644 --- a/composer.lock +++ b/composer.lock @@ -3368,16 +3368,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.13", + "version": "1.10.14", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "f07bf8c6980b81bf9e49d44bd0caf2e737614a70" + "reference": "d232901b09e67538e5c86a724be841bea5768a7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f07bf8c6980b81bf9e49d44bd0caf2e737614a70", - "reference": "f07bf8c6980b81bf9e49d44bd0caf2e737614a70", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d232901b09e67538e5c86a724be841bea5768a7c", + "reference": "d232901b09e67538e5c86a724be841bea5768a7c", "shasum": "" }, "require": { @@ -3426,7 +3426,7 @@ "type": "tidelift" } ], - "time": "2023-04-12T19:29:52+00:00" + "time": "2023-04-19T13:47:27+00:00" }, { "name": "phpunit/php-code-coverage", From 415dd52e21f147ad45fb825091f0267b38b69eec Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Mon, 24 Apr 2023 16:36:42 +0100 Subject: [PATCH 3/5] Updated docker-compose to mysql8 and redis7 (#3209) --- dev/openmage/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/openmage/docker-compose.yml b/dev/openmage/docker-compose.yml index 187f6bdfcb5..f12b1a44e7c 100644 --- a/dev/openmage/docker-compose.yml +++ b/dev/openmage/docker-compose.yml @@ -45,7 +45,7 @@ services: - "apache:${HOST_NAME:-openmage-7f000001.nip.io}" mysql: - image: mysql:5.7 + image: mysql:8.0 ports: - 3306 command: --default-authentication-plugin=mysql_native_password @@ -58,7 +58,7 @@ services: - mysql:/var/lib/mysql redis: - image: redis:6-alpine + image: redis:7-alpine command: redis-server --appendonly yes --maxmemory 10m volumes: - redis:/data From a6c6753771b0efae6ce47a3f0ce8d77702ee1afc Mon Sep 17 00:00:00 2001 From: Colin Mollenhour Date: Mon, 24 Apr 2023 14:46:54 -0400 Subject: [PATCH 4/5] Update README.md section on installation with composer require. Fixes mention of deprecated branch names post RFC-0002 acceptance. --- README.md | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index a71a20d0ade..4732c0fb36c 100644 --- a/README.md +++ b/README.md @@ -115,28 +115,24 @@ composer require "aydin-hassan/magento-core-composer-installer":"^2.1.0" Note: be sure to select `y` if composer asks you to trust `aydin-hassan/magento-core-composer-installer`. -Step 4: Require `magento-lts`: +Step 4: Require the appropriate version of `magento-lts`: ```bash -# OpenMage v19 -composer require "openmage/magento-lts":"^19.4.0" - -# OpenMage v20 +# Latest tagged v20 series release composer require "openmage/magento-lts":"^20.0.0" -``` - -Note: be sure to select `y` if composer asks you to trust `magento-hackathon/magento-composer-installer` or `cweagans/composer-patches`. -To install the latest development version (may be unstable): +# Legacy v19 tagged release (Magento 1.9.4.x drop-in replacement supported until April 4, 2025) +composer require "openmage/magento-lts":"^19.4.0" -```bash -# OpenMage v19 -composer require "openmage/magento-lts":"1.9.4.x-dev" +# Latest on "main" development branch +composer require "openmage/magento-lts":"dev-main" -# OpenMage v20 -composer require "openmage/magento-lts":"20.0.x-dev" +# Latest on "next" development branch +composer require "openmage/magento-lts":"dev-next" ``` +Note: be sure to select `y` if composer asks you to trust `magento-hackathon/magento-composer-installer` or `cweagans/composer-patches`. + When deploying to a production environment, it's recommended to optimize Composer's autoloader to speed up classes lookup time: ```bash From cde7af52b4b38f88accfb628ccc3c611d8fdc4f1 Mon Sep 17 00:00:00 2001 From: Andrea Zambon Date: Tue, 25 Apr 2023 00:04:57 +0200 Subject: [PATCH 5/5] Avoid JS errors if the zipcode field has no label (#3197) Co-authored-by: Fabrizio Balliano Co-authored-by: Ng Kiat Siong --- js/varien/form.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/varien/form.js b/js/varien/form.js index 2926ca69530..15f5696019e 100644 --- a/js/varien/form.js +++ b/js/varien/form.js @@ -384,13 +384,13 @@ ZipUpdater.prototype = { _setPostcodeOptional: function(){ this.zipElement = $(this.zipElement); - if (this.zipElement == undefined) { + if (this.zipElement === undefined) { return false; } // find label var label = $$('label[for="' + this.zipElement.id + '"]')[0]; - if (label != undefined) { + if (label !== undefined) { var wildCard = label.down('em') || label.down('span.required'); if (!wildCard) { label.insert(' *'); @@ -400,21 +400,21 @@ ZipUpdater.prototype = { // Make Zip and its label required/optional if (optionalZipCountries.indexOf(this.country) != -1) { - if (label.hasClassName('required')) { + if (label !== undefined && label.hasClassName('required')) { label.removeClassName('required'); } while (this.zipElement.hasClassName('required-entry')) { this.zipElement.removeClassName('required-entry'); } - if (wildCard != undefined) { + if (wildCard !== undefined) { wildCard.hide(); } } else { - if (!label.hasClassName('required')) { + if (label !== undefined && !label.hasClassName('required')) { label.addClassName('required'); } this.zipElement.addClassName('required-entry'); - if (wildCard != undefined) { + if (wildCard !== undefined) { wildCard.show(); } }