Improve compatibility with PHP 7.4 (#161)

Improve compatibility with PHP 7.4
cakephp · Jan 7, 2020 · 7538f9b · 7538f9b
2 parents ac2f915 + 7ae30dc
commit 7538f9b
Show file tree

Hide file tree

Showing 51 changed files with 228 additions and 141 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 dist: trusty
 

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "source": "https://github.com/cakephp/acl"
     },
     "require": {
-        "cakephp/cakephp": "^3.6.0",
+        "cakephp/cakephp": "^3.8.2",
         "cakephp/plugin-installer": "*"
     },
     "require-dev": {

diff --git a/src/AclExtras.php b/src/AclExtras.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Acl Extras.
  *
@@ -10,6 +11,7 @@
  * @author Mark Story <[email protected]>
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  */
+
 namespace Acl;
 
 use Acl\Controller\Component\AclComponent;
@@ -252,7 +254,7 @@ protected function _processPlugins($root, array $plugins = [])
             $pluginAlias = $this->_pluginAlias($plugin);
             $path = [
                 $this->rootNode,
-                $pluginAlias
+                $pluginAlias,
             ];
             $path = implode('/', Hash::filter($path));
             $pathNode = $this->_checkNode($path, $pluginAlias, $root->id);
@@ -268,7 +270,7 @@ protected function _processPlugins($root, array $plugins = [])
                 foreach (array_keys($this->pluginPrefixes[$plugin]) as $prefix) {
                     $path = [
                         $this->rootNode,
-                        $pluginAlias
+                        $pluginAlias,
                     ];
                     $path = implode('/', Hash::filter($path));
                     $pluginNode = $this->_checkNode($path, $pluginAlias, $root->id);
@@ -326,7 +328,7 @@ protected function _updateControllers($root, $controllers, $plugin = null, $pref
                 $this->rootNode,
                 $pluginPath,
                 $prefix,
-                $controllerName
+                $controllerName,
             ];
             $path = implode('/', Hash::filter($path));
             $controllerNode = $this->_checkNode($path, $controllerName, $root->id);
@@ -445,7 +447,7 @@ protected function _getCallbacks($className, $pluginPath = null, $prefixPath = n
     protected function _checkMethods($className, $controllerName, $node, $pluginPath = null, $prefixPath = null)
     {
         $excludes = $this->_getCallbacks($className, $pluginPath, $prefixPath);
-        $baseMethods = get_class_methods(new Controller);
+        $baseMethods = get_class_methods(new Controller());
         $namespace = $this->_getNamespace($className, $pluginPath, $prefixPath);
         $methods = get_class_methods($namespace);
         if ($methods == null) {
@@ -464,7 +466,7 @@ protected function _checkMethods($className, $controllerName, $node, $pluginPath
                 $pluginPath,
                 $prefixPath,
                 $controllerName,
-                $action
+                $action,
             ];
             $path = implode('/', Hash::filter($path));
             $this->_checkNode($path, $action, $node->id);
@@ -512,7 +514,7 @@ protected function _getNamespace($className, $pluginPath = null, $prefixPath = n
             $rootNamespace,
             'Controller',
             $prefixPath,
-            $namespace
+            $namespace,
         ];
 
         return implode('\\', Hash::filter($namespace));

diff --git a/src/AclInterface.php b/src/AclInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl;
 
 use Cake\Controller\Component;

diff --git a/src/Adapter/CachedDbAcl.php b/src/Adapter/CachedDbAcl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Adapter;
 
 use Acl\AclInterface;
@@ -125,7 +127,7 @@ protected function _getNodeCacheKey($ref)
             if (empty($tmpRef)) {
                 $ref = [
                     'model' => $alias,
-                    'foreign_key' => $ref[$name][$bindTable->getPrimaryKey()]
+                    'foreign_key' => $ref[$name][$bindTable->getPrimaryKey()],
                 ];
             } else {
                 $ref = $tmpRef;

diff --git a/src/Adapter/DbAcl.php b/src/Adapter/DbAcl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Adapter;
 
 use Acl\AclInterface;

diff --git a/src/Adapter/IniAcl.php b/src/Adapter/IniAcl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Adapter;
 
 use Acl\AclInterface;

diff --git a/src/Adapter/PhpAcl.php b/src/Adapter/PhpAcl.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PHP configuration based AclInterface implementation
  *
@@ -13,6 +14,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Adapter;
 
 use Acl\AclInterface;

diff --git a/src/Adapter/Utility/PhpAco.php b/src/Adapter/Utility/PhpAco.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PHP configuration based Access Control Object
  *
@@ -13,6 +14,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Adapter\Utility;
 
 /**

diff --git a/src/Adapter/Utility/PhpAro.php b/src/Adapter/Utility/PhpAro.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PHP configuration based Access Request Object
  *
@@ -13,6 +14,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Adapter\Utility;
 
 use Cake\Utility\Hash;

diff --git a/src/Auth/ActionsAuthorize.php b/src/Auth/ActionsAuthorize.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@@ -12,6 +13,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Auth;
 
 use Cake\Http\ServerRequest;

diff --git a/src/Auth/BaseAuthorize.php b/src/Auth/BaseAuthorize.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Auth;
 
 use Cake\Auth\BaseAuthorize as ParentAuthorize;
@@ -45,9 +47,9 @@ abstract class BaseAuthorize extends ParentAuthorize
             'edit' => 'update',
             'view' => 'read',
             'delete' => 'delete',
-            'remove' => 'delete'
+            'remove' => 'delete',
         ],
-        'userModel' => 'Users'
+        'userModel' => 'Users',
     ];
 
     /**

diff --git a/src/Auth/CrudAuthorize.php b/src/Auth/CrudAuthorize.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@@ -12,6 +13,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Auth;
 
 use Cake\Controller\ComponentRegistry;

diff --git a/src/Controller/Component/AclComponent.php b/src/Controller/Component/AclComponent.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Controller\Component;
 
 use Acl\AclInterface;

diff --git a/src/Model/Behavior/AclBehavior.php b/src/Model/Behavior/AclBehavior.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP :  Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Model\Behavior;
 
 use Cake\Core\App;

diff --git a/src/Model/Entity/Aco.php b/src/Model/Entity/Aco.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)

diff --git a/src/Model/Entity/Aro.php b/src/Model/Entity/Aro.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)

diff --git a/src/Model/Entity/Permission.php b/src/Model/Entity/Permission.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)

diff --git a/src/Model/Table/AclNodesTable.php b/src/Model/Table/AclNodesTable.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Model\Table;
 
 use Cake\Core\Configure;
@@ -57,7 +59,7 @@ public function node($ref = null)
             return null;
         } elseif (is_int($ref) || ctype_digit($ref)) {
             $ref = [
-                'id' => $ref
+                'id' => $ref,
             ];
         } elseif (is_string($ref)) {
             $path = explode('/', $ref);
@@ -74,9 +76,9 @@ public function node($ref = null)
                         'table' => $table,
                         'alias' => "{$type}0",
                         'type' => 'INNER',
-                        'conditions' => ["{$type}0.alias" => $start]
+                        'conditions' => ["{$type}0.alias" => $start],
                 ]],
-                'order' => ["{$type}.lft" => 'DESC']
+                'order' => ["{$type}.lft" => 'DESC'],
             ];
 
             foreach ($path as $i => $alias) {
@@ -90,22 +92,23 @@ public function node($ref = null)
                         "{$type}{$i}.lft" . ' > ' => new IdentifierExpression("{$type}{$j}.lft"),
                         "{$type}{$i}.rght" . ' < ' => new IdentifierExpression("{$type}{$j}.rght"),
                         "{$type}{$i}.alias" => $alias,
-                        "{$type}{$j}.id" . ' = ' => new IdentifierExpression("{$type}{$i}.parent_id")
-                    ]
+                        "{$type}{$j}.id" . ' = ' => new IdentifierExpression("{$type}{$i}.parent_id"),
+                    ],
                 ];
 
                 $queryData['conditions'] = [
                     'or' => [
                         ["{$type}.lft" . ' <= ' => new IdentifierExpression("{$type}0.lft"), "{$type}.rght" . ' >= ' => new IdentifierExpression("{$type}0.rght")],
-                        ["{$type}.lft" . ' <= ' => new IdentifierExpression("{$type}{$i}.lft"), "{$type}.rght" . ' >= ' => new IdentifierExpression("{$type}{$i}.rght")]
-                    ]
+                        ["{$type}.lft" . ' <= ' => new IdentifierExpression("{$type}{$i}.lft"), "{$type}.rght" . ' >= ' => new IdentifierExpression("{$type}{$i}.rght")],
+                    ],
                 ];
             }
             $query = $this->find('all', $queryData);
             $result = $query->toArray();
             $path = array_values($path);
 
-            if (!isset($result[0]) ||
+            if (
+                !isset($result[0]) ||
                 (!empty($path) && $result[0]->alias != $path[count($path) - 1]) ||
                 (empty($path) && $result[0]->alias != $start)
             ) {
@@ -123,7 +126,7 @@ public function node($ref = null)
             } else {
                 $connection = Configure::read('Acl.database');
                 $bindTable = TableRegistry::getTableLocator()->get($name, [
-                    'connection' => ConnectionManager::get($connection)
+                    'connection' => ConnectionManager::get($connection),
                 ]);
             }
             $entityClass = $bindTable->getEntityClass();
@@ -143,7 +146,7 @@ public function node($ref = null)
             if (empty($tmpRef)) {
                 $ref = [
                     'model' => $alias,
-                    'foreign_key' => $ref[$name][$this->getPrimaryKey()]
+                    'foreign_key' => $ref[$name][$this->getPrimaryKey()],
                 ];
             } else {
                 if (is_string($tmpRef)) {
@@ -174,8 +177,8 @@ public function node($ref = null)
                         'conditions' => [
                             "{$type}.lft" . ' <= ' => new IdentifierExpression("{$type}0.lft"),
                             "{$type}.rght" . ' >= ' => new IdentifierExpression("{$type}0.rght"),
-                        ]
-                    ]
+                        ],
+                    ],
                 ],
                 'order' => ["{$type}.lft" => 'DESC'],
             ];

diff --git a/src/Model/Table/AcoActionsTable.php b/src/Model/Table/AcoActionsTable.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
@@ -11,6 +12,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Acl\Model\Table;
 
 use Cake\Core\App;