Skip to content

Commit 67fd955

Browse files
committed
merge master to dev-php-compatibility
2 parents a25cb00 + efe809f commit 67fd955

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.semver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
:major: 4
33
:minor: 2
4-
:patch: 5
4+
:patch: 6
55
:special: ''
66
:metadata: ''

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
# Version 5.0.0 (coming soon)
23
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.
34
* 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
78
* `src/Loggers/Handlers/HandlerWrapper.php::isHandling(array|LogRecord $record): bool`
89
* `src/Loggers/Handlers/HandlerWrapper.php::handle(array|LogRecord $record): bool`
910

10-
# Version 4.2.6 (coming soon)
11+
# Version 4.2.6
1112

1213
* Min. PHP Version set to 7.3
1314
* Support PhpUnit 8.0

RoboFile.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class RoboFile extends \Robo\Tasks
4040
'target.dir' => __DIR__ . '/target',
4141
'symfony.dir' => __DIR__ . '/symfony',
4242
'webapp.name' => 'import-cli-simple',
43-
'webapp.version' => '4.2.5'
43+
'webapp.version' => '4.2.6'
4444
);
4545

4646
/**

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)