merge magento/2.3-develop into magento-obsessive-owls/MAGETWO-70174-data-migration

Author: Magento CICD

app/code/Magento/Catalog/view/base/web/template/product/link.html

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<a class="product-item-link"
+<a if="isAllowed()"
+   class="product-item-link"
    attr="href: $row().url"
    text="label"/>

app/code/Magento/CatalogImportExport/Model/Import/Uploader.php

@@ -161,6 +161,15 @@ public function move($fileName, $renameFileOff = false)
                 $read = $this->_readFactory->create($url, DriverPool::HTTPS);
             }
 
+            //only use filename (for URI with query parameters)
+            $parsedUrlPath = parse_url($url, PHP_URL_PATH);
+            if ($parsedUrlPath) {
+                $urlPathValues = explode('/', $parsedUrlPath);
+                if (!empty($urlPathValues)) {
+                    $fileName = end($urlPathValues);
+                }
+            }
+
             $fileName = preg_replace('/[^a-z0-9\._-]+/i', '', $fileName);
             $this->_directory->writeFile(
                 $this->_directory->getRelativePath($this->getTmpDir() . '/' . $fileName),

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/UploaderTest.php

@@ -217,12 +217,32 @@ public function moveFileUrlDataProvider()
             [
                 '$fileUrl' => 'http://test_uploader_file',
                 '$expectedHost' => 'test_uploader_file',
-                '$expectedFileName' => 'httptest_uploader_file',
+                '$expectedFileName' => 'test_uploader_file',
             ],
             [
                 '$fileUrl' => 'https://!:^&`;file',
                 '$expectedHost' => '!:^&`;file',
-                '$expectedFileName' => 'httpsfile',
+                '$expectedFileName' => 'file',
+            ],
+            [
+                '$fileUrl' => 'https://www.google.com/image.jpg',
+                '$expectedHost' => 'www.google.com/image.jpg',
+                '$expectedFileName' => 'image.jpg',
+            ],
+            [
+                '$fileUrl' => 'https://www.google.com/image.jpg?param=1',
+                '$expectedHost' => 'www.google.com/image.jpg?param=1',
+                '$expectedFileName' => 'image.jpg',
+            ],
+            [
+                '$fileUrl' => 'https://www.google.com/image.jpg?param=1&param=2',
+                '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
+                '$expectedFileName' => 'image.jpg',
+            ],
+            [
+                '$fileUrl' => 'http://www.google.com/image.jpg?param=1&param=2',
+                '$expectedHost' => 'www.google.com/image.jpg?param=1&param=2',
+                '$expectedFileName' => 'image.jpg',
             ],
         ];
     }

app/code/Magento/Dhl/Model/Carrier.php

@@ -606,7 +606,7 @@ public function getDhlProducts($doc)
             'L' => __('Express 10:30'),
             'G' => __('Domestic economy select'),
             'W' => __('Economy select'),
-            'I' => __('Break bulk economy'),
+            'I' => __('Domestic express 9:00'),
             'N' => __('Domestic express'),
             'O' => __('Others'),
             'R' => __('Globalmail business'),
@@ -616,7 +616,7 @@ public function getDhlProducts($doc)
         ];
 
         $nonDocType = [
-            '1' => __('Customer services'),
+            '1' => __('Domestic express 12:00'),
             '3' => __('Easy shop'),
             '4' => __('Jetline'),
             '8' => __('Express easy'),

app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php

@@ -447,4 +447,67 @@ public function requestToShipmentDataProvider()
             ]
         ];
     }
