Merge remote-tracking branch 'mainline-ce/2.3-develop' into MC-19247

Author: adifucan

app/code/Magento/Analytics/Model/ExportDataHandler.php

@@ -89,7 +89,7 @@ public function __construct(
     public function prepareExportData()
     {
         try {
-            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
+            $tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
 
             $this->prepareDirectory($tmpDirectory, $this->getTmpFilesDirRelativePath());
             $this->reportWriter->write($tmpDirectory, $this->getTmpFilesDirRelativePath());
@@ -157,7 +157,9 @@ private function prepareDirectory(WriteInterface $directory, $path)
     private function prepareFileDirectory(WriteInterface $directory, $path)
     {
         $directory->delete($path);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (dirname($path) !== '.') {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $directory->create(dirname($path));
         }
 
@@ -176,6 +178,7 @@ private function pack($source, $destination)
         $this->archive->pack(
             $source,
             $destination,
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             is_dir($source) ?: false
         );
 

app/code/Magento/Analytics/Test/Unit/Model/ExportDataHandlerTest.php

@@ -13,7 +13,7 @@
 use Magento\Framework\Archive;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\Framework\Filesystem\DirectoryList;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class ExportDataHandlerTest extends \PHPUnit\Framework\TestCase
@@ -137,7 +137,7 @@ public function testPrepareExportData($isArchiveSourceDirectory)
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::SYS_TMP)
+            ->with(DirectoryList::VAR_DIR)
             ->willReturn($this->directoryMock);
         $this->directoryMock
             ->expects($this->exactly(4))
@@ -238,7 +238,7 @@ public function testPrepareExportDataWithLocalizedException()
         $this->filesystemMock
             ->expects($this->once())
             ->method('getDirectoryWrite')
-            ->with(DirectoryList::SYS_TMP)
+            ->with(DirectoryList::VAR_DIR)
             ->willReturn($this->directoryMock);
         $this->reportWriterMock
             ->expects($this->once())

app/code/Magento/AsynchronousOperations/Model/OperationSearchResults.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with bulk Operation search result.
+ */
+class OperationSearchResults extends SearchResults implements OperationSearchResultsInterface
+{
+}

app/code/Magento/AsynchronousOperations/etc/di.xml

@@ -16,7 +16,7 @@
     <preference for="Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface" type="Magento\AsynchronousOperations\Model\OperationStatus" />
     <preference for="Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Detailed" />
     <preference for="Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Short" />
-    <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface" type="Magento\AsynchronousOperations\Model\OperationSearchResults" />
     <preference for="Magento\AsynchronousOperations\Api\OperationRepositoryInterface" type="Magento\AsynchronousOperations\Model\OperationRepository" />
     <type name="Magento\Framework\EntityManager\MetadataPool">
         <arguments>

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -323,7 +323,8 @@
                 </field>
                 <field id="port" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Port (25)</label>
-                    <comment>For Windows server only.</comment>
+                    <validate>validate-digits validate-digits-range digits-range-0-65535</validate>
+                    <comment>Please enter at least 0 and at most 65535 (For Windows server only).</comment>
                 </field>
                 <field id="set_return_path" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Set Return-Path</label>

app/code/Magento/BraintreeGraphQl/README.md

@@ -1,4 +1,9 @@
-# BraintreeGraphQl
+# Magento_BraintreeGraphQl module
 
-**BraintreeGraphQl** provides type and resolver for method additional
-information.
+The Magento_BraintreeGraphQl module provides type and resolver information for the GraphQL module to pass payment information data from the client to Magento.
+
+## Extensibility
+
+Extension developers can interact with the Magento_BraintreeGraphQl module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_BraintreeGraphQl module.

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Price/Provider.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Product\Price;
+
+use Magento\Bundle\Pricing\Price\FinalPrice;
+use Magento\Catalog\Pricing\Price\BasePrice;
+use Magento\Bundle\Model\Product\Price;
+use Magento\Catalog\Pricing\Price\RegularPrice;
+use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\SaleableInterface;
+
+/**
+ * Provides pricing information for Bundle products
+ */
+class Provider implements ProviderInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getMinimalFinalPrice(SaleableInterface $product): AmountInterface
+    {
+        return $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getMinimalPrice();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMinimalRegularPrice(SaleableInterface $product): AmountInterface
+    {
+        return $product->getPriceInfo()->getPrice(RegularPrice::PRICE_CODE)->getMinimalPrice();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMaximalFinalPrice(SaleableInterface $product): AmountInterface
+    {
+        return $product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getMaximalPrice();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMaximalRegularPrice(SaleableInterface $product): AmountInterface
+    {
+        return $product->getPriceInfo()->getPrice(RegularPrice::PRICE_CODE)->getMaximalPrice();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getRegularPrice(SaleableInterface $product): AmountInterface
+    {
+        if ($product->getPriceType() == Price::PRICE_TYPE_FIXED) {
+            return $product->getPriceInfo()->getPrice(BasePrice::PRICE_CODE)->getAmount();
+        }
+        return $product->getPriceInfo()->getPrice(RegularPrice::PRICE_CODE)->getAmount();
+    }
+}

app/code/Magento/BundleGraphQl/etc/graphql/di.xml

@@ -40,4 +40,22 @@
             </argument>
         </arguments>
     </type>
+
+
+    <type name="Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="bundle" xsi:type="object">Magento\BundleGraphQl\Model\Resolver\Product\Price\Provider</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessor\AttributeProcessor">
+        <arguments>
+            <argument name="fieldToAttributeMap" xsi:type="array">
+                <item name="price_range" xsi:type="array">
+                    <item name="price_type" xsi:type="string">price_type</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>

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

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\CategoryAttributeSearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Category Attribute search results.
+ */
+class CategoryAttributeSearchResults extends SearchResults implements CategoryAttributeSearchResultsInterface
+{
+}

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

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\Data\CategorySearchResultsInterface;
+use Magento\Framework\Api\SearchResults;
+
+/**
+ * Service Data Object with Category search results.
+ */
+class CategorySearchResults extends SearchResults implements CategorySearchResultsInterface
+{
+}