From ff21e6f1275cec4369c36c983d6f036b9c0643df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Eisenfu=CC=88hrer?= Date: Mon, 19 Dec 2022 13:41:11 +0100 Subject: [PATCH] Fix php 8.1 compatibility --- .semver | 2 +- CHANGELOG.md | 16 ++++++++++++++++ RoboFile.php | 2 +- composer.json | 2 +- composer.lock | 14 +++++++------- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/.semver b/.semver index 552097fe..7ae17cfb 100644 --- a/.semver +++ b/.semver @@ -1,6 +1,6 @@ --- :major: 4 :minor: 2 -:patch: 2 +:patch: 3 :special: '' :metadata: '' diff --git a/CHANGELOG.md b/CHANGELOG.md index 029dc161..b2f1eb19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# Version 4.2.3 + +* Min. PHP Version set to 7.3 +* Support PhpUnit 8.0 +* Please take a look at [UPGRADE-4.0.0](UPGRADE-4.0.0.md) + +## Features + +* none + +## Bugfixes + +* import: + * php 8.1 compatibility + + # Version 4.2.2 * Min. PHP Version set to 7.3 diff --git a/RoboFile.php b/RoboFile.php index c1fe7460..412b43b0 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.2' + 'webapp.version' => '4.2.3' ); /** diff --git a/composer.json b/composer.json index 0c3e5c7f..4c3747d3 100755 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "license": "MIT", "require": { "php": ">=7.3.0", - "techdivision/import": "^17.3.5", + "techdivision/import": "^17.3.6", "techdivision/import-cli": "^12.1.1", "techdivision/import-app-simple": "^18.0.0", "techdivision/import-configuration-jms": "^17.3.1", diff --git a/composer.lock b/composer.lock index 9b4052ee..2df9bdc6 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": "cd47871fe6c8320355d35272e8b1eba6", + "content-hash": "9096be1ec4acac0aaa0ef844f594c395", "packages": [ { "name": "brick/math", @@ -2645,16 +2645,16 @@ }, { "name": "techdivision/import", - "version": "17.3.5", + "version": "17.3.6", "source": { "type": "git", "url": "https://github.com/techdivision/import.git", - "reference": "c24f42ddc86e2bdff4f7e703dbcf30612866d1f1" + "reference": "da46c7a03c483133c491b9921e88e71e331ac581" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/techdivision/import/zipball/c24f42ddc86e2bdff4f7e703dbcf30612866d1f1", - "reference": "c24f42ddc86e2bdff4f7e703dbcf30612866d1f1", + "url": "https://api.github.com/repos/techdivision/import/zipball/da46c7a03c483133c491b9921e88e71e331ac581", + "reference": "da46c7a03c483133c491b9921e88e71e331ac581", "shasum": "" }, "require": { @@ -2712,9 +2712,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.3.5" + "source": "https://github.com/techdivision/import/tree/17.3.6" }, - "time": "2022-12-19T11:39:22+00:00" + "time": "2022-12-19T12:30:06+00:00" }, { "name": "techdivision/import-app-simple",