From c0637b94136224b6397d6a10ae3072254e9f53d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Eisenfu=CC=88hrer?= Date: Tue, 14 Nov 2023 12:16:00 +0100 Subject: [PATCH] Version 4.2.4 --- .semver | 2 +- CHANGELOG.md | 4 +- RoboFile.php | 2 +- composer.lock | 548 ++++++++++++-------------------------------------- 4 files changed, 131 insertions(+), 425 deletions(-) diff --git a/.semver b/.semver index 7ae17cfb..e1014757 100644 --- a/.semver +++ b/.semver @@ -1,6 +1,6 @@ --- :major: 4 :minor: 2 -:patch: 3 +:patch: 4 :special: '' :metadata: '' diff --git a/CHANGELOG.md b/CHANGELOG.md index 799b4ae9..1947e84a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Version 4.2.4 (Coming soon) +# Version 4.2.4 * Min. PHP Version set to 7.3 * Support PhpUnit 8.0 @@ -9,9 +9,11 @@ * import: * Extend multi/select callbacks with strict mode * Introduct new argument --config-dir for magento app/etc directory + * Preparation of a customer path for Magento backend storage of the configuration in `var/pacemaker/import/configuration` * import-cli: * Introduct new argument --config-dir for magento app/etc directory + * Preparation of a customer path for Magento backend storage of the configuration in `var/pacemaker/import/configuration` * import-configuration-jms: * Introduct new argument --config-dir for magento app/etc directory diff --git a/RoboFile.php b/RoboFile.php index c9ea485e..8dc3e364 100644 --- a/RoboFile.php +++ b/RoboFile.php @@ -40,7 +40,7 @@ class RoboFile extends \Robo\Tasks 'target.dir' => __DIR__ . '/target', 'symfony.dir' => __DIR__ . '/symfony', 'webapp.name' => 'import-cli-simple', - 'webapp.version' => '4.2.3' + 'webapp.version' => '4.2.4' ); /** diff --git a/composer.lock b/composer.lock index 68c63d40..98fea97c 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": "297aefe3bfac57d4e2ec2d93f02d89c8", + "content-hash": "f83383f4e886de42818bad6546339fda", "packages": [ { "name": "brick/math", @@ -1027,16 +1027,16 @@ }, { "name": "monolog/monolog", - "version": "2.9.1", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1" + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", "shasum": "" }, "require": { @@ -1113,7 +1113,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.1" + "source": "https://github.com/Seldaek/monolog/tree/2.9.2" }, "funding": [ { @@ -1125,7 +1125,7 @@ "type": "tidelift" } ], - "time": "2023-02-06T13:44:46+00:00" + "time": "2023-10-27T15:25:26+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -1638,85 +1638,6 @@ }, "time": "2020-01-27T09:15:09+00:00" }, - { - "name": "symfony/cache-contracts", - "version": "v1.1.13", - "source": { - "type": "git", - "url": "https://github.com/symfony/cache-contracts.git", - "reference": "a872a66e0bf7bac179c89bc96c7098bef1949f81" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/a872a66e0bf7bac179c89bc96c7098bef1949f81", - "reference": "a872a66e0bf7bac179c89bc96c7098bef1949f81", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "psr/cache": "^1.0|^2.0|^3.0" - }, - "suggest": { - "symfony/cache-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.1-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Cache\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to caching", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v1.1.13" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:41:36+00:00" - }, { "name": "symfony/config", "version": "v4.4.44", @@ -1885,6 +1806,100 @@ ], "time": "2022-11-05T17:10:16+00:00" }, + { + "name": "symfony/contracts", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/contracts.git", + "reference": "e3cc841da1eaf10088250a10618aa223eeb82280" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/contracts/zipball/e3cc841da1eaf10088250a10618aa223eeb82280", + "reference": "e3cc841da1eaf10088250a10618aa223eeb82280", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/cache": "^1.0|^2.0|^3.0", + "psr/container": "^1.0" + }, + "replace": { + "symfony/cache-contracts": "self.version", + "symfony/event-dispatcher-contracts": "self.version", + "symfony/http-client-contracts": "self.version", + "symfony/service-contracts": "self.version", + "symfony/translation-contracts": "self.version" + }, + "require-dev": { + "symfony/polyfill-intl-idn": "^1.10" + }, + "suggest": { + "psr/event-dispatcher": "When using the EventDispatcher contracts", + "symfony/cache-implementation": "", + "symfony/event-dispatcher-implementation": "", + "symfony/http-client-implementation": "", + "symfony/service-implementation": "", + "symfony/translation-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\": "" + }, + "exclude-from-classmap": [ + "**/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A set of abstractions extracted out of the Symfony components", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/contracts/tree/v1.10.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-07-20T09:59:04+00:00" + }, { "name": "symfony/dependency-injection", "version": "v4.4.49", @@ -2503,85 +2518,6 @@ ], "time": "2023-01-26T09:26:14+00:00" }, - { - "name": "symfony/service-contracts", - "version": "v1.1.13", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "afa00c500c2d6aea6e3b2f4862355f507bc5ebb4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/afa00c500c2d6aea6e3b2f4862355f507bc5ebb4", - "reference": "afa00c500c2d6aea6e3b2f4862355f507bc5ebb4", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "psr/container": "^1.0" - }, - "suggest": { - "symfony/service-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.1-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to writing services", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v1.1.13" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-27T14:01:05+00:00" - }, { "name": "symfony/var-exporter", "version": "v4.4.43", @@ -2657,16 +2593,16 @@ }, { "name": "techdivision/import", - "version": "17.5.2", + "version": "17.7.0", "source": { "type": "git", "url": "https://github.com/techdivision/import.git", - "reference": "1b8ed4500f6811a9308da79d110e87b0c5fb00ab" + "reference": "ce1d41f42ec049f027e9b27af7b47f8d76421310" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/techdivision/import/zipball/1b8ed4500f6811a9308da79d110e87b0c5fb00ab", - "reference": "1b8ed4500f6811a9308da79d110e87b0c5fb00ab", + "url": "https://api.github.com/repos/techdivision/import/zipball/ce1d41f42ec049f027e9b27af7b47f8d76421310", + "reference": "ce1d41f42ec049f027e9b27af7b47f8d76421310", "shasum": "" }, "require": { @@ -2677,7 +2613,7 @@ "league/event": "~2.0", "monolog/monolog": "~1.0|~2.3", "php": ">=7.3.0", - "psr/cache": "~1.0", + "psr/cache": "~1.0|~2.0|~3.0", "psr/container": "1.1.1", "psr/log": "~1.0", "ramsey/uuid": "^3.7|^3.8|^4.1|^4.2", @@ -2724,9 +2660,9 @@ "description": "A library supporting generic Magento 2 import functionality", "support": { "issues": "https://github.com/techdivision/import/issues", - "source": "https://github.com/techdivision/import/tree/17.5.2" + "source": "https://github.com/techdivision/import/tree/17.7.0" }, - "time": "2023-10-11T15:58:54+00:00" + "time": "2023-11-14T10:44:44+00:00" }, { "name": "techdivision/import-app-simple", @@ -3117,16 +3053,16 @@ }, { "name": "techdivision/import-cli", - "version": "dev-pac-827", + "version": "12.5.0", "source": { "type": "git", "url": "https://github.com/techdivision/import-cli.git", - "reference": "9c9514d4d90aca4366cf1fb87f206c659832fef0" + "reference": "4dcb1ec7e710b3e38f265d14b145a90745a5df02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/techdivision/import-cli/zipball/9c9514d4d90aca4366cf1fb87f206c659832fef0", - "reference": "9c9514d4d90aca4366cf1fb87f206c659832fef0", + "url": "https://api.github.com/repos/techdivision/import-cli/zipball/4dcb1ec7e710b3e38f265d14b145a90745a5df02", + "reference": "4dcb1ec7e710b3e38f265d14b145a90745a5df02", "shasum": "" }, "require": { @@ -3172,9 +3108,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/pac-827" + "source": "https://github.com/techdivision/import-cli/tree/12.5.0" }, - "time": "2023-10-02T10:13:13+00:00" + "time": "2023-11-14T10:44:14+00:00" }, { "name": "techdivision/import-configuration", @@ -3850,16 +3786,16 @@ }, { "name": "techdivision/import-product", - "version": "25.2.0", + "version": "25.2.1", "source": { "type": "git", "url": "https://github.com/techdivision/import-product.git", - "reference": "188a751f34e746fcb6875905cf394d5e1bcbca66" + "reference": "7f4a9b37d707a0002d0622329626743879c876d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/techdivision/import-product/zipball/188a751f34e746fcb6875905cf394d5e1bcbca66", - "reference": "188a751f34e746fcb6875905cf394d5e1bcbca66", + "url": "https://api.github.com/repos/techdivision/import-product/zipball/7f4a9b37d707a0002d0622329626743879c876d0", + "reference": "7f4a9b37d707a0002d0622329626743879c876d0", "shasum": "" }, "require": { @@ -3899,9 +3835,9 @@ "description": "Pacemaker library providing basic Magento 2 product import functionality", "support": { "issues": "https://github.com/techdivision/import-product/issues", - "source": "https://github.com/techdivision/import-product/tree/25.2.0" + "source": "https://github.com/techdivision/import-product/tree/25.2.1" }, - "time": "2023-07-03T17:49:26+00:00" + "time": "2023-10-16T14:51:53+00:00" }, { "name": "techdivision/import-product-bundle", @@ -4520,16 +4456,16 @@ }, { "name": "techdivision/import-product-url-rewrite", - "version": "25.0.3", + "version": "25.0.4", "source": { "type": "git", "url": "https://github.com/techdivision/import-product-url-rewrite.git", - "reference": "5a2f5574b3dd2f3f1558d05e87928af6bb96c7a8" + "reference": "ce18b071a4fe343e1a1e8b05b661994ace29095f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/techdivision/import-product-url-rewrite/zipball/5a2f5574b3dd2f3f1558d05e87928af6bb96c7a8", - "reference": "5a2f5574b3dd2f3f1558d05e87928af6bb96c7a8", + "url": "https://api.github.com/repos/techdivision/import-product-url-rewrite/zipball/ce18b071a4fe343e1a1e8b05b661994ace29095f", + "reference": "ce18b071a4fe343e1a1e8b05b661994ace29095f", "shasum": "" }, "require": { @@ -4569,9 +4505,9 @@ "description": "Pacemaker library providing basic Magento 2 product URL rewrite import functionality", "support": { "issues": "https://github.com/techdivision/import-product-url-rewrite/issues", - "source": "https://github.com/techdivision/import-product-url-rewrite/tree/25.0.3" + "source": "https://github.com/techdivision/import-product-url-rewrite/tree/25.0.4" }, - "time": "2023-09-18T13:46:34+00:00" + "time": "2023-10-16T14:53:24+00:00" }, { "name": "techdivision/import-product-variant", @@ -9015,80 +8951,6 @@ }, "time": "2018-11-26T06:55:10+00:00" }, - { - "name": "symfony/contracts", - "version": "v1.1.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/contracts.git", - "reference": "d3636025e8253c6144358ec0a62773cae588395b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/contracts/zipball/d3636025e8253c6144358ec0a62773cae588395b", - "reference": "d3636025e8253c6144358ec0a62773cae588395b", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "require-dev": { - "psr/cache": "^1.0", - "psr/container": "^1.0", - "symfony/polyfill-intl-idn": "^1.10" - }, - "suggest": { - "psr/cache": "When using the Cache contracts", - "psr/container": "When using the Service contracts", - "symfony/cache-contracts-implementation": "", - "symfony/event-dispatcher-implementation": "", - "symfony/http-client-contracts-implementation": "", - "symfony/service-contracts-implementation": "", - "symfony/translation-contracts-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\": "" - }, - "exclude-from-classmap": [ - "**/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A set of abstractions extracted out of the Symfony components", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/contracts/tree/master" - }, - "time": "2019-04-27T14:29:50+00:00" - }, { "name": "symfony/css-selector", "version": "v2.8.52", @@ -9494,85 +9356,6 @@ ], "time": "2022-07-20T09:59:04+00:00" }, - { - "name": "symfony/event-dispatcher-contracts", - "version": "v1.1.13", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", - "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", - "shasum": "" - }, - "require": { - "php": ">=7.1.3" - }, - "suggest": { - "psr/event-dispatcher": "", - "symfony/event-dispatcher-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.1-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\EventDispatcher\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to dispatching event", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:41:36+00:00" - }, { "name": "symfony/finder", "version": "v4.4.44", @@ -10548,84 +10331,6 @@ }, "time": "2020-01-04T12:24:57+00:00" }, - { - "name": "symfony/translation-contracts", - "version": "v1.1.13", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation-contracts.git", - "reference": "7462e5c4cb8b9cd152f992e8f10963b5641921f6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/7462e5c4cb8b9cd152f992e8f10963b5641921f6", - "reference": "7462e5c4cb8b9cd152f992e8f10963b5641921f6", - "shasum": "" - }, - "require": { - "php": ">=7.1.3" - }, - "suggest": { - "symfony/translation-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.1-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Translation\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to translation", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v1.1.13" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-06-27T13:16:42+00:00" - }, { "name": "symfony/yaml", "version": "v4.4.45", @@ -10842,7 +10547,6 @@ ], "minimum-stability": "stable", "stability-flags": { - "techdivision/import-cli": 20, "behat/symfony2-extension": 20 }, "prefer-stable": false,