From 2b7937ae85b2952439a26b24e2557eb72256e287 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 31 Aug 2023 10:50:09 -0400
Subject: [PATCH] Fix phpcs (#181)

* Allow composer scripts

* Apply present day phpcs rules.
---
 composer.json                                 |   8 +-
 src/AclExtras.php                             |  16 +-
 src/AclInterface.php                          |  13 +-
 src/Adapter/CachedDbAcl.php                   |  18 +-
 src/Adapter/DbAcl.php                         |  23 ++-
 src/Adapter/IniAcl.php                        |  24 ++-
 src/Adapter/PhpAcl.php                        |  25 ++-
 src/Adapter/Utility/PhpAco.php                |   5 +-
 src/Adapter/Utility/PhpAro.php                |  11 +-
 src/Auth/ActionsAuthorize.php                 |   5 +-
 src/Auth/BaseAuthorize.php                    |   3 +-
 src/Auth/CrudAuthorize.php                    |   5 +-
 src/Controller/Component/AclComponent.php     |  37 ++---
 src/Model/Behavior/AclBehavior.php            |  23 +--
 src/Model/Entity/Aco.php                      |   1 +
 src/Model/Entity/Aro.php                      |   1 +
 src/Model/Entity/Permission.php               |   1 +
 src/Model/Table/AclNodesTable.php             |  16 +-
 src/Model/Table/AcoActionsTable.php           |   8 +-
 src/Model/Table/AcosTable.php                 |   8 +-
 src/Model/Table/ArosTable.php                 |   6 +-
 src/Model/Table/PermissionsTable.php          |  21 +--
 src/Shell/AclExtrasShell.php                  |  10 +-
 src/Shell/AclShell.php                        |  41 +++--
 tests/Fixture/AcoActionsFixture.php           |   2 -
 tests/Fixture/AcoTwosFixture.php              |   2 -
 tests/Fixture/AcosFixture.php                 |   2 -
 tests/Fixture/AroTwosFixture.php              |   2 -
 tests/Fixture/ArosAcoTwosFixture.php          |   2 -
 tests/Fixture/ArosAcosFixture.php             |   2 -
 tests/Fixture/ArosFixture.php                 |   2 -
 tests/Fixture/PeopleFixture.php               |   1 -
 tests/TestCase/AclExtrasTest.php              |  10 +-
 tests/TestCase/AclShellTest.php               |   4 +-
 tests/TestCase/Adapter/CacheDbAclTest.php     |  13 +-
 tests/TestCase/Adapter/DbAclTest.php          |  24 +--
 tests/TestCase/Adapter/IniAclTest.php         |   5 +-
 tests/TestCase/Adapter/PhpAclTest.php         |   6 +-
 tests/TestCase/Auth/ActionsAuthorizeTest.php  |   5 +-
 tests/TestCase/Auth/CrudAuthorizeTest.php     |   5 +-
 .../Controller/Component/AclComponentTest.php |   7 +-
 .../Model/Behavior/AclBehaviorTest.php        |  25 +--
 tests/TestCase/Model/Table/AclNodesTest.php   |  36 ++--
 tests/TestCase/test_admin_controllers.php     |   3 +-
 tests/TestCase/test_controllers.php           |   6 +-
 .../test_nested_plugin_controllers.php        |   2 +-
 .../test_plugin_admin_controllers.php         |   2 +-
 tests/TestCase/test_plugin_controllers.php    |   2 +-
 tests/bootstrap.php                           |   2 +-
 tests/schema.php                              | 154 +++++++++---------
 .../Nested/TestPluginTwo/src/Plugin.php       |   1 +
 .../Plugin/TestPlugin/config/routes.php       |   1 -
 .../src/Model/Entity/TestPluginAuthUser.php   |   1 +
 .../test_app/Plugin/TestPlugin/src/Plugin.php |   1 +
 .../V10/Authors/Editors/DummyController.php   |   2 +-
 55 files changed, 282 insertions(+), 379 deletions(-)

diff --git a/composer.json b/composer.json
index c18db394..8b42326c 100644
--- a/composer.json
+++ b/composer.json
@@ -42,5 +42,11 @@
 
         }
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "config": {
+        "allow-plugins": {
+            "cakephp/plugin-installer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    }
 }
diff --git a/src/AclExtras.php b/src/AclExtras.php
index 52060214..82f78654 100644
--- a/src/AclExtras.php
+++ b/src/AclExtras.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Acl Extras.
@@ -34,7 +35,6 @@
  */
 class AclExtras
 {
-
     /**
      * Contains instance of AclComponent
      *
@@ -91,10 +91,14 @@ class AclExtras
      */
     protected $foundACOs = [];
 
-    /** @var \Cake\Controller\Controller */
+    /**
+     * @var \Cake\Controller\Controller
+     */
     protected $controller;
 
-    /** @var \Cake\Console\Shell */
+    /**
+     * @var \Cake\Console\Shell
+     */
     protected $Shell;
 
     /**
@@ -178,7 +182,7 @@ public function acoUpdate($params = [])
         } else {
             $plugin = $params['plugin'];
             if (!Plugin::loaded($plugin)) {
-                $this->err(__d('cake_acl', "<error>Plugin {0} not found or not activated.</error>", [$plugin]));
+                $this->err(__d('cake_acl', '<error>Plugin {0} not found or not activated.</error>', [$plugin]));
 
                 return false;
             }
@@ -236,7 +240,7 @@ protected function _processPrefixes($root)
      * @param string $plugin The name of the plugin to alias
      * @return string
      */
-    protected function _pluginAlias(string $plugin) :string
+    protected function _pluginAlias(string $plugin): string
     {
         return preg_replace('/\//', '\\', Inflector::camelize($plugin));
     }
@@ -355,7 +359,7 @@ public function getControllerList($plugin = null, $prefix = null)
             $dir = new Folder($path[0]);
             $controllers = $dir->find('.*Controller\.php');
         } else {
-            $path = Plugin::classPath($plugin) . 'Controller' . DS. (empty($prefix) ? '' : DS . Inflector::camelize($prefix));
+            $path = Plugin::classPath($plugin) . 'Controller' . DS . (empty($prefix) ? '' : DS . Inflector::camelize($prefix));
             $dir = new Folder($path);
             $controllers = $dir->find('.*Controller\.php');
         }
diff --git a/src/AclInterface.php b/src/AclInterface.php
index c4c7e37c..87f3da4b 100644
--- a/src/AclInterface.php
+++ b/src/AclInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -20,11 +21,9 @@
 /**
  * Access Control List interface.
  * Implementing classes are used by AclComponent to perform ACL checks in Cake.
- *
  */
 interface AclInterface
 {
-
     /**
      * Empty method to be overridden in subclasses
      *
@@ -33,7 +32,7 @@ interface AclInterface
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function check($aro, $aco, $action = "*");
+    public function check($aro, $aco, $action = '*');
 
     /**
      * Allow methods are used to grant an ARO access to an ACO.
@@ -43,7 +42,7 @@ public function check($aro, $aco, $action = "*");
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function allow($aro, $aco, $action = "*");
+    public function allow($aro, $aco, $action = '*');
 
     /**
      * Deny methods are used to remove permission from an ARO to access an ACO.
@@ -53,7 +52,7 @@ public function allow($aro, $aco, $action = "*");
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function deny($aro, $aco, $action = "*");
+    public function deny($aro, $aco, $action = '*');
 
     /**
      * Inherit methods modify the permission for an ARO to be that of its parent object.
@@ -63,12 +62,12 @@ public function deny($aro, $aco, $action = "*");
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function inherit($aro, $aco, $action = "*");
+    public function inherit($aro, $aco, $action = '*');
 
     /**
      * Initialization method for the Acl implementation
      *
-     * @param Component $component Component instance.
+     * @param \Cake\Controller\Component $component Component instance.
      * @return void
      */
     public function initialize(Component $component);
diff --git a/src/Adapter/CachedDbAcl.php b/src/Adapter/CachedDbAcl.php
index 9b958f4a..43ff9121 100644
--- a/src/Adapter/CachedDbAcl.php
+++ b/src/Adapter/CachedDbAcl.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -17,7 +18,6 @@
 
 use Acl\AclInterface;
 use Cake\Cache\Cache;
-use Cake\Controller\Component;
 use Cake\Core\Configure;
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
@@ -31,12 +31,10 @@
  */
 class CachedDbAcl extends DbAcl implements AclInterface
 {
-
     protected $_cacheConfig = 'default';
 
     /**
      * Constructor
-     *
      */
     public function __construct()
     {
@@ -50,7 +48,7 @@ public function __construct()
     /**
      * {{@inheritDoc}}
      */
-    public function check($aro, $aco, $action = "*")
+    public function check($aro, $aco, $action = '*')
     {
         $key = $this->_getCacheKey($aro, $aco, $action);
 
@@ -64,7 +62,7 @@ public function check($aro, $aco, $action = "*")
     /**
      * {{@inheritDoc}}
      */
-    public function allow($aro, $aco, $actions = "*", $value = 1)
+    public function allow($aro, $aco, $actions = '*', $value = 1)
     {
         Cache::clear($this->_cacheConfig);
 
@@ -74,8 +72,8 @@ public function allow($aro, $aco, $actions = "*", $value = 1)
     /**
      * Generates a string cache key for the ARO, ACO pair
      *
-     * @param string|array|Entity $aro The requesting object identifier.
-     * @param string|array|Entity $aco The controlled object identifier.
+     * @param string|array|\Cake\ORM\Entity $aro The requesting object identifier.
+     * @param string|array|\Cake\ORM\Entity $aco The controlled object identifier.
      * @param string $action Action
      * @return string
      */
@@ -87,7 +85,7 @@ protected function _getCacheKey($aro, $aco, $action = '*')
     /**
      * Generates a key string to use for the cache
      *
-     * @param string|array|Entity $ref Array with 'model' and 'foreign_key', model object, or string value
+     * @param string|array|\Cake\ORM\Entity $ref Array with 'model' and 'foreign_key', model object, or string value
      * @return string
      */
     protected function _getNodeCacheKey($ref)
@@ -100,7 +98,7 @@ protected function _getNodeCacheKey($ref)
             return $ref->getSource() . '_' . $ref->id;
         } elseif (is_array($ref) && !(isset($ref['model']) && isset($ref['foreign_key']))) {
             $name = key($ref);
-            list(, $alias) = pluginSplit($name);
+            [, $alias] = pluginSplit($name);
 
             $bindTable = TableRegistry::getTableLocator()->get($name);
             $entityClass = $bindTable->getEntityClass();
@@ -113,7 +111,7 @@ protected function _getNodeCacheKey($ref)
                 throw new Exception\Exception(
                     __d(
                         'cake_dev',
-                        "Entity class {0} not found in CachedDbAcl::_getNodeCacheKey() when trying to bind {1} object",
+                        'Entity class {0} not found in CachedDbAcl::_getNodeCacheKey() when trying to bind {1} object',
                         [$type, $this->alias()]
                     )
                 );
diff --git a/src/Adapter/DbAcl.php b/src/Adapter/DbAcl.php
index 769bb6d4..af642231 100644
--- a/src/Adapter/DbAcl.php
+++ b/src/Adapter/DbAcl.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -16,12 +17,12 @@
 namespace Acl\Adapter;
 
 use Acl\AclInterface;
+use Acl\Model\Table\AcosTable;
+use Acl\Model\Table\ArosTable;
+use Acl\Model\Table\PermissionsTable;
 use Cake\Controller\Component;
 use Cake\Core\App;
 use Cake\ORM\TableRegistry;
-use Acl\Model\Table\PermissionsTable;
-use Acl\Model\Table\ArosTable;
-use Acl\Model\Table\AcosTable;
 
 /**
  * DbAcl implements an ACL control system in the database. ARO's and ACO's are
@@ -39,7 +40,6 @@
  *        Users
  *            edit
  * }}}
- *
  */
 class DbAcl implements AclInterface
 {
@@ -49,7 +49,6 @@ class DbAcl implements AclInterface
 
     /**
      * Constructor
-     *
      */
     public function __construct()
     {
@@ -65,7 +64,7 @@ public function __construct()
     /**
      * Initializes the containing component and sets the Aro/Aco objects to it.
      *
-     * @param AclComponent $component Component
+     * @param \Acl\Adapter\AclComponent $component Component
      * @return void
      */
     public function initialize(Component $component)
@@ -83,7 +82,7 @@ public function initialize(Component $component)
      * @return bool Success (true if ARO has access to action in ACO, false otherwise)
      * @link https://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#checking-permissions-the-acl-component
      */
-    public function check($aro, $aco, $action = "*")
+    public function check($aro, $aco, $action = '*')
     {
         return $this->Permission->check($aro, $aco, $action);
     }
@@ -98,7 +97,7 @@ public function check($aro, $aco, $action = "*")
      * @return bool Success
      * @link https://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#assigning-permissions
      */
-    public function allow($aro, $aco, $actions = "*", $value = 1)
+    public function allow($aro, $aco, $actions = '*', $value = 1)
     {
         return $this->Permission->allow($aro, $aco, $actions, $value);
     }
@@ -112,7 +111,7 @@ public function allow($aro, $aco, $actions = "*", $value = 1)
      * @return bool Success
      * @link https://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#assigning-permissions
      */
-    public function deny($aro, $aco, $action = "*")
+    public function deny($aro, $aco, $action = '*')
     {
         return $this->allow($aro, $aco, $action, -1);
     }
@@ -125,7 +124,7 @@ public function deny($aro, $aco, $action = "*")
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function inherit($aro, $aco, $action = "*")
+    public function inherit($aro, $aco, $action = '*')
     {
         return $this->allow($aro, $aco, $action, 0);
     }
@@ -139,7 +138,7 @@ public function inherit($aro, $aco, $action = "*")
      * @return bool Success
      * @see allow()
      */
-    public function grant($aro, $aco, $action = "*")
+    public function grant($aro, $aco, $action = '*')
     {
         return $this->allow($aro, $aco, $action);
     }
@@ -153,7 +152,7 @@ public function grant($aro, $aco, $action = "*")
      * @return bool Success
      * @see deny()
      */
-    public function revoke($aro, $aco, $action = "*")
+    public function revoke($aro, $aco, $action = '*')
     {
         return $this->deny($aro, $aco, $action);
     }
diff --git a/src/Adapter/IniAcl.php b/src/Adapter/IniAcl.php
index 99bbad52..94e0a4cd 100644
--- a/src/Adapter/IniAcl.php
+++ b/src/Adapter/IniAcl.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -18,17 +19,14 @@
 use Acl\AclInterface;
 use Cake\Controller\Component;
 use Cake\Core\Configure\Engine\IniConfig;
-use Cake\Core\InstanceConfigTrait;
 use Cake\Utility\Hash;
 
 /**
  * IniAcl implements an access control system using an INI file. An example
  * of the ini file used can be found in /config/acl.ini.
- *
  */
 class IniAcl implements AclInterface
 {
-
     /**
      * The Hash::extract() path to the user/aro identifier in the
      * acl.ini file. This path will be used to extract the string
@@ -60,7 +58,7 @@ public function __construct()
     /**
      * Initialize method
      *
-     * @param Component $component Component instance.
+     * @param \Cake\Controller\Component $component Component instance.
      * @return void
      */
     public function initialize(Component $component)
@@ -82,7 +80,7 @@ public function initialize(Component $component)
      * @param string $action Action (defaults to *)
      * @return void
      */
-    public function allow($aro, $aco, $action = "*")
+    public function allow($aro, $aco, $action = '*')
     {
     }
 
@@ -94,7 +92,7 @@ public function allow($aro, $aco, $action = "*")
      * @param string $action Action (defaults to *)
      * @return void
      */
-    public function deny($aro, $aco, $action = "*")
+    public function deny($aro, $aco, $action = '*')
     {
     }
 
@@ -106,7 +104,7 @@ public function deny($aro, $aco, $action = "*")
      * @param string $action Action (defaults to *)
      * @return void
      */
-    public function inherit($aro, $aco, $action = "*")
+    public function inherit($aro, $aco, $action = '*')
     {
     }
 
@@ -129,7 +127,7 @@ public function check($aro, $aco, $action = null)
         }
 
         if (isset($aclConfig[$aro]['deny'])) {
-            $userDenies = $this->arrayTrim(explode(",", $aclConfig[$aro]['deny']));
+            $userDenies = $this->arrayTrim(explode(',', $aclConfig[$aro]['deny']));
 
             if (array_search($aco, $userDenies)) {
                 return false;
@@ -137,7 +135,7 @@ public function check($aro, $aco, $action = null)
         }
 
         if (isset($aclConfig[$aro]['allow'])) {
-            $userAllows = $this->arrayTrim(explode(",", $aclConfig[$aro]['allow']));
+            $userAllows = $this->arrayTrim(explode(',', $aclConfig[$aro]['allow']));
 
             if (array_search($aco, $userAllows)) {
                 return true;
@@ -145,12 +143,12 @@ public function check($aro, $aco, $action = null)
         }
 
         if (isset($aclConfig[$aro]['groups'])) {
-            $userGroups = $this->arrayTrim(explode(",", $aclConfig[$aro]['groups']));
+            $userGroups = $this->arrayTrim(explode(',', $aclConfig[$aro]['groups']));
 
             foreach ($userGroups as $group) {
                 if (array_key_exists($group, $aclConfig)) {
                     if (isset($aclConfig[$group]['deny'])) {
-                        $groupDenies = $this->arrayTrim(explode(",", $aclConfig[$group]['deny']));
+                        $groupDenies = $this->arrayTrim(explode(',', $aclConfig[$group]['deny']));
 
                         if (array_search($aco, $groupDenies)) {
                             return false;
@@ -158,7 +156,7 @@ public function check($aro, $aco, $action = null)
                     }
 
                     if (isset($aclConfig[$group]['allow'])) {
-                        $groupAllows = $this->arrayTrim(explode(",", $aclConfig[$group]['allow']));
+                        $groupAllows = $this->arrayTrim(explode(',', $aclConfig[$group]['allow']));
 
                         if (array_search($aco, $groupAllows)) {
                             return true;
@@ -196,7 +194,7 @@ public function arrayTrim($array)
         foreach ($array as $key => $value) {
             $array[$key] = trim($value);
         }
-        array_unshift($array, "");
+        array_unshift($array, '');
 
         return $array;
     }
diff --git a/src/Adapter/PhpAcl.php b/src/Adapter/PhpAcl.php
index 6cb0380f..882ade04 100644
--- a/src/Adapter/PhpAcl.php
+++ b/src/Adapter/PhpAcl.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * PHP configuration based AclInterface implementation
@@ -23,30 +24,26 @@
 use Cake\Controller\Component;
 use Cake\Core\Configure\Engine\PhpConfig;
 use Cake\Core\Exception\Exception;
-use Cake\Utility\Hash;
-use Cake\Utility\Inflector;
 
 /**
  * PhpAcl implements an access control system using a plain PHP configuration file.
  * An example file can be found in app/Config/acl.php
- *
  */
 class PhpAcl implements AclInterface
 {
-
     /**
      * Constant for deny
      *
      * @var bool
      */
-    const DENY = false;
+    public const DENY = false;
 
     /**
      * Constant for allow
      *
      * @var bool
      */
-    const ALLOW = true;
+    public const ALLOW = true;
 
     /**
      * Options:
@@ -60,14 +57,14 @@ class PhpAcl implements AclInterface
     /**
      * Aro Object
      *
-     * @var PhpAro
+     * @var \Acl\Adapter\Utility\PhpAro
      */
     public $Aro = null;
 
     /**
      * Aco Object
      *
-     * @var PhpAco
+     * @var \Acl\Adapter\Utility\PhpAco
      */
     public $Aco = null;
 
@@ -87,7 +84,7 @@ public function __construct()
     /**
      * Initialize method
      *
-     * @param Component $Component Component instance
+     * @param \Cake\Controller\Component $Component Component instance
      * @return void
      */
     public function initialize(Component $Component)
@@ -139,7 +136,7 @@ public function build(array $config)
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function allow($aro, $aco, $action = "*")
+    public function allow($aro, $aco, $action = '*')
     {
         return $this->Aco->access($this->Aro->resolve($aro), $aco, $action, 'allow');
     }
@@ -152,7 +149,7 @@ public function allow($aro, $aco, $action = "*")
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function deny($aro, $aco, $action = "*")
+    public function deny($aro, $aco, $action = '*')
     {
         return $this->Aco->access($this->Aro->resolve($aro), $aco, $action, 'deny');
     }
@@ -165,7 +162,7 @@ public function deny($aro, $aco, $action = "*")
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function inherit($aro, $aco, $action = "*")
+    public function inherit($aro, $aco, $action = '*')
     {
         return false;
     }
@@ -179,12 +176,12 @@ public function inherit($aro, $aco, $action = "*")
      * @param string $action Action
      * @return bool true if access is granted, false otherwise
      */
-    public function check($aro, $aco, $action = "*")
+    public function check($aro, $aco, $action = '*')
     {
         $allow = $this->options['policy'];
         $prioritizedAros = $this->Aro->roles($aro);
 
-        if ($action && $action !== "*") {
+        if ($action && $action !== '*') {
             $aco .= '/' . $action;
         }
 
diff --git a/src/Adapter/Utility/PhpAco.php b/src/Adapter/Utility/PhpAco.php
index c0e41d44..c78f5a79 100644
--- a/src/Adapter/Utility/PhpAco.php
+++ b/src/Adapter/Utility/PhpAco.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * PHP configuration based Access Control Object
@@ -19,11 +20,9 @@
 
 /**
  * Access Control Object
- *
  */
 class PhpAco
 {
-
     /**
      * holds internal ACO representation
      *
@@ -71,7 +70,7 @@ public function path($aco)
         $stack = [[$root, 0]];
 
         while (!empty($stack)) {
-            list($root, $level) = array_pop($stack);
+            [$root, $level] = array_pop($stack);
 
             if (empty($path[$level])) {
                 $path[$level] = [];
diff --git a/src/Adapter/Utility/PhpAro.php b/src/Adapter/Utility/PhpAro.php
index 1cb70802..ba1ac680 100644
--- a/src/Adapter/Utility/PhpAro.php
+++ b/src/Adapter/Utility/PhpAro.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * PHP configuration based Access Request Object
@@ -22,18 +23,16 @@
 
 /**
  * Access Request Object
- *
  */
 class PhpAro
 {
-
     /**
      * role to resolve to when a provided ARO is not listed in
      * the internal tree
      *
      * @var string
      */
-    const DEFAULT_ROLE = 'Role/default';
+    public const DEFAULT_ROLE = 'Role/default';
 
     /**
      * map external identifiers. E.g. if
@@ -100,7 +99,7 @@ public function roles($aro)
         $stack = [[$aro, 0]];
 
         while (!empty($stack)) {
-            list($element, $depth) = array_pop($stack);
+            [$element, $depth] = array_pop($stack);
             $aros[$depth][] = $element;
 
             foreach ($this->_tree as $node => $children) {
@@ -123,7 +122,7 @@ public function roles($aro)
     public function resolve($aro)
     {
         foreach ($this->map as $aroGroup => $map) {
-            list($model, $field) = explode('/', $map, 2);
+            [$model, $field] = explode('/', $map, 2);
             $mapped = '';
 
             if (is_array($aro)) {
@@ -140,7 +139,7 @@ public function resolve($aro)
                 if (strpos($aro, '/') === false) {
                     $mapped = $aroGroup . '/' . $aro;
                 } else {
-                    list($aroModel, $aroValue) = explode('/', $aro, 2);
+                    [$aroModel, $aroValue] = explode('/', $aro, 2);
 
                     $aroModel = Inflector::camelize($aroModel);
 
diff --git a/src/Auth/ActionsAuthorize.php b/src/Auth/ActionsAuthorize.php
index 7aa77402..894ffb22 100644
--- a/src/Auth/ActionsAuthorize.php
+++ b/src/Auth/ActionsAuthorize.php
@@ -1,7 +1,7 @@
 <?php
+declare(strict_types=1);
 
 /**
- *
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
@@ -27,7 +27,6 @@
  */
 class ActionsAuthorize extends BaseAuthorize
 {
-
     /**
      * Authorize a user using the AclComponent.
      *
@@ -35,7 +34,7 @@ class ActionsAuthorize extends BaseAuthorize
      * @param \Cake\Network\Request $request The request needing authorization.
      * @return bool
      */
-    public function authorize($user, ServerRequest $request) :bool
+    public function authorize($user, ServerRequest $request): bool
     {
         $Acl = $this->_registry->load('Acl');
         $user = [$this->_config['userModel'] => $user];
diff --git a/src/Auth/BaseAuthorize.php b/src/Auth/BaseAuthorize.php
index eb6b8162..38ea9bd8 100644
--- a/src/Auth/BaseAuthorize.php
+++ b/src/Auth/BaseAuthorize.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -16,7 +17,6 @@
 namespace Acl\Auth;
 
 use Cake\Auth\BaseAuthorize as ParentAuthorize;
-use Cake\Controller\ComponentRegistry;
 use Cake\Http\ServerRequest;
 use Cake\Utility\Inflector;
 
@@ -25,7 +25,6 @@
  */
 abstract class BaseAuthorize extends ParentAuthorize
 {
-
     /**
      * Default config for authorize objects.
      *
diff --git a/src/Auth/CrudAuthorize.php b/src/Auth/CrudAuthorize.php
index 9ce1861b..573b34b6 100644
--- a/src/Auth/CrudAuthorize.php
+++ b/src/Auth/CrudAuthorize.php
@@ -1,7 +1,7 @@
 <?php
+declare(strict_types=1);
 
 /**
- *
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
@@ -34,11 +34,10 @@
  */
 class CrudAuthorize extends BaseAuthorize
 {
-
     /**
      * Sets up additional actionMap values that match the configured `Routing.prefixes`.
      *
-     * @param ComponentRegistry $registry The component registry from the controller.
+     * @param \Cake\Controller\ComponentRegistry $registry The component registry from the controller.
      * @param array $config An array of config. This class does not use any config.
      */
     public function __construct(ComponentRegistry $registry, $config = [])
diff --git a/src/Controller/Component/AclComponent.php b/src/Controller/Component/AclComponent.php
index 1102cacd..bc9506b6 100644
--- a/src/Controller/Component/AclComponent.php
+++ b/src/Controller/Component/AclComponent.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -20,10 +21,7 @@
 use Cake\Controller\ComponentRegistry;
 use Cake\Core\App;
 use Cake\Core\Configure;
-use Cake\Core\Configure\Engine\IniConfig;
 use Cake\Core\Exception\Exception;
-use Cake\Utility\ClassRegistry;
-use Cake\Utility\Inflector;
 
 /**
  * Access Control List factory class.
@@ -36,11 +34,10 @@
  */
 class AclComponent extends Component
 {
-
     /**
      * Instance of an ACL class
      *
-     * @var AclInterface
+     * @var \Acl\AclInterface
      */
     protected $_Instance = null;
 
@@ -61,7 +58,7 @@ class AclComponent extends Component
     /**
      * Constructor. Will return an instance of the correct ACL class as defined in `Configure::read('Acl.classname')`
      *
-     * @param ComponentRegistry $collection A ComponentRegistry
+     * @param \Cake\Controller\ComponentRegistry $collection A ComponentRegistry
      * @param array $config Array of configuration settings
      * @throws \Cake\Core\Exception\Exception when Acl.classname could not be loaded.
      */
@@ -86,8 +83,8 @@ public function __construct(ComponentRegistry $collection, array $config = [])
      *
      * Will call the initialize method on the adapter if setting a new one.
      *
-     * @param AclInterface|string $adapter Instance of AclInterface or a string name of the class to use. (optional)
-     * @return AclInterface|void either null, or the adapter implementation.
+     * @param \Acl\AclInterface|string $adapter Instance of AclInterface or a string name of the class to use. (optional)
+     * @return \Acl\AclInterface|void either null, or the adapter implementation.
      * @throws \Cake\Core\Exception\Exception when the given class is not an instance of AclInterface
      */
     public function adapter($adapter = null)
@@ -112,12 +109,12 @@ public function adapter($adapter = null)
      * Pass-thru function for ACL check instance. Check methods
      * are used to check whether or not an ARO can access an ACO
      *
-     * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
-     * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function check($aro, $aco, $action = "*")
+    public function check($aro, $aco, $action = '*')
     {
         return $this->_Instance->check($aro, $aco, $action);
     }
@@ -126,12 +123,12 @@ public function check($aro, $aco, $action = "*")
      * Pass-thru function for ACL allow instance. Allow methods
      * are used to grant an ARO access to an ACO.
      *
-     * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
-     * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function allow($aro, $aco, $action = "*")
+    public function allow($aro, $aco, $action = '*')
     {
         return $this->_Instance->allow($aro, $aco, $action);
     }
@@ -140,12 +137,12 @@ public function allow($aro, $aco, $action = "*")
      * Pass-thru function for ACL deny instance. Deny methods
      * are used to remove permission from an ARO to access an ACO.
      *
-     * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
-     * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function deny($aro, $aco, $action = "*")
+    public function deny($aro, $aco, $action = '*')
     {
         return $this->_Instance->deny($aro, $aco, $action);
     }
@@ -154,12 +151,12 @@ public function deny($aro, $aco, $action = "*")
      * Pass-thru function for ACL inherit instance. Inherit methods
      * modify the permission for an ARO to be that of its parent object.
      *
-     * @param array|string|Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
-     * @param array|string|Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aro ARO The requesting object identifier. See `AclNode::node()` for possible formats
+     * @param array|string|\Acl\Controller\Component\Model $aco ACO The controlled object identifier. See `AclNode::node()` for possible formats
      * @param string $action Action (defaults to *)
      * @return bool Success
      */
-    public function inherit($aro, $aco, $action = "*")
+    public function inherit($aro, $aco, $action = '*')
     {
         return $this->_Instance->inherit($aro, $aco, $action);
     }
diff --git a/src/Model/Behavior/AclBehavior.php b/src/Model/Behavior/AclBehavior.php
index dd2f4938..0622af48 100644
--- a/src/Model/Behavior/AclBehavior.php
+++ b/src/Model/Behavior/AclBehavior.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP :  Rapid Development Framework (https://cakephp.org)
@@ -33,7 +34,6 @@
  */
 class AclBehavior extends Behavior
 {
-
     /**
      * Table instance
      */
@@ -49,7 +49,7 @@ class AclBehavior extends Behavior
     /**
      * Sets up the configuration for the model, and loads ACL models if they haven't been already
      *
-     * @param Table $model Table instance being attached
+     * @param \Cake\ORM\Table $model Table instance being attached
      * @param array $config Configuration
      * @return void
      */
@@ -94,7 +94,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|array|\Acl\Model\Behavior\Model $ref Array with 'model' and 'foreign_key', model object, or string value
      * @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 https://book.cakephp.org/2.0/en/core-libraries/behaviors/acl.html#node
@@ -114,10 +114,11 @@ public function node($ref = null, $type = null)
             throw new Exception\Exception(__d('cake_dev', 'ref parameter must be a string or an Entity'));
         }
 
-        if(property_exists($this->_table, $type)){
+        if (property_exists($this->_table, $type)) {
             return $this->_table->{$type}->node($ref);
-        }else{
+        } else {
             $type = Inflector::pluralize($type);
+
             return $this->_table->{$type}->node($ref);
         }
     }
@@ -125,8 +126,8 @@ public function node($ref = null, $type = null)
     /**
      * Creates a new ARO/ACO node bound to this record
      *
-     * @param Event $event The afterSave event that was fired
-     * @param Entity $entity The entity being saved
+     * @param \Cake\Event\Event $event The afterSave event that was fired
+     * @param \Cake\ORM\Entity $entity The entity being saved
      * @return void
      */
     public function afterSave(Event $event, Entity $entity)
@@ -143,7 +144,7 @@ public function afterSave(Event $event, Entity $entity)
                 $parent = $this->node($parent, $type)->first();
             }
             $data = [
-                'parent_id' => isset($parent->id) ? $parent->id : null,
+                'parent_id' => $parent->id ?? null,
                 'model' => $model->getAlias(),
                 'foreign_key' => $entity->id,
             ];
@@ -154,7 +155,7 @@ public function afterSave(Event $event, Entity $entity)
 
             if (!$entity->isNew()) {
                 $node = $this->node($entity, $type)->first();
-                $data['id'] = isset($node->id) ? $node->id : null;
+                $data['id'] = $node->id ?? null;
                 $newData = $model->{$type}->patchEntity($node, $data);
             } else {
                 $newData = $model->{$type}->newEntity($data);
@@ -167,8 +168,8 @@ public function afterSave(Event $event, Entity $entity)
     /**
      * Destroys the ARO/ACO node bound to the deleted record
      *
-     * @param Event $event The afterDelete event that was fired
-     * @param Entity $entity The entity being deleted
+     * @param \Cake\Event\Event $event The afterDelete event that was fired
+     * @param \Cake\ORM\Entity $entity The entity being deleted
      * @return void
      */
     public function afterDelete(Event $event, Entity $entity)
diff --git a/src/Model/Entity/Aco.php b/src/Model/Entity/Aco.php
index 4a950d51..ba50dc98 100644
--- a/src/Model/Entity/Aco.php
+++ b/src/Model/Entity/Aco.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
diff --git a/src/Model/Entity/Aro.php b/src/Model/Entity/Aro.php
index 2ad0c10d..aa8684e5 100644
--- a/src/Model/Entity/Aro.php
+++ b/src/Model/Entity/Aro.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
diff --git a/src/Model/Entity/Permission.php b/src/Model/Entity/Permission.php
index 30465392..9af59d0f 100644
--- a/src/Model/Entity/Permission.php
+++ b/src/Model/Entity/Permission.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
diff --git a/src/Model/Table/AclNodesTable.php b/src/Model/Table/AclNodesTable.php
index fad02713..76746669 100644
--- a/src/Model/Table/AclNodesTable.php
+++ b/src/Model/Table/AclNodesTable.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -20,23 +21,20 @@
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Datasource\ConnectionManager;
 use Cake\ORM\Entity;
-use Cake\ORM\Query;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 
 /**
  * ACL Nodes
- *
  */
 class AclNodesTable extends Table
 {
-
     /**
      * {@inheritDoc}
      *
      * @return void
      */
-    public static function defaultConnectionName() :string
+    public static function defaultConnectionName(): string
     {
         return Configure::read('Acl.database');
     }
@@ -44,8 +42,8 @@ public static function defaultConnectionName() :string
     /**
      * Retrieves the Aro/Aco node for this model
      *
-     * @param string|array|Table $ref Array with 'model' and 'foreign_key', model object, or string value
-     * @return array|Query|false Node found in database
+     * @param string|array|\Cake\ORM\Table $ref Array with 'model' and 'foreign_key', model object, or string value
+     * @return array|\Cake\ORM\Query|false Node found in database
      * @throws \Cake\Core\Exception\Exception when binding to a model that doesn't exist.
      */
     public function node($ref = null)
@@ -115,11 +113,11 @@ public function node($ref = null)
                 return false;
             }
         } elseif (is_object($ref) && $ref instanceof Entity) {
-            list(, $alias) = pluginSplit($ref->getSource());
+            [, $alias] = pluginSplit($ref->getSource());
             $ref = ['model' => $alias, 'foreign_key' => $ref->id];
         } elseif (is_array($ref) && !(isset($ref['model']) && isset($ref['foreign_key']))) {
             $name = key($ref);
-            list(, $alias) = pluginSplit($name);
+            [, $alias] = pluginSplit($name);
 
             if (TableRegistry::getTableLocator()->exists($name)) {
                 $bindTable = TableRegistry::getTableLocator()->get($name);
@@ -136,7 +134,7 @@ public function node($ref = null)
             }
 
             if (empty($entity)) {
-                throw new Exception\Exception(__d('cake_dev', "Entity class {0} not found in AclNode::node() when trying to bind {1} object", [$type, $this->getAlias()]));
+                throw new Exception\Exception(__d('cake_dev', 'Entity class {0} not found in AclNode::node() when trying to bind {1} object', [$type, $this->getAlias()]));
             }
 
             $tmpRef = null;
diff --git a/src/Model/Table/AcoActionsTable.php b/src/Model/Table/AcoActionsTable.php
index 1b9f2c6f..dbf17f55 100644
--- a/src/Model/Table/AcoActionsTable.php
+++ b/src/Model/Table/AcoActionsTable.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -15,26 +16,23 @@
 
 namespace Acl\Model\Table;
 
-use Cake\Core\App;
 use Cake\ORM\Table;
 
 /**
  * Action for Access Control Object
- *
  */
 class AcoActionsTable extends Table
 {
-
     /**
      * {@inheritDoc}
      *
      * @param array $config Configuration
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         $this->belongsTo('Acos', [
-            'className' => 'Acl.Acos'
+            'className' => 'Acl.Acos',
         ]);
     }
 }
diff --git a/src/Model/Table/AcosTable.php b/src/Model/Table/AcosTable.php
index 69795ade..81416ab7 100644
--- a/src/Model/Table/AcosTable.php
+++ b/src/Model/Table/AcosTable.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -15,23 +16,18 @@
 
 namespace Acl\Model\Table;
 
-use Acl\Model\Table\AclNodesTable;
-use Cake\Core\App;
-
 /**
  * Access Control Object
- *
  */
 class AcosTable extends AclNodesTable
 {
-
     /**
      * {@inheritDoc}
      *
      * @param array $config Config
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('Acos');
diff --git a/src/Model/Table/ArosTable.php b/src/Model/Table/ArosTable.php
index f5af0683..645281ce 100644
--- a/src/Model/Table/ArosTable.php
+++ b/src/Model/Table/ArosTable.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -15,23 +16,20 @@
 
 namespace Acl\Model\Table;
 
-use Acl\Model\Table\AclNodesTable;
 use Cake\Core\App;
 
 /**
  * Access Request Object
- *
  */
 class ArosTable extends AclNodesTable
 {
-
     /**
      * {@inheritDoc}
      *
      * @param array $config Config
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('Aros');
diff --git a/src/Model/Table/PermissionsTable.php b/src/Model/Table/PermissionsTable.php
index 4549be46..05c71810 100644
--- a/src/Model/Table/PermissionsTable.php
+++ b/src/Model/Table/PermissionsTable.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -15,17 +16,10 @@
 
 namespace Acl\Model\Table;
 
-use Cake\Core\App;
-use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
-use Cake\ORM\Table;
-use Cake\Utility\Hash;
-use Acl\Model\Table\ArosTable;
-use Acl\Model\Table\AcosTable;
 
 /**
  * Permissions linking AROs with ACOs
- *
  */
 class PermissionsTable extends AclNodesTable
 {
@@ -38,15 +32,15 @@ class PermissionsTable extends AclNodesTable
      * @param array $config Configuration
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         $this->setAlias('Permissions');
         $this->setTable('aros_acos');
         $this->belongsTo('Aros', [
-            'className' => 'Acl.Aros'
+            'className' => 'Acl.Aros',
         ]);
         $this->belongsTo('Acos', [
-            'className' => 'Acl.Acos'
+            'className' => 'Acl.Acos',
         ]);
         $this->Aro = $this->Aros->getTarget();
         $this->Aco = $this->Acos->getTarget();
@@ -101,7 +95,7 @@ public function check($aro, $aco, $action = '*')
         }
 
         if ($action !== '*' && !in_array('_' . $action, $permKeys)) {
-            trigger_error(__d('cake_dev', "ACO permissions key {0} does not exist in {1}", $action, 'DbAcl::check()'), E_USER_NOTICE);
+            trigger_error(__d('cake_dev', 'ACO permissions key {0} does not exist in {1}', $action, 'DbAcl::check()'), E_USER_NOTICE);
 
             return false;
         }
@@ -204,7 +198,7 @@ public function allow($aro, $aco, $actions = '*', $value = 1)
                 $save[$action] = $value;
             }
         }
-        list($save['aro_id'], $save['aco_id']) = [$perms['aro'], $perms['aco']];
+        [$save['aro_id'], $save['aco_id']] = [$perms['aro'], $perms['aco']];
 
         if ($perms['link'] && !empty($perms['link'][$alias])) {
             $save['id'] = $perms['link'][$alias][0]['id'];
@@ -215,7 +209,7 @@ public function allow($aro, $aco, $actions = '*', $value = 1)
         $entityClass = $this->getEntityClass();
         $entity = new $entityClass($save);
 
-        return ($this->save($entity) !== false);
+        return $this->save($entity) !== false;
     }
 
     /**
@@ -274,4 +268,3 @@ public function getAcoKeys($keys)
         return $newKeys;
     }
 }
-
diff --git a/src/Shell/AclExtrasShell.php b/src/Shell/AclExtrasShell.php
index 1ac75b43..aa014462 100644
--- a/src/Shell/AclExtrasShell.php
+++ b/src/Shell/AclExtrasShell.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Acl Extras Shell.
@@ -28,7 +29,6 @@
  */
 class AclExtrasShell extends Shell
 {
-
     /**
      * Contains arguments parsed from the command line.
      *
@@ -39,7 +39,7 @@ class AclExtrasShell extends Shell
     /**
      * AclExtras instance
      *
-     * @var AclExtras
+     * @var \Acl\AclExtras
      */
     public $AclExtras;
 
@@ -48,7 +48,7 @@ class AclExtrasShell extends Shell
      *
      * @param \Cake\Console\ConsoleIo $io An io instance.
      */
-    public function __construct(ConsoleIo $io = null)
+    public function __construct(?ConsoleIo $io = null)
     {
         parent::__construct($io);
         $this->AclExtras = new AclExtras();
@@ -59,7 +59,7 @@ public function __construct(ConsoleIo $io = null)
      *
      * @return void
      */
-    public function startup() :void
+    public function startup(): void
     {
         parent::startup();
         $this->AclExtras->startup();
@@ -103,7 +103,7 @@ public function acoUpdate()
      *
      * @return \Cake\Console\ConsoleOptionParser
      */
-    public function getOptionParser() :ConsoleOptionParser
+    public function getOptionParser(): ConsoleOptionParser
     {
         $parser = parent::getOptionParser();
 
diff --git a/src/Shell/AclShell.php b/src/Shell/AclShell.php
index 475882ec..cc344773 100644
--- a/src/Shell/AclShell.php
+++ b/src/Shell/AclShell.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -19,24 +20,20 @@
 use Cake\Console\ConsoleOptionParser;
 use Cake\Console\Shell;
 use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Controller;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
-use Cake\Utility\Hash;
 
 /**
  * Shell for ACL management. This console is known to have issues with zend.ze1_compatibility_mode
  * being enabled. Be sure to turn it off when using this shell.
- *
  */
 class AclShell extends Shell
 {
-
     /**
      * Contains instance of AclComponent
      *
-     * @var AclComponent
+     * @var \Acl\Controller\Component\AclComponent
      */
     public $Acl;
 
@@ -59,7 +56,7 @@ class AclShell extends Shell
      *
      * @return void
      */
-    public function startup() :void
+    public function startup(): void
     {
         parent::startup();
         if (isset($this->params['connection'])) {
@@ -137,15 +134,15 @@ public function create()
         if (is_string($data) && $data !== '/') {
             $data = ['alias' => $data];
         } elseif (is_string($data)) {
-            $this->abort(__d('cake_acl', '/ can not be used as an alias!') . __d('cake_acl', "	/ is the root, please supply a sub alias"));
+            $this->abort(__d('cake_acl', '/ can not be used as an alias!') . __d('cake_acl', '  / is the root, please supply a sub alias'));
         }
 
         $data['parent_id'] = $parent;
         $entity = $this->Acl->{$class}->newEntity($data);
         if ($this->Acl->{$class}->save($entity)) {
-            $this->out(__d('cake_acl', "<success>New {0}</success> {1} created.", [$class, $this->args[2]]), 2);
+            $this->out(__d('cake_acl', '<success>New {0}</success> {1} created.', [$class, $this->args[2]]), 2);
         } else {
-            $this->err(__d('cake_acl', "There was a problem creating a new {0} {1}.", [$class, $this->args[2]]));
+            $this->err(__d('cake_acl', 'There was a problem creating a new {0} {1}.', [$class, $this->args[2]]));
         }
     }
 
@@ -207,7 +204,7 @@ public function getPath()
 
         if (empty($nodes) || $nodes->count() === 0) {
             $this->abort(
-                __d('cake_acl', "Supplied Node {0} not found", [$this->args[1]]),
+                __d('cake_acl', 'Supplied Node {0} not found', [$this->args[1]]),
                 __d('cake_acl', 'No tree returned.')
             );
         }
@@ -231,9 +228,9 @@ protected function _outputNode($class, $node, $indent)
     {
         $indent = str_repeat('  ', $indent);
         if ($node['alias']) {
-            $this->out($indent . "[" . $node['id'] . "] " . $node['alias']);
+            $this->out($indent . '[' . $node['id'] . '] ' . $node['alias']);
         } else {
-            $this->out($indent . "[" . $node['id'] . "] " . $node['model'] . '.' . $node['foreign_key']);
+            $this->out($indent . '[' . $node['id'] . '] ' . $node['model'] . '.' . $node['foreign_key']);
         }
     }
 
@@ -367,9 +364,9 @@ public function view()
     /**
      * Gets the option parser instance and configures it.
      *
-     * @return ConsoleOptionParser
+     * @return \Cake\Console\ConsoleOptionParser
      */
-    public function getOptionParser() :ConsoleOptionParser
+    public function getOptionParser(): ConsoleOptionParser
     {
         $parser = parent::getOptionParser();
 
@@ -430,8 +427,8 @@ public function getOptionParser() :ConsoleOptionParser
             'help' => __d('cake_acl', 'Print out the path to an ACL node.'),
             'parser' => [
                 'description' => [
-                    __d('cake_acl', "Returns the path to the ACL object specified by <node>."),
-                    __d('cake_acl', "This command is useful in determining the inheritance of permissions for a certain object in the tree."),
+                    __d('cake_acl', 'Returns the path to the ACL object specified by <node>.'),
+                    __d('cake_acl', 'This command is useful in determining the inheritance of permissions for a certain object in the tree.'),
                 ],
                 'arguments' => [
                     'type' => $type,
@@ -481,7 +478,7 @@ public function getOptionParser() :ConsoleOptionParser
             'help' => __d('cake_acl', 'Inherit an ARO\'s parent permissions.'),
             'parser' => [
                 'description' => [
-                    __d('cake_acl', "Use this command to force a child ARO object to inherit its permissions settings from its parent."),
+                    __d('cake_acl', 'Use this command to force a child ARO object to inherit its permissions settings from its parent.'),
                 ],
                 'arguments' => [
                     'aro' => ['help' => __d('cake_acl', 'ARO to have permissions inherit.'), 'required' => true],
@@ -493,9 +490,9 @@ public function getOptionParser() :ConsoleOptionParser
             'help' => __d('cake_acl', 'View a tree or a single node\'s subtree.'),
             'parser' => [
                 'description' => [
-                    __d('cake_acl', "The view command will return the ARO or ACO tree."),
-                    __d('cake_acl', "The optional node parameter allows you to return"),
-                    __d('cake_acl', "only a portion of the requested tree."),
+                    __d('cake_acl', 'The view command will return the ARO or ACO tree.'),
+                    __d('cake_acl', 'The optional node parameter allows you to return'),
+                    __d('cake_acl', 'only a portion of the requested tree.'),
                 ],
                 'arguments' => [
                     'type' => $type,
@@ -510,7 +507,7 @@ public function getOptionParser() :ConsoleOptionParser
                 '',
                 ' - <alias> - The node will be given a string alias (or path, in the case of <parent>)',
                 "   i.e. 'John'. When used with <parent>, this takes the form of an alias path,",
-                "   i.e. <group>/<subgroup>/<parent>.",
+                '   i.e. <group>/<subgroup>/<parent>.',
                 '',
                 "To add a node at the root level, enter 'root' or '/' as the <parent> parameter.",
             ]
@@ -622,7 +619,7 @@ protected function _dataVars($type = null)
         }
         $vars = [];
         $class = ucwords($type);
-        $vars['secondary_id'] = (strtolower($class) === 'aro') ? 'foreign_key' : 'object_id';
+        $vars['secondary_id'] = strtolower($class) === 'aro' ? 'foreign_key' : 'object_id';
         $vars['data_name'] = $type;
         $vars['table_name'] = $type . 's';
         $vars['class'] = $class;
diff --git a/tests/Fixture/AcoActionsFixture.php b/tests/Fixture/AcoActionsFixture.php
index d6b18670..6c2eb21e 100644
--- a/tests/Fixture/AcoActionsFixture.php
+++ b/tests/Fixture/AcoActionsFixture.php
@@ -19,11 +19,9 @@
 
 /**
  * Short description for class.
- *
  */
 class AcoActionsFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/Fixture/AcoTwosFixture.php b/tests/Fixture/AcoTwosFixture.php
index b1a29bc1..99536583 100644
--- a/tests/Fixture/AcoTwosFixture.php
+++ b/tests/Fixture/AcoTwosFixture.php
@@ -19,11 +19,9 @@
 
 /**
  * Short description for class.
- *
  */
 class AcoTwosFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/Fixture/AcosFixture.php b/tests/Fixture/AcosFixture.php
index f3cd12de..90726dc2 100644
--- a/tests/Fixture/AcosFixture.php
+++ b/tests/Fixture/AcosFixture.php
@@ -19,11 +19,9 @@
 
 /**
  * Short description for class.
- *
  */
 class AcosFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/Fixture/AroTwosFixture.php b/tests/Fixture/AroTwosFixture.php
index 2503e394..458dba8e 100644
--- a/tests/Fixture/AroTwosFixture.php
+++ b/tests/Fixture/AroTwosFixture.php
@@ -19,11 +19,9 @@
 
 /**
  * Short description for class.
- *
  */
 class AroTwosFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/Fixture/ArosAcoTwosFixture.php b/tests/Fixture/ArosAcoTwosFixture.php
index 01ee60a7..dccd67e6 100644
--- a/tests/Fixture/ArosAcoTwosFixture.php
+++ b/tests/Fixture/ArosAcoTwosFixture.php
@@ -19,11 +19,9 @@
 
 /**
  * Short description for class.
- *
  */
 class ArosAcoTwosFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/Fixture/ArosAcosFixture.php b/tests/Fixture/ArosAcosFixture.php
index 0f5fa1ad..64a10157 100644
--- a/tests/Fixture/ArosAcosFixture.php
+++ b/tests/Fixture/ArosAcosFixture.php
@@ -19,11 +19,9 @@
 
 /**
  * Short description for class.
- *
  */
 class ArosAcosFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/Fixture/ArosFixture.php b/tests/Fixture/ArosFixture.php
index f95a79e9..077a90f4 100644
--- a/tests/Fixture/ArosFixture.php
+++ b/tests/Fixture/ArosFixture.php
@@ -19,11 +19,9 @@
 
 /**
  * Short description for class.
- *
  */
 class ArosFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/Fixture/PeopleFixture.php b/tests/Fixture/PeopleFixture.php
index a49e8227..9dcd7dd4 100644
--- a/tests/Fixture/PeopleFixture.php
+++ b/tests/Fixture/PeopleFixture.php
@@ -22,7 +22,6 @@
  */
 class PeopleFixture extends TestFixture
 {
-
     /**
      * records property
      *
diff --git a/tests/TestCase/AclExtrasTest.php b/tests/TestCase/AclExtrasTest.php
index a13a17a6..a39571ea 100644
--- a/tests/TestCase/AclExtrasTest.php
+++ b/tests/TestCase/AclExtrasTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Acl Extras Shell.
@@ -21,7 +22,6 @@
 namespace Acl\Test\TestCase;
 
 use Cake\Core\Configure;
-use Cake\Core\Plugin;
 use Cake\Datasource\ConnectionManager;
 use Cake\TestSuite\TestCase;
 
@@ -34,11 +34,9 @@
 
 /**
  * AclExtras Shell Test case
- *
  */
 class AclExtrasTest extends TestCase
 {
-
     public $fixtures = [
         'app.Acos',
         'app.Aros',
@@ -50,7 +48,7 @@ class AclExtrasTest extends TestCase
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Acl.classname', 'DbAcl');
@@ -66,7 +64,7 @@ public function setUp() :void
      *
      * @return void
      */
-    public function tearDown() :void
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->Task);
@@ -372,7 +370,7 @@ public function testUpdateWithPlugins()
         $this->clearPlugins();
         $this->loadPlugins([
             new \TestPlugin\Plugin(),
-            new \Nested\TestPluginTwo\Plugin()
+            new \Nested\TestPluginTwo\Plugin(),
         ]);
         $this->_clean();
 
diff --git a/tests/TestCase/AclShellTest.php b/tests/TestCase/AclShellTest.php
index d8b621df..7b59de3a 100644
--- a/tests/TestCase/AclShellTest.php
+++ b/tests/TestCase/AclShellTest.php
@@ -1,8 +1,8 @@
 <?php
+declare(strict_types=1);
 
 namespace Acl\Test\TestCase;
 
-use Acl\Shell\AclShell;
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
@@ -15,7 +15,7 @@ class AclShellTest extends TestCase
         'app.ArosAcos',
     ];
 
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         $this->io = $this->getMockBuilder('Cake\Console\ConsoleIo')
diff --git a/tests/TestCase/Adapter/CacheDbAclTest.php b/tests/TestCase/Adapter/CacheDbAclTest.php
index f1b804a4..b369512d 100644
--- a/tests/TestCase/Adapter/CacheDbAclTest.php
+++ b/tests/TestCase/Adapter/CacheDbAclTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -16,26 +17,20 @@
 namespace Acl\Test\TestCase\Adapter;
 
 use Acl\Adapter\CachedDbAcl;
-use Acl\Controller\Component\AclComponent;
 use Cake\Cache\Cache;
-use Cake\Controller\ComponentRegistry;
 use Cake\Core\Configure;
 use Cake\ORM\Entity;
-use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 
 /**
  * CachedDbAclTwoTest class
- *
  */
 class CachedDbAclTwoTest extends CachedDbAcl
 {
-
     //public $Permission = null;
 
     /**
      * construct method
-     *
      */
     // public function __construct()
     // {
@@ -48,7 +43,6 @@ class CachedDbAclTwoTest extends CachedDbAcl
      * @param string|array|Entity $aro The requesting object identifier.
      * @param string|array|Entity $aco The controlled object identifier.
      * @param string $action Action
-     *
      * @return string
      */
     public function getCacheKey($aro, $aco, $action)
@@ -59,7 +53,6 @@ public function getCacheKey($aro, $aco, $action)
 
 /**
  * Test case for AclComponent using the CachedDbAcl implementation.
- *
  */
 class CacheDbAclTest extends TestCase
 {
@@ -77,7 +70,7 @@ class CacheDbAclTest extends TestCase
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Acl.classname', __NAMESPACE__ . '\CachedDbAclTwoTest');
@@ -96,7 +89,7 @@ public function setUp() :void
      *
      * @return void
      */
-    public function tearDown() :void
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->Acl);
diff --git a/tests/TestCase/Adapter/DbAclTest.php b/tests/TestCase/Adapter/DbAclTest.php
index 2e770826..b611ae2c 100644
--- a/tests/TestCase/Adapter/DbAclTest.php
+++ b/tests/TestCase/Adapter/DbAclTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -19,30 +20,26 @@
 use Acl\Controller\Component\AclComponent;
 use Acl\Model\Entity\Aco;
 use Acl\Model\Entity\Aro;
-use Acl\Model\Table\AclNodesTable;
 use Acl\Model\Table\AcosTable;
 use Acl\Model\Table\ArosTable;
 use Acl\Model\Table\PermissionsTable;
 use Cake\Controller\ComponentRegistry;
 use Cake\Core\Configure;
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\Fixture\TestModel;
 use Cake\TestSuite\TestCase;
 
 /**
  * AroTwoTest class
- *
  */
 class AroTwoTest extends ArosTable
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('AroTwoTest');
@@ -57,18 +54,16 @@ public function initialize(array $config) :void
 
 /**
  * AcoTwoTest class
- *
  */
 class AcoTwoTest extends AcosTable
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('AcoTwoTest');
@@ -83,18 +78,16 @@ public function initialize(array $config) :void
 
 /**
  * PermissionTwoTest class
- *
  */
 class PermissionTwoTest extends PermissionsTable
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('PermissionTwoTest');
@@ -114,14 +107,11 @@ public function initialize(array $config) :void
 
 /**
  * DbAclTwoTest class
- *
  */
 class DbAclTwoTest extends DbAcl
 {
-
     /**
      * construct method
-     *
      */
     public function __construct()
     {
@@ -138,11 +128,9 @@ public function __construct()
 
 /**
  * Test case for AclComponent using the DbAcl implementation.
- *
  */
 class DbAclTest extends TestCase
 {
-
     /**
      * fixtures property
      *
@@ -159,7 +147,7 @@ class DbAclTest extends TestCase
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Acl.classname', __NAMESPACE__ . '\DbAclTwoTest');
@@ -185,7 +173,7 @@ public function setUp() :void
      *
      * @return void
      */
-    public function tearDown() :void
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->Acl);
diff --git a/tests/TestCase/Adapter/IniAclTest.php b/tests/TestCase/Adapter/IniAclTest.php
index b4035fee..20dc3fd6 100644
--- a/tests/TestCase/Adapter/IniAclTest.php
+++ b/tests/TestCase/Adapter/IniAclTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -23,17 +24,15 @@
 
 /**
  * Test case for the IniAcl implementation
- *
  */
 class IniAclTest extends TestCase
 {
-
     /**
      * Setup
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Acl.classname', 'IniAcl');
diff --git a/tests/TestCase/Adapter/PhpAclTest.php b/tests/TestCase/Adapter/PhpAclTest.php
index 06ae668c..669fc91b 100644
--- a/tests/TestCase/Adapter/PhpAclTest.php
+++ b/tests/TestCase/Adapter/PhpAclTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -16,7 +17,6 @@
 namespace Acl\Test\TestCase\Adapter;
 
 use Acl\Adapter\PhpAcl;
-use Acl\Adapter\Utility\PhpAco;
 use Acl\Adapter\Utility\PhpAro;
 use Acl\Controller\Component\AclComponent;
 use Cake\Controller\ComponentRegistry;
@@ -25,17 +25,15 @@
 
 /**
  * Test case for the PhpAcl implementation
- *
  */
 class PhpAclTest extends TestCase
 {
-
     /**
      * Setup
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Acl.classname', 'PhpAcl');
diff --git a/tests/TestCase/Auth/ActionsAuthorizeTest.php b/tests/TestCase/Auth/ActionsAuthorizeTest.php
index b4cf3379..7d23dada 100644
--- a/tests/TestCase/Auth/ActionsAuthorizeTest.php
+++ b/tests/TestCase/Auth/ActionsAuthorizeTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -21,17 +22,15 @@
 
 /**
  * Class ActionsAuthorizeTest
- *
  */
 class ActionsAuthorizeTest extends TestCase
 {
-
     /**
      * setUp
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         $this->controller = $this->getMockBuilder('Cake\Controller\Controller')
diff --git a/tests/TestCase/Auth/CrudAuthorizeTest.php b/tests/TestCase/Auth/CrudAuthorizeTest.php
index db98d632..73fd4268 100644
--- a/tests/TestCase/Auth/CrudAuthorizeTest.php
+++ b/tests/TestCase/Auth/CrudAuthorizeTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -23,17 +24,15 @@
 
 /**
  * Class CrudAuthorizeTest
- *
  */
 class CrudAuthorizeTest extends TestCase
 {
-
     /**
      * setup
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Routing.prefixes', []);
diff --git a/tests/TestCase/Controller/Component/AclComponentTest.php b/tests/TestCase/Controller/Component/AclComponentTest.php
index 1e84de7b..cdd5e6a0 100644
--- a/tests/TestCase/Controller/Component/AclComponentTest.php
+++ b/tests/TestCase/Controller/Component/AclComponentTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) Tests <https://book.cakephp.org/2.0/en/development/testing.html>
@@ -22,17 +23,15 @@
 
 /**
  * Test Case for AclComponent
- *
  */
 class AclComponentTest extends TestCase
 {
-
     /**
      * setUp method
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         if (!class_exists('MockAclImplementation', false)) {
@@ -50,7 +49,7 @@ public function setUp() :void
      *
      * @return void
      */
-    public function tearDown() :void
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->Acl);
diff --git a/tests/TestCase/Model/Behavior/AclBehaviorTest.php b/tests/TestCase/Model/Behavior/AclBehaviorTest.php
index 38685c7f..80dfaa86 100644
--- a/tests/TestCase/Model/Behavior/AclBehaviorTest.php
+++ b/tests/TestCase/Model/Behavior/AclBehaviorTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP : Rapid Development Framework (https://cakephp.org)
@@ -15,34 +16,27 @@
 
 namespace Cake\Acl\Test\TestCase\Model\Behavior;
 
-use Acl\Model\Behavior\AclBehavior;
 use Acl\Model\Entity\Aco;
 use Acl\Model\Entity\Aro;
-use Acl\Model\Table\AclNodesTable;
-use Acl\Model\Table\AcosTable;
-use Acl\Model\Table\ArosTable;
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\ORM\Entity;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
-use Cake\TestSuite\Fixture\TestModel;
 use Cake\TestSuite\TestCase;
 
 /**
  * Test Person class - self joined model
- *
  */
 class AclPeople extends Table
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         $this->setTable('people');
         $this->setEntityClass(__NAMESPACE__ . '\AclPerson');
@@ -60,7 +54,6 @@ public function initialize(array $config) :void
 
 class AclPerson extends Entity
 {
-
     /**
      * parentNode method
      *
@@ -88,18 +81,16 @@ public function parentNode()
 
 /**
  * AclUsers class
- *
  */
 class AclUsers extends Table
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         $this->setTable('users');
         $this->setEntityClass(__NAMESPACE__ . '\AclUser');
@@ -109,7 +100,6 @@ public function initialize(array $config) :void
 
 class AclUser extends Entity
 {
-
     /**
      * parentNode
      *
@@ -125,14 +115,13 @@ public function parentNode()
  */
 class AclPosts extends Table
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         $this->setTable('posts');
         $this->setEntityClass(__NAMESPACE__ . '\AclPost');
@@ -142,7 +131,6 @@ public function initialize(array $config) :void
 
 class AclPost extends Entity
 {
-
     /**
      * parentNode
      *
@@ -159,7 +147,6 @@ public function parentNode()
  */
 class AclBehaviorTest extends TestCase
 {
-
     /**
      * Aco property
      *
@@ -193,7 +180,7 @@ class AclBehaviorTest extends TestCase
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Acl.database', 'test');
@@ -222,7 +209,7 @@ public function setUp() :void
      *
      * @return void
      */
-    public function tearDown() :void
+    public function tearDown(): void
     {
         parent::tearDown();
         unset($this->Aro, $this->Aco);
diff --git a/tests/TestCase/Model/Table/AclNodesTest.php b/tests/TestCase/Model/Table/AclNodesTest.php
index 2bcbd2f5..efa684d7 100644
--- a/tests/TestCase/Model/Table/AclNodesTest.php
+++ b/tests/TestCase/Model/Table/AclNodesTest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) Tests <https://book.cakephp.org/2.0/en/development/testing.html>
@@ -16,34 +17,28 @@
 namespace Acl\Test\TestCase\Model\Table;
 
 use Acl\Adapter\DbAcl;
-use Acl\Model\Table\AclNodesTable;
 use Acl\Model\Table\AcoActionsTable;
 use Acl\Model\Table\AcosTable;
 use Acl\Model\Table\ArosTable;
 use Acl\Model\Table\PermissionsTable;
 use Cake\Core\App;
 use Cake\Core\Configure;
-use Cake\Core\Plugin;
 use Cake\ORM\Entity;
-use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Hash;
 
 /**
  * Aro Test Wrapper
- *
  */
 class DbAroTest extends ArosTable
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('DbAroTest');
@@ -59,18 +54,16 @@ public function initialize(array $config) :void
 
 /**
  * Aco Test Wrapper
- *
  */
 class DbAcoTest extends AcosTable
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('DbAcoTest');
@@ -86,18 +79,16 @@ public function initialize(array $config) :void
 
 /**
  * Permission Test Wrapper
- *
  */
 class DbPermissionTest extends PermissionsTable
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         parent::initialize($config);
         $this->setAlias('DbPermissionTest');
@@ -115,18 +106,16 @@ public function initialize(array $config) :void
 
 /**
  * DboActionTest class
- *
  */
 class DbAcoActionTest extends AcoActionsTable
 {
-
     /**
      * initialize
      *
      * @param array $config Configuration array
      * @return void
      */
-    public function initialize(array $config) :void
+    public function initialize(array $config): void
     {
         $this->setTable('aco_actions');
         $this->belongsTo('DbAcoTest', [
@@ -137,11 +126,9 @@ public function initialize(array $config) :void
 
 /**
  * DbAroUserTest class
- *
  */
 class DbAroUserTest extends Entity
 {
-
     /**
      * bindNode method
      *
@@ -160,7 +147,6 @@ public function bindNode($ref = null)
 
 /**
  * TestDbAcl class
- *
  */
 class TestDbAcl extends DbAcl
 {
@@ -168,11 +154,9 @@ class TestDbAcl extends DbAcl
 
 /**
  * AclNodeTest class
- *
  */
 class AclNodeTest extends TestCase
 {
-
     /**
      * fixtures property
      *
@@ -191,7 +175,7 @@ class AclNodeTest extends TestCase
      *
      * @return void
      */
-    public function setUp() :void
+    public function setUp(): void
     {
         parent::setUp();
         Configure::write('Acl.classname', 'TestDbAcl');
@@ -250,7 +234,7 @@ public function testNode()
         $expected = [8, 7, 6, 1];
         $this->assertSame($expected, $result);
 
-        $result = $Aco->node("8");
+        $result = $Aco->node('8');
         $result = $result->all()->extract('id')->toArray();
         $expected = [8, 7, 6, 1];
         $this->assertSame($expected, $result);
@@ -260,7 +244,7 @@ public function testNode()
         $expected = [7, 6, 1];
         $this->assertSame($expected, $result);
 
-        $result = $Aco->node("7");
+        $result = $Aco->node('7');
         $result = $result->all()->extract('id')->toArray();
         $expected = [7, 6, 1];
         $this->assertSame($expected, $result);
@@ -270,7 +254,7 @@ public function testNode()
         $expected = [4, 3, 2, 1];
         $this->assertSame($expected, $result);
 
-        $result = $Aco->node("4");
+        $result = $Aco->node('4');
         $result = $result->all()->extract('id')->toArray();
         $expected = [4, 3, 2, 1];
         $this->assertSame($expected, $result);
@@ -280,7 +264,7 @@ public function testNode()
         $expected = [3, 2, 1];
         $this->assertSame($expected, $result);
 
-        $result = $Aco->node("3");
+        $result = $Aco->node('3');
         $result = $result->all()->extract('id')->toArray();
         $expected = [3, 2, 1];
         $this->assertSame($expected, $result);
diff --git a/tests/TestCase/test_admin_controllers.php b/tests/TestCase/test_admin_controllers.php
index 3b7aff64..09a82164 100644
--- a/tests/TestCase/test_admin_controllers.php
+++ b/tests/TestCase/test_admin_controllers.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Acl\Controller\Admin;
 
@@ -6,7 +7,6 @@
 
 class PostsController extends Controller
 {
-
     public function index()
     {
     }
@@ -22,7 +22,6 @@ public function edit()
 
 class BigLongNamesController extends Controller
 {
-
     public function index()
     {
     }
diff --git a/tests/TestCase/test_controllers.php b/tests/TestCase/test_controllers.php
index 7fba55f5..354204d7 100644
--- a/tests/TestCase/test_controllers.php
+++ b/tests/TestCase/test_controllers.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Acl\Controller;
 
@@ -6,7 +7,6 @@
 
 class CommentsController extends Controller
 {
-
     public function add()
     {
     }
@@ -26,7 +26,6 @@ protected function _secret_method()
 
 class PostsController extends Controller
 {
-
     public function index()
     {
     }
@@ -42,7 +41,6 @@ public function edit()
 
 class BigLongNamesController extends Controller
 {
-
     public function index()
     {
     }
@@ -62,7 +60,6 @@ public function delete()
 
 abstract class AbstractController extends Controller
 {
-
     public function index()
     {
     }
@@ -82,7 +79,6 @@ public function delete()
 
 class ConcreteController extends AbstractController
 {
-
     public function index()
     {
     }
diff --git a/tests/TestCase/test_nested_plugin_controllers.php b/tests/TestCase/test_nested_plugin_controllers.php
index 631906f8..ee724773 100644
--- a/tests/TestCase/test_nested_plugin_controllers.php
+++ b/tests/TestCase/test_nested_plugin_controllers.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Nested\TestPluginTwo\Controller;
 
@@ -6,7 +7,6 @@
 
 class PluginTwoController extends Controller
 {
-
     public function index()
     {
     }
diff --git a/tests/TestCase/test_plugin_admin_controllers.php b/tests/TestCase/test_plugin_admin_controllers.php
index 1e3e0521..f0e922e0 100644
--- a/tests/TestCase/test_plugin_admin_controllers.php
+++ b/tests/TestCase/test_plugin_admin_controllers.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace TestPlugin\Controller\Admin;
 
@@ -6,7 +7,6 @@
 
 class PluginController extends Controller
 {
-
     public function index()
     {
     }
diff --git a/tests/TestCase/test_plugin_controllers.php b/tests/TestCase/test_plugin_controllers.php
index 499b4e0e..b3a07aa1 100644
--- a/tests/TestCase/test_plugin_controllers.php
+++ b/tests/TestCase/test_plugin_controllers.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace TestPlugin\Controller;
 
@@ -6,7 +7,6 @@
 
 class PluginController extends Controller
 {
-
     public function index()
     {
     }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 690f333b..058bad83 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
@@ -119,7 +120,6 @@
 
 // Create test database schema
 if (env('FIXTURE_SCHEMA_METADATA')) {
-
     $loader = new SchemaLoader();
     $loader->loadInternalFile(env('FIXTURE_SCHEMA_METADATA'));
 }
diff --git a/tests/schema.php b/tests/schema.php
index ab8991ef..1efea563 100644
--- a/tests/schema.php
+++ b/tests/schema.php
@@ -19,189 +19,189 @@
         'table' => 'aros',
         'columns' => [
             'id' => [
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             'parent_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'model' => [
                 'type' => 'string',
-                'null' => true
+                'null' => true,
             ],
             'foreign_key' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'alias' => [
                 'type' => 'string',
-                'default' => ''
+                'default' => '',
             ],
             'lft' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'rght' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
-            ]
+                'null' => true,
+            ],
         ],
         'constraints' => [
             'primary' =>
                 [
                     'type' => 'primary',
-                    'columns' => ['id']
-                ]
-        ]
+                    'columns' => ['id'],
+                ],
+        ],
     ],
     [
         'table' => 'acos',
         'columns' => [
             'id' => [
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             'parent_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'model' => [
                 'type' => 'string',
-                'null' => true
+                'null' => true,
             ],
             'foreign_key' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'alias' => [
                 'type' => 'string',
-                'default' => ''
+                'default' => '',
             ],
             'lft' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'rght' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
-            ]
+                'null' => true,
+            ],
         ],
         'constraints' => [
             'primary' =>
                 [
                     'type' => 'primary',
-                    'columns' => ['id']
-                ]
-        ]
+                    'columns' => ['id'],
+                ],
+        ],
     ],
     [
         'table' => 'aros_acos',
         'columns' => [
             'id' => [
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             'aro_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => false
+                'null' => false,
             ],
             'aco_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => false
+                'null' => false,
             ],
             '_create' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
             '_read' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
             '_update' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
             '_delete' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
         ],
         'constraints' => [
             'primary' =>
                 [
                     'type' => 'primary',
-                    'columns' => ['id']
-                ]
-        ]
+                    'columns' => ['id'],
+                ],
+        ],
     ],
     [
         'table' => 'aco_actions',
         'columns' => [
             'id' => [
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             'parent_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'model' => [
                 'type' => 'string',
-                'null' => true
+                'null' => true,
             ],
             'foreign_key' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'alias' => [
                 'type' => 'string',
-                'default' => ''
+                'default' => '',
             ],
             'lft' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'rght' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
-            ]
+                'null' => true,
+            ],
         ],
         'constraints' => [
             'primary' =>
                 ['type' => 'primary',
-                    'columns' => ['id']
-                ]
-        ]
+                    'columns' => ['id'],
+                ],
+        ],
     ],
     [
         'table' => 'aco_twos',
         'columns' => [
             'id' => [
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             'parent_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'model' => [
                 'type' => 'string',
-                'null' => true
+                'null' => true,
             ],
             'foreign_key' => [
                 'type' => 'integer',
@@ -209,114 +209,114 @@
                 'null' => true],
             'alias' => [
                 'type' => 'string',
-                'default' => ''
+                'default' => '',
             ],
             'lft' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'rght' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
         ],
         'constraints' => [
             'primary' => [
                 'type' => 'primary',
                 'columns' => [
-                    'id'
-                ]
-            ]
+                    'id',
+                ],
+            ],
         ],
     ],
     [
         'table' => 'aro_twos',
         'columns' => [
             'id' => [
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             'parent_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'model' => [
                 'type' => 'string',
-                'null' => true
+                'null' => true,
             ],
             'foreign_key' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'alias' => [
                 'type' => 'string',
-                'default' => ''
+                'default' => '',
             ],
             'lft' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
             'rght' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => true
+                'null' => true,
             ],
         ],
         'constraints' => [
             'primary' => [
                 'type' => 'primary',
                 'columns' => [
-                    'id'
-                ]
-            ]
+                    'id',
+                ],
+            ],
         ],
     ],
     [
         'table' => 'aros_aco_twos',
         'columns' => [
             'id' => [
-                'type' => 'integer'
+                'type' => 'integer',
             ],
             'aro_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => false
+                'null' => false,
             ],
             'aco_id' => [
                 'type' => 'integer',
                 'length' => 10,
-                'null' => false
+                'null' => false,
             ],
             '_create' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
             '_read' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
             '_update' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
             '_delete' => [
                 'type' => 'string',
                 'length' => 2,
-                'default' => 0
+                'default' => 0,
             ],
         ],
         'constraints' => [
             'primary' => [
                 'type' => 'primary',
-                'columns' => ['id']
-            ]
+                'columns' => ['id'],
+            ],
         ],
     ],
     [
@@ -324,28 +324,28 @@
         'columns' => [
             'id' => [
                 'type' => 'integer',
-                'null' => false
+                'null' => false,
             ],
             'name' => [
                 'type' => 'string',
                 'null' => false,
-                'length' => 32
+                'length' => 32,
             ],
             'mother_id' => [
                 'type' => 'integer',
-                'null' => false
+                'null' => false,
             ],
             'father_id' => [
                 'type' => 'integer',
-                'null' => false
+                'null' => false,
             ],
         ],
         'constraints' => [
             'PRIMARY' => [
                 'type' => 'primary',
                 'columns' => [
-                    'id'
-                ]
+                    'id',
+                ],
             ],
         ],
     ],
diff --git a/tests/test_app/Plugin/Nested/TestPluginTwo/src/Plugin.php b/tests/test_app/Plugin/Nested/TestPluginTwo/src/Plugin.php
index 27c9de2b..a649e788 100644
--- a/tests/test_app/Plugin/Nested/TestPluginTwo/src/Plugin.php
+++ b/tests/test_app/Plugin/Nested/TestPluginTwo/src/Plugin.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Nested\TestPluginTwo;
 
diff --git a/tests/test_app/Plugin/TestPlugin/config/routes.php b/tests/test_app/Plugin/TestPlugin/config/routes.php
index a90dbe2a..b9cca8ef 100644
--- a/tests/test_app/Plugin/TestPlugin/config/routes.php
+++ b/tests/test_app/Plugin/TestPlugin/config/routes.php
@@ -10,4 +10,3 @@
         });
     });
 };
-
diff --git a/tests/test_app/Plugin/TestPlugin/src/Model/Entity/TestPluginAuthUser.php b/tests/test_app/Plugin/TestPlugin/src/Model/Entity/TestPluginAuthUser.php
index 413bd8a0..3d5d03a8 100644
--- a/tests/test_app/Plugin/TestPlugin/src/Model/Entity/TestPluginAuthUser.php
+++ b/tests/test_app/Plugin/TestPlugin/src/Model/Entity/TestPluginAuthUser.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace TestPlugin\Model\Entity;
 
diff --git a/tests/test_app/Plugin/TestPlugin/src/Plugin.php b/tests/test_app/Plugin/TestPlugin/src/Plugin.php
index 7e59951f..bdbcd285 100644
--- a/tests/test_app/Plugin/TestPlugin/src/Plugin.php
+++ b/tests/test_app/Plugin/TestPlugin/src/Plugin.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace TestPlugin;
 
diff --git a/tests/test_app/src/Controller/Admin/V10/Authors/Editors/DummyController.php b/tests/test_app/src/Controller/Admin/V10/Authors/Editors/DummyController.php
index 2a95bccf..645cd633 100644
--- a/tests/test_app/src/Controller/Admin/V10/Authors/Editors/DummyController.php
+++ b/tests/test_app/src/Controller/Admin/V10/Authors/Editors/DummyController.php
@@ -1,10 +1,10 @@
 <?php
+declare(strict_types=1);
 
 namespace TestApp\Controller\Admin\V10\Authors\Editors;
 
 class DummyController
 {
-
     public function implementedEvents()
     {
         return [];