Deprecate the NotFoundActivationStrategy class

symfony · Oct 19, 2016 · b77bdf0 · b77bdf0
1 parent e7caf49
commit b77bdf0
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 125 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,8 +19,6 @@ matrix:
     - php: 5.3
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak
     # Test against Symfony LTS versions
-    - php: 5.6
-      env: SYMFONY_VERSION="2.3.*"
     - php: 5.6
       env: SYMFONY_VERSION="2.7.*"
     - php: 5.6

diff --git a/DependencyInjection/MonologExtension.php b/DependencyInjection/MonologExtension.php
@@ -320,8 +320,11 @@ private function buildHandler(ContainerBuilder $container, $name, array $handler
             if (isset($handler['activation_strategy'])) {
                 $activation = new Reference($handler['activation_strategy']);
             } elseif (!empty($handler['excluded_404s'])) {
-                $activationDef = new Definition('%monolog.activation_strategy.not_found.class%', array($handler['excluded_404s'], $handler['action_level']));
-                $activationDef->addMethodCall('setRequest', array(new Reference('request', ContainerInterface::NULL_ON_INVALID_REFERENCE, false)));
+                $activationDef = new Definition('%monolog.activation_strategy.not_found.class%', array(
+                    new Reference('request_stack'),
+                    $handler['excluded_404s'],
+                    $handler['action_level']
+                ));
                 $container->setDefinition($handlerId.'.not_found_strategy', $activationDef);
                 $activation = new Reference($handlerId.'.not_found_strategy');
             } else {

diff --git a/NotFoundActivationStrategy.php b/NotFoundActivationStrategy.php
diff --git a/Resources/config/monolog.xml b/Resources/config/monolog.xml
@@ -39,7 +39,7 @@
         <parameter key="monolog.handler.loggly.class">Monolog\Handler\LogglyHandler</parameter>
         <parameter key="monolog.handler.logentries.class">Monolog\Handler\LogEntriesHandler</parameter>
         <parameter key="monolog.handler.whatfailuregroup.class">Monolog\Handler\WhatFailureGroupHandler</parameter>
-        <parameter key="monolog.activation_strategy.not_found.class">Symfony\Bundle\MonologBundle\NotFoundActivationStrategy</parameter>
+        <parameter key="monolog.activation_strategy.not_found.class">Symfony\Bridge\Monolog\Handler\FingersCrossed\NotFoundActivationStrategy</parameter>
 
         <parameter key="monolog.handler.fingers_crossed.class">Monolog\Handler\FingersCrossedHandler</parameter>
         <parameter key="monolog.handler.fingers_crossed.error_level_activation_strategy.class">Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy</parameter>

diff --git a/Tests/DependencyInjection/MonologExtensionTest.php b/Tests/DependencyInjection/MonologExtensionTest.php
@@ -338,7 +338,31 @@ public function testLogglyHandler()
         ))));
         $handler = $container->getDefinition('monolog.handler.loggly');
         $this->assertDICDefinitionMethodCallAt(0, $handler, 'setTag', array('foo,bar'));
+    }
+
+    public function testFingersCrossedHandlerWhenExcluded404sAreSpecified()
+    {
+        $container = $this->getContainer(array(array('handlers' => array(
+            'main' => array('type' => 'fingers_crossed', 'handler' => 'nested', 'excluded_404s' => array('^/foo', '^/bar')),
+            'nested' => array('type' => 'stream', 'path' => '/tmp/symfony.log')
+        ))));
 
+        $this->assertTrue($container->hasDefinition('monolog.logger'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.main'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.nested'));
+        $this->assertTrue($container->hasDefinition('monolog.handler.main.not_found_strategy'));
+
+        $logger = $container->getDefinition('monolog.logger');
+        $this->assertDICDefinitionMethodCallAt(0, $logger, 'useMicrosecondTimestamps', array('%monolog.use_microseconds%'));
+        $this->assertDICDefinitionMethodCallAt(1, $logger, 'pushHandler', array(new Reference('monolog.handler.main')));
+
+        $strategy = $container->getDefinition('monolog.handler.main.not_found_strategy');
+        $this->assertDICDefinitionClass($strategy, '%monolog.activation_strategy.not_found.class%');
+        $this->assertDICConstructorArguments($strategy, array(new Reference('request_stack'), array('^/foo', '^/bar'), \Monolog\Logger::WARNING));
+
+        $handler = $container->getDefinition('monolog.handler.main');
+        $this->assertDICDefinitionClass($handler, '%monolog.handler.fingers_crossed.class%');
+        $this->assertDICConstructorArguments($handler, array(new Reference('monolog.handler.nested'), new Reference('monolog.handler.main.not_found_strategy'), 0, true, true, null));
     }
 
     protected function getContainer(array $config = array())

diff --git a/Tests/NotFoundActivationStrategyTest.php b/Tests/NotFoundActivationStrategyTest.php
diff --git a/composer.json b/composer.json
@@ -17,10 +17,10 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/monolog-bridge": "~2.3|~3.0",
-        "symfony/dependency-injection": "~2.3|~3.0",
-        "symfony/config": "~2.3|~3.0",
-        "symfony/http-kernel": "~2.3|~3.0",
+        "symfony/monolog-bridge": "~2.7|~3.0",
+        "symfony/dependency-injection": "~2.7|~3.0",
+        "symfony/config": "~2.7|~3.0",
+        "symfony/http-kernel": "~2.7|~3.0",
         "monolog/monolog": "~1.18"
     },
     "require-dev": {