+    
+    /**
+     * @dataProvider dhlProductsDataProvider
+     *
+     * @param string $docType
+     * @param array $products
+     */
+    public function testGetDhlProducts(string $docType, array $products)
+    {
+        $this->assertEquals($products, $this->model->getDhlProducts($docType));
+    }
+
+    /**
+     * @return array
+     */
+    public function dhlProductsDataProvider() : array
+    {
+        return [
+            'doc' => [
+                'docType' => \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_DOC,
+                'products' => [
+                    '2' => 'Easy shop',
+                    '5' => 'Sprintline',
+                    '6' => 'Secureline',
+                    '7' => 'Express easy',
+                    '9' => 'Europack',
+                    'B' => 'Break bulk express',
+                    'C' => 'Medical express',
+                    'D' => 'Express worldwide',
+                    'U' => 'Express worldwide',
+                    'K' => 'Express 9:00',
+                    'L' => 'Express 10:30',
+                    'G' => 'Domestic economy select',
+                    'W' => 'Economy select',
+                    'I' => 'Domestic express 9:00',
+                    'N' => 'Domestic express',
+                    'O' => 'Others',
+                    'R' => 'Globalmail business',
+                    'S' => 'Same day',
+                    'T' => 'Express 12:00',
+                    'X' => 'Express envelope',
+                ]
+            ],
+            'non-doc' => [
+                'docType' => \Magento\Dhl\Model\Carrier::DHL_CONTENT_TYPE_NON_DOC,
+                'products' => [
+                    '1' => 'Domestic express 12:00',
+                    '3' => 'Easy shop',
+                    '4' => 'Jetline',
+                    '8' => 'Express easy',
+                    'P' => 'Express worldwide',
+                    'Q' => 'Medical express',
+                    'E' => 'Express 9:00',
+                    'F' => 'Freight worldwide',
+                    'H' => 'Economy select',
+                    'J' => 'Jumbo box',
+                    'M' => 'Express 10:30',
+                    'V' => 'Europack',
+                    'Y' => 'Express 12:00',
+                ]
+            ]
+        ];
+    }
 }

app/code/Magento/Dhl/i18n/en_US.csv

@@ -23,14 +23,12 @@ Europack,Europack
 "Express 10:30","Express 10:30"
 "Domestic economy select","Domestic economy select"
 "Economy select","Economy select"
-"Break bulk economy","Break bulk economy"
 "Domestic express","Domestic express"
 Others,Others
 "Globalmail business","Globalmail business"
 "Same day","Same day"
 "Express 12:00","Express 12:00"
 "Express envelope","Express envelope"
-"Customer services","Customer services"
 Jetline,Jetline
 "Freight worldwide","Freight worldwide"
 "Jumbo box","Jumbo box"
@@ -81,3 +79,5 @@ Size,Size
 "Show Method if Not Applicable","Show Method if Not Applicable"
 "Sort Order","Sort Order"
 Debug,Debug
+"Domestic express 9:00","Domestic express 9:00"
+"Domestic express 12:00","Domestic express 12:00"

app/code/Magento/Eav/Test/Unit/Model/TypeLocatorTest.php

@@ -4,10 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Eav\Test\Unit\Model;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Eav\Model\TypeLocator;
 use Magento\Eav\Model\TypeLocator\ComplexType as ComplexTypeLocator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -66,7 +65,10 @@ public function testGetType(
         $expected
     ) {
         $this->complexType->expects($this->once())->method('getType')->willReturn($expected);
-        $type = $this->customAttributeTypeLocator->getType($attributeCode, $serviceEntityTypeMapData[$serviceClass]);
+        $type = $this->customAttributeTypeLocator->getType(
+            $attributeCode,
+            $serviceEntityTypeMapData[$serviceClass]
+        );
 
         $this->assertEquals($expected, $type, 'Expected: ' . $expected . 'but got: ' . $type);
     }
@@ -79,16 +81,22 @@ public function getTypeDataProvider()
     {
         $serviceInterface = \Magento\Catalog\Api\Data\ProductInterface::class;
         $eavEntityType = 'catalog_product';
-        $mediaBackEndModelClass = \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class;
-        $mediaAttributeDataInterface = \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class;
+        $mediaBackEndModelClass = ProductAttributeMediaGalleryEntryInterface::class;
+        $mediaAttributeDataInterface = ProductAttributeMediaGalleryEntryInterface::class;
 
-        $attribute = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, ['getBackendModel']);
+        $attribute = $this->createPartialMock(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+            ['getBackendModel']
+        );
 
         $attribute->expects($this->any())
             ->method('getBackendModel')
             ->willReturn($mediaBackEndModelClass);
 
-        $attributeNoBackendModel = $this->createPartialMock(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, ['getBackendModel', 'getFrontendInput']);
+        $attributeNoBackendModel = $this->createPartialMock(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+            ['getBackendModel', 'getFrontendInput']
+        );
 
         $attributeNoBackendModel->expects($this->any())
             ->method('getBackendModel')

