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

barryvdh · web-flow · commit 2f59ddf1fa3d · 2017-01-07T18:07:55.000+01:00
[5.4] The HttpDriver gets a SessionManager instead of Session\Store, so instanceof check didn't work
diff --git a/src/SymfonyHttpDriver.php b/src/SymfonyHttpDriver.php
@@ -11,7 +11,7 @@
  */
 class SymfonyHttpDriver implements HttpDriverInterface
 {
-    /** @var \Symfony\Component\HttpFoundation\Session\Session|\Illuminate\Contracts\Session\Session */
+    /** @var \Symfony\Component\HttpFoundation\Session\Session|\Illuminate\Contracts\Session\Session|\Illuminate\Session\SessionManager */
     protected $session;
     /** @var \Symfony\Component\HttpFoundation\Response */
     protected $response;
@@ -51,7 +51,7 @@ 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) {
+        if (method_exists($this->session, 'driver') && $this->session->driver() instanceof \Illuminate\Contracts\Session\Session) {
             $this->session->put($name, $value);
             return;
         }
