fixed array operator parsing, updated migration and composer json

Author: kodeine

composer.json

@@ -11,7 +11,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "4.2.x|~5.0"
+        "illuminate/support": "4.2.x|~5.0",
+        "illuminate/database": "4.2.x|~5.0"
     },
     "autoload": {
         "classmap": [

src/Kodeine/Acl/Helper/Helper.php

@@ -37,6 +37,12 @@ protected function toDotPermissions(array $permissions)
 
     protected function parseOperator($str)
     {
+        // if its an array lets use
+        // and operator by default
+        if (is_array($str)) {
+            $str = implode(',', $str);
+        }
+
         if (preg_match('/([,|])(?:\s+)?/', $str, $m)) {
             return $m[1] == '|' ? 'or' : 'and';
         }

src/Kodeine/Acl/Models/Eloquent/Role.php

@@ -84,7 +84,7 @@ public function can($permission, $operator = null, $mergePermissions = [])
     protected function canWithAnd($permission, $permissions)
     {
         foreach ($permission as $check) {
-            if ( ! in_array($check, $permissions) || $permissions[$check] != true ) {
+            if ( ! in_array($check, $permissions) || ! isset($permissions[$check]) || $permissions[$check] != true ) {
                 return false;
             }
         }
@@ -100,7 +100,7 @@ protected function canWithAnd($permission, $permissions)
     protected function canWithOr($permission, $permissions)
     {
         foreach ($permission as $check) {
-            if ( in_array($check, $permissions) && $permissions[$check] == true ) {
+            if ( in_array($check, $permissions) && isset($permissions[$check]) && $permissions[$check] == true ) {
                 return true;
             }
         }

src/migrations/2015_02_07_172649_create_permissions_table.php

@@ -15,6 +15,7 @@ public function up()
     {
         Schema::create('permissions', function (Blueprint $table) {
             $table->increments('id');
+            $table->integer('inherit_id')->index();
             $table->string('name')->index();
             $table->string('slug')->index();
             $table->text('description')->nullable();