Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGETWO-85050

Author: omiroshnichenko

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -467,7 +467,9 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
         if (!$ignoreLinksFlag && $ignoreLinksFlag !== null) {
             $productLinks = $product->getProductLinks();
         }
-        $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
+        if (!isset($productDataArray['store_id'])) {
+            $productDataArray['store_id'] = (int)$this->storeManager->getStore()->getId();
+        }
         $product = $this->initializeProductData($productDataArray, empty($existingProduct));
 
         $this->processLinks($product, $productLinks);

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -97,7 +97,11 @@ define([
                 success: function (res) {
                     var eventData, parameters;
 
-                    $(document).trigger('ajax:addToCart', form.data().productSku, form, res);
+                    $(document).trigger('ajax:addToCart', {
+                        'sku': form.data().productSku,
+                        'form': form,
+                        'response': res
+                    });
 
                     if (self.isLoaderEnabled()) {
                         $('body').trigger(self.options.processStop);

app/code/Magento/Quote/Observer/Webapi/SubmitObserver.php renamed to app/code/Magento/Quote/Observer/SubmitObserver.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Quote\Observer\Webapi;
+namespace Magento\Quote\Observer;
 
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 use Magento\Framework\Event\ObserverInterface;
@@ -13,12 +13,12 @@ class SubmitObserver implements ObserverInterface
     /**
      * @var \Psr\Log\LoggerInterface
      */
-    protected $logger;
+    private $logger;
 
     /**
      * @var OrderSender
      */
-    protected $orderSender;
+    private $orderSender;
 
     /**
      * @param \Psr\Log\LoggerInterface $logger

app/code/Magento/Quote/Test/Unit/Observer/Webapi/SubmitObserverTest.php renamed to app/code/Magento/Quote/Test/Unit/Observer/SubmitObserverTest.php

@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Quote\Test\Unit\Observer\Webapi;
+namespace Magento\Quote\Test\Unit\Observer;
 
 class SubmitObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Quote\Observer\Webapi\SubmitObserver
+     * @var \Magento\Quote\Observer\SubmitObserver
      */
     protected $model;
 
@@ -59,7 +59,7 @@ protected function setUp()
         $eventMock->expects($this->once())->method('getQuote')->willReturn($this->quoteMock);
         $eventMock->expects($this->once())->method('getOrder')->willReturn($this->orderMock);
         $this->quoteMock->expects($this->once())->method('getPayment')->willReturn($this->paymentMock);
-        $this->model = new \Magento\Quote\Observer\Webapi\SubmitObserver(
+        $this->model = new \Magento\Quote\Observer\SubmitObserver(
             $this->loggerMock,
             $this->orderSenderMock
         );

app/code/Magento/Quote/etc/frontend/events.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
+    </event>
+</config>

app/code/Magento/Quote/etc/webapi_rest/events.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_model_service_quote_submit_success">
-        <observer name="sendEmail" instance="Magento\Quote\Observer\Webapi\SubmitObserver" />
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
     </event>
 </config>

app/code/Magento/Quote/etc/webapi_soap/events.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="sales_model_service_quote_submit_success">
-        <observer name="sendEmail" instance="Magento\Quote\Observer\Webapi\SubmitObserver" />
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
     </event>
 </config>

dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php

@@ -12,6 +12,9 @@
 
 /**
  * Provide tests for ProductRepository model.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
  */
 class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
 {
@@ -122,4 +125,23 @@ public function testCreateWithoutSpecifiedType()
         self::assertSame('1.2300', $product->getWeight());
         self::assertSame('simple', $product->getTypeId());
     }
+
+    /**
+     * Tests product repository update should use provided store code.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testProductUpdate()
+    {
+        $sku = 'simple';
+        $nameUpdated = 'updated';
+        $product = $this->productRepository->get($sku, false, 0);
+        $product->setName($nameUpdated);
+        $this->productRepository->save($product);
+        $product = $this->productRepository->get($sku, false, 0);
+        self::assertEquals(
+            $nameUpdated,
+            $product->getName()
+        );
+    }
 }

dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php

@@ -14,9 +14,6 @@ public function testXmlFiles()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-            /**
-             * @param string $filename
-             */
             function ($filename) {
                 $dom = new \DOMDocument();
                 $xmlFile = file_get_contents($filename);
@@ -27,9 +24,9 @@ function ($filename) {
 
                 $schemaLocations = [];
                 preg_match('/xsi:noNamespaceSchemaLocation=\s*"(urn:[^"]+)"/s', $xmlFile, $schemaLocations);
-                $this->assertEquals(
+                $this->assertCount(
                     2,
-                    count($schemaLocations),
+                    $schemaLocations,
                     'The XML file at ' . $filename . ' does not have a schema properly defined.  It should '
                     . 'have a xsi:noNamespaceSchemaLocation attribute defined with a URN path.  E.g. '
                     . 'xsi:noNamespaceSchemaLocation="urn:magento:framework:Relative_Path/something.xsd"'
@@ -60,6 +57,7 @@ public function getSchemas()
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::LIBRARY) as $libraryPath) {
             $libSchemas = array_merge($libSchemas, $this->_getFiles($libraryPath, '*.xsd'));
         }
+
         return $this->_dataSet(array_merge($codeSchemas, $libSchemas));
     }
 
@@ -79,6 +77,7 @@ public function getXmlFiles()
         foreach ($componentRegistrar->getPaths(ComponentRegistrar::LIBRARY) as $libraryPath) {
             $libXml = array_merge($libXml, $this->_getFiles($libraryPath, '*.xml', '/.\/Test\/./'));
         }
+
         return $this->_dataSet(array_merge($codeXml, $designXml, $libXml));
     }
 
@@ -107,8 +106,11 @@ private function _filterSpecialCases(&$files)
             '#conf/schema.xml$#',
             '#conf/solrconfig.xml$#',
             '#layout/swagger_index_index.xml$#',
-            '#Doc/etc/doc/vars.xml$#'
+            '#Doc/etc/doc/vars.xml$#',
+            '#phpunit.xml$#',
+            '#app/code/(?!Magento)(.*?)/.*?/Test/.*\.xml$#',
         ];
+
         foreach ($list as $pattern) {
             foreach ($files as $key => $value) {
                 if (preg_match($pattern, $value)) {
@@ -124,6 +126,7 @@ protected function _dataSet($files)
         foreach ($files as $file) {
             $data[substr($file, strlen(BP))] = [$file];
         }
+
         return $data;
     }
 }