merge magento/2.3-develop into magento-trigger/MAGETWO-89736

Author: Magento CICD

.github/ISSUE_TEMPLATE.md

@@ -28,8 +28,8 @@
 
 ### Expected result
 <!--- Tell us what should happen -->
-1. [Screenshot, logs]
+1. [Screenshots, logs or description]
 
 ### Actual result
 <!--- Tell us what happens instead -->
-1. [Screenshot, logs]
+1. [Screenshots, logs or description]

app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php

@@ -88,7 +88,7 @@ protected function setUp()
 
         $this->paymentInfoMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
-            ->setMethods(['__wakeup'])
+            ->setMethods(['__wakeup', 'getExtensionAttributes'])
             ->getMock();
 
         $this->paymentTokenMock = $objectManager->getObject(PaymentToken::class);
@@ -107,6 +107,10 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
+        $this->paymentInfoMock->expects(self::any())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->paymentExtensionMock);
+
         $this->subject = [
             'payment' => $this->paymentDataObjectMock,
         ];
@@ -184,7 +188,7 @@ public function testHandleWithoutToken()
             ->method('create');
 
         $this->handler->handle($this->subject, $response);
-        self::assertNull($this->paymentInfoMock->getExtensionAttributes());
+        self::assertNotNull($this->paymentInfoMock->getExtensionAttributes());
     }
 
     /**

app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php

@@ -80,9 +80,11 @@ protected function setUp()
 
         $this->payment = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
-            ->setMethods(['__wakeup'])
+            ->setMethods(['__wakeup', 'getExtensionAttributes'])
             ->getMock();
 
+        $this->payment->expects(self::any())->method('getExtensionAttributes')->willReturn($this->paymentExtension);
+
         $config = $this->getConfigMock();
 
         $this->paymentHandler = new VaultDetailsHandler(

app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php

@@ -13,6 +13,7 @@
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Braintree\Gateway\Config\PayPal\Config;
 use Magento\Braintree\Model\Paypal\Helper\QuoteUpdater;
+use Magento\Quote\Api\Data\CartExtensionInterface;
 
 /**
  * Class QuoteUpdaterTest
@@ -281,7 +282,7 @@ private function updateQuoteStep(\PHPUnit_Framework_MockObject_MockObject $quote
      */
     private function getQuoteMock()
     {
-        return $this->getMockBuilder(Quote::class)
+        $quoteMock = $this->getMockBuilder(Quote::class)
             ->setMethods(
                 [
                     'getIsVirtual',
@@ -291,9 +292,21 @@ private function getQuoteMock()
                     'collectTotals',
                     'getShippingAddress',
                     'getBillingAddress',
+                    'getExtensionAttributes'
                 ]
             )->disableOriginalConstructor()
             ->getMock();
+
+        $cartExtensionMock = $this->getMockBuilder(CartExtensionInterface::class)
+            ->setMethods(['setShippingAssignments'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $quoteMock->expects(self::any())
+            ->method('getExtensionAttributes')
+            ->willReturn($cartExtensionMock);
+
+        return $quoteMock;
     }
 
     /**

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

@@ -2535,13 +2535,7 @@ public function setTypeId($typeId)
      */
     public function getExtensionAttributes()
     {
-        $extensionAttributes = $this->_getExtensionAttributes();
-        if (null === $extensionAttributes) {
-            /** @var \Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes */
-            $extensionAttributes = $this->extensionAttributesFactory->create(ProductInterface::class);
-            $this->setExtensionAttributes($extensionAttributes);
-        }
-        return $extensionAttributes;
+        return $this->_getExtensionAttributes();
     }
 
     /**

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -1570,7 +1570,7 @@ protected function getEntityPkName(\Magento\Eav\Model\Entity\AbstractEntity $ent
     }
 
     /**
-     * Add requere tax percent flag for product collection
+     * Add require tax percent flag for product collection
      *
      * @return $this
      */

app/code/Magento/Catalog/Test/Unit/Model/CustomOptions/CustomOptionTest.php

@@ -7,6 +7,8 @@
 
 use Magento\Catalog\Model\CustomOptions\CustomOption;
 use Magento\Catalog\Model\Webapi\Product\Option\Type\File\Processor as FileProcessor;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Catalog\Api\Data\CustomOptionExtensionInterface;
 
 class CustomOptionTest extends \PHPUnit\Framework\TestCase
 {
@@ -15,6 +17,12 @@ class CustomOptionTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
+    /** @var \Magento\Framework\Api\ExtensionAttributesFactory | \PHPUnit_Framework_MockObject_MockObject */
+    private $extensionAttributesFactoryMock;
+
+    /** @var \Magento\Catalog\Api\Data\CustomOptionExtensionInterface | \PHPUnit_Framework_MockObject_MockObject */
+    private $extensionMock;
+
     /**
      * @var FileProcessor | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -30,7 +38,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $extensionAttributesFactory = $this->getMockBuilder(\Magento\Framework\Api\ExtensionAttributesFactory::class)
+        $this->extensionAttributesFactoryMock = $this->getMockBuilder(ExtensionAttributesFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -52,10 +60,17 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->extensionMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\CustomOptionExtensionInterface::class)
+            ->setMethods(['getFileInfo'])
+            ->getMockForAbstractClass();
+
+        $this->extensionAttributesFactoryMock->expects(self::any())
+            ->method('create')->willReturn($this->extensionMock);
+
         $this->model = new CustomOption(
             $context,
             $registry,
-            $extensionAttributesFactory,
+            $this->extensionAttributesFactoryMock,
             $attributeValueFactory,
             $this->fileProcessor,
             $resource,
@@ -84,14 +99,10 @@ public function testGetOptionValue()
 
     public function testGetOptionValueWithFileInfo()
     {
-        $customOption = $this->getMockBuilder(\Magento\Catalog\Api\Data\CustomOptionExtensionInterface::class)
-            ->setMethods(['getFileInfo'])
-            ->getMockForAbstractClass();
-
         $imageContent = $this->getMockBuilder(\Magento\Framework\Api\Data\ImageContentInterface::class)
             ->getMockForAbstractClass();
 
-        $customOption->expects($this->once())
+        $this->extensionMock->expects($this->once())
             ->method('getFileInfo')
             ->willReturn($imageContent);
 
@@ -112,7 +123,6 @@ public function testGetOptionValueWithFileInfo()
             ->with($imageContent)
             ->willReturn($imageResult);
 
-        $this->model->setExtensionAttributes($customOption);
         $this->model->setData(\Magento\Catalog\Api\Data\CustomOptionInterface::OPTION_VALUE, 'file');
         $this->assertEquals($imageResult, $this->model->getOptionValue());
     }

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

@@ -1336,7 +1336,6 @@ public function testSaveExistingWithMediaGalleryEntries()
 
         $expectedResult = [
             [
-                'value_id' => 5,
                 'value_id' => 5,
                 "label" => "new_label_text",
                 'file' => 'filename1',

app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php

@@ -9,7 +9,7 @@
  * Interface PaymentDetailsInterface
  * @api
  */
-interface PaymentDetailsInterface
+interface PaymentDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
     /**#@+
      * Constants defined for keys of array, makes typos less likely

app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php

@@ -174,7 +174,7 @@ private function buildFooter(array $footer)
      * correct HTML format.
      *
      * @param string $content
-     * @returns string
+     * @return string
      */
     private function formatContentWithLinks($content)
     {