Merge pull request barryvdh#583 from martindilling/martindilling/update-for-5.4

barryvdh · web-flow · commit b551206747e2 · 2017-01-06T11:20:12.000+01:00
Update for 5.4
diff --git a/src/DataCollector/SessionCollector.php b/src/DataCollector/SessionCollector.php
@@ -8,13 +8,13 @@
 
 class SessionCollector extends DataCollector implements DataCollectorInterface, Renderable
 {
-    /** @var  \Symfony\Component\HttpFoundation\Session\SessionInterface $session */
+    /** @var  \Symfony\Component\HttpFoundation\Session\SessionInterface|\Illuminate\Contracts\Session\Session $session */
     protected $session;
 
     /**
      * Create a new SessionCollector
      *
-     * @param \Symfony\Component\HttpFoundation\Session\SessionInterface $session
+     * @param \Symfony\Component\HttpFoundation\Session\SessionInterface|\Illuminate\Contracts\Session\Session $session
      */
     public function __construct($session)
     {
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -231,7 +231,16 @@ function ($view) use ($debugbar) {
                     $logger = new MessagesCollector('log');
                     $this['messages']->aggregate($logger);
                     $this->app['log']->listen(
-                        function ($level, $message, $context) use ($logger) {
+                        function ($level, $message = null, $context = null) use ($logger) {
+                            // Laravel 5.4 changed how the global log listeners are called. We must account for
+                            // the first argument being an "event object", where arguments are passed
+                            // via object properties, instead of individual arguments.
+                            if ($level instanceof \Illuminate\Log\Events\MessageLogged) {
+                                $message = $level->message;
+                                $context = $level->context;
+                                $level = $level->level;
+                            }
+
                             try {
                                 $logMessage = (string) $message;
                                 if (mb_check_encoding($logMessage, 'UTF-8')) {
diff --git a/src/SymfonyHttpDriver.php b/src/SymfonyHttpDriver.php
@@ -11,7 +11,7 @@
  */
 class SymfonyHttpDriver implements HttpDriverInterface
 {
-    /** @var \Symfony\Component\HttpFoundation\Session\Session */
+    /** @var \Symfony\Component\HttpFoundation\Session\Session|\Illuminate\Contracts\Session\Session */
     protected $session;
     /** @var \Symfony\Component\HttpFoundation\Response */
     protected $response;
@@ -48,6 +48,13 @@ public function isSessionStarted()
      */
     public function setSessionValue($name, $value)
     {
+        // In Laravel 5.4 the session changed to use their own custom implementation
+        // instead of the one from Symfony. One of the changes was the set method
+        // that was changed to put. Here we check if we are using the new one.
+        if ($this->session instanceof \Illuminate\Contracts\Session\Session) {
+            $this->session->put($name, $value);
+            return;
+        }
         $this->session->set($name, $value);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@`
`8`	`8`
`9`	`9`	`class SessionCollector extends DataCollector implements DataCollectorInterface, Renderable`
`10`	`10`	`{`
`11`		`- /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface $session */`
	`11`	`+ /** @var \Symfony\Component\HttpFoundation\Session\SessionInterface\|\Illuminate\Contracts\Session\Session $session */`
`12`	`12`	`protected $session;`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Create a new SessionCollector`
`16`	`16`	`*`
`17`		`- * @param \Symfony\Component\HttpFoundation\Session\SessionInterface $session`
	`17`	`+ * @param \Symfony\Component\HttpFoundation\Session\SessionInterface\|\Illuminate\Contracts\Session\Session $session`
`18`	`18`	`*/`
`19`	`19`	`public function __construct($session)`
`20`	`20`	`{`