Merge branch '2.1-develop' into MAGETWO-81472

ybohaienko · ybohaienko · commit 379cd9eddffb · 2018-06-01T11:54:22.000+03:00
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
@@ -61,8 +61,10 @@ public function execute()
         if (empty($result)) {
             $result[] = [
                 'severity' => (string)\Magento\Framework\Notification\MessageInterface::SEVERITY_NOTICE,
-                'text' => 'You have viewed and resolved all recent system notices. '
-                    . 'Please refresh the web page to clear the notice alert.',
+                'text' => __(
+                    'You have viewed and resolved all recent system notices. '
+                    . 'Please refresh the web page to clear the notice alert.'
+                )
             ];
         }
         $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
diff --git a/app/code/Magento/AdminNotification/i18n/en_US.csv b/app/code/Magento/AdminNotification/i18n/en_US.csv
@@ -49,3 +49,4 @@ Severity,Severity
 "Date Added","Date Added"
 Message,Message
 Actions,Actions
+"You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert.","You have viewed and resolved all recent system notices. Please refresh the web page to clear the notice alert."
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -311,7 +311,7 @@ public function joinUrlRewrite()
             ['request_path'],
             sprintf(
                 '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = %d AND {{table}}.entity_type = \'%s\'',
-                $this->_storeManager->getStore()->getId(),
+                $this->getStoreId(),
                 CategoryUrlRewriteGenerator::ENTITY_TYPE
             ),
             'left'
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -1535,7 +1535,7 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
     }
 
     /**
-     * Add requere tax percent flag for product collection
+     * Add require tax percent flag for product collection
      *
      * @return $this
      */
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Category/Collection/UrlRewriteTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Unit\Model\ResourceModel\Category\Collection;
+
+class UrlRewriteTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_model;
+
+    protected function setUp()
+    {
+        $this->_model = $this->getMockBuilder(\Magento\Catalog\Model\ResourceModel\Category\Collection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['joinTable'])
+            ->getMock();
+    }
+
+    public function testStoreIdUsedByUrlRewrite()
+    {
+        $cond = '{{table}}.is_autogenerated = 1 AND {{table}}.store_id = 100 AND {{table}}.entity_type = \'category\'';
+        $this->_model->expects($this->once())
+            ->method('joinTable')
+            ->with(
+                $this->anything(),
+                $this->anything(),
+                $this->anything(),
+                $this->equalTo($cond),
+                $this->anything()
+            );
+        $this->_model->setStoreId(100);
+        $this->_model->joinUrlRewrite();
+    }
+}
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -246,9 +246,8 @@ protected function _getSuperAttributeId($productId, $attributeId)
     {
         if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) {
             return $this->_productSuperAttrs["{$productId}_{$attributeId}"];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
diff --git a/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php b/app/code/Magento/Multishipping/Block/Checkout/AbstractMultishipping.php
@@ -5,7 +5,7 @@
  */
 
 /**
- * Mustishipping checkout base abstract block
+ * Multishipping checkout base abstract block
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -9,7 +9,7 @@
 use Magento\Quote\Model\Quote\Address;
 
 /**
- * Mustishipping checkout shipping
+ * Multishipping checkout shipping
  *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -2363,13 +2363,17 @@ public function merge(Quote $quote)
      * Trigger collect totals after loading, if required
      *
      * @return $this
+     * @throws \Exception
      */
     protected function _afterLoad()
     {
         // collect totals and save me, if required
         if (1 == $this->getData('trigger_recollect')) {
-            $this->collectTotals()->save();
+            $this->collectTotals()
+                ->setTriggerRecollect(0)
+                ->save();
         }
+
         return parent::_afterLoad();
     }
 
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
@@ -146,8 +146,7 @@ public function getOrderItem()
      * Declare qty
      *
      * @param float $qty
-     * @return \Magento\Sales\Model\Order\Invoice\Item
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return $this
      */
     public function setQty($qty)
     {
@@ -159,7 +158,6 @@ public function setQty($qty)
      * Applying qty to order item
      *
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function register()
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote.php
@@ -74,7 +74,7 @@ protected function _initRule()
     /**
      * Initiate action
      *
-     * @return this
+     * @return $this
      */
     protected function _initAction()
     {
diff --git a/app/code/Magento/Security/Model/AdminSessionInfo.php b/app/code/Magento/Security/Model/AdminSessionInfo.php
@@ -154,7 +154,7 @@ public function isOtherSessionsTerminated()
      * Setter for isOtherSessionsTerminated
      *
      * @param bool $isOtherSessionsTerminated
-     * @return this
+     * @return $this
      */
     public function setIsOtherSessionsTerminated($isOtherSessionsTerminated)
     {
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
@@ -831,20 +831,20 @@ public function getInfoUrl($store = null)
      * If it necessary will be returned conversion type (minus or plus)
      *
      * @param null|int|string|Store $store
-     * @return bool
+     * @return bool|int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function needPriceConversion($store = null)
     {
-        $res = false;
+        $res = 0;
         $priceIncludesTax = $this->priceIncludesTax($store) || $this->getNeedUseShippingExcludeTax();
         if ($priceIncludesTax) {
             switch ($this->getPriceDisplayType($store)) {
                 case self::DISPLAY_TYPE_EXCLUDING_TAX:
                 case self::DISPLAY_TYPE_BOTH:
                     return self::PRICE_CONVERSION_MINUS;
                 case self::DISPLAY_TYPE_INCLUDING_TAX:
-                    $res = true;
+                    $res = false;
                     break;
                 default:
                     break;
diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
@@ -197,6 +197,7 @@
     <type name="Magento\Framework\Data\Argument\Interpreter\Composite">
         <arguments>
             <argument name="interpreters" xsi:type="array">
+                <item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
                 <item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
                 <item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>
diff --git a/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php b/app/code/Magento/User/Model/Backend/Config/ObserverConfig.php
@@ -72,7 +72,7 @@ public function getAdminPasswordLifetime()
     }
 
     /**
-     * Get admin maxiumum security failures from config
+     * Get admin maximum security failures from config
      *
      * @return int
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Category/CollectionTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\ResourceModel\Category;
+
+class CollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ResourceModel\Category\Collection
+     */
+    private $collection;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        $this->collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ResourceModel\Category\Collection::class
+        );
+    }
+
+    protected function setDown()
+    {
+        /* Refresh stores memory cache after store deletion */
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        )->reinitStores();
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
+     */
+    public function testJoinUrlRewriteOnDefault()
+    {
+        $categories = $this->collection->joinUrlRewrite()->addPathFilter('1/2/3');
+        $this->assertCount(1, $categories);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $categories->getFirstItem();
+        $this->assertStringEndsWith('category.html', $category->getUrl());
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
+     */
+    public function testJoinUrlRewriteNotOnDefaultStore()
+    {
+        $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Store\Model\Store::class);
+        $storeId = $store->load('second_category_store', 'code')->getId();
+        $categories = $this->collection->setStoreId($storeId)->joinUrlRewrite()->addPathFilter('1/2/3');
+        $this->assertCount(1, $categories);
+        /** @var $category \Magento\Catalog\Model\Category */
+        $category = $categories->getFirstItem();
+        $this->assertContains('category-3-on-2', $category->getUrl());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/category_multiple_stores.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Catalog\Model\CategoryFactory $factory */
+$factory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\CategoryFactory::class
+);
+/** @var \Magento\Catalog\Model\CategoryRepository $repository */
+$repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Model\CategoryRepository::class
+);
+/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+$storeManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Store\Model\StoreManagerInterface::class
+);
+/** @var \Magento\Store\Model\Store $store */
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+if (!$store->load('second_category_store', 'code')->getId()) {
+    $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        \Magento\Store\Model\StoreManagerInterface::class
+    )->getWebsite()->getId();
+    $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        \Magento\Store\Model\StoreManagerInterface::class
+    )->getWebsite()->getDefaultGroupId();
+
+    $store->setCode(
+        'second_category_store'
+    )->setWebsiteId(
+        $websiteId
+    )->setGroupId(
+        $groupId
+    )->setName(
+        'Fixture Store'
+    )->setSortOrder(
+        10
+    )->setIsActive(
+        1
+    );
+    $store->save();
+}
+
+/* Refresh stores memory cache */
+\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Store\Model\StoreManagerInterface::class
+)->reinitStores();
+
+/** @var \Magento\Catalog\Model\Category $newCategory */
+$newCategory = $factory->create();
+$newCategory
+    ->setName('Category')
+    ->setParentId(2)
+    ->setLevel(2)
+    ->setPath('1/2/3')
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1);
+$repository->save($newCategory);
+$currentStoreId = $storeManager->getStore()->getId();
+$storeManager->setCurrentStore($storeManager->getStore($store->getId()));
+$newCategory->setUrlKey('category-3-on-2');
+$repository->save($newCategory);
+$storeManager->setCurrentStore($storeManager->getStore($currentStoreId));
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Date.php b/lib/internal/Magento/Framework/Data/Form/Element/Date.php
@@ -167,6 +167,8 @@ public function getElementHtml()
                         'buttonImage' => $this->getImage(),
                         'buttonText' => 'Select Date',
                         'disabled' => $this->getDisabled(),
