feature #1232 updated the Monolog provider to use the newest features of...

feature #1232 updated the Monolog provider to use the newest features of Monolog and the Symfony bridge (fabpot)

This PR was merged into the 2.0.x-dev branch.

Discussion
----------

updated the Monolog provider to use the newest features of Monolog and the Symfony bridge

@Seldaek If you can have a quick look, that would be much appreciated :)

Commits
-------

a53ce590 updated the Monolog provider to use the newest features of Monolog and the Symfony bridge

src/Silex/Provider/MonologServiceProvider.php

@@ -15,10 +15,12 @@ use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
+use Monolog\Handler;
+use Monolog\ErrorHandler;
 use Silex\Application;
 use Silex\Api\BootableProviderInterface;
 use Symfony\Bridge\Monolog\Handler\DebugHandler;
+use Symfony\Bridge\Monolog\Handler\FingersCrossed\NotFoundActivationStrategy;
 use Silex\EventListener\LogListener;
 
 /**
@@ -40,6 +42,10 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
 
                 return new DebugHandler($level);
             };
+
+            $app['monolog.not_found_activation_strategy'] = function () use ($app) {
+                return new NotFoundActivationStrategy($app['request_stack'], array('^/'), $app['monolog.level']);
+            };
         }
 
         $app['monolog.logger.class'] = $bridge ? 'Symfony\Bridge\Monolog\Logger' : 'Monolog\Logger';
@@ -47,12 +53,13 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
         $app['monolog'] = function ($app) {
             $log = new $app['monolog.logger.class']($app['monolog.name']);
 
-            $log->pushHandler($app['monolog.handler']);
-
-            if ($app['debug'] && isset($app['monolog.handler.debug'])) {
-                $log->pushHandler($app['monolog.handler.debug']);
+            $handler = new Handler\GroupHandler($app['monolog.handlers']);
+            if (isset($app['monolog.not_found_activation_strategy'])) {
+                $handler = new Handler\FingersCrossedHandler($handler, $app['monolog.not_found_activation_strategy']);
             }
 
+            $log->pushHandler($handler);
+
             return $log;
         };
 
@@ -63,12 +70,26 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
         $app['monolog.handler'] = function () use ($app) {
             $level = MonologServiceProvider::translateLevel($app['monolog.level']);
 
-            $handler = new StreamHandler($app['monolog.logfile'], $level, $app['monolog.bubble'], $app['monolog.permission']);
+            $handler = new Handler\StreamHandler($app['monolog.logfile'], $level, $app['monolog.bubble'], $app['monolog.permission']);
             $handler->setFormatter($app['monolog.formatter']);
 
             return $handler;
         };
 
+        $app['monolog.handlers'] = function () use ($app) {
+            $handlers = array();
+
+            if ($app['monolog.logfile']) {
+                $handlers[] = $app['monolog.handler'];
+            }
+
+            if ($app['debug'] && isset($app['monolog.handler.debug'])) {
+                $handlers[] = $app['monolog.handler.debug'];
+            }
+
+            return $handlers;
+        };
+
         $app['monolog.level'] = function () {
             return Logger::DEBUG;
         };
@@ -77,14 +98,17 @@ class MonologServiceProvider implements ServiceProviderInterface, BootableProvid
             return new LogListener($app['logger'], $app['monolog.exception.logger_filter']);
         };
 
-        $app['monolog.name'] = 'myapp';
+        $app['monolog.name'] = 'app';
         $app['monolog.bubble'] = true;
         $app['monolog.permission'] = null;
         $app['monolog.exception.logger_filter'] = null;
+        $app['monolog.logfile'] = null;
     }
 
     public function boot(Application $app)
     {
+        ErrorHandler::register($app['monolog']);
+
         if (isset($app['monolog.listener'])) {
             $app['dispatcher']->addSubscriber($app['monolog.listener']);
         }

tests/Silex/Tests/Application/MonologTraitTest.php

@@ -39,6 +39,7 @@ class MonologTraitTest extends \PHPUnit_Framework_TestCase
             'monolog.handler' => function () use ($app) {
                 return new TestHandler($app['monolog.level']);
             },
+            'monolog.logfile' => 'php://memory',
         ));
 
         return $app;

tests/Silex/Tests/Provider/MonologServiceProviderTest.php

@@ -66,11 +66,12 @@ class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
     {
         $app = new Application();
 
-        $app->register(new MonologServiceProvider());
-        $app['monolog.formatter'] = new JsonFormatter();
-        $app['monolog.logfile'] = 'php://memory';
+        $app->register(new MonologServiceProvider(), array(
+            'monolog.formatter' => new JsonFormatter(),
+            'monolog.logfile' => 'php://memory',
+        ));
 
-        $this->assertInstanceOf('Monolog\Formatter\JsonFormatter', $app['logger']->popHandler()->getFormatter());
+        $this->assertInstanceOf('Monolog\Formatter\JsonFormatter', $app['monolog.handler']->getFormatter());
     }
 
     public function testErrorLogging()
@@ -197,13 +198,14 @@ class MonologServiceProviderTest extends \PHPUnit_Framework_TestCase
     {
         $app = new Application();
 
-        $app->register(new MonologServiceProvider());
-
-        $app['monolog.handler'] = function () use ($app) {
-            $level = MonologServiceProvider::translateLevel($app['monolog.level']);
+        $app->register(new MonologServiceProvider(), array(
+            'monolog.handler' => function () use ($app) {
+                $level = MonologServiceProvider::translateLevel($app['monolog.level']);
 
-            return new TestHandler($level);
-        };
+                return new TestHandler($level);
+            },
+            'monolog.logfile' => 'php://memory',
+        ));
 
         return $app;
     }