Skip to content
This repository has been archived by the owner on Jan 31, 2020. It is now read-only.

Commit

Permalink
Merge branch 'release'
Browse files Browse the repository at this point in the history
  • Loading branch information
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions src/AbstractOptions.php
Expand Up @@ -40,6 +40,7 @@ public function __construct($options = null)

/**
* @param array|Traversable $options
* @throws Exception\InvalidArgumentException
* @return void
*/
public function setFromArray($options)
Expand Down Expand Up @@ -80,6 +81,7 @@ public function toArray()
* @see ParameterObject::__set()
* @param string $key
* @param mixed $value
* @throws Exception\BadMethodCallException
* @return void
*/
public function __set($key, $value)
Expand All @@ -100,6 +102,7 @@ public function __set($key, $value)
/**
* @see ParameterObject::__get()
* @param string $key
* @throws Exception\BadMethodCallException
* @return mixed
*/
public function __get($key)
Expand Down
1 change: 1 addition & 0 deletions src/ArrayUtils.php
Expand Up @@ -172,6 +172,7 @@ public static function isHashTable($value, $allowEmpty = false)
*
* @param array|Traversable $iterator The array or Traversable object to convert
* @param bool $recursive Recursively check all nested structures
* @throws Exception\InvalidArgumentException if $iterator is not an array or a Traversable object
* @return array
*/
public static function iteratorToArray($iterator, $recursive = true)
Expand Down
4 changes: 2 additions & 2 deletions src/CallbackHandler.php
Expand Up @@ -52,9 +52,8 @@ class CallbackHandler
/**
* Constructor
*
* @param string $event Event to which slot is subscribed
* @param string|array|object|callable $callback PHP callback
* @param array $options Options used by the callback handler (e.g., priority)
* @param array $metadata Callback metadata
*/
public function __construct($callback, array $metadata = array())
{
Expand All @@ -73,6 +72,7 @@ public function __construct($callback, array $metadata = array())
* to registering the callback.
*
* @param callable $callback
* @throws Exception\InvalidCallbackException
* @return void
*/
protected function registerCallback($callback)
Expand Down
3 changes: 2 additions & 1 deletion src/Hydrator/Reflection.php
Expand Up @@ -64,7 +64,8 @@ public function hydrate(array $data, $object)
* class has not been loaded.
*
* @static
* @param string|object $object
* @param string|object $input
* @throws Exception\InvalidArgumentException
* @return array
*/
protected static function getReflProperties($input)
Expand Down
2 changes: 2 additions & 0 deletions src/Message.php
Expand Up @@ -32,6 +32,7 @@ class Message implements MessageInterface
*
* @param string|int|array|Traversable $spec
* @param mixed $value
* @throws Exception\InvalidArgumentException
* @return Message
*/
public function setMetadata($spec, $value = null)
Expand All @@ -57,6 +58,7 @@ public function setMetadata($spec, $value = null)
*
* @param null|string|int $key
* @param null|mixed $default
* @throws Exception\InvalidArgumentException
* @return mixed
*/
public function getMetadata($key = null, $default = null)
Expand Down
1 change: 1 addition & 0 deletions src/PriorityQueue.php
Expand Up @@ -272,6 +272,7 @@ public function hasPriority($priority)
/**
* Get the inner priority queue instance
*
* @throws \DomainException
* @return SplPriorityQueue
*/
protected function getQueue()
Expand Down

0 comments on commit 3b21b5d

Please sign in to comment.