From 2dd44d650db444368eb5f813b179d83add904bde Mon Sep 17 00:00:00 2001
From: lilHermit <developer@lilhermit.co.uk>
Date: Mon, 11 Jul 2022 16:23:07 +0100
Subject: [PATCH 1/5] Refactored test fixture schema for CakePHP 4.3+

---
 phpunit.xml.dist                     |  11 +-
 tests/Fixture/AcoActionsFixture.php  |  16 --
 tests/Fixture/AcoTwosFixture.php     |  16 --
 tests/Fixture/AcosFixture.php        |  16 --
 tests/Fixture/AroTwosFixture.php     |  16 --
 tests/Fixture/ArosAcoTwosFixture.php |  16 --
 tests/Fixture/ArosAcosFixture.php    |  16 --
 tests/Fixture/ArosFixture.php        |  16 --
 tests/Fixture/PeopleFixture.php      |  18 --
 tests/bootstrap.php                  |   8 +
 tests/schema.php                     | 352 +++++++++++++++++++++++++++
 11 files changed, 364 insertions(+), 137 deletions(-)
 create mode 100644 tests/schema.php

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index b81b55c3..8d688cb9 100644
--- 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/tests/Fixture/AcoActionsFixture.php b/tests/Fixture/AcoActionsFixture.php
index 4f91ca7e..f6288ba3 100644
--- 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
index e9c35d8f..f9f1b952 100644
--- 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
index 52c7abad..21593a4a 100644
--- 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
index a0ff84f9..f32e500f 100644
--- 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
index 1b39398c..dbb7f061 100644
--- 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
index d7e0de48..0645e454 100644
--- 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
index ea7ceefa..2348a413 100644
--- 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
index 9ca46e4d..784f0d4a 100644
--- 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/bootstrap.php b/tests/bootstrap.php
index 39689530..be537c1c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -17,6 +17,7 @@
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
 use Cake\Log\Log;
+use Cake\TestSuite\Fixture\SchemaLoader;
 
 require_once 'vendor/autoload.php';
 
@@ -115,3 +116,10 @@
 ]);
 
 Chronos::setTestNow(Chronos::now());
+
+// 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
new file mode 100644
index 00000000..ab8991ef
--- /dev/null
+++ b/tests/schema.php
@@ -0,0 +1,352 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * Abstract schema for CakePHP tests.
+ *
+ * This format resembles the existing fixture schema
+ * and is converted to SQL via the Schema generation
+ * features of the Database package.
+ */
+
+/**
+ * Load CakePHP core test schema
+ */
+$core = include './vendor/cakephp/cakephp/tests/schema.php';
+
+return array_merge($core, [
+    [
+        'table' => 'aros',
+        'columns' => [
+            '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']
+                ]
+        ]
+    ],
+    [
+        'table' => 'acos',
+        'columns' => [
+            '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']
+                ]
+        ]
+    ],
+    [
+        'table' => 'aros_acos',
+        'columns' => [
+            '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']
+                ]
+        ]
+    ],
+    [
+        'table' => 'aco_actions',
+        'columns' => [
+            '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']
+                ]
+        ]
+    ],
+    [
+        'table' => 'aco_twos',
+        'columns' => [
+            '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'
+                ]
+            ]
+        ],
+    ],
+    [
+        'table' => 'aro_twos',
+        'columns' => [
+            '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'
+                ]
+            ]
+        ],
+    ],
+    [
+        'table' => 'aros_aco_twos',
+        'columns' => [
+            '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']
+            ]
+        ],
+    ],
+    [
+        'table' => 'people',
+        'columns' => [
+            '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'
+                ]
+            ],
+        ],
+    ],
+]);

From 23ed490659087319914f391241e4d354dee43d5d Mon Sep 17 00:00:00 2001
From: lilHermit <developer@lilhermit.co.uk>
Date: Mon, 11 Jul 2022 16:26:32 +0100
Subject: [PATCH 2/5] Refactored for ResultsetInterface extract deprecation

---
 src/Model/Table/PermissionsTable.php        |  4 +--
 tests/TestCase/Model/Table/AclNodesTest.php | 30 ++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Model/Table/PermissionsTable.php b/src/Model/Table/PermissionsTable.php