app/code/Magento/GraphQl/Controller/GraphQl.php

@@ -10,13 +10,13 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Webapi\Response;
 use Magento\GraphQl\Model\SchemaGeneratorInterface;
-use Magento\Framework\GraphQl\RequestProcessor;
+use Magento\Framework\GraphQl\QueryProcessor;
 use Magento\Framework\GraphQl\ExceptionFormatter;
 use Magento\GraphQl\Model\ResolverContext;
+use Magento\Framework\GraphQl\HttpRequestProcessor;
 
 /**
  * Front controller for web API GraphQL area.
@@ -39,38 +39,50 @@ class GraphQl implements FrontControllerInterface
     private $jsonSerializer;
 
     /**
-     * @var RequestProcessor
+     * @var QueryProcessor
      */
-    private $requestProcessor;
+    private $queryProcessor;
 
-    /** @var ExceptionFormatter */
+    /**
+     * @var ExceptionFormatter
+     */
     private $graphQlError;
 
-    /** @var ResolverContext */
+    /**
+     * @var ResolverContext
+     */
     private $context;
 
+    /**
+     * @var HttpRequestProcessor
+     */
+    private $requestProcessor;
+
     /**
      * @param Response $response
      * @param SchemaGeneratorInterface $schemaGenerator
      * @param SerializerInterface $jsonSerializer
-     * @param RequestProcessor $requestProcessor
+     * @param QueryProcessor $queryProcessor
      * @param ExceptionFormatter $graphQlError
      * @param ResolverContext $context
+     * @param HttpRequestProcessor $requestProcessor
      */
     public function __construct(
         Response $response,
         SchemaGeneratorInterface $schemaGenerator,
         SerializerInterface $jsonSerializer,
-        RequestProcessor $requestProcessor,
+        QueryProcessor $queryProcessor,
         ExceptionFormatter $graphQlError,
-        ResolverContext $context
+        ResolverContext $context,
+        HttpRequestProcessor $requestProcessor
     ) {
         $this->response = $response;
         $this->schemaGenerator = $schemaGenerator;
         $this->jsonSerializer = $jsonSerializer;
-        $this->requestProcessor = $requestProcessor;
+        $this->queryProcessor = $queryProcessor;
         $this->graphQlError = $graphQlError;
         $this->context = $context;
+        $this->requestProcessor = $requestProcessor;
     }
 
     /**
@@ -82,17 +94,11 @@ public function __construct(
     public function dispatch(RequestInterface $request)
     {
         try {
-            /** @var $request Http */
-            if ($request->getHeader('Content-Type')
-                && strpos($request->getHeader('Content-Type'), 'application/json') !== false
-            ) {
-                $content = $request->getContent();
-                $data = $this->jsonSerializer->unserialize($content);
-            } else {
-                throw new LocalizedException(__('Request content type must be application/json'));
-            }
+            /** @var Http $request */
+            $this->requestProcessor->processHeaders($request);
+            $data = $this->jsonSerializer->unserialize($request->getContent());
             $schema = $this->schemaGenerator->generate();
-            $result = $this->requestProcessor->process(
+            $result = $this->queryProcessor->process(
                 $schema,
                 isset($data['query']) ? $data['query'] : '',
                 null,

app/code/Magento/GraphQl/Controller/HttpHeaderProcessor/ContentTypeProcessor.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\GraphQl\Controller\HttpHeaderProcessor;
+
+use Magento\Framework\GraphQl\HttpHeaderProcessorInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Processes the "Content-Type" header entry
+ */
+class ContentTypeProcessor implements HttpHeaderProcessorInterface
+{
+    /**
+     * Handle the mandatory application/json header
+     *
+     * {@inheritDoc}
+     * @throws LocalizedException
+     */
+    public function processHeaderValue($headerValue)
+    {
+        if (!$headerValue || strpos($headerValue, 'application/json') === false) {
+            throw new LocalizedException(
+                new \Magento\Framework\Phrase('Request content type must be application/json')
+            );
+        }
+    }
+}