From cfca5f5b336fb0edfdac651e83d789e7e8e62469 Mon Sep 17 00:00:00 2001 From: Kenza Yamlahi Date: Mon, 2 Oct 2023 12:00:03 +0200 Subject: [PATCH 1/2] Make import-cli-simple dependencies compatible with Magento 2.4.6 --- composer.json | 2 +- composer.lock | 88 ++++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/composer.json b/composer.json index 0f2fa2c7..50032656 100755 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "require": { "php": ">=7.3.0", "techdivision/import": "^17.5.1", - "techdivision/import-cli": "^12.3.0", + "techdivision/import-cli": "dev-pac-827", "techdivision/import-app-simple": "^18.0.3", "techdivision/import-configuration-jms": "^17.4.1", "techdivision/import-ee": "^16.0.0", diff --git a/composer.lock b/composer.lock index 7dbb930a..330feeac 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7db70267d802cc73937852208ec5e944", + "content-hash": "297aefe3bfac57d4e2ec2d93f02d89c8", "packages": [ { "name": "brick/math", @@ -287,16 +287,16 @@ }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { @@ -328,9 +328,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/instantiator", @@ -1129,16 +1129,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.1", + "version": "1.24.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01" + "reference": "bcad8d995980440892759db0c32acae7c8e79442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", - "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", + "reference": "bcad8d995980440892759db0c32acae7c8e79442", "shasum": "" }, "require": { @@ -1170,9 +1170,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" }, - "time": "2023-09-18T12:18:02+00:00" + "time": "2023-09-26T12:28:12+00:00" }, { "name": "psr/cache", @@ -3117,24 +3117,24 @@ }, { "name": "techdivision/import-cli", - "version": "12.3.0", + "version": "dev-pac-827", "source": { "type": "git", "url": "https://github.com/techdivision/import-cli.git", - "reference": "ba5e679e08ed4381bc9ba0aeef65c660955065ad" + "reference": "14ff5e3da5337199f67b1e1c0a87812e11412ca6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/techdivision/import-cli/zipball/ba5e679e08ed4381bc9ba0aeef65c660955065ad", - "reference": "ba5e679e08ed4381bc9ba0aeef65c660955065ad", + "url": "https://api.github.com/repos/techdivision/import-cli/zipball/14ff5e3da5337199f67b1e1c0a87812e11412ca6", + "reference": "14ff5e3da5337199f67b1e1c0a87812e11412ca6", "shasum": "" }, "require": { "php": ">=7.3.0", "ramsey/uuid": "^3.7|^3.8|^4.1|^4.2", - "symfony/config": "~2.8|~3.0|~4.0|~5.0", + "symfony/config": "~2.8|~3.0|~4.0|~5.0|~6.0", "symfony/console": "~2.3,!=2.7.0|~4.0|~5.0", - "symfony/dependency-injection": "~2.3,!=2.7.0|~3.0|~4.0|~5.0", + "symfony/dependency-injection": "~2.3,!=2.7.0|~3.0|~4.0|~5.0|~6.0", "symfony/expression-language": "~2.3,!=2.7.0|~4.0|~5.0", "techdivision/import-app-simple": "^18.0.0", "techdivision/import-configuration-jms": "^17.0.0" @@ -3148,7 +3148,7 @@ "phpunit/phpunit": "^6.5.0|^8.0.0|~9.5.0", "sebastian/phpcpd": "~3.0|~4.0|~5.0|~6.0", "squizlabs/php_codesniffer": "~3.4.0|~3.6.0", - "symfony/http-kernel": "~2.0|~3.0|~4.0" + "symfony/http-kernel": "~2.0|~3.0|~4.0|~5.0|~6.0" }, "type": "library", "autoload": { @@ -3172,9 +3172,9 @@ "description": "Commands and Helpers to implement a CLI providing single-threaded Magento 2 importing functionality based on Pacemaker", "support": { "issues": "https://github.com/techdivision/import-cli/issues", - "source": "https://github.com/techdivision/import-cli/tree/12.3.0" + "source": "https://github.com/techdivision/import-cli/tree/pac-827" }, - "time": "2023-07-10T16:37:46+00:00" + "time": "2023-10-02T09:53:25+00:00" }, { "name": "techdivision/import-configuration", @@ -7062,16 +7062,16 @@ }, { "name": "pdepend/pdepend", - "version": "2.14.0", + "version": "2.15.1", "source": { "type": "git", "url": "https://github.com/pdepend/pdepend.git", - "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1" + "reference": "d12f25bcdfb7754bea458a4a5cb159d55e9950d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1", - "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/d12f25bcdfb7754bea458a4a5cb159d55e9950d0", + "reference": "d12f25bcdfb7754bea458a4a5cb159d55e9950d0", "shasum": "" }, "require": { @@ -7113,7 +7113,7 @@ ], "support": { "issues": "https://github.com/pdepend/pdepend/issues", - "source": "https://github.com/pdepend/pdepend/tree/2.14.0" + "source": "https://github.com/pdepend/pdepend/tree/2.15.1" }, "funding": [ { @@ -7121,7 +7121,7 @@ "type": "tidelift" } ], - "time": "2023-05-26T13:15:18+00:00" + "time": "2023-09-28T12:00:56+00:00" }, { "name": "phar-io/manifest", @@ -7298,22 +7298,22 @@ }, { "name": "phpmd/phpmd", - "version": "2.13.0", + "version": "2.14.1", "source": { "type": "git", "url": "https://github.com/phpmd/phpmd.git", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3" + "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3", - "reference": "dad0228156856b3ad959992f9748514fa943f3e3", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/442fc2c34edcd5198b442d8647c7f0aec3afabe8", + "reference": "442fc2c34edcd5198b442d8647c7f0aec3afabe8", "shasum": "" }, "require": { "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", "ext-xml": "*", - "pdepend/pdepend": "^2.12.1", + "pdepend/pdepend": "^2.15.1", "php": ">=5.3.9" }, "require-dev": { @@ -7323,7 +7323,7 @@ "gregwar/rst": "^1.0", "mikey179/vfsstream": "^1.6.8", "phpunit/phpunit": "^4.8.36 || ^5.7.27", - "squizlabs/php_codesniffer": "^2.0" + "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2" }, "bin": [ "src/bin/phpmd" @@ -7360,6 +7360,7 @@ "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", "homepage": "https://phpmd.org/", "keywords": [ + "dev", "mess detection", "mess detector", "pdepend", @@ -7369,7 +7370,7 @@ "support": { "irc": "irc://irc.freenode.org/phpmd", "issues": "https://github.com/phpmd/phpmd/issues", - "source": "https://github.com/phpmd/phpmd/tree/2.13.0" + "source": "https://github.com/phpmd/phpmd/tree/2.14.1" }, "funding": [ { @@ -7377,20 +7378,20 @@ "type": "tidelift" } ], - "time": "2022-09-10T08:44:15+00:00" + "time": "2023-09-28T13:07:44+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.28", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", - "reference": "7134a5ccaaf0f1c92a4f5501a6c9f98ac4dcc0ef", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { @@ -7447,7 +7448,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.28" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -7455,7 +7456,7 @@ "type": "github" } ], - "time": "2023-09-12T14:36:20+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -10841,6 +10842,7 @@ ], "minimum-stability": "stable", "stability-flags": { + "techdivision/import-cli": 20, "behat/symfony2-extension": 20 }, "prefer-stable": false, @@ -10849,5 +10851,5 @@ "php": ">=7.3.0" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From e50b31fc34610cd1f21c8c1da3ac4c5d60f771b5 Mon Sep 17 00:00:00 2001 From: Kenza Yamlahi Date: Mon, 2 Oct 2023 13:24:15 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 6 ++++++ composer.lock | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44e76b04..fd594611 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,12 @@ * Better error message on PDOException ## Bugfixes +* Make composer dependencies compatible with Magento 2.4.6 (PAC-827) + * Update `symfony/dependency-injection` with version `~6.0` + * Update `symfony/http-kernel` with version `~5.0 ~6.0` + * Update `symfony/configl` with version `~6.0` + + * Import-category & Import-category-ee #METSUP-32: * url rewrites for the multistore store views are updated unintentionally diff --git a/composer.lock b/composer.lock index 330feeac..37d69ba8 100644 --- a/composer.lock +++ b/composer.lock @@ -3121,12 +3121,12 @@ "source": { "type": "git", "url": "https://github.com/techdivision/import-cli.git", - "reference": "14ff5e3da5337199f67b1e1c0a87812e11412ca6" + "reference": "9c9514d4d90aca4366cf1fb87f206c659832fef0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/techdivision/import-cli/zipball/14ff5e3da5337199f67b1e1c0a87812e11412ca6", - "reference": "14ff5e3da5337199f67b1e1c0a87812e11412ca6", + "url": "https://api.github.com/repos/techdivision/import-cli/zipball/9c9514d4d90aca4366cf1fb87f206c659832fef0", + "reference": "9c9514d4d90aca4366cf1fb87f206c659832fef0", "shasum": "" }, "require": { @@ -3174,7 +3174,7 @@ "issues": "https://github.com/techdivision/import-cli/issues", "source": "https://github.com/techdivision/import-cli/tree/pac-827" }, - "time": "2023-10-02T09:53:25+00:00" + "time": "2023-10-02T10:13:13+00:00" }, { "name": "techdivision/import-configuration",