10000 Deprecate the NotFoundActivationStrategy class · symfony/monolog-bundle@b77bdf0 · GitHub
[go: up one dir, main page]
Skip to content

Commit b77bdf0

Browse files
BPScottfabpot
BPScott
authored and
fabpot
committed
Deprecate the NotFoundActivationStrategy class
1 parent e7caf49 commit b77bdf0

File tree

7 files changed

+34
-125
lines changed

7 files changed

+34
-125
lines changed

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ matrix:
1919
- php: 5.3
2020
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
2121
# Test against Symfony LTS versions
22-
- php: 5.6
23-
env: SYMFONY_VERSION="2.3.*"
2422
- php: 5.6
2523
env: SYMFONY_VERSION="2.7.*"
2624
- php: 5.6

‎DependencyInjection/MonologExtension.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,11 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
320320
if (isset($handler['activation_strategy'])) {
321321
$activation = new Reference($handler['activation_strategy']);
322322
} elseif (!empty($handler['excluded_404s'])) {
323-
$activationDef = new Definition('%monolog.activation_strategy.not_found.class%', array($handler['excluded_404s'], $handler['action_level']));
324-
$activationDef->addMethodCall('setRequest', array(new Reference('request', ContainerInterface::NULL_ON_INVALID_REFERENCE, false)));
323+
$activationDef = new Definition('%monolog.activation_strategy.not_found.class%', array(
324+
new Reference('request_stack'),
325+
$handler['excluded_404s'],
326+
$handler['action_level']
327+
));
325328
$container->setDefinition($handlerId.'.not_found_strategy', $activationDef);
326329
$activation = new Reference($handlerId.'.not_found_strategy');
327330
} else {

‎NotFoundActivationStrategy.php

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

‎Resources/config/monolog.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<parameter key="monolog.handler.loggly.class">Monolog\Handler\LogglyHandler</parameter>
4040
<parameter key="monolog.handler.logentries.class">Monolog\Handler\LogEntriesHandler</parameter>
4141
<parameter key="monolog.handler.whatfailuregroup.class">Monolog\Handler\WhatFailureGroupHandler</parameter>
42-
<parameter key="monolog.activation_strategy.not_found.class">Symfony\Bundle\MonologBundle\NotFoundActivationStrategy</parameter>
42+
<parameter key="monolog.activation_strategy.not_found.class">Symfony\Bridge\Monolog\Handler\FingersCrossed\NotFoundActivationStrategy</parameter>
4343

4444
<parameter key="monolog.handler.fingers_crossed.class">Monolog\Handler\FingersCrossedHandler</parameter>
4545
<parameter key="monolog.handler.fingers_crossed.error_level_activation_strategy.class">Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy</parameter>

‎Tests/DependencyInjection/MonologExtensionTest.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,31 @@ public function testLogglyHandler()
338338
))));
339339
$handler = $container->getDefinition('monolog.handler.loggly');
340340
$this->assertDICDefinitionMethodCallAt(0, $handler, 'setTag', array('foo,bar'));
341+
}
342+
343+
public function testFingersCrossedHandlerWhenExcluded404sAreSpecified()
344+
{
345+
$container = $this->getContainer(array(array('handlers' => array(
346+
'main' => array('type' => 'fingers_crossed', 'handler' => 'nested', 'excluded_404s' => array('^/foo', '^/bar')),
347+
'nested' => array('type' => 'stream', 'path' => '/tmp/symfony.log')
348+
))));
341349

350+
$this->assertTrue($container->hasDefinition('monolog.logger'));
351+
$this->assertTrue($container->hasDefinition('monolog.handler.main'));
352+
$this->assertTrue($container->hasDefinition('monolog.handler.nested'));
353+
$this->assertTrue($container->hasDefinition('monolog.handler.main.not_found_strategy'));
354+
355+
$logger = $container->getDefinition('monolog.logger');
356+
$this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
357+
$this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
358+
359+
$strategy = $container->getDefinition('monolog.handler.main.not_found_strategy');
360+
$this->assertDICDefinitionClass($strategy, '%monolog.activation_strategy.not_found.class%');
361+
$this->assertDICConstructorArguments($strategy, array(new Reference('request_stack'), array('^/foo', '^/bar'), \Monolog\Logger::WARNING));
362+
363+
$handler = $container->getDefinition('monolog.handler.main');
364+
$this->assertDICDefinitionClass($handler, '%monolog.handler.fingers_crossed.class%');
365+
$this->assertDICConstructorArguments($handler, array(new Reference('monolog.handler.nested'), new Reference('monolog.handler.main.not_found_strategy'), 0, true, true, null));
342366
}
343367

344368
protected function getContainer(array $config = array())

‎Tests/NotFoundActivationStrategyTest.php

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

‎composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.2",
20-
"symfony/monolog-bridge": "~2.3|~3.0",
21-
"symfony/dependency-injection": "~2.3|~3.0",
22-
"symfony/config": "~2.3|~3.0",
23-
"symfony/http-kernel": "~2.3|~3.0",
20+
"symfony/monolog-bridge": "~2.7|~3.0",
21+
"symfony/dependency-injection": "~2.7|~3.0",
22+
"symfony/config": "~2.7|~3.0",
23+
"symfony/http-kernel": "~2.7|~3.0",
2424
"monolog/monolog": "~1.18"
2525
},
2626
"require-dev": {

0 commit comments

Comments
 (0)
0