CAKEPHP upgrade to 5.2.7 (#334, CFM-338)

Fix DynamicProperties php 8.2 issue Sync configuration files
COmanage · Sep 11, 2025 · 5493369 · 5493369
1 parent 9dd919d
commit 5493369
Show file tree

Hide file tree

Showing 4,136 changed files with 184,965 additions and 134,724 deletions.
diff --git a/app/availableplugins/ApiConnector/src/Controller/ApiSourceEndpointsController.php b/app/availableplugins/ApiConnector/src/Controller/ApiSourceEndpointsController.php
@@ -33,7 +33,7 @@
 use App\Controller\StandardPluginController;
 
 class ApiSourceEndpointsController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'ApiSourceEndpoints.id' => 'asc'
     ]

diff --git a/app/availableplugins/ApiConnector/src/Controller/ApiSourcesController.php b/app/availableplugins/ApiConnector/src/Controller/ApiSourcesController.php
@@ -33,7 +33,7 @@
 use App\Controller\StandardPluginController;
 
 class ApiSourcesController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'ApiSources.id' => 'asc'
     ]

diff --git a/app/availableplugins/ApiConnector/src/Model/Entity/ApiSource.php b/app/availableplugins/ApiConnector/src/Model/Entity/ApiSource.php
@@ -41,7 +41,7 @@ class ApiSource extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/ApiConnector/src/Model/Entity/ApiSourceEndpoint.php b/app/availableplugins/ApiConnector/src/Model/Entity/ApiSourceEndpoint.php
@@ -41,7 +41,7 @@ class ApiSourceEndpoint extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/ApiConnector/src/Model/Entity/ApiSourceRecord.php b/app/availableplugins/ApiConnector/src/Model/Entity/ApiSourceRecord.php
@@ -41,7 +41,7 @@ class ApiSourceRecord extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/FileConnector/src/Controller/FileProvisionersController.php b/app/availableplugins/FileConnector/src/Controller/FileProvisionersController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class FileProvisionersController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'FileProvisioners.id' => 'asc'
     ]

diff --git a/app/availableplugins/FileConnector/src/Controller/FileSourcesController.php b/app/availableplugins/FileConnector/src/Controller/FileSourcesController.php
@@ -34,7 +34,7 @@
 use Cake\Http\Response;
 
 class FileSourcesController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'FileSources.id' => 'asc'
     ]

diff --git a/app/availableplugins/FileConnector/src/Model/Entity/FileProvisioner.php b/app/availableplugins/FileConnector/src/Model/Entity/FileProvisioner.php
@@ -41,7 +41,7 @@ class FileProvisioner extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/FileConnector/src/Model/Entity/FileSource.php b/app/availableplugins/FileConnector/src/Model/Entity/FileSource.php
@@ -41,7 +41,7 @@ class FileSource extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/...vailableplugins/PasswordAuthenticator/src/Controller/PasswordAuthenticatorsController.php b/...vailableplugins/PasswordAuthenticator/src/Controller/PasswordAuthenticatorsController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class PasswordAuthenticatorsController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'PasswordAuthenticators.id' => 'asc'
     ]

diff --git a/app/availableplugins/PasswordAuthenticator/src/Controller/PasswordsController.php b/app/availableplugins/PasswordAuthenticator/src/Controller/PasswordsController.php
@@ -34,7 +34,7 @@
 use App\Lib\Enum\ProvisioningContextEnum;
 
 class PasswordsController extends SingleAuthenticatorController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'Passwords.id' => 'asc'
     ]

diff --git a/app/availableplugins/PasswordAuthenticator/src/Model/Entity/Password.php b/app/availableplugins/PasswordAuthenticator/src/Model/Entity/Password.php
@@ -41,7 +41,7 @@ class Password extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/PasswordAuthenticator/src/Model/Entity/PasswordAuthenticator.php b/app/availableplugins/PasswordAuthenticator/src/Model/Entity/PasswordAuthenticator.php
@@ -41,7 +41,7 @@ class PasswordAuthenticator extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/PipelineToolkit/src/Controller/IdentifierMappersController.php b/app/availableplugins/PipelineToolkit/src/Controller/IdentifierMappersController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class IdentifierMappersController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'IdentifierMappers.id' => 'asc'
     ]

diff --git a/app/availableplugins/PipelineToolkit/src/Controller/LoginIdentifierTypesController.php b/app/availableplugins/PipelineToolkit/src/Controller/LoginIdentifierTypesController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class LoginIdentifierTypesController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'LoginIdentifierTypes.id' => 'asc'
     ]

diff --git a/app/availableplugins/PipelineToolkit/src/Controller/PersonRoleMappersController.php b/app/availableplugins/PipelineToolkit/src/Controller/PersonRoleMappersController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class PersonRoleMappersController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'PersonRoleMappers.id' => 'asc'
     ]

diff --git a/app/availableplugins/PipelineToolkit/src/Controller/PersonRoleMappingsController.php b/app/availableplugins/PipelineToolkit/src/Controller/PersonRoleMappingsController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class PersonRoleMappingsController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'PersonRoleMappings.id' => 'asc'
     ]

