Skip to content

Commit b9b322d

Browse files
committed
feature #370 Drop support Symfony 3.4 (lyrixx)
This PR was merged into the 3.x-dev branch. Discussion ---------- Drop support Symfony 3.4 fixes #365 Commits ------- ca82e88 Drop support Symfony 3.4
2 parents dfa458c + ca82e88 commit b9b322d

File tree

5 files changed

+13
-37
lines changed

5 files changed

+13
-37
lines changed

.travis.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,10 @@ env:
1616
matrix:
1717
fast_finish: true
1818
include:
19-
- php: 5.6
19+
- php: 7.1
2020
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
21-
# Test against Symfony LTS versions
22-
- php: 5.6
23-
env: SYMFONY_VERSION="3.4.*"
24-
- php: 7.0
2521
- php: 7.1
26-
# There is a bug in PHPUnit 5.7
27-
env: SYMFONY_PHPUNIT_VERSION=6.5
22+
env: SYMFONY_VERSION="4.4.*"
2823
# Test against seldaek/monolog 1.x
2924
- php: 7.2
3025
env: MONOLOG_VERSION=1.*

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 3.7.0 (xxxx-xx-xx)
22

33
* Register resettable processors (`ResettableInterface`) for autoconfiguration (tag: `kernel.reset`)
4+
* Drop support for Symfony 3.4
45

56
## 3.6.0 (2020-10-06)
67

DependencyInjection/MonologExtension.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -120,24 +120,6 @@ public function load(array $configs, ContainerBuilder $container)
120120
}
121121
}
122122
$container->setParameter('monolog.handlers_to_channels', $handlersToChannels);
123-
124-
if (PHP_VERSION_ID < 70000) {
125-
$this->addClassesToCompile([
126-
'Monolog\\Formatter\\FormatterInterface',
127-
'Monolog\\Formatter\\LineFormatter',
128-
'Monolog\\Handler\\HandlerInterface',
129-
'Monolog\\Handler\\AbstractHandler',
130-
'Monolog\\Handler\\AbstractProcessingHandler',
131-
'Monolog\\Handler\\StreamHandler',
132-
'Monolog\\Handler\\FingersCrossedHandler',
133-
'Monolog\\Handler\\FilterHandler',
134-
'Monolog\\Handler\\TestHandler',
135-
'Monolog\\Logger',
136-
'Symfony\\Bridge\\Monolog\\Logger',
137-
'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface',
138-
'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy',
139-
]);
140-
}
141123
}
142124

143125
$container->setParameter('monolog.additional_channels', isset($config['channels']) ? $config['channels'] : []);

MonologBundle.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
use Symfony\Bundle\MonologBundle\DependencyInjection\Compiler\FixEmptyLoggerPass;
2424

2525
/**
26-
* Bundle.
27-
*
2826
* @author Jordi Boggiano <j.boggiano@seld.be>
2927
*/
3028
class MonologBundle extends Bundle

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"type": "symfony-bundle",
44
"description": "Symfony MonologBundle",
55
"keywords": ["log", "logging"],
6-
"homepage": "http://symfony.com",
6+
"homepage": "https://symfony.com",
77
"license": "MIT",
88
"authors": [
99
{
@@ -12,21 +12,21 @@
1212
},
1313
{
1414
"name": "Symfony Community",
15-
"homepage": "http://symfony.com/contributors"
15+
"homepage": "https://symfony.com/contributors"
1616
}
1717
],
1818
"require": {
19-
"php": ">=5.6",
20-
"symfony/monolog-bridge": "~3.4 || ~4.0 || ^5.0",
21-
"symfony/dependency-injection": "~3.4.10 || ^4.0.10 || ^5.0",
22-
"symfony/config": "~3.4 || ~4.0 || ^5.0",
23-
"symfony/http-kernel": "~3.4 || ~4.0 || ^5.0",
19+
"php": ">=7.1.3",
20+
"symfony/monolog-bridge": "~4.4 || ^5.0",
21+
"symfony/dependency-injection": "^4.4 || ^5.0",
22+
"symfony/config": "~4.4 || ^5.0",
23+
"symfony/http-kernel": "~4.4 || ^5.0",
2424
"monolog/monolog": "~1.22 || ~2.0"
2525
},
2626
"require-dev": {
27-
"symfony/yaml": "~3.4 || ~4.0 || ^5.0",
28-
"symfony/console": "~3.4 || ~4.0 || ^5.0",
29-
"symfony/phpunit-bridge": "^4.4 || ^5.0"
27+
"symfony/yaml": "~4.4 || ^5.0",
28+
"symfony/console": "~4.4 || ^5.0",
29+
"symfony/phpunit-bridge": "^5.1"
3030
},
3131
"autoload": {
3232
"psr-4": { "Symfony\\Bundle\\MonologBundle\\": "" },

0 commit comments

Comments
 (0)