Skip to content

Commit

Permalink
Merge pull request tmaiaroto#23 from Ciaro/master
Browse files Browse the repository at this point in the history
Minor QA.
  • Loading branch information
nateabele committed Mar 12, 2012
2 parents 9de3a7b + e040213 commit c2c4878
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Checkout the code to either of your library directories:

cd libraries
git clone https://github.com/rich97/li3_access.git
git clone https://github.com/tmaiaroto/li3_access.git

Include the library in in your `/app/config/bootstrap/libraries.php`

Expand Down
4 changes: 2 additions & 2 deletions extensions/adapter/security/access/AuthRbac.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class AuthRbac extends \lithium\core\Object {
protected $_roles = null;

/**
* The `Rbac` adapter will iterate trough the rbac data Array.
* The `Rbac` adapter will iterate through the rbac data Array.
*
* @todo: write better tests!
*
Expand Down Expand Up @@ -189,7 +189,7 @@ protected static function _parseClosures(array &$data, $request, array &$roleOpt
* @param mixed $params The Lithium `Request` object, or an array with at least
* 'request', and 'params'
* @param array $options
* @return array|mixed $roles Roles with attachted User Models
* @return array|mixed $roles Roles with attached User Models
*/
protected static function _getRolesByAuth($params, array $options = array()) {
$roles = array('*' => '*');
Expand Down
5 changes: 0 additions & 5 deletions extensions/adapter/security/access/Simple.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@

namespace li3_access\extensions\adapter\security\access;

/* uncomment it if needed
use lithium\core\Libraries;
use lithium\util\Set;
*/

class Simple extends \lithium\core\Object {

/**
Expand Down
5 changes: 2 additions & 3 deletions security/Access.php
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ protected static function _initConfig($name, $config) {
* perhaps, login.
*
* @param string $name The name of the `Access` configuration/adapter to check against.
* @param object $request A Lithium Request object.
* @param mixed $resource The user data that holds all necessary information about
* the user requesting access. Or `false` (because Auth::check() can return `false`).
* @param mixed $user The user data array that holds all necessary information about
* the user requesting access. Or `false` (because `Auth::check()` can return `false`).
* @param mixed $params The Lithium `Request` object, or an array with at least
* 'request', and 'params'
* @param array $options An array of additional options.
Expand Down

0 comments on commit c2c4878

Please sign in to comment.