+                        'minDate' => $this->getMinDate(),
+                        'maxDate' => $this->getMaxDate(),
                     ],
                 ]
             )
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd b/lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd
@@ -62,4 +62,10 @@
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd b/lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd
@@ -32,4 +32,10 @@
             <xs:field xpath="@name"/>
         </xs:unique>
     </xs:element>
+
+    <xs:complexType name="const">
+        <xs:complexContent>
+            <xs:extension base="argumentType" />
+        </xs:complexContent>
+    </xs:complexType>
 </xs:schema>
diff --git a/lib/web/mage/validation/validation.js b/lib/web/mage/validation/validation.js
@@ -25,7 +25,7 @@
                     var val = $(e).val();
                     if (val && val.length > 0) {
                         result = true;
-                        var valInt = parseInt(val, 10) || 0;
+                        var valInt = parseFloat(val) || 0;
                         if (valInt >= 0) {
                             total += valInt;
                         } else {

Original file line number	Diff line number	Diff line change
`@@ -1535,7 +1535,7 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent`
`1535`	`1535`	`}`
`1536`	`1536`
`1537`	`1537`	`/**`
`1538`		`- * Add requere tax percent flag for product collection`
	`1538`	`+ * Add require tax percent flag for product collection`
`1539`	`1539`	`*`
`1540`	`1540`	`* @return $this`
`1541`	`1541`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -246,9 +246,8 @@ protected function _getSuperAttributeId($productId, $attributeId)`
`246`	`246`	`{`
`247`	`247`	`if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) {`
`248`	`248`	`return $this->_productSuperAttrs["{$productId}_{$attributeId}"];`
`249`		`- } else {`
`250`		`- return null;`
`251`	`249`	`}`
	`250`	`+ return null;`
`252`	`251`	`}`
`253`	`252`
`254`	`253`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`
`7`	`7`	`/**`
`8`		`- * Mustishipping checkout base abstract block`
	`8`	`+ * Multishipping checkout base abstract block`
`9`	`9`	`*`
`10`	`10`	`* @author Magento Core Team <core@magentocommerce.com>`
`11`	`11`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Magento\Quote\Model\Quote\Address;`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * Mustishipping checkout shipping`
	`12`	`+ * Multishipping checkout shipping`
`13`	`13`	`*`
`14`	`14`	`* @author Magento Core Team <core@magentocommerce.com>`
`15`	`15`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -2363,13 +2363,17 @@ public function merge(Quote $quote)`
`2363`	`2363`	`* Trigger collect totals after loading, if required`
`2364`	`2364`	`*`
`2365`	`2365`	`* @return $this`
	`2366`	`+ * @throws \Exception`
`2366`	`2367`	`*/`
`2367`	`2368`	`protected function _afterLoad()`
`2368`	`2369`	`{`
`2369`	`2370`	`// collect totals and save me, if required`
`2370`	`2371`	`if (1 == $this->getData('trigger_recollect')) {`
`2371`		`- $this->collectTotals()->save();`
	`2372`	`+ $this->collectTotals()`
	`2373`	`+ ->setTriggerRecollect(0)`
	`2374`	`+ ->save();`
`2372`	`2375`	`}`
	`2376`	`+`
`2373`	`2377`	`return parent::_afterLoad();`
`2374`	`2378`	`}`
`2375`	`2379`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,7 @@ public function getOrderItem()`
`146`	`146`	`* Declare qty`
`147`	`147`	`*`
`148`	`148`	`* @param float $qty`
`149`		`- * @return \Magento\Sales\Model\Order\Invoice\Item`
`150`		`- * @throws \Magento\Framework\Exception\LocalizedException`
	`149`	`+ * @return $this`
`151`	`150`	`*/`
`152`	`151`	`public function setQty($qty)`
`153`	`152`	`{`
`@@ -159,7 +158,6 @@ public function setQty($qty)`
`159`	`158`	`* Applying qty to order item`
`160`	`159`	`*`
`161`	`160`	`* @return $this`
`162`		`- * @throws \Magento\Framework\Exception\LocalizedException`
`163`	`161`	`*/`
`164`	`162`	`public function register()`
`165`	`163`	`{`