ENGCOM-7506: Scoped identity at product alert email #26534

 - Merge Pull Request #26534 from maqlec/magento2:alert-sender-scope-fix
 - Merged commits:
   1. da04422
   2. d88c8d8
   3. 5f3b07d
   4. 87dde61
   5. 9c79208
   6. 06e2117
   7. 2b1e727
   8. d9b4c5a
   9. 667e51c
   10. 3c6b66a
   11. bba5b16
   12. f823fc2
   13. a50dcf5

Author: magento-engcom-team

app/code/Magento/ProductAlert/Model/Email.php

@@ -1,9 +1,10 @@
 <?php
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ProductAlert\Model;
 
 use Magento\Catalog\Model\Product;
@@ -40,7 +41,7 @@
  * @api
  * @since 100.0.2
  * @method int getStoreId()
- * @method $this setStoreId()
+ * @method $this setStoreId(int $storeId)
  */
 class Email extends AbstractModel
 {
@@ -206,7 +207,7 @@ public function getType()
      *
      * @return $this
      */
-    public function setWebsite(\Magento\Store\Model\Website $website)
+    public function setWebsite(Website $website)
     {
         $this->_website = $website;
         return $this;
@@ -275,7 +276,7 @@ public function clean()
      *
      * @return $this
      */
-    public function addPriceProduct(\Magento\Catalog\Model\Product $product)
+    public function addPriceProduct(Product $product)
     {
         $this->_priceProducts[$product->getId()] = $product;
         return $this;
@@ -288,7 +289,7 @@ public function addPriceProduct(\Magento\Catalog\Model\Product $product)
      *
      * @return $this
      */
-    public function addStockProduct(\Magento\Catalog\Model\Product $product)
+    public function addStockProduct(Product $product)
     {
         $this->_stockProducts[$product->getId()] = $product;
         return $this;
@@ -342,7 +343,7 @@ public function send()
             return false;
         }
 
-        $storeId = $this->getStoreId() ?: (int) $this->_customer->getStoreId();
+        $storeId = (int) $this->getStoreId() ?: (int) $this->_customer->getStoreId();
         $store = $this->getStore($storeId);
 
         $this->_appEmulation->startEnvironmentEmulation($storeId);
@@ -378,12 +379,13 @@ public function send()
                 'customerName' => $customerName,
                 'alertGrid' => $alertGrid,
             ]
-        )->setFrom(
+        )->setFromByScope(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_IDENTITY,
                 ScopeInterface::SCOPE_STORE,
                 $storeId
-            )
+            ),
+            $storeId
         )->addTo(
             $this->_customer->getEmail(),
             $customerName

dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php

@@ -3,32 +3,40 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\ProductAlert\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Helper\View;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test for Magento\ProductAlert\Model\Email class.
  *
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class EmailTest extends \PHPUnit\Framework\TestCase
+class EmailTest extends TestCase
 {
     /**
      * @var Email
      */
     protected $_emailModel;
 
     /**
-     * @var \Magento\TestFramework\ObjectManager
+     * @var ObjectManager
      */
     protected $_objectManager;
 
@@ -38,7 +46,7 @@ class EmailTest extends \PHPUnit\Framework\TestCase
     protected $customerAccountManagement;
 
     /**
-     * @var \Magento\Customer\Helper\View
+     * @var View
      */
     protected $_customerViewHelper;
 
@@ -62,11 +70,11 @@ class EmailTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp(): void
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_objectManager = Bootstrap::getObjectManager();
         $this->customerAccountManagement = $this->_objectManager->create(
             AccountManagementInterface::class
         );
-        $this->_customerViewHelper = $this->_objectManager->create(\Magento\Customer\Helper\View::class);
+        $this->_customerViewHelper = $this->_objectManager->create(View::class);
         $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
         $this->customerRepository = $this->_objectManager->create(CustomerRepositoryInterface::class);
         $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -100,7 +108,7 @@ public function testSend($isCustomerIdUsed)
             $this->_emailModel->setCustomerData($customer);
         }
 
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var Product $product */
         $product = $this->productRepository->getById(1);
 
         $this->_emailModel->addPriceProduct($product);
@@ -165,4 +173,36 @@ public function testEmailForDifferentCustomers(): void
             );
         }
     }
+
+    /**
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Store/_files/second_store_with_second_identity.php
+     */
+    public function testScopedMessageIdentity()
+    {
+        /** @var Website $website */
+        $website = $this->_objectManager->create(Website::class);
+        $website->load(1);
+        $this->_emailModel->setWebsite($website);
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->_objectManager->create(StoreManagerInterface::class);
+        $store = $storeManager->getStore('fixture_second_store');
+        $this->_emailModel->setStoreId($store->getId());
+
+        $customer = $this->customerRepository->getById(1);
+        $this->_emailModel->setCustomerData($customer);
+
+        /** @var Product $product */
+        $product = $this->productRepository->getById(1);
+
+        $this->_emailModel->addPriceProduct($product);
+        $this->_emailModel->send();
+
+        $from = $this->transportBuilder->getSentMessage()->getFrom()[0];
+        $this->assertEquals('Fixture Store Owner', $from->getName());
+        $this->assertEquals('fixture.store.owner@example.com', $from->getEmail());
+    }
 }

dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Create fixture store with second identity
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store.php');
+
+$objectManager = Bootstrap::getObjectManager();
+$store = $objectManager->create(Store::class);
+if ($storeId = $store->load('fixture_second_store', 'code')->getId()) {
+    /** @var Config $configResource */
+    $configResource = $objectManager->get(Config::class);
+    $configResource->saveConfig(
+        'trans_email/ident_general/name',
+        'Fixture Store Owner',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    $configResource->saveConfig(
+        'trans_email/ident_general/email',
+        'fixture.store.owner@example.com',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    $scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+    $scopeConfig->clean();
+}

dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+$store = $objectManager->create(Store::class);
+$storeId = $store->load('fixture_second_store', 'code')->getId();
+
+if ($storeId) {
+    $configResource = $objectManager->get(Config::class);
+    $configResource->deleteConfig(
+        'trans_email/ident_general/name',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    $configResource->deleteConfig(
+        'trans_email/ident_general/email',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+}
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store_rollback.php');