Skip to content

Commit 9049914

Browse files
committed
Merge branch 'release/0.6.2'
2 parents 3925f18 + 5075ed0 commit 9049914

File tree

7 files changed

+30
-42
lines changed

7 files changed

+30
-42
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
### [0.6.2] - 2016-10-02
3+
4+
* maintenance
5+
26
### [0.6.1] - 2016-10-02
37

48
* maintenance

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ public function otherwise(callable $onRejected)
8888
}
8989

9090
/**
91-
* @param callable $onFulfilledOrRejected
91+
* @param callable $onAlways
9292
*
9393
* @return self
9494
*/
95-
public function always(callable $onFulfilledOrRejected)
95+
public function always(callable $onAlways)
9696
{
97-
$this->adaptee->always($onFulfilledOrRejected);
97+
$this->adaptee->always($onAlways);
9898

9999
return $this;
100100
}

src/Tidal/WampWatch/Async/PromiseInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ public function done(callable $onFulfilled = null, callable $onRejected = null,
3939
public function otherwise(callable $onRejected);
4040

4141
/**
42-
* @param callable $onFulfilledOrRejected
42+
* @param callable $onAlways
4343
*
4444
* @return PromiseInterface
4545
*/
46-
public function always(callable $onFulfilledOrRejected);
46+
public function always(callable $onAlways);
4747

4848
/**
4949
* @param callable $onProgress

src/Tidal/WampWatch/Contract/Async/PromiseInterface.php

Lines changed: 0 additions & 37 deletions
This file was deleted.

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ private function getProcedures()
4343
return $this->getCollection(static::$proceduresPropertyName);
4444
}
4545

46+
/**
47+
* @param string $name
48+
*
49+
* @return ObjectCollectionInterface
50+
*/
51+
abstract protected function getCollection($name);
52+
4653
public function hasProcedure($uri)
4754
{
4855
return $this->getProcedures()->has($uri);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ private function getRealms()
4444
return $this->getCollection($this->realmsPropertyName);
4545
}
4646

47+
/**
48+
* @param string $name
49+
*
50+
* @return ObjectCollectionInterface
51+
*/
52+
abstract protected function getCollection($name);
53+
4754
public function hasRealm($name)
4855
{
4956
return $this->getRealms()->has($name);

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ private function getTopics()
4343
return $this->getCollection($this->topicsPropertyName);
4444
}
4545

46+
/**
47+
* @param string $name
48+
*
49+
* @return ObjectCollectionInterface
50+
*/
51+
abstract protected function getCollection($name);
52+
4653
public function hasTopic($uri)
4754
{
4855
return $this->getTopics()->has($uri);

0 commit comments

Comments
 (0)