[Magento Community Engineering] Community Contributions - 2.3-develop-fast-lane-prs

magento-engcom-team · web-flow · commit c01cd6b92f34 · 2019-08-29T12:52:57.000-05:00
- merged with '2.3-develop-prs' branch
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -44,7 +44,10 @@
                             <!-- ko if: Array.isArray(option.value) -->
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
-                            <!-- ko ifnot: Array.isArray(option.value) -->
+                            <!-- ko if: (!Array.isArray(option.value) && option.option_type == 'file') -->
+                                <span data-bind="html: option.value"></span>
+                            <!-- /ko -->
+                            <!-- ko if: (!Array.isArray(option.value) && option.option_type != 'file') -->
                                 <span data-bind="text: option.value"></span>
                             <!-- /ko -->
                         </dd>
diff --git a/app/code/Magento/Eav/Model/AttributeProvider.php b/app/code/Magento/Eav/Model/AttributeProvider.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Eav\Model;
 
@@ -52,7 +53,7 @@ public function __construct(
      * Returns array of fields
      *
      * @param string $entityType
-     * @return array
+     * @return string[]
      * @throws \Exception
      */
     public function getAttributes($entityType)
@@ -66,6 +67,7 @@ public function getAttributes($entityType)
         foreach ($searchResult->getItems() as $attribute) {
             $attributes[] = $attribute->getAttributeCode();
         }
+
         return $attributes;
     }
 }
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Quote\Model\Quote\Address\Total;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
@@ -112,17 +115,21 @@ public function collect(
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {
-        $amount = $total->getShippingAmount();
-        $shippingDescription = $total->getShippingDescription();
-        $title = ($shippingDescription)
-            ? __('Shipping & Handling (%1)', $shippingDescription)
-            : __('Shipping & Handling');
+        if (!$quote->getIsVirtual()) {
+            $amount = $total->getShippingAmount();
+            $shippingDescription = $total->getShippingDescription();
+            $title = ($shippingDescription)
+                ? __('Shipping & Handling (%1)', $shippingDescription)
+                : __('Shipping & Handling');
 
-        return [
-            'code' => $this->getCode(),
-            'title' => $title,
-            'value' => $amount
-        ];
+            return [
+                'code' => $this->getCode(),
+                'title' => $title,
+                'value' => $amount
+            ];
+        } else {
+            return [];
+        }
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender.php b/app/code/Magento/Sales/Model/Order/Email/Sender.php
@@ -12,8 +12,9 @@
 
 /**
  * Class Sender
- * @api
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
+ * @api
  * @since 100.0.2
  */
 abstract class Sender
@@ -87,10 +88,12 @@ protected function checkAndSend(Order $order)
             $this->logger->error($e->getMessage());
             return false;
         }
-        try {
-            $sender->sendCopyTo();
-        } catch (\Exception $e) {
-            $this->logger->error($e->getMessage());
+        if ($this->identityContainer->getCopyMethod() == 'copy') {
+            try {
+                $sender->sendCopyTo();
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage());
+            }
         }
         return true;
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php b/app/code/Magento/Sales/Model/Order/Email/SenderBuilder.php
@@ -84,7 +84,7 @@ public function sendCopyTo()
     {
         $copyTo = $this->identityContainer->getEmailCopyTo();
 
-        if (!empty($copyTo) && $this->identityContainer->getCopyMethod() == 'copy') {
+        if (!empty($copyTo)) {
             $this->configureEmailTemplate();
             foreach ($copyTo as $email) {
                 $this->transportBuilder->addTo($email);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
@@ -283,6 +283,10 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->willReturn($emailSendingResult);
 
             if ($emailSendingResult) {
+                $this->identityContainerMock->expects($this->once())
+                    ->method('getCopyMethod')
+                    ->willReturn('copy');
+
                 $this->senderBuilderFactoryMock->expects($this->once())
                     ->method('create')
                     ->willReturn($this->senderMock);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php
@@ -57,7 +57,7 @@ protected function setUp()
 
         $this->identityContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity::class,
-            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId']
+            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod']
         );
         $this->identityContainerMock->expects($this->any())
             ->method('getStore')
@@ -138,6 +138,10 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                 ->willReturn($emailSendingResult);
 
             if ($emailSendingResult) {
+                $this->identityContainerMock->expects($this->once())
+                    ->method('getCopyMethod')
+                    ->willReturn('copy');
+
                 $this->senderBuilderFactoryMock->expects($this->once())
                     ->method('create')
                     ->willReturn($this->senderMock);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -57,7 +57,7 @@ protected function setUp()
 
         $this->identityContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::class,
-            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId']
+            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod']
         );
         $this->identityContainerMock->expects($this->any())
             ->method('getStore')
@@ -144,6 +144,10 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                 ->willReturn($emailSendingResult);
 
             if ($emailSendingResult) {
+                $this->identityContainerMock->expects($this->once())
+                    ->method('getCopyMethod')
+                    ->willReturn('copy');
+
                 $this->senderBuilderFactoryMock->expects($this->once())
                     ->method('create')
                     ->willReturn($this->senderMock);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/OrderSenderTest.php
@@ -30,7 +30,7 @@ protected function setUp()
 
         $this->identityContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\OrderIdentity::class,
-            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId']
+            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod']
         );
         $this->identityContainerMock->expects($this->any())
             ->method('getStore')
@@ -77,6 +77,10 @@ public function testSend($configValue, $forceSyncMode, $emailSendingResult, $sen
                 ->willReturn($emailSendingResult);
 
             if ($emailSendingResult) {
+                $this->identityContainerMock->expects($senderSendException ? $this->never() : $this->once())
+                    ->method('getCopyMethod')
+                    ->willReturn('copy');
+
                 $addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
 
                 $this->addressRenderer->expects($this->any())
@@ -214,6 +218,10 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
             ->method('isEnabled')
             ->willReturn(true);
 
+        $this->identityContainerMock->expects($this->once())
+            ->method('getCopyMethod')
+            ->willReturn('copy');
+
         $addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
 
         $this->addressRenderer->expects($this->exactly($formatCallCount))
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentSenderTest.php
@@ -57,7 +57,7 @@ protected function setUp()
 
         $this->identityContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::class,
-            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId']
+            ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod']
         );
         $this->identityContainerMock->expects($this->any())
             ->method('getStore')
@@ -144,6 +144,10 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
                 ->willReturn($emailSendingResult);
 
             if ($emailSendingResult) {
+                $this->identityContainerMock->expects($this->once())
+                    ->method('getCopyMethod')
+                    ->willReturn('copy');
+
                 $this->senderBuilderFactoryMock->expects($this->once())
                     ->method('create')
                     ->willReturn($this->senderMock);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/SenderBuilderTest.php
@@ -48,11 +48,14 @@ protected function setUp()
             ['getTemplateVars', 'getTemplateOptions', 'getTemplateId']
         );
 
-        $this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, [
-            'getStoreId',
-            '__wakeup',
-            'getId',
-        ]);
+        $this->storeMock = $this->createPartialMock(
+            \Magento\Store\Model\Store::class,
+            [
+                'getStoreId',
+                '__wakeup',
+                'getId',
+            ]
+        );
 
         $this->identityContainerMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::class,
@@ -165,9 +168,6 @@ public function testSendCopyTo()
         $transportMock = $this->createMock(
             \Magento\Sales\Test\Unit\Model\Order\Email\Stub\TransportInterfaceMock::class
         );
-        $this->identityContainerMock->expects($this->once())
-            ->method('getCopyMethod')
-            ->will($this->returnValue('copy'));
         $this->identityContainerMock->expects($this->never())
             ->method('getCustomerEmail');
         $this->identityContainerMock->expects($this->never())
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
@@ -282,6 +282,10 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->willReturn($emailSendingResult);
 
             if ($emailSendingResult) {
+                $this->identityContainerMock->expects($this->once())
+                    ->method('getCopyMethod')
+                    ->willReturn('copy');
+
                 $this->senderBuilderFactoryMock->expects($this->once())
                     ->method('create')
                     ->willReturn($this->senderMock);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
@@ -284,6 +284,10 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 ->willReturn($emailSendingResult);
 
             if ($emailSendingResult) {
+                $this->identityContainerMock->expects($this->once())
+                    ->method('getCopyMethod')
+                    ->willReturn('copy');
+
                 $this->senderBuilderFactoryMock->expects($this->once())
                     ->method('create')
                     ->willReturn($this->senderMock);
diff --git a/lib/internal/Magento/Framework/Model/EntitySnapshot.php b/lib/internal/Magento/Framework/Model/EntitySnapshot.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Model;
 
@@ -44,6 +45,8 @@ public function __construct(
     }
 
     /**
+     * Register snapshot of entity data.
+     *
      * @param string $entityType
      * @param object $entity
      * @return void
@@ -55,7 +58,7 @@ public function registerSnapshot($entityType, $entity)
         $entityData = $hydrator->extract($entity);
         $attributes = $this->attributeProvider->getAttributes($entityType);
         $this->snapshotData[$entityType][$entityData[$metadata->getIdentifierField()]]
-            = array_intersect_key($entityData, $attributes);
+            = array_intersect(\array_keys($entityData), $attributes);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProvider.php b/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProvider.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Model\EntitySnapshot;
 
@@ -53,31 +54,29 @@ public function __construct(
      * Returns array of fields
      *
      * @param string $entityType
-     * @return array
+     * @return string[]
      * @throws \Exception
      */
     public function getAttributes($entityType)
     {
         if (!isset($this->registry[$entityType])) {
             $metadata = $this->metadataPool->getMetadata($entityType);
-            $this->registry[$entityType] = $metadata->getEntityConnection()->describeTable($metadata->getEntityTable());
-            if ($metadata->getLinkField() != $metadata->getIdentifierField()) {
-                unset($this->registry[$entityType][$metadata->getLinkField()]);
-            }
-            $providers = [];
-            if (isset($this->providers[$entityType])) {
-                $providers = $this->providers[$entityType];
-            } elseif (isset($this->providers['default'])) {
-                $providers = $this->providers['default'];
+            $entityDescription = $metadata->getEntityConnection()->describeTable($metadata->getEntityTable());
+            if ($metadata->getLinkField() !== $metadata->getIdentifierField()) {
+                unset($entityDescription[$metadata->getLinkField()]);
             }
+            $attributes = [];
+            $attributes[] = \array_keys($entityDescription);
+
+            $providers = $this->providers[$entityType] ?? $this->providers['default'] ?? [];
             foreach ($providers as $providerClass) {
                 $provider = $this->objectManager->get($providerClass);
-                $this->registry[$entityType] = array_merge(
-                    $this->registry[$entityType],
-                    $provider->getAttributes($entityType)
-                );
+                $attributes[] = $provider->getAttributes($entityType);
             }
+
+            $this->registry[$entityType] = \array_merge(...$attributes);
         }
+
         return $this->registry[$entityType];
     }
 }
diff --git a/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProviderInterface.php b/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProviderInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Model\EntitySnapshot;
 
@@ -12,8 +13,10 @@
 interface AttributeProviderInterface
 {
     /**
+     * Returns array of fields
+     *
      * @param string $entityType
-     * @return array
+     * @return string[]
      */
     public function getAttributes($entityType);
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`* Copyright © Magento, Inc. All rights reserved.`
`4`	`4`	`* See COPYING.txt for license details.`
`5`	`5`	`*/`
	`6`	`+declare(strict_types=1);`
`6`	`7`
`7`	`8`	`namespace Magento\Eav\Model;`
`8`	`9`
`@@ -52,7 +53,7 @@ public function __construct(`
`52`	`53`	`* Returns array of fields`
`53`	`54`	`*`
`54`	`55`	`* @param string $entityType`
`55`		`- * @return array`
	`56`	`+ * @return string[]`
`56`	`57`	`* @throws \Exception`
`57`	`58`	`*/`
`58`	`59`	`public function getAttributes($entityType)`
`@@ -66,6 +67,7 @@ public function getAttributes($entityType)`
`66`	`67`	`foreach ($searchResult->getItems() as $attribute) {`
`67`	`68`	`$attributes[] = $attribute->getAttributeCode();`
`68`	`69`	`}`
	`70`	`+`
`69`	`71`	`return $attributes;`
`70`	`72`	`}`
`71`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function sendCopyTo()`
`84`	`84`	`{`
`85`	`85`	`$copyTo = $this->identityContainer->getEmailCopyTo();`
`86`	`86`
`87`		`- if (!empty($copyTo) && $this->identityContainer->getCopyMethod() == 'copy') {`
	`87`	`+ if (!empty($copyTo)) {`
`88`	`88`	`$this->configureEmailTemplate();`
`89`	`89`	`foreach ($copyTo as $email) {`
`90`	`90`	`$this->transportBuilder->addTo($email);`