From 01c7027f4f409336f15fedcbebe776072d2180f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Eisenfu=CC=88hrer?= Date: Fri, 26 Jul 2024 10:30:56 +0200 Subject: [PATCH] Finale version 5.0.0 --- .semver | 6 +++--- CHANGELOG.md | 7 ++++--- RoboFile.php | 3 ++- UPGRADE-5.0.0.md | 2 +- composer.json | 2 -- composer.lock | 30 +++++++++++++++++++----------- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/.semver b/.semver index 0d9941ef..2b872b76 100644 --- a/.semver +++ b/.semver @@ -1,6 +1,6 @@ --- -:major: 4 -:minor: 2 -:patch: 6 +:major: 5 +:minor: 0 +:patch: 0 :special: '' :metadata: '' diff --git a/CHANGELOG.md b/CHANGELOG.md index d73bb033..6d303bcf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# Version 5.0.0 (coming soon) -This is mostly a cleanup release offering stronger type guarantees for integrators with the changes, but there is no big new feature for end users. -* The minimum supported PHP version is now 8.1.0. +# Version 5.0.0 +Update from 4.2.x with minimum dependency on PHP 8.1 and third-party modules + +* Min. PHP Version set to 8.1. * replace dependency `"behat/symfony2-extension"` and `"behat/mink-goutte-driver"` with `friends-of-behat/symfony-extension` and `"friends-of-behat/mink-browserkit-driver"` * Upgrade required dependency * Correction of the compatibility of functions diff --git a/RoboFile.php b/RoboFile.php index bda53721..272eca34 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.6' + 'webapp.version' => '5.0.0' ); /** @@ -348,6 +348,7 @@ public function runCpd() $this->properties['vendor.dir'].'/techdivision/import-converter-product-attribute/src/Observers/ProductToAttributeOptionValueConverterObserver.php', $this->properties['vendor.dir'].'/techdivision/import-customer-address/src/Observers/CustomerAddressAttributeObserver.php', $this->properties['vendor.dir'].'/techdivision/import-serializer-csv/src/CategoryCsvSerializer.php', + $this->properties['vendor.dir'].'/techdivision/import-product-tier-price/src/Utils/PrimarySkuToPkMappingUtil.php', ); // run the copy past detector diff --git a/UPGRADE-5.0.0.md b/UPGRADE-5.0.0.md index 31288313..a6be8ec6 100644 --- a/UPGRADE-5.0.0.md +++ b/UPGRADE-5.0.0.md @@ -1,4 +1,4 @@ -# Upgrade from 3.8.* to 4.0.0 +# Upgrade from 4.2.* to 5.0.0 This is mostly a cleanup release offering stronger type guarantees for integrators with the changes, but there is no big new feature for end users. * The minimum supported PHP version is now 8.1.0. diff --git a/composer.json b/composer.json index 4c8a0cd1..97895c0e 100755 --- a/composer.json +++ b/composer.json @@ -44,8 +44,6 @@ "techdivision/import-configuration": "^6.0.0", "egulias/email-validator": "^3.2.0" }, - "minimum-stability": "dev", - "prefer-stable": true, "require-dev": { "doctrine/dbal": "^4.0.4", "pdepend/pdepend": "^2.16.2", diff --git a/composer.lock b/composer.lock index 9501b6e5..c07e2356 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": "15abc56137c87da5b3dd67fc834789fd", + "content-hash": "57729efd8160c11419a972db97be28e3", "packages": [ { "name": "brick/math", @@ -5524,30 +5524,38 @@ }, { "name": "composer/pcre", - "version": "3.1.4", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "04229f163664973f68f38f6f73d917799168ef24" + "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", - "reference": "04229f163664973f68f38f6f73d917799168ef24", + "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90", + "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.8" + }, "require-dev": { - "phpstan/phpstan": "^1.3", + "phpstan/phpstan": "^1.11.8", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -5575,7 +5583,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.4" + "source": "https://github.com/composer/pcre/tree/3.2.0" }, "funding": [ { @@ -5591,7 +5599,7 @@ "type": "tidelift" } ], - "time": "2024-05-27T13:40:54+00:00" + "time": "2024-07-25T09:36:02+00:00" }, { "name": "composer/semver", @@ -10739,9 +10747,9 @@ } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": true, + "prefer-stable": false, "prefer-lowest": false, "platform": { "php": "^8.1"