index 92293024..902d97e7 100644
--- 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/TestCase/Model/Table/AclNodesTest.php b/tests/TestCase/Model/Table/AclNodesTest.php
index 0ddd00b9..96a92c34 100644
--- a/tests/TestCase/Model/Table/AclNodesTest.php
+++ b/tests/TestCase/Model/Table/AclNodesTest.php
@@ -216,52 +216,52 @@ public function testNode()
         $Aco = TableRegistry::getTableLocator()->get('DbAcoTest');
 
         $result = $Aco->node('Controller1');
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [2, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node('Controller1/action1');
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [3, 2, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node('Controller2/action1');
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [7, 6, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node('Controller1/action2');
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [5, 2, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node('Controller1/action1/record1');
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [4, 3, 2, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node('Controller2/action1/record1');
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [8, 7, 6, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node(8);
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [8, 7, 6, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node(7);
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [7, 6, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node(4);
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [4, 3, 2, 1];
         $this->assertSame($expected, $result);
 
         $result = $Aco->node(3);
-        $result = $result->extract('id')->toArray();
+        $result = $result->all()->extract('id')->toArray();
         $expected = [3, 2, 1];
         $this->assertSame($expected, $result);
 
@@ -295,12 +295,12 @@ public function testNodeArrayFind()
         $Aro = TableRegistry::getTableLocator()->get('DbAroTest');
         $Aro->setEntityClass(__NAMESPACE__ . '\DbAroUserTest');
         Configure::write('DbAclbindMode', 'string');
-        $result = $Aro->node(['DbAroTest' => ['id' => '1', 'foreign_key' => '1']])->extract('id')->toArray();
+        $result = $Aro->node(['DbAroTest' => ['id' => '1', 'foreign_key' => '1']])->all()->extract('id')->toArray();
         $expected = [3, 2, 1];
         $this->assertSame($expected, $result);
 
         Configure::write('DbAclbindMode', 'array');
-        $result = $Aro->node(['DbAroTest' => ['id' => 4, 'foreign_key' => 2]])->extract('id')->toArray();
+        $result = $Aro->node(['DbAroTest' => ['id' => 4, 'foreign_key' => 2]])->all()->extract('id')->toArray();
         $expected = [4];
         $this->assertSame($expected, $result);
     }
@@ -315,12 +315,12 @@ public function testNodeObjectFind()
         $Aro = TableRegistry::getTableLocator()->get('DbAroTest');
         $Model = new DbAroUserTest(['id' => 1]);
         $Model->setSource('AuthUser');
-        $result = $Aro->node($Model)->extract('id')->toArray();
+        $result = $Aro->node($Model)->all()->extract('id')->toArray();
         $expected = [3, 2, 1];
         $this->assertSame($expected, $result);
 
         $Model->id = 2;
-        $result = $Aro->node($Model)->extract('id')->toArray();
+        $result = $Aro->node($Model)->all()->extract('id')->toArray();
         $expected = [4, 2, 1];
         $this->assertSame($expected, $result);
     }
@@ -378,7 +378,7 @@ public function testNodeActionAuthorize()
         $this->assertSame($expected, $result);
 
         $node = $Aro->node(['TestPlugin.TestPluginAuthUser' => ['id' => 1, 'user' => 'mariano']]);
-        $result = $node->extract('id')->toArray();
+        $result = $node->all()->extract('id')->toArray();
         $expected = $aro->id;
         $this->assertSame($expected, $result[0]);
 

From fccc73c9d3a0b33e0d2c8dceca0ec5a743bf4930 Mon Sep 17 00:00:00 2001
From: lilHermit <developer@lilhermit.co.uk>
Date: Sat, 16 Jul 2022 07:09:03 +0100
Subject: [PATCH 3/5] Testsuite fixes

---
 tests/TestCase/AclExtrasTest.php              | 19 +++++++++----------
 tests/TestCase/Model/Table/AclNodesTest.php   |  8 ++------
 .../Plugin/TestPlugin/config/routes.php       | 14 ++++++++++----
 tests/test_app/config/routes.php              | 11 ++++++++---
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/tests/TestCase/AclExtrasTest.php b/tests/TestCase/AclExtrasTest.php
index a183dd95..93a20aa2 100644
--- 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
index 96a92c34..8de2dfbd 100644
--- a/tests/TestCase/Model/Table/AclNodesTest.php
+++ b/tests/TestCase/Model/Table/AclNodesTest.php
@@ -364,9 +364,7 @@ public function testNodeAliasParenting()
      */
     public function testNodeActionAuthorize()
     {
-        $this->deprecated(function () {
-            Plugin::getCollection()->add(new \TestPlugin\Plugin());
-        });
+        $this->loadPlugins([new \TestPlugin\Plugin()]);
 
         $Aro = TableRegistry::getTableLocator()->get('DbAroTest');
         $Aro->setEntityClass(App::className('TestPlugin.TestPluginAuthUser', 'Model/Entity'));
@@ -382,8 +380,6 @@ public function testNodeActionAuthorize()
         $expected = $aro->id;
         $this->assertSame($expected, $result[0]);
 
-        $this->deprecated(function () {
-            Plugin::getCollection()->clear();
-        });
+        $this->clearPlugins();
     }
 }
diff --git a/tests/test_app/Plugin/TestPlugin/config/routes.php b/tests/test_app/Plugin/TestPlugin/config/routes.php
index 496937d1..a90dbe2a 100644
--- a/tests/test_app/Plugin/TestPlugin/config/routes.php
+++ b/tests/test_app/Plugin/TestPlugin/config/routes.php
@@ -1,7 +1,13 @@
 <?php
 
-\Cake\Routing\Router::plugin('TestPlugin', function ($routes) {
-    $routes->prefix('admin', function ($routes) {
-        $routes->fallbacks('DashedRoute');
+use Cake\Routing\RouteBuilder;
+
+return static function (RouteBuilder $routes) {
+
+    $routes->plugin('TestPlugin', function ($routes) {
+        $routes->prefix('admin', function ($routes) {
+            $routes->fallbacks('DashedRoute');
+        });
     });
-});
+};
+
diff --git a/tests/test_app/config/routes.php b/tests/test_app/config/routes.php
index d1ff8854..9ea91e3d 100644
--- a/tests/test_app/config/routes.php
+++ b/tests/test_app/config/routes.php
@@ -1,5 +1,10 @@
 <?php
 
-\Cake\Routing\Router::prefix('Admin', function ($routes) {
-    $routes->fallbacks('DashedRoute');
-});
+use Cake\Routing\RouteBuilder;
+
+return static function (RouteBuilder $routes) {
+
+    $routes->prefix('Admin', function ($routes) {
+        $routes->fallbacks('DashedRoute');
+    });
+};

From 4db5bf5379e7333555ea803355405170e0248924 Mon Sep 17 00:00:00 2001
From: lilHermit <developer@lilhermit.co.uk>
Date: Sat, 16 Jul 2022 09:42:21 +0100
Subject: [PATCH 4/5] Fixed PHP 8.1 deprecation regarding ctype_digit

---
 composer.json                     | 2 +-
 src/Model/Table/AclNodesTable.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 53a9ab6d..c18db394 100644
--- 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/src/Model/Table/AclNodesTable.php b/src/Model/Table/AclNodesTable.php
index 7e824272..85492066 100644
--- 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,
             ];

From a8704f0e3dd13cfceee42f78e91da72828667bfb Mon Sep 17 00:00:00 2001
From: lilHermit <developer@lilhermit.co.uk>
Date: Sat, 16 Jul 2022 10:17:23 +0100
Subject: [PATCH 5/5] Added some tests that cover the ctype_digit condition

---
 tests/TestCase/Model/Table/AclNodesTest.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/TestCase/Model/Table/AclNodesTest.php b/tests/TestCase/Model/Table/AclNodesTest.php
index 8de2dfbd..fa346276 100644
--- a/tests/TestCase/Model/Table/AclNodesTest.php
+++ b/tests/TestCase/Model/Table/AclNodesTest.php
@@ -250,21 +250,41 @@ public function testNode()
         $expected = [8, 7, 6, 1];
         $this->assertSame($expected, $result);
 
+        $result = $Aco->node("8");
+        $result = $result->all()->extract('id')->toArray();
+        $expected = [8, 7, 6, 1];
+        $this->assertSame($expected, $result);
+
         $result = $Aco->node(7);
         $result = $result->all()->extract('id')->toArray();
         $expected = [7, 6, 1];
         $this->assertSame($expected, $result);
 
+        $result = $Aco->node("7");
+        $result = $result->all()->extract('id')->toArray();
+        $expected = [7, 6, 1];
+        $this->assertSame($expected, $result);
+
         $result = $Aco->node(4);
         $result = $result->all()->extract('id')->toArray();
         $expected = [4, 3, 2, 1];
         $this->assertSame($expected, $result);
 
+        $result = $Aco->node("4");
+        $result = $result->all()->extract('id')->toArray();
+        $expected = [4, 3, 2, 1];
+        $this->assertSame($expected, $result);
+
         $result = $Aco->node(3);
         $result = $result->all()->extract('id')->toArray();
         $expected = [3, 2, 1];
         $this->assertSame($expected, $result);
 
+        $result = $Aco->node("3");
+        $result = $result->all()->extract('id')->toArray();
+        $expected = [3, 2, 1];
+        $this->assertSame($expected, $result);
+
         $this->assertFalse($Aco->node('Controller2/action3'));
 
         $this->assertFalse($Aco->node('Controller2/action3/record5'));