Merge remote-tracking branch 'origin/develop' into MAGETWO-51472

Author: adifucan

app/code/Magento/Braintree/Observer/DataAssignObserver.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\Event\Observer;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Quote\Api\Data\PaymentInterface;
 
 /**
  * Class DataAssignObserver
@@ -31,13 +32,19 @@ class DataAssignObserver extends AbstractDataAssignObserver
     public function execute(Observer $observer)
     {
         $data = $this->readDataArgument($observer);
+
+        $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+        if (!is_array($additionalData)) {
+            return;
+        }
+
         $paymentInfo = $this->readPaymentModelArgument($observer);
 
         foreach ($this->additionalInformationList as $additionalInformationKey) {
-            if ($data->getDataByKey($additionalInformationKey) !== null) {
+            if (isset($additionalData[$additionalInformationKey])) {
                 $paymentInfo->setAdditionalInformation(
                     $additionalInformationKey,
-                    $data->getDataByKey($additionalInformationKey)
+                    $additionalData[$additionalInformationKey]
                 );
             }
         }

app/code/Magento/Braintree/Test/Unit/Observer/DataAssignObserverTest.php

@@ -10,6 +10,7 @@
 use Magento\Payment\Model\InfoInterface;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Braintree\Observer\DataAssignObserver;
+use Magento\Quote\Api\Data\PaymentInterface;
 
 /**
  * Class DataAssignObserverTest
@@ -30,8 +31,10 @@ public function testExecute()
         $paymentInfoModel = $this->getMock(InfoInterface::class);
         $dataObject = new DataObject(
             [
-                'payment_method_nonce' => self::PAYMENT_METHOD_NONCE,
-                'device_data' => self::DEVICE_DATA,
+                PaymentInterface::KEY_ADDITIONAL_DATA => [
+                    'payment_method_nonce' => self::PAYMENT_METHOD_NONCE,
+                    'device_data' => self::DEVICE_DATA
+                ]
             ]
         );
         $observerContainer->expects(static::atLeastOnce())

app/code/Magento/Catalog/Model/Product/Copier.php

@@ -47,8 +47,10 @@ public function copy(\Magento\Catalog\Model\Product $product)
         $product->getWebsiteIds();
         $product->getCategoryIds();
 
+        /** @var \Magento\Catalog\Model\Product $duplicate */
         $duplicate = $this->productFactory->create();
         $duplicate->setData($product->getData());
+        $duplicate->setOptions([]);
         $duplicate->setIsDuplicate(true);
         $duplicate->setOriginalId($product->getEntityId());
         $duplicate->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);

app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php

@@ -38,7 +38,7 @@ public function __construct(
         \Magento\Framework\File\Size $fileSize
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
+        $this->rootDirectory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
         $this->fileSize = $fileSize;
     }
 

app/code/Magento/Catalog/Model/ResourceModel/Category/Collection/Factory.php

@@ -5,6 +5,10 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Category\Collection;
 
+/**
+ * Class Factory
+ * @deprecated
+ */
 class Factory
 {
     /**

app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php

@@ -6,6 +6,8 @@
 namespace Magento\Catalog\Model\ResourceModel\Category;
 
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\Catalog\Model\ResourceModel\Category\Flat\CollectionFactory as CategoryFlatCollectionFactory;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Category flat model
@@ -68,6 +70,7 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
+     * @deprecated
      */
     protected $_categoryCollectionFactory;
 
@@ -78,6 +81,11 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      */
     protected $_categoryFactory;
 
+    /**
+     * @var CategoryFlatCollectionFactory
+     */
+    private $categoryFlatCollectionFactory;
+
     /**
      * Class constructor
      *
@@ -399,7 +407,7 @@ public function getCategories($parent, $recursionLevel = 0, $sorted = false, $as
             );
             $parentPath = $this->getConnection()->fetchOne($select);
 
-            $collection = $this->_categoryCollectionFactory
+            $collection = $this->getCategoryFlatCollectionFactory()
                 ->create()
                 ->addNameToResult()
                 ->addUrlRewriteToResult()
@@ -690,4 +698,19 @@ public function getProductsPosition($category)
 
         return $this->getConnection()->fetchPairs($select, $bind);
     }
+
+    /**
+     * Get instance of CategoryFlatCollectionFactory
+     *
+     * @return CategoryFlatCollectionFactory
+     */
+    private function getCategoryFlatCollectionFactory()
+    {
+        if (!$this->categoryFlatCollectionFactory instanceof CategoryFlatCollectionFactory) {
+            $this->categoryFlatCollectionFactory = ObjectManager::getInstance()
+                ->get(CategoryFlatCollectionFactory::class);
+        }
+
+        return $this->categoryFlatCollectionFactory;
+    }
 }

app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Processor.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Api\Data\ImageContentInterface;
-use Magento\Catalog\Model\Product\Option\Type\File\ValidateFactory;
 use Magento\Framework\Api\ImageProcessor;
 use Magento\Framework\Filesystem;
 
@@ -20,7 +19,7 @@ class Processor
     protected $imageProcessor;
 
     /** @var string */
-    protected $destinationFolder = '/custom_options/quote';
+    protected $destinationFolder = 'custom_options/quote';
 
     /**
      * @param Filesystem $filesystem
@@ -40,9 +39,8 @@ public function __construct(
      */
     protected function saveFile(ImageContentInterface $imageContent)
     {
-        $uri = $this->filesystem->getUri(DirectoryList::MEDIA);
         $filePath = $this->imageProcessor->processImageContent($this->destinationFolder, $imageContent);
-        return $uri . $this->destinationFolder . $filePath;
+        return $this->destinationFolder . $filePath;
     }
 
     /**
@@ -54,8 +52,8 @@ public function processFileContent(ImageContentInterface $imageContent)
     {
         $filePath = $this->saveFile($imageContent);
 
-        $fileAbsolutePath = $this->filesystem->getDirectoryRead(DirectoryList::ROOT)->getAbsolutePath($filePath);
-        $fileHash = md5($this->filesystem->getDirectoryRead(DirectoryList::ROOT)->readFile($filePath));
+        $fileAbsolutePath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($filePath);
+        $fileHash = md5($this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->readFile($filePath));
         $imageSize = getimagesize($fileAbsolutePath);
         $result = [
             'type' => $imageContent->getType(),

app/code/Magento/Catalog/Model/Webapi/Product/Option/Type/File/Validator.php

@@ -79,6 +79,7 @@ public function testCopy()
             [
                 '__wakeup',
                 'setData',
+                'setOptions',
                 'setIsDuplicate',
                 'setOriginalId',
                 'setStatus',
@@ -97,6 +98,7 @@ public function testCopy()
         );
         $this->productFactoryMock->expects($this->once())->method('create')->will($this->returnValue($duplicateMock));
 
+        $duplicateMock->expects($this->once())->method('setOptions')->with([]);
         $duplicateMock->expects($this->once())->method('setIsDuplicate')->with(true);
         $duplicateMock->expects($this->once())->method('setOriginalId')->with(1);
         $duplicateMock->expects(