Merge pull request #173 from lilHermit/php8-support

markstory · web-flow · commit 3eae9a9a6770 · 2022-08-30T09:54:36.000-04:00
PHP 8.1 support
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "source": "https://github.com/cakephp/acl"
     },
     "require": {
-        "php": "^7.2",
+        "php": ">=7.2",
         "cakephp/cakephp": "^4.0",
         "cakephp/plugin-installer": "^1.2"
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,6 +10,7 @@
         <ini name="memory_limit" value="-1"/>
         <ini name="apc.enable_cli" value="1"/>
 
+        <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/>
         <!-- SQLite
         <env name="db_class" value="Cake\Database\Driver\Sqlite"/>
         <env name="db_dsn" value="sqlite:///:memory:"/>
@@ -30,13 +31,9 @@
             <directory>./tests/TestCase/</directory>
         </testsuite>
     </testsuites>
-    <listeners>
-        <listener class="\Cake\TestSuite\Fixture\FixtureInjector" file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php">
-            <arguments>
-                <object class="\Cake\TestSuite\Fixture\FixtureManager" />
-            </arguments>
-        </listener>
-    </listeners>
+    <extensions>
+        <extension class="\Cake\TestSuite\Fixture\PHPUnitExtension" />
+    </extensions>
 
     <filter>
         <whitelist>
diff --git a/src/Model/Table/AclNodesTable.php b/src/Model/Table/AclNodesTable.php
@@ -57,7 +57,7 @@ public function node($ref = null)
 
         if (empty($ref)) {
             return null;
-        } elseif (is_int($ref) || ctype_digit($ref)) {
+        } elseif (is_int($ref) || (is_string($ref) && ctype_digit($ref))) {
             $ref = [
                 'id' => $ref,
             ];
diff --git a/src/Model/Table/PermissionsTable.php b/src/Model/Table/PermissionsTable.php
@@ -230,8 +230,8 @@ public function getAclLink($aro, $aco)
         if (empty($obj['Aro']) || empty($obj['Aco'])) {
             return false;
         }
-        $aro = $obj['Aro']->extract('id')->toArray();
-        $aco = $obj['Aco']->extract('id')->toArray();
+        $aro = $obj['Aro']->all()->extract('id')->toArray();
+        $aco = $obj['Aco']->all()->extract('id')->toArray();
         $aro = current($aro);
         $aco = current($aco);
         $alias = $this->getAlias();
diff --git a/tests/Fixture/AcoActionsFixture.php b/tests/Fixture/AcoActionsFixture.php
@@ -24,22 +24,6 @@
 class AcoActionsFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer'],
-        'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'model' => ['type' => 'string', 'default' => ''],
-        'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'alias' => ['type' => 'string', 'default' => ''],
-        'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/Fixture/AcoTwosFixture.php b/tests/Fixture/AcoTwosFixture.php
@@ -24,22 +24,6 @@
 class AcoTwosFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer'],
-        'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'model' => ['type' => 'string', 'null' => true],
-        'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'alias' => ['type' => 'string', 'default' => ''],
-        'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/Fixture/AcosFixture.php b/tests/Fixture/AcosFixture.php
@@ -24,22 +24,6 @@
 class AcosFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer'],
-        'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'model' => ['type' => 'string', 'null' => true],
-        'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'alias' => ['type' => 'string', 'default' => ''],
-        'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/Fixture/AroTwosFixture.php b/tests/Fixture/AroTwosFixture.php
@@ -24,22 +24,6 @@
 class AroTwosFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer'],
-        'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'model' => ['type' => 'string', 'null' => true],
-        'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'alias' => ['type' => 'string', 'default' => ''],
-        'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/Fixture/ArosAcoTwosFixture.php b/tests/Fixture/ArosAcoTwosFixture.php
@@ -24,22 +24,6 @@
 class ArosAcoTwosFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer'],
-        'aro_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
-        'aco_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
-        '_create' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_read' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_update' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_delete' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/Fixture/ArosAcosFixture.php b/tests/Fixture/ArosAcosFixture.php
@@ -24,22 +24,6 @@
 class ArosAcosFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer'],
-        'aro_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
-        'aco_id' => ['type' => 'integer', 'length' => 10, 'null' => false],
-        '_create' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_read' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_update' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_delete' => ['type' => 'string', 'length' => 2, 'default' => 0],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/Fixture/ArosFixture.php b/tests/Fixture/ArosFixture.php
@@ -24,22 +24,6 @@
 class ArosFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer'],
-        'parent_id' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'model' => ['type' => 'string', 'null' => true],
-        'foreign_key' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'alias' => ['type' => 'string', 'default' => ''],
-        'lft' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        'rght' => ['type' => 'integer', 'length' => 10, 'null' => true],
-        '_constraints' => ['primary' => ['type' => 'primary', 'columns' => ['id']]],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/Fixture/PeopleFixture.php b/tests/Fixture/PeopleFixture.php
@@ -23,24 +23,6 @@
 class PeopleFixture extends TestFixture
 {
 
-    /**
-     * fields property
-     *
-     * @var array
-     */
-    public $fields = [
-        'id' => ['type' => 'integer', 'null' => false],
-        'name' => ['type' => 'string', 'null' => false, 'length' => 32],
-        'mother_id' => ['type' => 'integer', 'null' => false],
-        'father_id' => ['type' => 'integer', 'null' => false],
-        '_constraints' => [
-            'PRIMARY' => ['type' => 'primary', 'columns' => ['id']],
-        ],
-        '_indexes' => [
-            'mother_id' => ['type' => 'index', 'columns' => ['mother_id', 'father_id']],
-        ],
-    ];
-
     /**
      * records property
      *
diff --git a/tests/TestCase/AclExtrasTest.php b/tests/TestCase/AclExtrasTest.php
@@ -368,12 +368,12 @@ public function testAddingControllers()
      */
     public function testUpdateWithPlugins()
     {
-        $this->deprecated(function () {
-            Plugin::getCollection()->clear();
-            Plugin::getCollection()->add(new \TestPlugin\Plugin());
-            Plugin::getCollection()->add(new \Nested\TestPluginTwo\Plugin());
-            //Plugin::routes();
-        });
+
+        $this->clearPlugins();
+        $this->loadPlugins([
+            new \TestPlugin\Plugin(),
+            new \Nested\TestPluginTwo\Plugin()
+        ]);
         $this->_clean();
 
         $this->Task->expects($this->atLeast(3))
@@ -433,10 +433,9 @@ public function testUpdateWithPlugins()
      */
     public function testSyncWithNestedPlugin()
     {
-        $this->deprecated(function () {
-            Plugin::getCollection()->clear();
-            Plugin::getCollection()->add(new \Nested\TestPluginTwo\Plugin());
-        });
+        $this->clearPlugins();
+        $this->loadPlugins([new \Nested\TestPluginTwo\Plugin()]);
+
         $this->_clean();
 
         $this->Task->expects($this->atLeast(2))
diff --git a/tests/TestCase/Model/Table/AclNodesTest.php b/tests/TestCase/Model/Table/AclNodesTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
diff --git a/tests/schema.php b/tests/schema.php
diff --git a/tests/test_app/Plugin/TestPlugin/config/routes.php b/tests/test_app/Plugin/TestPlugin/config/routes.php
diff --git a/tests/test_app/config/routes.php b/tests/test_app/config/routes.php
