Refactoring AdvancedPricingImportExport fixture

Author: Usik2203

dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php

@@ -4,26 +4,45 @@
  * See COPYING.txt for license details.
  */
 
-$productModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Catalog\Model\Product::class);
+declare(strict_types=1);
 
-$productModel->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var Product $productModel
+ * @var ProductRepositoryInterface $productRepository
+ */
+$productModel = $objectManager->create(Product::class);
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+$productModel->setTypeId(Type::TYPE_SIMPLE)
     ->setAttributeSetId(4)
     ->setName('AdvancedPricingSimple 1')
     ->setSku('AdvancedPricingSimple 1')
     ->setPrice(321)
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
     ->setCategoryIds([])
     ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
-    ->setIsObjectNew(true)
-    ->save();
+    ->setIsObjectNew(true);
+
+$productRepository->save($productModel);
 
 $productModel->setName('AdvancedPricingSimple 2')
     ->setId(null)
-    ->setUrlKey(null)
+    ->setUrlKey('')
     ->setSku('AdvancedPricingSimple 2')
     ->setPrice(654)
-    ->setIsObjectNew(true)
-    ->save();
+    ->setIsObjectNew(true);
+
+$productRepository->save($productModel);

dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/product_with_second_website.php

@@ -4,7 +4,12 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\Group;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 use Magento\Store\Api\WebsiteRepositoryInterface;
@@ -13,15 +18,16 @@
 Resolver::getInstance()->requireDataFixture('Magento/AdvancedPricingImportExport/_files/create_products.php');
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository */
-$attributeRepository = $objectManager
-    ->get(Magento\Catalog\Api\ProductAttributeRepositoryInterface::class);
-$groupPriceAttribute = $attributeRepository->get('tier_price')
-    ->setScope(Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface::SCOPE_WEBSITE);
+
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+$groupPriceAttribute = $attributeRepository->get('tier_price')->setScope(ScopedAttributeInterface::SCOPE_WEBSITE);
 $attributeRepository->save($groupPriceAttribute);
+
 /** @var WebsiteRepositoryInterface $websiteRepository */
 $websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
 $website = $websiteRepository->get('test');
+
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
 $productModel = $productRepository->get('AdvancedPricingSimple 2');
@@ -30,10 +36,10 @@
     [
         [
             'website_id' => $website->getId(),
-            'cust_group' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+            'cust_group' => Group::CUST_GROUP_ALL,
             'price_qty'  => 3,
             'price'      => 5
         ]
     ]
 );
-$productModel->save();
+$productRepository->save($productModel);