8000 minor #33492 [MonologBridge] Bump min version for monolog ^1.25 and d… · symfony/symfony@654b803 · GitHub
[go: up one dir, main page]
Skip to content

Commit 654b803

Browse files
nicolas-grekasnicolas-grekas
committed
minor #33492 [MonologBridge] Bump min version for monolog ^1.25 and drop dead code (lyrixx)
This PR was merged into the 4.4 branch. Discussion ---------- [MonologBridge] Bump min version for monolog ^1.25 and drop dead code | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 1e19c65 [MonologBridge] Bump min version for monolog ^1.25 and drop dead code
2 parents 108a799 + 1e19c65 commit 654b803

File tree

5 files changed

+4
-149
lines changed

5 files changed

+4
-149
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"doctrine/reflection": "~1.0",
110110
"doctrine/doctrine-bundle": "~1.4",
111111
"masterminds/html5": "^2.6",
112-
"monolog/monolog": "~1.11",
112+
"monolog/monolog": "^1.25.1",
113113
"nyholm/psr7": "^1.0",
114114
"ocramius/proxy-manager": "^2.1",
115115
"php-http/httplug": "^1.0|^2.0",

‎src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
use Monolog\Formatter\FormatterInterface;
1515
use Monolog\Formatter\LogstashFormatter;
1616
use Monolog\Handler\AbstractHandler;
17+
use Monolog\Handler\FormattableHandlerTrait;
18+
use Monolog\Handler\ProcessableHandlerTrait;
1719
use Monolog\Logger;
1820
use Symfony\Component\HttpClient\HttpClient;
1921
use Symfony\Contracts\HttpClient\Exception\ExceptionInterface;

‎src/Symfony/Bridge/Monolog/Handler/FormattableHandlerTrait.php

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎src/Symfony/Bridge/Monolog/Handler/ProcessableHandlerTrait.php

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": "^7.1.3",
20-
"monolog/monolog": "~1.19",
20+
"monolog/monolog": "^1.25.1",
2121
"symfony/service-contracts": "^1.1",
2222
"symfony/http-kernel": "^4.3"
2323
},

0 commit comments

Comments
 (0)
0