Merge pull request #6328 from magento-tsg/2.4-develop-pr103

[Arrows] Fixes for 2.4 (pr103) (2.4-develop)

Author: zakdma

app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml

@@ -227,8 +227,8 @@
             <div class="grid_prepare admin__page-subsection"></div>
         </div>
     </section>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#package_template') ?>
     <div id="packages_content"></div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#package_template') ?>
     <?php $scriptString = <<<script
 require(['jquery'], function($){
     $("div#packages_content").on('click', "button[data-action='package-save-items']",

app/code/Magento/Ui/view/base/web/js/form/element/region.js

@@ -23,6 +23,22 @@ define([
             }
         },
 
+        /**
+         * {@inheritdoc}
+         */
+        initialize: function () {
+            var option;
+
+            this._super();
+
+            option = _.find(this.countryOptions, function (row) {
+                return row['is_default'] === true;
+            });
+            this.hideRegion(option);
+
+            return this;
+        },
+
         /**
          * Method called every time country selector's value gets changed.
          * Updates all validations and requirements for certain country.
@@ -42,16 +58,9 @@ define([
                 return;
             }
 
-            defaultPostCodeResolver.setUseDefaultPostCode(!option['is_zipcode_optional']);
-
-            if (option['is_region_visible'] === false) {
-                // Hide select and corresponding text input field if region must not be shown for selected country.
-                this.setVisible(false);
+            this.hideRegion(option);
 
-                if (this.customEntry) { // eslint-disable-line max-depth
-                    this.toggleInput(false);
-                }
-            }
+            defaultPostCodeResolver.setUseDefaultPostCode(!option['is_zipcode_optional']);
 
             isRegionRequired = !this.skipValidation && !!option['is_region_required'];
 
@@ -67,7 +76,24 @@ define([
                 input.validation['required-entry'] = isRegionRequired;
                 input.validation['validate-not-number-first'] = !this.options().length;
             }.bind(this));
+        },
+
+        /**
+         * Hide select and corresponding text input field if region must not be shown for selected country.
+         *
+         * @private
+         * @param {Object}option
+         */
+        hideRegion: function (option) {
+            if (!option || option['is_region_visible'] !== false) {
+                return;
+            }
+
+            this.setVisible(false);
+
+            if (this.customEntry) {
+                this.toggleInput(false);
+            }
         }
     });
 });
-

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/region.test.js

@@ -47,6 +47,40 @@ define([
             });
         });
 
+        describe('initialize method', function () {
+            it('Hides region field when it should be hidden for default country', function () {
+                model.countryOptions = {
+                    'DefaultCountryCode': {
+                        'is_default': true,
+                        'is_region_visible': false
+                    },
+                    'NonDefaultCountryCode': {
+                        'is_region_visible': true
+                    }
+                };
+
+                model.initialize();
+
+                expect(model.visible()).toEqual(false);
+            });
+
+            it('Shows region field when it should be visible for default country', function () {
+                model.countryOptions = {
+                    'CountryCode': {
+                        'is_default': true,
+                        'is_region_visible': true
+                    },
+                    'NonDefaultCountryCode': {
+                        'is_region_visible': false
+                    }
+                };
+
+                model.initialize();
+
+                expect(model.visible()).toEqual(true);
+            });
+        });
+
         describe('update method', function () {
             it('makes field optional when there is no corresponding country', function () {
                 var value = 'Value';

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -56,7 +56,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
     public const DDL_CREATE            = 2;
     public const DDL_INDEX             = 3;
     public const DDL_FOREIGN_KEY       = 4;
-    public const DDL_EXISTS            = 5;
+    private const DDL_EXISTS           = 5;
     public const DDL_CACHE_PREFIX      = 'DB_PDO_MYSQL_DDL';
     public const DDL_CACHE_TAG         = 'DB_PDO_MYSQL_DDL';
 
@@ -665,11 +665,9 @@ protected function _prepareQuery(&$sql, &$bind = [])
         }
 
         // Mixed bind is not supported - so remember whether it is named bind, to normalize later if required
-        $isNamedBind = false;
         if ($bind) {
             foreach ($bind as $k => $v) {
                 if (!is_int($k)) {
-                    $isNamedBind = true;
                     if ($k[0] != ':') {
                         $bind[":{$k}"] = $v;
                         unset($bind[$k]);