Skip to content

Commit

Permalink
Merge pull request #10 from mbijnsdorp/feature/compatible-magento-2-4
Browse files Browse the repository at this point in the history
Declare module as compatible with Magento 2.4.x
  • Loading branch information
hostep committed Aug 2, 2020
2 parents b635995 + c6b4536 commit 76b6107
Show file tree
Hide file tree
Showing 3 changed files with 2,073 additions and 1,462 deletions.
3 changes: 2 additions & 1 deletion Test/Checker/Catalog/Product/UrlKey/DuplicateUrlKeyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class DuplicateUrlKeyTest extends TestCase
/** @var ObjectManagerHelper */
private $objectManagerHelper;

protected function setUp()
protected function setUp(): void
{
$this->objectManagerHelper = new ObjectManagerHelper($this);
}
Expand Down Expand Up @@ -56,6 +56,7 @@ function ($productData) use ($storeId) {

$collectionsPerStoreId = array_map(
function ($productsData) {
/** @var \PHPUnit\Framework\MockObject\MockObject $productCollectionMock */
$productCollectionMock = $this->objectManagerHelper
->getCollectionMock(ProductCollection::class, $productsData);

Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
],
"require": {
"php": "~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0",
"magento/framework": "^100.1 || ^101.0 || ^102.0",
"magento/module-backend": "^100.1 || ^101.0",
"magento/module-catalog": "^101.0 || ^102.0 || ^103.0",
"magento/framework": "^100.1 || ^101.0 || ^102.0 || ^103.0",
"magento/module-backend": "^100.1 || ^101.0 || ^102.0",
"magento/module-catalog": "^101.0 || ^102.0 || ^103.0 || ^104.0",
"magento/module-cron": "^100.1",
"magento/module-store": "^100.1 || ^101.0",
"magento/module-ui": "^100.1 || ^101.0",
Expand All @@ -28,7 +28,7 @@
"phpcompatibility/php-compatibility": "^9.2",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.26",
"phpunit/phpunit": "^7.5",
"phpunit/phpunit": "^9.0",
"vimeo/psalm": "^3.11"
},
"config": {
Expand Down
Loading

0 comments on commit 76b6107

Please sign in to comment.