Merge pull request #48 from netresearch/CI-251

Establish M2.4 compatibility

Author: schmengler

README.md

@@ -36,13 +36,13 @@ Install it into your Magento 2 project with composer:
 If you need a customer without specific data, this is all:
 
 ```php
-protected function setUp()
+protected function setUp(): void
 {
   $this->customerFixture = new CustomerFixture(
     CustomerBuilder::aCustomer()->build()
   );
 }
-protected function tearDown()
+protected function tearDown(): void
 {
   CustomerFixtureRollback::create()->execute($this->customerFixture);
 }
@@ -98,7 +98,7 @@ $this->customerFixture->login();
 
 
 
-### Adresses
+### Addresses
 
 Similar to the customer builder you can also configure the address builder with custom attributes:
 
@@ -120,7 +120,7 @@ AddressBuilder::anAddress()
 Product fixtures work similar as customer fixtures:
 
 ```php
-protected function setUp()
+protected function setUp(): void
 {
   $this->productFixture = new ProductFixture(
     ProductBuilder::aSimpleProduct()
@@ -133,7 +133,7 @@ protected function setUp()
       ->build()
   );
 }
-protected function tearDown()
+protected function tearDown(): void
 {
   ProductFixtureRollback::create()->execute($this->productFixture);
 }

composer.json

@@ -30,21 +30,27 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "magento/framework": "^101.0|^102.0",
-        "magento/zendframework1": "^1.12",
-        "magento/module-catalog": "^101.0|^102.0|^103.0",
-        "magento/module-customer": "^100.1|^101.0|^102.0",
-        "magento/module-checkout": "^100.1",
-        "magento/module-indexer": "^100.0",
+        "php": "^7.1",
+        "magento/framework": "^102.0|^103.0",
+        "magento/zendframework1": "^1.14",
+        "magento/module-catalog": "^103.0|^104.0",
+        "magento/module-catalog-inventory": "^100.3",
+        "magento/module-checkout": "^100.3",
+        "magento/module-customer": "^102.0|^103.0",
+        "magento/module-directory": "^100.3",
+        "magento/module-indexer": "^100.3",
+        "magento/module-payment": "^100.3",
+        "magento/module-quote": "^101.1",
+        "magento/module-sales": "^102.0|^103.0",
         "fzaninotto/faker": "^v1.9.0"
-
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0|^6.0",
+        "ext-json": "*",
+        "magento/module-store": "^101.0",
+        "phpunit/phpunit": "^6.0|^9.0",
         "pds/skeleton": "^1.0",
-        "phpro/grumphp": "^0.11.6",
-        "phpstan/phpstan": "^0.8.0",
+        "phpro/grumphp": "^0.13.0",
+        "phpstan/phpstan": "^0.9.0",
         "squizlabs/php_codesniffer": "^3.0"
     }
 }

registration.php

@@ -1,4 +1,5 @@
 <?php
