diff --git a/.travis.yml b/.travis.yml index bb4a859..5800803 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: php -php: +php: - 5.4 - 5.5 - 5.6 - hhvm before_script: - - composer self-update - - composer require satooshi/php-coveralls:~0.6 --prefer-source --no-interaction --dev + - travis_retry composer self-update + - travis_retry composer require satooshi/php-coveralls:~0.6 --prefer-source --no-interaction --dev script: phpunit -c phpunit.xml --coverage-text @@ -17,6 +17,5 @@ after_script: matrix: allow_failures: - - php: 5.6 - php: hhvm fash_finish: true diff --git a/src/Auth/Acl/Container.php b/src/Auth/Acl/Container.php index 65df6fc..b0b931f 100644 --- a/src/Auth/Acl/Container.php +++ b/src/Auth/Acl/Container.php @@ -89,11 +89,10 @@ protected function initiate() /** * Assign single or multiple $roles + $actions to have access. * - * @param string|array $roles A string or an array of roles - * @param string|array $actions A string or an array of action name - * @param bool $allow + * @param string|array $roles A string or an array of roles + * @param string|array $actions A string or an array of action name + * @param bool $allow * @return $this - * @throws \InvalidArgumentException */ public function allow($roles, $actions, $allow = true) { @@ -120,8 +119,8 @@ public function can($action) * Verify whether given roles has sufficient roles to access the * actions based on available type of access. * - * @param string|array $roles A string or an array of roles - * @param string $action A string of action name + * @param string|array $roles A string or an array of roles + * @param string $action A string of action name * @return bool * @throws \InvalidArgumentException */ diff --git a/src/Auth/Acl/Factory.php b/src/Auth/Acl/Factory.php index 84e6cbe..86d99ac 100644 --- a/src/Auth/Acl/Factory.php +++ b/src/Auth/Acl/Factory.php @@ -23,7 +23,7 @@ class Factory /** * Construct a new Environment. * - * @param \Orchestra\Auth\Guard|\Illuminate\Auth\Guard $auth + * @param \Orchestra\Auth\Guard $auth */ public function __construct(Guard $auth) { diff --git a/src/Auth/Acl/Fluent.php b/src/Auth/Acl/Fluent.php index a6b8321..d8b96f2 100644 --- a/src/Auth/Acl/Fluent.php +++ b/src/Auth/Acl/Fluent.php @@ -91,7 +91,7 @@ public function detach(array $keys) /** * Check if an id is set in the collection. * - * @param integer $id + * @param int $id * @return bool */ public function exist($id) @@ -214,7 +214,7 @@ public function rename($from, $to) * Get the ID from a key. * * @param string $key - * @return integer + * @return int */ public function search($key) {