merge master to dev-php-compatibility

techdivision · Jul 11, 2024 · 67fd955 · 67fd955
2 parents a25cb00 + efe809f
commit 67fd955
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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