Merge remote-tracking branch 'mainline/2.2-develop' into kamilszewczyk/2.2-develop

Author: Stanislav Idolov

.php_cs.dist

@@ -4,10 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Pre-commit hook installation:
- * vendor/bin/static-review.php hook:install dev/tools/Magento/Tools/StaticReview/pre-commit .git/hooks/pre-commit
- */
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
     ->exclude('dev/tests/functional/generated')

README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=develop)](https://travis-ci.org/magento/magento2)
+[![Build Status](https://travis-ci.org/magento/magento2.svg?branch=2.2-develop)](https://travis-ci.org/magento/magento2)
+[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>

app/code/Magento/AdminNotification/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-admin-notification",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-media-storage": "100.2.*",

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-catalog-inventory": "100.2.*",
         "magento/module-eav": "101.0.*",

app/code/Magento/Analytics/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-backend": "100.2.*",
         "magento/module-config": "101.0.*",
         "magento/module-integration": "100.2.*",

app/code/Magento/Authorization/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-backend": "100.2.*",
         "magento/framework": "101.0.*"
     },

app/code/Magento/Authorizenet/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-authorizenet",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-sales": "101.0.*",
         "magento/module-store": "100.2.*",
         "magento/module-quote": "101.0.*",

app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php

@@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editGroup', ['group_id' => $row->getGroupId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />'
+        . '(' . __('Code') . ': ' . $row->getGroupCode() . ')';
     }
 }

app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php

@@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editStore', ['store_id' => $row->getStoreId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />' .
+        '(' . __('Code') . ': ' . $row->getStoreCode() . ')';
     }
 }

app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php

@@ -24,6 +24,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editWebsite', ['website_id' => $row->getWebsiteId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />' .
+        '(' . __('Code') . ': ' . $row->getCode() . ')';
     }
 }

app/code/Magento/Backend/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-backend",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-store": "100.2.*",
         "magento/module-directory": "100.2.*",
         "magento/module-developer": "100.2.*",

app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml

@@ -8,5 +8,7 @@
 
 ?>
 <?php if ($block->getBugreportUrl()): ?>
-    <a class="link-report" href="<?= /* @escapeNotVerified */ $block->getBugreportUrl() ?>" id="footer_bug_tracking"><?= /* @escapeNotVerified */ __('Report an Issue') ?></a>
+    <a class="link-report" href="<?= /* @escapeNotVerified */ $block->getBugreportUrl() ?>" id="footer_bug_tracking" target="_blank">
+        <?= /* @escapeNotVerified */ __('Report an Issue') ?>
+    </a>
 <?php endif; ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml

@@ -19,9 +19,6 @@
       <?php break;
     case 'column': ?>
       <?php break;
-    case 'hidden': ?>
-    <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>">
-      <?php break;
     case 'select': ?>
     <span class="form_row">
         <?php if ($element->getLabel()): ?><label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label><?php endif; ?>

app/code/Magento/Backup/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-backup",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-store": "100.2.*",
         "magento/module-backend": "100.2.*",
         "magento/module-cron": "100.2.*",

app/code/Magento/Braintree/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-braintree",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/framework": "101.0.*",
         "magento/magento-composer-installer": "*",
         "magento/module-config": "101.0.*",

app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php

@@ -314,6 +314,7 @@ protected function getBundleOptions()
                         'template' => 'ui/dynamic-rows/templates/collapsible',
                         'additionalClasses' => 'admin__field-wide',
                         'dataScope' => 'data.bundle_options',
+                        'isDefaultFieldScope' => 'is_default',
                         'bundleSelectionsName' => 'product_bundle_container.bundle_selections'
                     ],
                 ],
@@ -378,6 +379,9 @@ protected function getBundleOptions()
                                                     'selection_qty' => '',
                                                 ],
                                                 'links' => ['insertData' => '${ $.provider }:${ $.dataProvider }'],
+                                                'imports' => [
+                                                    'inputType' => '${$.provider}:${$.dataScope}.type'
+                                                ],
                                                 'source' => 'product'
                                             ],
                                         ],
@@ -594,10 +598,13 @@ protected function getBundleSelections()
                     'config' => [
                         'componentType' => Container::NAME,
                         'isTemplate' => true,
-                        'component' => 'Magento_Bundle/js/components/bundle-record',
+                        'component' => 'Magento_Ui/js/dynamic-rows/record',
                         'is_collection' => true,
                         'imports' => [
-                            'onTypeChanged' => '${ $.provider }:${ $.bundleOptionsDataScope }.type'
+                            'inputType' => '${$.parentName}:inputType'
+                        ],
+                        'exports' => [
+                            'isDefaultValue' => '${$.parentName}:isDefaultValue.${$.index}'
                         ]
                     ],
                 ],
@@ -691,11 +698,15 @@ protected function getBundleSelections()
                                 'componentType' => Form\Field::NAME,
                                 'formElement' => Form\Element\Checkbox::NAME,
                                 'dataType' => Form\Element\DataType\Price::NAME,
