Merge branch 'release/0.3.0'

tidal · Jul 20, 2016 · cec12bf · cec12bf
2 parents e37beaa + 6162416
commit cec12bf
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### [0.3.0] - 2016-07-20
+
+  * Renamed methods dealing with meta subscriptions to be more distinct
+    - getSubscriptionCollection -> getMetaSubscriptionCollection
+    - setSubscriptionCollection -> setMetaSubscriptionCollection
+    - isSubscribed              -> isMetaSubscribed
+
 ### [0.2.1] - 2016-07-19
 
   * Reworked MonitorTrait to provide a generic interface for initial calls to wamp router

diff --git a/src/Tidal/WampWatch/MonitorTrait.php b/src/Tidal/WampWatch/MonitorTrait.php
@@ -40,9 +40,9 @@ trait MonitorTrait
     protected $isRunning = false;
 
     /**
-     * @var SubscriptionCollection
+     * @var SubscriptionCollection collection for meta subscriptions
      */
-    protected $subscriptionCollection;
+    protected $metaSubscriptionCollection;
 
     /**
      * @var string
@@ -74,7 +74,7 @@ protected function setClientSession(ClientSession $session)
      */
     public function start()
     {
-        $this->getSubscriptionCollection()->subscribe()->done(function () {
+        $this->getMetaSubscriptionCollection()->subscribe()->done(function () {
             $this->checkStarted();
         });
         $this->callInitialProcedure()->done(function () {
@@ -96,7 +96,7 @@ public function stop()
             return false;
         }
 
-        $this->getSubscriptionCollection()->unsubscribe();
+        $this->getMetaSubscriptionCollection()->unsubscribe();
 
         $this->isRunning = false;
         $this->emit('stop', [$this]);
@@ -129,14 +129,22 @@ public function isRunning()
         return $this->isRunning;
     }
 
+    /**
+     * @param \Tidal\WampWatch\Subscription\Collection $collection
+     */
+    public function setMetaSubscriptionCollection(SubscriptionCollection $collection)
+    {
+        $this->metaSubscriptionCollection = $collection;
+    }
+
     /**
      * @return \Tidal\WampWatch\Subscription\Collection
      */
-    protected function getSubscriptionCollection()
+    public function getMetaSubscriptionCollection()
     {
-        return isset($this->subscriptionCollection)
-            ? $this->subscriptionCollection
-            : $this->subscriptionCollection = new SubscriptionCollection($this->session);
+        return isset($this->metaSubscriptionCollection)
+            ? $this->metaSubscriptionCollection
+            : $this->metaSubscriptionCollection = new SubscriptionCollection($this->session);
     }
 
     protected function setInitialCall($pocedure, callable $callback)
@@ -173,7 +181,7 @@ protected function callInitialProcedure()
      */
     protected function checkStarted()
     {
-        if ($this->isSubscribed() &&
+        if ($this->isMetaSubscribed() &&
             $this->initialCallDone &&
             !$this->isRunning()
         ) {
@@ -182,12 +190,12 @@ protected function checkStarted()
         }
     }
 
-    protected function isSubscribed()
+    protected function isMetaSubscribed()
     {
-        if (!$this->getSubscriptionCollection()->hasSubscription()) {
+        if (!$this->getMetaSubscriptionCollection()->hasSubscription()) {
             return true;
         }
 
-        return $this->getSubscriptionCollection()->isSubscribed();
+        return $this->getMetaSubscriptionCollection()->isSubscribed();
     }
 }
diff --git a/src/Tidal/WampWatch/SessionMonitor.php b/src/Tidal/WampWatch/SessionMonitor.php
@@ -168,7 +168,7 @@ protected function validateSessionInfo($sessionInfo)
     protected function initSetupCalls()
     {
         // @var \Tidal\WampWatch\Subscription\Collection
-        $collection = $this->getSubscriptionCollection();
+        $collection = $this->getMetaSubscriptionCollection();
 
         $collection->addSubscription(self::SESSION_JOIN_TOPIC, function (array $res) {
             $sessionInfo = $res[0];