Merge pull request #2116 from LuckyCyborg/4.0

Improve the Platform module
nova-framework · Sep 21, 2018 · f05e8d8 · f05e8d8
2 parents 2869678 + a984416
commit f05e8d8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/app/Platform/Bootstrap.php b/app/Platform/Bootstrap.php
@@ -14,7 +14,7 @@
 // Define The Application Version
 //--------------------------------------------------------------------------
 
-define('VERSION', '4.0.93');
+define('VERSION', '4.0.94');
 
 //--------------------------------------------------------------------------
 // Set PHP Error Reporting Options

diff --git a/modules/Platform/Support/EventedMenu.php b/modules/Platform/Support/EventedMenu.php
@@ -10,6 +10,8 @@
 use Nova\Support\Arr;
 use Nova\Support\Str;
 
+use LogicException;
+
 
 class EventedMenu
 {
@@ -124,15 +126,30 @@ protected function userIsAllowed(array $item, UserInterface $user, GateInterface
         }
 
         // The abilities entry was specified.
-        else if (is_string($abilities = $item['can'])) {
+        else if (! is_array($abilities = $item['can'])) {
             $abilities = explode('|', $abilities);
         }
 
-        foreach ($abilities as $ability) {
-            list ($ability, $parameters) = array_pad(explode(':', $ability, 2), 2, array());
+        foreach ($abilities as $value) {
+            if (! is_array($value)) {
+                list ($ability, $parameters) = array_pad(explode(':', $value, 2), 2, array());
+
+                if (is_string($parameters)) {
+                    $parameters = explode(',', $parameters);
+                }
+
+            // The information is given as an array.
+            } else if (! is_null($ability = Arr::get($value, 'ability'))) {
+                $parameters = Arr::get($value, 'arguments', array());
+
+                if (! is_array($parameters)) {
+                    $parameters = array($parameters);
+                }
+            }
 
-            if (is_string($parameters)) {
-                $parameters = explode(',', $parameters);
+            // Invalid ability format specified.
+            else {
+                throw new LogicException('Invalid user ability.');
             }
 
             if (call_user_func(array($gate, 'allows'), $ability, $parameters)) {