diff --git a/.semver b/.semver index 8862ed6b..0d9941ef 100644 --- a/.semver +++ b/.semver @@ -1,6 +1,6 @@ --- :major: 4 :minor: 2 -:patch: 5 +:patch: 6 :special: '' :metadata: '' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b69ab67..3b347bb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +<<<<<<< HEAD # 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. @@ -7,7 +8,7 @@ This is mostly a cleanup release offering stronger type guarantees for integrato * `src/Loggers/Handlers/HandlerWrapper.php::isHandling(array|LogRecord $record): bool` * `src/Loggers/Handlers/HandlerWrapper.php::handle(array|LogRecord $record): bool` -# Version 4.2.6 (coming soon) +# Version 4.2.6 * Min. PHP Version set to 7.3 * Support PhpUnit 8.0 diff --git a/RoboFile.php b/RoboFile.php index 23e4cfef..bda53721 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.5' + 'webapp.version' => '4.2.6' ); /** diff --git a/composer.lock b/composer.lock index 406a2a45..e38810f9 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": "b4ddb98bdbe601c7d7891caed749063e", + "content-hash": "8a97cb331de4285259784e27c78259d2", "packages": [ { "name": "brick/math",