Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop

Author: Oleksandr Karpenko

app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml

@@ -27,7 +27,7 @@
                        value=""
                        data-validate="{required:true}"
                        placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"
-                       autocomplete="username"
+                       autocomplete="off"
                     />
             </div>
         </div>
@@ -43,7 +43,7 @@
                        data-validate="{required:true}"
                        value=""
                        placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>"
-                       autocomplete="current-password"
+                       autocomplete="off"
                     />
             </div>
         </div>

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -9,7 +9,12 @@
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\Request\DataPersistorInterface;
 
+/**
+ * Class Save
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
@@ -37,6 +42,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $productRepository;
 
+    /**
+     * @var DataPersistorInterface
+     */
+    protected $dataPersistor;
+
     /**
      * @var StoreManagerInterface
      */
@@ -110,6 +120,7 @@ public function execute()
                 $this->copyToStores($data, $productId);
 
                 $this->messageManager->addSuccess(__('You saved the product.'));
+                $this->getDataPersistor()->clear('catalog_product');
                 if ($product->getSku() != $originalSku) {
                     $this->messageManager->addNotice(
                         __(
@@ -131,11 +142,13 @@ public function execute()
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
                 $this->_session->setProductData($data);
+                $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             } catch (\Exception $e) {
                 $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
                 $this->messageManager->addError($e->getMessage());
                 $this->_session->setProductData($data);
+                $this->getDataPersistor()->set('catalog_product', $data);
                 $redirectBack = $productId ? true : 'new';
             }
         } else {
@@ -246,4 +259,18 @@ private function getStoreManager()
         }
         return $this->storeManager;
     }
+
+    /**
+     * Retrieve data persistor
+     *
+     * @return DataPersistorInterface|mixed
+     */
+    protected function getDataPersistor()
+    {
+        if (null === $this->dataPersistor) {
+            $this->dataPersistor = $this->_objectManager->get(DataPersistorInterface::class);
+        }
+
+        return $this->dataPersistor;
+    }
 }

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

@@ -30,12 +30,32 @@ public function process(\DOMElement $mediaNode, $mediaParentTag)
                 if ($attribute->nodeType != XML_ELEMENT_NODE) {
                     continue;
                 }
-                $nodeValue = $attribute->nodeValue;
+                if ($attribute->tagName == 'background') {
+                    $nodeValue = $this->processImageBackground($attribute->nodeValue);
+                } else {
+                    $nodeValue = $attribute->nodeValue;
+                }
                 $result[$mediaParentTag][$moduleNameImage][Image::MEDIA_TYPE_CONFIG_NODE][$imageId][$attribute->tagName]
                     = $nodeValue;
             }
         }
 
         return $result;
     }
+
+    /**
+     * Convert rgb background string into array
+     *
+     * @param string $backgroundString
+     * @return int[]
+     */
+    private function processImageBackground($backgroundString)
+    {
+        $pattern = '#\[(\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\]#';
+        $backgroundArray = [];
+        if (preg_match($pattern, $backgroundString, $backgroundArray)) {
+            array_shift($backgroundArray);
+        }
+        return $backgroundArray;
+    }
 }

app/code/Magento/Catalog/Model/Locator/RegistryLocator.php

@@ -5,7 +5,10 @@
  */
 namespace Magento\Catalog\Model\Locator;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Registry;
+use Magento\Store\Api\Data\StoreInterface;
 
 /**
  * Class RegistryLocator
@@ -15,7 +18,17 @@ class RegistryLocator implements LocatorInterface
     /**
      * @var Registry
      */
-    protected $registry;
+    private $registry;
+
+    /**
+     * @var ProductInterface
+     */
+    private $product;
+
+    /**
+     * @var StoreInterface
+     */
+    private $store;
 
     /**
      * @param Registry $registry
@@ -27,30 +40,46 @@ public function __construct(Registry $registry)
 
     /**
      * {@inheritdoc}
+     * @throws NotFoundException
      */
     public function getProduct()
     {
-        return $this->registry->registry('current_product');
+        if (null !== $this->product) {
+            return $this->product;
+        }
+
+        if ($product = $this->registry->registry('current_product')) {
+            return $this->product = $product;
+        }
+
+        throw new NotFoundException(__('Product was not registered'));
     }
 
     /**
      * {@inheritdoc}
+     * @throws NotFoundException
      */
     public function getStore()
     {
-        return $this->registry->registry('current_store');
-    }
+        if (null !== $this->store) {
+            return $this->store;
+        }
 
+        if ($store = $this->registry->registry('current_store')) {
+            return $this->store = $store;
+        }
+
+        throw new NotFoundException(__('Store was not registered'));
+    }
 
     /**
      * {@inheritdoc}
      */
     public function getWebsiteIds()
     {
-        return $this->registry->registry('current_product')->getWebsiteIds();
+        return $this->getProduct()->getWebsiteIds();
     }
 
-
     /**
      * {@inheritdoc}
      */

app/code/Magento/Catalog/Model/Product/Link/Converter.php

@@ -19,7 +19,7 @@ class Converter
     protected function indexBySku(array $products)
     {
         $converted = [];
-        foreach($products as $product) {
+        foreach ($products as $product) {
             $converted[$product->getSku()] = $product;
         }
         return $converted;
@@ -34,7 +34,7 @@ public function convertLinksToGroupedArray($entity)
         $basicData = $entity->getProductLinks();
         $associatedProducts = $entity->getTypeInstance()->getAssociatedProducts($entity);
         $associatedProducts = $this->indexBySku($associatedProducts);
-
+        $linksAsArray = [];
         /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $link */
         foreach ($basicData as $link) {
             $info = $link->getData();
@@ -46,4 +46,4 @@ public function convertLinksToGroupedArray($entity)
         }
         return $linksAsArray;
     }
-}
+}

app/code/Magento/Catalog/Model/Product/Link/Resolver.php

@@ -17,13 +17,16 @@ class Resolver
      */
     protected $links = null;
 
+    /**
+     * Resolver constructor.
+     * @param \Magento\Framework\App\RequestInterface $request
+     */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request
     ) {
         $this->request = $request;
     }
 
-
     /**
      * Get stored value.
      * Fallback to request if none.
@@ -42,6 +45,7 @@ public function getLinks()
      * Override link data from request
      *
      * @param array|null $links
+     * @return void
      */
     public function override($links)
     {

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

@@ -15,6 +15,7 @@
 use Magento\Framework\Api\ImageProcessorInterface;
 use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\ValidatorException;
@@ -546,6 +547,8 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
             );
         } catch (ValidatorException $e) {
             throw new CouldNotSaveException(__($e->getMessage()));
+        } catch (LocalizedException $e) {
+            throw $e;
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\CouldNotSaveException(__('Unable to save product'));
         }

app/code/Magento/Catalog/Test/Unit/Model/ImageExtractorTest.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Test\Unit\Model;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class ImageExtractorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Catalog\Model\ImageExtractor
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(\Magento\Catalog\Model\ImageExtractor::class);
+    }
+
+    public function testProcess()
+    {
+        $expectedArray = include(__DIR__ . '/_files/converted_view.php');
+        $this->assertEquals($expectedArray, $this->model->process($this->getDomElement(), 'media'));
+    }
+
+    /**
+     * Get mocked dom element
+     *
+     * @return \DOMElement
+     */
+    private function getDomElement()
+    {
+        $doc = new \DOMDocument();
+        $doc->load(__DIR__ . '/_files/valid_view.xml');
+        return $doc->getElementsByTagName('images')->item(0);
+    }
+}