Merge branch 'release/0.6.2'

CHANGELOG.md

@@ -1,4 +1,8 @@
 
+### [0.6.2] - 2016-10-02
+
+  * maintenance
+
 ### [0.6.1] - 2016-10-02
 
   * maintenance

src/Tidal/WampWatch/Adapter/React/PromiseAdapter.php

@@ -88,13 +88,13 @@ public function otherwise(callable $onRejected)
     }
 
     /**
-     * @param callable $onFulfilledOrRejected
+     * @param callable $onAlways
      *
      * @return self
      */
-    public function always(callable $onFulfilledOrRejected)
+    public function always(callable $onAlways)
     {
-        $this->adaptee->always($onFulfilledOrRejected);
+        $this->adaptee->always($onAlways);
 
         return $this;
     }

src/Tidal/WampWatch/Async/PromiseInterface.php

@@ -39,11 +39,11 @@ public function done(callable $onFulfilled = null, callable $onRejected = null,
     public function otherwise(callable $onRejected);
 
     /**
-     * @param callable $onFulfilledOrRejected
+     * @param callable $onAlways
      *
      * @return PromiseInterface
      */
-    public function always(callable $onFulfilledOrRejected);
+    public function always(callable $onAlways);
 
     /**
      * @param callable $onProgress

src/Tidal/WampWatch/Model/Property/Collection/HasProceduresTrait.php

@@ -43,6 +43,13 @@ private function getProcedures()
         return $this->getCollection(static::$proceduresPropertyName);
     }
 
+    /**
+     * @param string $name
+     *
+     * @return ObjectCollectionInterface
+     */
+    abstract protected function getCollection($name);
+
     public function hasProcedure($uri)
     {
         return $this->getProcedures()->has($uri);

src/Tidal/WampWatch/Model/Property/Collection/HasRealmsTrait.php

@@ -44,6 +44,13 @@ private function getRealms()
         return $this->getCollection($this->realmsPropertyName);
     }
 
+    /**
+     * @param string $name
+     *
+     * @return ObjectCollectionInterface
+     */
+    abstract protected function getCollection($name);
+
     public function hasRealm($name)
     {
         return $this->getRealms()->has($name);

src/Tidal/WampWatch/Model/Property/Collection/HasTopicsTrait.php

@@ -43,6 +43,13 @@ private function getTopics()
         return $this->getCollection($this->topicsPropertyName);
     }
 
+    /**
+     * @param string $name
+     *
+     * @return ObjectCollectionInterface
+     */
+    abstract protected function getCollection($name);
+
     public function hasTopic($uri)
     {
         return $this->getTopics()->has($uri);