Merge branch 'main' into next

empiricompany · Apr 25, 2023 · 0db9446 · 0db9446
2 parents 13926d8 + cde7af5
commit 0db9446
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -115,28 +115,24 @@ composer require "aydin-hassan/magento-core-composer-installer":"^2.1.0"
 
 <small>Note: be sure to select `y` if composer asks you to trust `aydin-hassan/magento-core-composer-installer`.</small>
 
-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"
-```
-
-<small>Note: be sure to select `y` if composer asks you to trust `magento-hackathon/magento-composer-installer` or `cweagans/composer-patches`.</small>
 
-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"
 ```
 
+<small>Note: be sure to select `y` if composer asks you to trust `magento-hackathon/magento-composer-installer` or `cweagans/composer-patches`.</small>
+
 When deploying to a production environment, it's recommended to optimize Composer's autoloader to speed up classes lookup time:
 
 ```bash

diff --git 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
diff --git 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

diff --git 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(' <span class="required">*</span>');
@@ -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();
             }
         }