Merge remote-tracking branch 'upstream/2.2.10-develop' into MC-18478

magento · Aug 1, 2019 · 763fd6f · 763fd6f
2 parents 9fcaa74 + 6dd7508
commit 763fd6f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 43 deletions.
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AttributeSet.php
@@ -78,7 +78,13 @@ public function getOptions()
                 \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::SORT_ORDER_ASC
             );
 
-        return $collection->getData();
+        $collectionData = $collection->getData() ?? [];
+
+        array_walk($collectionData, function (&$attribute) {
+            $attribute['__disableTmpl'] = true;
+        });
+
+        return $collectionData;
     }
 
     /**

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js b/app/code/Magento/Ui/view/base/web/js/grid/editing/record.js
@@ -134,11 +134,6 @@ define([
 
             field = utils.extend({}, fields.base, field);
 
-            field.__disableTmpl = {
-                label: true,
-                options: true
-            };
-
             return utils.template(field, {
                 record: this,
                 column: column

diff --git a/composer.json b/composer.json
@@ -54,7 +54,7 @@
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "tedivm/jshrink": "~1.3.0",
-        "magento/composer": "1.2.x-dev as 1.2.1",
+        "magento/composer": "~1.2.0",
         "lib-libxml": "*",
         "ext-ctype": "*",
         "ext-gd": "*",
@@ -273,12 +273,5 @@
             "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/"
         }
     },
-    "prefer-stable": true,
-    "minimum-stability": "dev",
-    "repositories": {
-        "magento.composer": {
-            "type": "vcs",
-            "url": "https://github.com/magento/composer.git"
-        }
-    }
+    "minimum-stability": "stable"
 }
diff --git a/composer.lock b/composer.lock
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
@@ -72,16 +72,16 @@ class Template implements \Zend_Filter_Interface
         'getdatausingmethod',
         '__destruct',
         '__call',
-        '__callStatic',
+        '__callstatic',
         '__set',
         '__unset',
         '__sleep',
         '__wakeup',
         '__invoke',
         '__set_state',
-        '__debugInfo',
-        '___callParent',
-        '___callPlugins'
+        '__debuginfo',
+        '___callparent',
+        '___callplugins'
     ];
 
     /**

diff --git a/lib/web/mage/utils/template.js b/lib/web/mage/utils/template.js
@@ -40,7 +40,7 @@ define([
      * To limit recursion for a specific property add __disableTmpl: {propertyName: numberOfCycles}.
      *
      * @param {String} tmpl
-     * @param {Object} target
+     * @param {Object|undefined} target
      * @returns {Boolean|Object}
      */
     function isTmplIgnored(tmpl, target) {
@@ -131,7 +131,9 @@ define([
             cycles = 0;
 
         while (~tmpl.indexOf(opener) && (typeof maxCycles === 'undefined' || cycles < maxCycles)) {
-            tmpl = template(tmpl, data);
+            if (!isTmplIgnored(tmpl)) {
+                tmpl = template(tmpl, data);
+            }
 
             if (tmpl === last) {
                 break;