refactoring

Author: engcom-Echo

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;
@@ -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);

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

@@ -3,34 +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;
 
@@ -40,7 +46,7 @@ class EmailTest extends \PHPUnit\Framework\TestCase
     protected $customerAccountManagement;
 
     /**
-     * @var \Magento\Customer\Helper\View
+     * @var View
      */
     protected $_customerViewHelper;
 
@@ -64,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);
@@ -102,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);
@@ -189,7 +195,7 @@ public function testScopedMessageIdentity()
         $customer = $this->customerRepository->getById(1);
         $this->_emailModel->setCustomerData($customer);
 
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var Product $product */
         $product = $this->productRepository->getById(1);
 
         $this->_emailModel->addPriceProduct($product);

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

@@ -7,13 +7,14 @@
  */
 declare(strict_types=1);
 
-require_once __DIR__ . '/second_store.php';
-
 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);

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

@@ -1,20 +1,22 @@
 <?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(\Magento\Store\Model\Store::class);
+$store = $objectManager->create(Store::class);
 $storeId = $store->load('fixture_second_store', 'code')->getId();
 
 if ($storeId) {
-    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+    $configResource = $objectManager->get(Config::class);
     $configResource->deleteConfig(
         'trans_email/ident_general/name',
         ScopeInterface::SCOPE_STORES,
@@ -27,4 +29,4 @@
     );
 }
 
-require_once __DIR__ . '/second_store_rollback.php';
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store_rollback.php');