Add posibilityy to pass single role and permission string to ability

Fix #213
santigarcor · Oct 30, 2017 · 5d3600d · 5d3600d
1 parent 8badb71
commit 5d3600d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/Helper.php b/src/Helper.php
@@ -97,9 +97,9 @@ public static function assignRealValuesTo($team, $requireAllOrOptions, $method)
      * @param  string|array  $value
      * @return string|array
      */
-    public static function standardize($value)
+    public static function standardize($value, $toArray = false)
     {
-        if (is_array($value) || strpos($value, '|') === false) {
+        if (is_array($value) || ((strpos($value, '|') === false) && !$toArray)) {
             return $value;
         }
 

diff --git a/src/Traits/LaratrustUserTrait.php b/src/Traits/LaratrustUserTrait.php
@@ -306,8 +306,8 @@ public function ability($roles, $permissions, $team = null, $options = [])
     {
         list($team, $options) = Helper::assignRealValuesTo($team, $options, 'is_array');
         // Convert string to array if that's what is passed in.
-        $roles = Helper::standardize($roles);
-        $permissions = Helper::standardize($permissions);
+        $roles = Helper::standardize($roles, true);
+        $permissions = Helper::standardize($permissions, true);
 
         // Set up default values and validate options.
         $options = Helper::checkOrSet('validate_all', $options, [false, true]);

diff --git a/tests/LaratrustTestCase.php b/tests/LaratrustTestCase.php
@@ -13,7 +13,7 @@ protected function getPackageProviders($app)
 
     protected function getPackageAliases($app)
     {
-        return ['Laratrust' => 'Laratrust\LaratrustServiceProvider'];
+        return ['Laratrust' => 'Laratrust\LaratrustFacade'];
     }
 
     protected function getEnvironmentSetUp($app)

diff --git a/tests/LaratrustUserAbilityTest.php b/tests/LaratrustUserAbilityTest.php
@@ -223,6 +223,19 @@ public function testAbilityShouldAcceptStrings()
                 ['return_type' => 'both']
             )
         );
+
+        $this->assertSame(
+            $this->user->ability(
+                ['role_a'],
+                ['permission_a'],
+                ['return_type' => 'both']
+            ),
+            $this->user->ability(
+                'role_a',
+                'permission_a',
+                ['return_type' => 'both']
+            )
+        );
     }
 
     public function testAbilityDefaultOptions()