wip

spatie · Jan 12, 2017 · ad6cddc · ad6cddc
1 parent e26f5ef
commit ad6cddc
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 10 deletions.
diff --git a/src/BaseStream.php b/src/BaseStream.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Spatie\TwitterStreamingApi;
+
+abstract class BaseStream
+{
+    /** @var \Spatie\TwitterStreamingApi\PhirehoseWrapper  */
+    protected $stream;
+
+    protected function createStream(
+        string $accessToken,
+        string $accessSecret,
+        string $consumerKey,
+        string $consumerSecret,
+        string $filter
+    ) : PhirehoseWrapper
+    {
+        return new PhirehoseWrapper(
+            $accessToken,
+            $accessSecret,
+            $consumerKey,
+            $consumerSecret,
+            $filter
+        );
+    }
+
+    public function startListening()
+    {
+        $this->stream->startListening();
+    }
+}
diff --git a/src/TwitterStream.php → src/PhirehoseWrapper.php b/src/TwitterStream.php → src/PhirehoseWrapper.php
@@ -5,14 +5,14 @@
 use OauthPhirehose;
 use Phirehose;
 
-class TwitterStream extends OauthPhirehose
+class PhirehoseWrapper extends OauthPhirehose
 {
     /** @var callable */
-    public $onStreamActivity;
+    protected $onStreamActivity;
 
     public function __construct($accessToken, $accessSecret, $consumerKey, $consumerSecret, $method = Phirehose::METHOD_FILTER)
     {
-        parent::__construct($accessToken, $accessSecret, $method);
+        parent::__construct($accessToken, $accessSecret, $consumerKey, $consumerKey);
 
         $this->consumerKey = $consumerKey;
         $this->consumerSecret = $consumerSecret;
@@ -30,6 +30,11 @@ public function enqueueStatus($status)
         ($this->onStreamActivity)($status);
     }
 
+    public function performOnStreamActivity(callable $onStreamActivity)
+    {
+        $this->onStreamActivity = $onStreamActivity;
+    }
+
     public function startListening()
     {
         $this->consume();

diff --git a/src/PublicStream.php b/src/PublicStream.php
@@ -4,18 +4,21 @@
 
 use Phirehose;
 
-class PublicStream extends TwitterStream
+class PublicStream extends BaseStream
 {
     public function __construct($accessToken, $accessSecret, $consumerKey, $consumerSecret)
     {
-        parent::__construct(
+
+
+        $this->stream = $this->createStream(
             $accessToken,
             $accessSecret,
             $consumerKey,
             $consumerSecret,
-            Phirehose::METHOD_FILTER);
+            Phirehose::METHOD_FILTER
+        );
     }
-    
+
     /**
      * @param string|array $listenFor
      * @param callable $whenHears
@@ -24,13 +27,13 @@ public function __construct($accessToken, $accessSecret, $consumerKey, $consumer
      */
     public function whenHears($listenFor, callable $whenHears)
     {
-        if (! is_array($listenFor)) {
+        if (!is_array($listenFor)) {
             $listenFor = [$listenFor];
         }
 
-        $this->setTrack($listenFor);
+        $this->stream->setTrack($listenFor);
 
-        $this->onStreamActivity = $whenHears;
+        $this->stream->performOnStreamActivity($whenHears);
 
         return $this;
     }