Use 'Acl.' as plugin prefix and pluralized class name in ACL behavior

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "cakephp/acl",
+    "name": "itnovum/acl",
     "description": "Acl Plugin for CakePHP framework",
     "type": "cakephp-plugin",
     "keywords": [
@@ -21,7 +21,7 @@
         "source": "https://github.com/cakephp/acl"
     },
     "require": {
-        "php": "^7.2",
+        "php": ">=7.2",
         "cakephp/cakephp": "^4.0",
         "cakephp/plugin-installer": "^1.2"
     },

src/Model/Behavior/AclBehavior.php

@@ -72,15 +72,16 @@ public function __construct(Table $model, array $config = [])
         }
         foreach ($types as $type) {
             $alias = Inflector::pluralize($type);
-            $className = App::className($alias . 'Table', 'Model/Table');
+            $className = App::className($alias, 'Model/Table', 'Table');
             if ($className == false) {
-                $className = App::className('Acl.' . $alias . 'Table', 'Model/Table');
+                $className = App::className('Acl.' . $alias, 'Model/Table', 'Table');
             }
             $config = [];
             if (!TableRegistry::getTableLocator()->exists($alias)) {
                 $config = ['className' => $className];
             }
-            $model->hasMany($type, [
+
+            $model->hasMany($alias, [
                 'targetTable' => TableRegistry::getTableLocator()->get($alias, $config),
             ]);
         }
@@ -94,7 +95,7 @@ public function __construct(Table $model, array $config = [])
      * Retrieves the Aro/Aco node for this model
      *
      * @param string|array|Model $ref Array with 'model' and 'foreign_key', model object, or string value
-     * @param string $type Only needed when Acl is set up as 'both', specify 'Aro' or 'Aco' to get the correct node
+     * @param string $type Pluralized! Only needed when Acl is set up as 'both', specify 'Aros' or 'Acos' to get the correct node
      * @return \Cake\ORM\Query
      * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/acl.html#node
      * @throws \Cake\Core\Exception\Exception
@@ -113,7 +114,12 @@ public function node($ref = null, $type = null)
             throw new Exception\Exception(__d('cake_dev', 'ref parameter must be a string or an Entity'));
         }
 
-        return $this->_table->{$type}->node($ref);
+        if(property_exists($this->_table, $type)){
+            return $this->_table->{$type}->node($ref);
+        }else{
+            $type = Inflector::pluralize($type);
+            return $this->_table->{$type}->node($ref);
+        }
     }
 
     /**
@@ -131,6 +137,7 @@ public function afterSave(Event $event, Entity $entity)
             $types = [$types];
         }
         foreach ($types as $type) {
+            $type = Inflector::pluralize($type);
             $parent = $entity->parentNode();
             if (!empty($parent)) {
                 $parent = $this->node($parent, $type)->first();
@@ -171,6 +178,7 @@ public function afterDelete(Event $event, Entity $entity)
             $types = [$types];
         }
         foreach ($types as $type) {
+            $type = Inflector::pluralize($type);
             $node = $this->node($entity, $type)->toArray();
             if (!empty($node)) {
                 $event->getSubject()->{$type}->delete($node[0]);

src/Model/Table/AclNodesTable.php

@@ -57,7 +57,7 @@ public function node($ref = null)
 
         if (empty($ref)) {
             return null;
-        } elseif (is_int($ref) || ctype_digit($ref)) {
+        } elseif (is_numeric($ref)) {
             $ref = [
                 'id' => $ref,
             ];

src/Model/Table/AcoActionsTable.php

@@ -34,7 +34,7 @@ class AcoActionsTable extends Table
     public function initialize(array $config) :void
     {
         $this->belongsTo('Acos', [
-            'className' => App::className('Acl.AcosTable', 'Model/Table'),
+            'className' => 'Acl.Acos'
         ]);
     }
 }

src/Model/Table/AcosTable.php

@@ -39,13 +39,13 @@ public function initialize(array $config) :void
         $this->addBehavior('Tree', ['type' => 'nested']);
 
         $this->belongsToMany('Aros', [
-            'through' => App::className('Acl.PermissionsTable', 'Model/Table'),
-            'className' => App::className('Acl.ArosTable', 'Model/Table'),
+            'through' => 'Acl.Permissions',
+            'className' => 'Acl.Aros',
         ]);
         $this->hasMany('AcoChildren', [
-            'className' => App::className('Acl.AcosTable', 'Model/Table'),
+            'className' => 'Acl.Acos',
             'foreignKey' => 'parent_id',
         ]);
-        $this->setEntityClass(App::className('Acl.Aco', 'Model/Entity'));
+        $this->setEntityClass('Acl.Aco');
     }
 }

src/Model/Table/ArosTable.php

@@ -39,11 +39,11 @@ public function initialize(array $config) :void
         $this->addBehavior('Tree', ['type' => 'nested']);
 
         $this->belongsToMany('Acos', [
-            'through' => App::className('Acl.PermissionsTable', 'Model/Table'),
-            'className' => App::className('Acl.AcosTable', 'Model/Table'),
+            'through' => 'Acl.Permissions',
+            'className' => 'Acl.Acos',
         ]);
         $this->hasMany('AroChildren', [
-            'className' => App::className('Acl.ArosTable', 'Model/Table'),
+            'className' => 'Acl.Aros',
             'foreignKey' => 'parent_id',
         ]);
 

src/Model/Table/PermissionsTable.php

@@ -39,10 +39,10 @@ public function initialize(array $config) :void
         $this->setAlias('Permissions');
         $this->setTable('aros_acos');
         $this->belongsTo('Aros', [
-            'className' => App::className('Acl.ArosTable', 'Model/Table'),
+            'className' => 'Acl.Aros'
         ]);
         $this->belongsTo('Acos', [
-            'className' => App::className('Acl.AcosTable', 'Model/Table'),
+            'className' => 'Acl.Acos'
         ]);
         $this->Aro = $this->Aros->getTarget();
         $this->Aco = $this->Acos->getTarget();
@@ -230,8 +230,8 @@ public function getAclLink($aro, $aco)
         if (empty($obj['Aro']) || empty($obj['Aco'])) {
             return false;
         }
-        $aro = $obj['Aro']->extract('id')->toArray();
-        $aco = $obj['Aco']->extract('id')->toArray();
+        $aro = $obj['Aro']->all()->extract('id')->toArray();
+        $aco = $obj['Aco']->all()->extract('id')->toArray();
         $aro = current($aro);
         $aco = current($aco);
         $alias = $this->getAlias();