III-1732 Merge branch 'master' into feature/III-1732

* master: III-1756: Monolog socket.io handler was split off to separate library # Conflicts: # composer.lock
cultuurnet · Jan 13, 2017 · e206b6b · e206b6b
2 parents afeb056 + 92f31b4
commit e206b6b
Show file tree

Hide file tree

Showing 3 changed files with 505 additions and 466 deletions.
diff --git a/bootstrap.php b/bootstrap.php
@@ -382,7 +382,7 @@ function ($app) {
                         $emitter->in($handler_config['room']);
                     }
 
-                    $handler = new \CultuurNet\UDB3\Monolog\SocketIOEmitterHandler(
+                    $handler = new \CultuurNet\MonologSocketIO\SocketIOEmitterHandler(
                         $emitter
                     );
                     break;

diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
         "cultuurnet/silex-amqp": "~0.1",
         "cultuurnet/silex-service-provider-jwt": "~0.1",
         "cultuurnet/symfony-security-jwt": "~0.1",
-        "cultuurnet/udb3-http-foundation": "~0.1"
+        "cultuurnet/udb3-http-foundation": "~0.1",
+        "cultuurnet/monolog-socketio": "~0.1"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.7",