+
 \Magento\Framework\Component\ComponentRegistrar::register(
     \Magento\Framework\Component\ComponentRegistrar::MODULE,
     'TddWizard_Fixtures',

src/Catalog/CategoryBuilder.php

@@ -4,20 +4,16 @@
 
 use Magento\Catalog\Api\CategoryLinkRepositoryInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Model\Category;
-use \Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Api\Data\CategoryProductLinkInterface;
 use Magento\Catalog\Api\Data\CategoryProductLinkInterfaceFactory;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
 class CategoryBuilder
 {
-    /**
-     * @var CategoryInterface
-     */
-    private $category;
-
     /**
      * @var CategoryRepositoryInterface
      */
@@ -38,10 +34,15 @@ class CategoryBuilder
      */
     private $productLinkFactory;
 
+    /**
+     * @var CategoryInterface|Category
+     */
+    private $category;
+
     /**
      * @var int[]
      */
-    private $skus = [];
+    private $skus;
 
     public function __construct(
         CategoryRepositoryInterface $categoryRepository,
@@ -54,15 +55,15 @@ public function __construct(
         $this->categoryRepository = $categoryRepository;
         $this->categoryResource = $categoryResource;
         $this->categoryLinkRepository = $categoryLinkRepository;
+        $this->productLinkFactory = $productLinkFactory;
         $this->category = $category;
         $this->skus = $skus;
-        $this->productLinkFactory = $productLinkFactory;
     }
 
-    public static function topLevelCategory(ObjectManagerInterface $objectManager = null) : CategoryBuilder
+    public static function topLevelCategory(ObjectManagerInterface $objectManager = null): CategoryBuilder
     {
         if ($objectManager === null) {
-            $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+            $objectManager = Bootstrap::getObjectManager();
         }
         /** @var CategoryInterface $category */
         $category = $objectManager->create(CategoryInterface::class);
@@ -84,10 +85,9 @@ public static function topLevelCategory(ObjectManagerInterface $objectManager =
     public static function childCategoryOf(
         CategoryFixture $parent,
         ObjectManagerInterface $objectManager = null
-    ): CategoryBuilder
-    {
+    ): CategoryBuilder {
         if ($objectManager === null) {
-            $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+            $objectManager = Bootstrap::getObjectManager();
         }
         /** @var CategoryInterface $category */
         $category = $objectManager->create(CategoryInterface::class);
@@ -112,35 +112,35 @@ public static function childCategoryOf(
      * @param string[] $skus
      * @return CategoryBuilder
      */
-    public function withProducts(array $skus) : CategoryBuilder
+    public function withProducts(array $skus): CategoryBuilder
     {
         $builder = clone $this;
         $builder->skus = $skus;
         return $builder;
     }
 
-    public function withDescription(string $description) : CategoryBuilder
+    public function withDescription(string $description): CategoryBuilder
     {
         $builder = clone $this;
         $builder->category->setCustomAttribute('description', $description);
         return $builder;
     }
 
-    public function withName(string $name) : CategoryBuilder
+    public function withName(string $name): CategoryBuilder
     {
         $builder = clone $this;
         $builder->category->setName($name);
         return $builder;
     }
 
-    public function withUrlKey(string $urlKey) : CategoryBuilder
+    public function withUrlKey(string $urlKey): CategoryBuilder
     {
         $builder = clone $this;
         $builder->category->setData('url_key', $urlKey);
         return $builder;
     }
 
-    public function withIsActive(bool $isActive) : CategoryBuilder
+    public function withIsActive(bool $isActive): CategoryBuilder
     {
         $builder = clone $this;
         $builder->category->setIsActive($isActive);
@@ -152,7 +152,11 @@ public function __clone()
         $this->category = clone $this->category;
     }
 
-    public function build() : CategoryInterface
+    /**
+     * @return CategoryInterface
+     * @throws \Exception
+     */
+    public function build(): CategoryInterface
     {
         $builder = clone $this;
         if (!$builder->category->getData('url_key')) {
@@ -175,4 +179,4 @@ public function build() : CategoryInterface
         }
         return $builder->category;
     }
-}
+}

src/Catalog/CategoryFixture.php

@@ -25,12 +25,12 @@ public function __construct(CategoryInterface $category)
         $this->category = $category;
     }
 
-    public function getId() : int
+    public function getId(): int
     {
         return $this->category->getId();
     }
 
-    public function getUrlKey() : string
+    public function getUrlKey(): string
     {
         /** @var Category $category */
         $category = $this->category;

src/Catalog/CategoryFixtureRollback.php

@@ -3,15 +3,18 @@
 namespace TddWizard\Fixtures\Catalog;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
 
 class CategoryFixtureRollback
 {
     /**
      * @var Registry
      */
     private $registry;
+
     /**
      * @var CategoryRepositoryInterface
      */
@@ -23,18 +26,22 @@ public function __construct(Registry $registry, CategoryRepositoryInterface $cat
         $this->categoryRepository = $categoryRepository;
     }
 
-    public static function create(ObjectManagerInterface $objectManager = null)
+    public static function create(ObjectManagerInterface $objectManager = null): CategoryFixtureRollback
     {
         if ($objectManager === null) {
-            $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+            $objectManager = Bootstrap::getObjectManager();
         }
         return new self(
             $objectManager->get(Registry::class),
             $objectManager->get(CategoryRepositoryInterface::class)
         );
     }
 
-    public function execute(CategoryFixture ...$categoryFixtures)
+    /**
+     * @param CategoryFixture ...$categoryFixtures
+     * @throws LocalizedException
+     */
+    public function execute(CategoryFixture ...$categoryFixtures): void
     {
         $this->registry->unregister('isSecureArea');
         $this->registry->register('isSecureArea', true);

src/Catalog/FulltextIndex.php

@@ -25,18 +25,23 @@ public function __construct(IndexerFactory $indexerFactory)
         $this->indexerFactory = $indexerFactory;
     }
 
-    public static function ensureTablesAreCreated()
+    /**
+     * @throws \Throwable
+     */
+    public static function ensureTablesAreCreated(): void
     {
         if (!self::$created) {
             (new self(Bootstrap::getObjectManager()->create(IndexerFactory::class)))->reindex();
         }
     }
 
-    public function reindex()
+    /**
+     * @throws \Throwable
+     */
+    public function reindex(): void
     {
-        /** @var \Magento\Indexer\Model\Indexer $indexer */
         $indexer = $this->indexerFactory->create();
         $indexer->load('catalogsearch_fulltext');
         $indexer->reindexAll();
     }
-}
+}

src/Catalog/IndexFailed.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace TddWizard\Fixtures\Catalog;
@@ -23,7 +24,9 @@ public static function becauseInitiallyTriggeredInTransaction(\Exception $previo
  */ 
 
 TXT
-            , 0, $previous
+            ,
+            0,
+            $previous
         );
     }
-}
+}