Merge branch 'master' of github.com:laravel/framework

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Broadcasting;
 
-use Pusher;
 use Closure;
+use Pusher\Pusher;
 use Psr\Log\LoggerInterface;
 use InvalidArgumentException;
 use Illuminate\Broadcasting\Broadcasters\LogBroadcaster;

src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php

@@ -2,7 +2,7 @@
 
 namespace Illuminate\Broadcasting\Broadcasters;
 
-use Pusher;
+use Pusher\Pusher;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Broadcasting\BroadcastException;
@@ -13,14 +13,14 @@ class PusherBroadcaster extends Broadcaster
     /**
      * The Pusher SDK instance.
      *
-     * @var \Pusher
+     * @var Pusher
      */
     protected $pusher;
 
     /**
      * Create a new broadcaster instance.
      *
-     * @param  \Pusher  $pusher
+     * @param  Pusher  $pusher
      * @return void
      */
     public function __construct(Pusher $pusher)
@@ -112,7 +112,7 @@ public function broadcast(array $channels, $event, array $payload = [])
     /**
      * Get the Pusher SDK instance.
      *
-     * @return \Pusher
+     * @return Pusher
      */
     public function getPusher()
     {

src/Illuminate/Broadcasting/composer.json

@@ -31,7 +31,7 @@
         }
     },
     "suggest": {
-        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0)."
+        "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~3.0)."
     },
     "config": {
         "sort-packages": true

src/Illuminate/Http/ResponseTrait.php

@@ -49,7 +49,9 @@ public function content()
      */
     public function getOriginalContent()
     {
-        return $this->original;
+        $original = $this->original;
+
+        return $original instanceof self ? $original->{__FUNCTION__}() : $original;
     }
 
     /**

tests/Http/HttpResponseTest.php

@@ -91,6 +91,14 @@ public function testGetOriginalContent()
         $this->assertSame($arr, $response->getOriginalContent());
     }
 
+    public function testGetOriginalContentRetrievesTheFirstOriginalContent()
+    {
+        $previousResponse = new \Illuminate\Http\Response(['foo' => 'bar']);
+        $response = new \Illuminate\Http\Response($previousResponse);
+
+        $this->assertSame(['foo' => 'bar'], $response->getOriginalContent());
+    }
+
     public function testSetAndRetrieveStatusCode()
     {
         $response = new \Illuminate\Http\Response('foo');