From 57dce06d0cf533b91d96e6849896422c78c0edf0 Mon Sep 17 00:00:00 2001 From: yamlahik Date: Fri, 28 Jun 2024 16:06:29 +0200 Subject: [PATCH 1/2] upgrade dependency require-dev and php8 --- composer.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index d7ba00e..89bb2d8 100755 --- a/composer.json +++ b/composer.json @@ -3,21 +3,21 @@ "description": "Pacemaker library providing the functionality to convert a CSV file with category from a CSV file with products", "license": "MIT", "require": { - "php": ">=7.3.0", - "techdivision/import-product": "^25.0.0", - "techdivision/import-category": "^21.0.0", - "techdivision/import-converter": "^11.0.0" + "php": "^8.1", + "techdivision/import-product": "dev-compatibility-php-81", + "techdivision/import-category": "dev-compatibility-php-81", + "techdivision/import-converter": "dev-compatibility-php-81" }, "require-dev": { - "doctrine/dbal": "2.5.*", - "pdepend/pdepend": "2.5.2", - "phpmd/phpmd": "@stable", - "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", - "consolidation/robo": "~1.0", - "mikey179/vfsstream": "~1.0", - "symfony/http-kernel": "~2.0|~3.0|~4.0" + "doctrine/dbal": "^4.0.4", + "pdepend/pdepend": "^2.16.2", + "phpmd/phpmd": "^2.15.0", + "phpunit/phpunit": "^11.2.5", + "sebastian/phpcpd": "^2.0.1", + "squizlabs/php_codesniffer": "^3.10.1", + "consolidation/robo": "^4.0.2", + "mikey179/vfsstream": "v1.6.11", + "symfony/http-kernel": "v4.4.51" }, "minimum-stability": "dev", "prefer-stable": true, From f85eb3615ce37df778d1c3f86ac2f0ea9a8e50c8 Mon Sep 17 00:00:00 2001 From: yamlahik Date: Wed, 24 Jul 2024 17:08:20 +0200 Subject: [PATCH 2/2] merge master to compatibility-php-81 --- CHANGELOG.md | 10 ++++++++++ composer.json | 10 +++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b0e192..f71237f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Version 11.0.0 + +## Features + +### PHP 8.1 Compatibility + +* Update dependencies +* Add PHP ">=8.1" support +* Remove PHP 7.3 support + # Version 10.0.0 ## Bugfixes diff --git a/composer.json b/composer.json index 89bb2d8..08e4227 100755 --- a/composer.json +++ b/composer.json @@ -4,9 +4,9 @@ "license": "MIT", "require": { "php": "^8.1", - "techdivision/import-product": "dev-compatibility-php-81", - "techdivision/import-category": "dev-compatibility-php-81", - "techdivision/import-converter": "dev-compatibility-php-81" + "techdivision/import-product": "^26.0.0", + "techdivision/import-category": "^22.0.0", + "techdivision/import-converter": "^12.0.0" }, "require-dev": { "doctrine/dbal": "^4.0.4", @@ -16,8 +16,8 @@ "sebastian/phpcpd": "^2.0.1", "squizlabs/php_codesniffer": "^3.10.1", "consolidation/robo": "^4.0.2", - "mikey179/vfsstream": "v1.6.11", - "symfony/http-kernel": "v4.4.51" + "mikey179/vfsstream": "~1.6.11", + "symfony/http-kernel": "~4.4.51" }, "minimum-stability": "dev", "prefer-stable": true,