Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-82385

Author: viktorpetryk

app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php

@@ -47,7 +47,7 @@ public function add($attributeCode, $option)
                 /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
                     $attributeOption = $attributeOption->getLabel();
             });
-            if (in_array($option->getLabel(), $currentOptions)) {
+            if (in_array($option->getLabel(), $currentOptions, true)) {
                 return false;
             }
         }

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -2205,7 +2205,7 @@ private function getTierPriceSelect(array $productIds)
             $this->getLinkField() . ' IN(?)',
             $productIds
         )->order(
-            $this->getLinkField()
+            'qty'
         );
         return $select;
     }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php

@@ -318,7 +318,7 @@ public function testAddTierPriceDataByGroupId()
                 [ '(customer_group_id=? AND all_groups=0) OR all_groups=1', $customerGroupId]
             )
             ->willReturnSelf();
-        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
         $this->connectionMock->expects($this->once())
             ->method('fetchAll')
             ->with($select)
@@ -370,7 +370,7 @@ public function testAddTierPriceData()
         $select->expects($this->exactly(1))->method('where')
             ->with('entity_id IN(?)', [1])
             ->willReturnSelf();
-        $select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
+        $select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
         $this->connectionMock->expects($this->once())
             ->method('fetchAll')
             ->with($select)

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

@@ -111,7 +111,7 @@
             <argument name="batchSizeManagement" xsi:type="object">Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement</argument>
         </arguments>
     </type>
-    <type name="\Magento\Framework\Data\CollectionModifier">
+    <type name="Magento\Framework\Data\CollectionModifier">
         <arguments>
             <argument name="conditions" xsi:type="array">
                 <item name="stockStatusCondition" xsi:type="object">Magento\CatalogInventory\Model\ProductCollectionStockCondition</item>

app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php

@@ -236,8 +236,8 @@ protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
         if ($attribute->getFilterOptions()) {
             $options = [];
 
-            foreach ($attribute->getFilterOptions() as $value => $label) {
-                $options[] = ['value' => $value, 'label' => $label];
+            foreach ($attribute->getFilterOptions() as $optionValue => $label) {
+                $options[] = ['value' => $optionValue, 'label' => $label];
             }
         } else {
             $options = $attribute->getSource()->getAllOptions(false);

app/code/Magento/Ui/view/base/web/js/dynamic-rows/record.js

@@ -25,7 +25,7 @@ define([
             },
             listens: {
                 position: 'initPosition',
-                elems: 'setColumnVisibileListener'
+                elems: 'setColumnVisibleListener'
             },
             links: {
                 position: '${ $.name }.${ $.positionProvider }:value'
@@ -123,7 +123,7 @@ define([
         /**
          * Set column visibility listener
          */
-        setColumnVisibileListener: function () {
+        setColumnVisibleListener: function () {
             var elem = _.find(this.elems(), function (curElem) {
                 return !curElem.hasOwnProperty('visibleListener');
             });

app/design/frontend/Magento/blank/web/css/source/_navigation.less

@@ -131,12 +131,18 @@
                 );
             }
         }
-
         .switcher-dropdown {
             .lib-list-reset-styles();
+            display: none;
             padding: @indent__s 0;
         }
-
+        .switcher-options {
+            &.active {
+                .switcher-dropdown {
+                    display: block;
+                }
+            }
+        } 
         .header.links {
             .lib-list-reset-styles();
             border-bottom: 1px solid @color-gray82;
@@ -207,7 +213,7 @@
         }
 
         .nav-toggle {
-            &:after{
+            &:after {
                 background: rgba(0, 0, 0, @overlay__opacity);
                 content: '';
                 display: block;

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payment-options.less

@@ -69,6 +69,13 @@
 
         .payment-option-content {
             .lib-css(padding, 0 0 @indent__base @checkout-payment-option-content__padding__xl);
+            .primary {
+                .action {
+                    &.action-apply {
+                        margin-right: 0;
+                    }
+                }
+            }
         }
 
         .payment-option-inner {

app/design/frontend/Magento/luma/Magento_GiftMessage/web/css/source/_module.less

@@ -246,6 +246,10 @@
     .gift-messages-order {
         margin-bottom: @indent__m;
     }
+
+    .gift-message-summary {
+        padding-right: 7rem;
+    }
 }
 
 //
@@ -282,10 +286,6 @@
         }
     }
 
-    .gift-message-summary {
-        padding-right: 7rem;
-    }
-
     //
     //  In-table block
     //  ---------------------------------------------

lib/web/varien/js.js

@@ -607,17 +607,11 @@ if (!("console" in window) || !("firebug" in console))
  * @example fireEvent($('my-input', 'click'));
  */
 function fireEvent(element, event) {
-    if (document.createEvent) {
-        // dispatch for all browsers except IE before version 9
-        var evt = document.createEvent('HTMLEvents');
+    // dispatch event
+    var evt = document.createEvent('HTMLEvents');
 
-        evt.initEvent(event, true, true); // event type, bubbling, cancelable
-        return element.dispatchEvent(evt);
-    }
-    // dispatch for IE before version 9
-    var evt = document.createEventObject();
-
-    return element.fireEvent('on' + event, evt);
+    evt.initEvent(event, true, true); // event type, bubbling, cancelable
+    return element.dispatchEvent(evt);
 
 }