+                                'component' => 'Magento_Bundle/js/components/bundle-user-defined-checkbox',
                                 'label' => __('User Defined'),
                                 'dataScope' => 'selection_can_change_qty',
                                 'value' => '1',
                                 'valueMap' => ['true' => '1', 'false' => '0'],
                                 'sortOrder' => 110,
+                                'imports' => [
+                                    'inputType' => '${$.parentName}:inputType'
+                                ]
                             ],
                         ],
                     ],

app/code/Magento/Bundle/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-bundle",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-store": "100.2.*",
         "magento/module-catalog": "102.0.*",
         "magento/module-tax": "100.2.*",
@@ -22,7 +22,8 @@
     },
     "suggest": {
         "magento/module-webapi": "100.2.*",
-        "magento/module-bundle-sample-data": "Sample Data version:100.2.*"
+        "magento/module-bundle-sample-data": "Sample Data version:100.2.*",
+        "magento/module-sales-rule": "101.0.*"
     },
     "type": "magento2-module",
     "version": "100.2.2",

app/code/Magento/Bundle/etc/di.xml

@@ -207,4 +207,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesRule\Model\Quote\ChildrenValidationLocator">
+        <arguments>
+            <argument name="productTypeChildrenValidationMap" xsi:type="array">
+                <item name="bundle" xsi:type="boolean">false</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-checkbox.js

@@ -14,7 +14,10 @@ define([
             clearing: false,
             parentContainer: '',
             parentSelections: '',
-            changer: ''
+            changer: '',
+            exports: {
+                value: '${$.parentName}:isDefaultValue'
+            }
         },
 
         /**
@@ -58,10 +61,6 @@ define([
 
             this.prefer = typeMap[type];
             this.elementTmpl(this.templates[typeMap[type]]);
-
-            if (this.prefer === 'radio' && this.checked()) {
-                this.clearValues();
-            }
         },
 
         /**

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows-grid.js

@@ -14,7 +14,57 @@ define([
             label: '',
             columnsHeader: false,
             columnsHeaderAfterRender: true,
-            addButton: false
+            addButton: false,
+            isDefaultFieldScope: 'is_default',
+            defaultRecords: {
+                use: [],
+                moreThanOne: false,
+                state: {}
+            },
+            listens: {
+                inputType: 'onInputTypeChange',
+                isDefaultValue: 'onIsDefaultValue'
+            }
+        },
+
+        /**
+         * Handler for type select.
+         *
+         * @param {String} inputType - changed.
+         */
+        onInputTypeChange: function (inputType) {
+            if (this.defaultRecords.moreThanOne && (inputType === 'radio' || inputType === 'select')) {
+                _.each(this.defaultRecords.use, function (index, counter) {
+                    this.source.set(
+                        this.dataScope + '.bundle_selections.' + index + '.' + this.isDefaultFieldScope,
+                        counter ? '0' : '1'
+                    );
+                }.bind(this));
+            }
+        },
+
+        /**
+         * Handler for is_default field.
+         *
+         * @param {Object} data - changed data.
+         */
+        onIsDefaultValue: function (data) {
+            var cb,
+                use = 0;
+
+            this.defaultRecords.use = [];
+
+            cb = function (elem, key) {
+
+                if (~~elem) {
+                    this.defaultRecords.use.push(key);
+                    use++;
+                }
+
+                this.defaultRecords.moreThanOne = use > 1;
+            }.bind(this);
+
+            _.each(data, cb);
         },
 
         /**
@@ -29,7 +79,6 @@ define([
                 recordIndex;
 
             this.parsePagesData(data);
-            this.templates.record.bundleOptionsDataScope = this.dataScope;
 
             if (newData.length) {
                 if (this.insertData().length) {

app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-user-defined-checkbox.js

@@ -0,0 +1,30 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/single-checkbox'
+], function (Checkbox) {
+    'use strict';
+
+    return Checkbox.extend({
+        defaults: {
+            listens: {
+                inputType: 'onInputTypeChange'
+            }
+        },
+
+        /**
+         * Handler for "inputType" property
+         *
+         * @param {String} data
+         */
+        onInputTypeChange: function (data) {
+            data === 'checkbox' || data === 'multi' ?
+                this.clear()
+                    .visible(false) :
+                this.visible(true);
+        }
+    });
+});

app/code/Magento/BundleImportExport/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-bundle-import-export",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-catalog": "102.0.*",
         "magento/module-import-export": "100.2.*",
         "magento/module-catalog-import-export": "100.2.*",

app/code/Magento/CacheInvalidate/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-cache-invalidate",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-page-cache": "100.2.*",
         "magento/framework": "101.0.*"
     },

app/code/Magento/Captcha/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-captcha",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.0.13|~7.1.0",
         "magento/module-store": "100.2.*",
         "magento/module-customer": "101.0.*",
         "magento/module-checkout": "100.2.*",