diff --git a/app/availableplugins/PipelineToolkit/src/Model/Entity/IdentifierMapper.php b/app/availableplugins/PipelineToolkit/src/Model/Entity/IdentifierMapper.php
@@ -41,7 +41,7 @@ class IdentifierMapper extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/PipelineToolkit/src/Model/Entity/LoginIdentifierType.php b/app/availableplugins/PipelineToolkit/src/Model/Entity/LoginIdentifierType.php
@@ -43,7 +43,7 @@ class LoginIdentifierType extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/PipelineToolkit/src/Model/Entity/PersonRoleMapper.php b/app/availableplugins/PipelineToolkit/src/Model/Entity/PersonRoleMapper.php
@@ -41,7 +41,7 @@ class PersonRoleMapper extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/PipelineToolkit/src/Model/Entity/PersonRoleMapping.php b/app/availableplugins/PipelineToolkit/src/Model/Entity/PersonRoleMapping.php
@@ -43,7 +43,7 @@ class PersonRoleMapping extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappersTable.php b/app/availableplugins/PipelineToolkit/src/Model/Table/PersonRoleMappersTable.php
@@ -109,7 +109,7 @@ public function buildPersonRole(
     // We need our Mapping configuration, which won't be in $flange
     $mappings = $this->PersonRoleMappings->find()
                      ->where(['person_role_mapper_id' => $flange->person_role_mapper->id])
-                     ->order(['ordr' => 'ASC'])
+                     ->orderBy(['ordr' => 'ASC'])
                      ->all();
 
     foreach($mappings as $mapping) {

diff --git a/app/availableplugins/SqlConnector/src/Controller/SqlProvisionersController.php b/app/availableplugins/SqlConnector/src/Controller/SqlProvisionersController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class SqlProvisionersController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'SqlProvisioners.id' => 'asc'
     ]

diff --git a/app/availableplugins/SqlConnector/src/Controller/SqlSourcesController.php b/app/availableplugins/SqlConnector/src/Controller/SqlSourcesController.php
@@ -32,7 +32,7 @@
 use App\Controller\StandardPluginController;
 
 class SqlSourcesController extends StandardPluginController {
-  public $paginate = [
+  protected array $paginate = [
     'order' => [
       'SqlSources.id' => 'asc'
     ]

diff --git a/app/availableplugins/SqlConnector/src/Model/Entity/SqlProvisioner.php b/app/availableplugins/SqlConnector/src/Model/Entity/SqlProvisioner.php
@@ -41,7 +41,7 @@ class SqlProvisioner extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/SqlConnector/src/Model/Entity/SqlSource.php b/app/availableplugins/SqlConnector/src/Model/Entity/SqlSource.php
@@ -41,7 +41,7 @@ class SqlSource extends Entity {
    *
    * @var array<string, bool>
    */
-  protected $_accessible = [
+  protected array $_accessible = [
     '*' => true,
     'id' => false,
     'slug' => false,

diff --git a/app/availableplugins/SqlConnector/src/Model/Table/SqlSourcesTable.php b/app/availableplugins/SqlConnector/src/Model/Table/SqlSourcesTable.php
@@ -185,10 +185,10 @@ protected function getChanges(
     if($SourceTable->getSchema()->getColumnType('modified')) {
       $this->llog('trace', "Calculating changes via modified timestamp for " . $source->description);
 
-      $query = $SourceTable->find('list', [
-                             'keyField' => 'source_key',
-                             'valueField' => 'modified'
-                           ])
+      $query = $SourceTable->find('list',
+                             keyField: 'source_key',
+                             valueField: 'modified',
+                           )
                            ->where([
                              'modified >' => date('Y-m-d H:i:s', $lastStart),
                              'modified <=' => date('Y-m-d H:i:s', $curStart)
@@ -245,10 +245,10 @@ protected function getInventory(
   ): int|array {
     $SourceTable = $this->getRecordTable($source->sql_source);
 
-    $query = $SourceTable->find('list', [
-                            'keyField' => 'source_key',
-                            'valueField' => 'modified'
-                          ]);
+    $query = $SourceTable->find('list',
+                            keyField: 'source_key',
+                            valueField: 'modified',
+                          );
 
     if($count) {
       return $query->count();

diff --git a/app/composer.json b/app/composer.json
@@ -5,22 +5,26 @@
     "type": "project",
     "license": "MIT",
     "require": {
-        "php": ">=8.0",
-        "cakephp/cakephp": "4.6.*",
-        "cakephp/migrations": "^3.2",
-        "cakephp/plugin-installer": "^1.3",
-        "doctrine/dbal": "^3.3",
+        "php": ">=8.1",
+        "ext-intl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "cakephp/authentication": "~3.0",
+        "cakephp/cakephp": "5.2.*",
+        "cakephp/migrations": "^4.0.0",
+        "cakephp/plugin-installer": "^2.0",
+        "doctrine/dbal": "^3.10.1",
         "league/container": "^4.2.0",
-        "mobiledetect/mobiledetectlib": "^2.8",
-        "psr/log": "^2.0",
+        "mobiledetect/mobiledetectlib": "^4.8.03",
+        "psr/log": "^3.0",
         "symfony/html-sanitizer": "^7.2"
     },
     "require-dev": {
-        "cakephp/bake": "^2.6",
-        "cakephp/cakephp-codesniffer": "^4.5",
-        "cakephp/debug_kit": "^4.5",
-        "josegonzalez/dotenv": "^3.2",
-        "phpunit/phpunit": "~8.5.0 || ^9.3",
+        "cakephp/bake": "^3.0.0",
+        "cakephp/cakephp-codesniffer": "^5.0",
+        "cakephp/debug_kit": "^5.0.0",
+        "josegonzalez/dotenv": "^4.0",
+        "phpunit/phpunit": "^10.5.5 || ^11.1.3 || ^12.1",
         "psy/psysh": "@stable"
     },
     "suggest": {