update to cakephp 4.4

Author: skie

composer.json

@@ -35,7 +35,7 @@
         "firebase/php-jwt": "^5.0"
     },
     "require-dev": {
-        "cakephp/cakephp-codesniffer": "^4.0",
+        "cakephp/cakephp-codesniffer": "~4.4.0",
         "league/flysystem-vfs": "^1.0",
         "phpunit/phpunit": "^9.5",
         "vlucas/phpdotenv": "^3.3"

phpunit.xml.dist

@@ -1,33 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    colors="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="./tests/bootstrap.php"
-    >
-    <php>
-        <ini name="memory_limit" value="-1"/>
-        <ini name="apc.enable_cli" value="1"/>
-        <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/>
-    </php>
-
-    <!-- Add any additional test suites you want to run here -->
-    <testsuites>
-        <testsuite name="Api Test Suite">
-            <directory>./tests/TestCase</directory>
-        </testsuite>
-    </testsuites>
-
-    <!-- Setup a listener for fixtures -->
-    <extensions>
-      <extension class="\Cake\TestSuite\Fixture\PHPUnitExtension" />
-    </extensions>
-
-    <!-- Prevent coverage reports from looking in tests and vendors -->
-    <filter>
-		<whitelist processUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">./src</directory>
-		</whitelist>
-    </filter>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="./tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="memory_limit" value="-1"/>
+    <ini name="apc.enable_cli" value="1"/>
+    <env name="FIXTURE_SCHEMA_METADATA" value="./tests/schema.php"/>
+  </php>
+  <!-- Add any additional test suites you want to run here -->
+  <testsuites>
+    <testsuite name="Api Test Suite">
+      <directory>./tests/TestCase</directory>
+    </testsuite>
+  </testsuites>
+  <!-- Setup a listener for fixtures -->
+  <extensions>
+    <extension class="\Cake\TestSuite\Fixture\PHPUnitExtension"/>
+  </extensions>
+  <!-- Prevent coverage reports from looking in tests and vendors -->
 </phpunit>

src/Service/Action/Auth/LoginAction.php

@@ -124,6 +124,7 @@ protected function _authConfig(): array
                         'username' => $this->_identifiedField,
                         'password' => $this->_passwordField,
                     ],
+                    'finder' => 'active',
                 ],
             ],
         ]);

src/Service/Locator/ServiceLocator.php

@@ -174,7 +174,6 @@ public function get(string $alias, array $options = []): Service
                 $options['className'] = Inflector::camelize(Inflector::underscore($className));
                 $options['service'] = Inflector::dasherize($alias);
             } else {
-            $options['className'] = $className;
                 $options['className'] = $className;
                 $options['service'] = Inflector::underscore($alias);
             }

tests/Base/BaseTraitTest.php

@@ -22,7 +22,7 @@ trait BaseTraitTest
     /**
      * Sets up the session as a logged in user for an user with id $id
      *
-     * @param $id
+     * @param mixed $id
      * @return void
      */
     protected function loginAsUserId($id)

tests/TestCase/Auth/Authorize/SimpleRbacAuthorizeTest.php

@@ -156,10 +156,10 @@ protected function preparePermissions($permissions)
 
     /**
      * @dataProvider providerAuthorize
-     * @param $permissions
-     * @param $user
-     * @param $requestParams
-     * @param $expected
+     * @param mixed $permissions
+     * @param mixed $user
+     * @param mixed $requestParams
+     * @param mixed $expected
      * @param string|null $msg
      */
     public function testAuthorize($permissions, $user, $requestParams, $expected, $msg = null)

tests/TestCase/Integration/Service/Action/Auth/LoginActionTest.php

@@ -63,6 +63,7 @@ public function testSuccessLogin()
             'last_name' => 'last1',
             'active' => true,
             'api_token' => 'yyy',
+            'role' => 'admin',
         ];
         $data = Hash::get($result, 'data');
         unset($data['activation_date']);

tests/TestCase/Integration/Service/Action/Auth/RegisterActionTest.php

@@ -78,6 +78,7 @@ public function testSuccessRegister()
             'active' => false,
             'api_token' => null,
             'message' => 'Please validate your account before log in',
+            'role' => 'user',
         ];
         $data = $result['data'];
         unset($data['id'], $data['tos_date']);

tests/TestCase/Integration/Service/Action/Extension/CursorPaginationExtensionTest.php

@@ -160,9 +160,6 @@ public function testListWithSinceIdWithNewDataAdded()
         $this->assertEquals('http://example.com/api/articles?max_id=16', Hash::get($result, 'pagination.links.next'));
     }
 
-    /**
-     * @param $count
-     */
     protected function _addData($count)
     {
         $Article = TableRegistry::get('Articles');

tests/bootstrap.php

@@ -12,6 +12,8 @@
  */
 
 use Cake\Core\Configure;
+use Cake\Error\ErrorTrap;
+use Cake\Error\ExceptionTrap;
 use Cake\Mailer\Email;
 use Cake\Utility\Security;
 
@@ -156,11 +158,8 @@ class_alias(\CakeDC\Api\Test\App\Controller\AppController::class, 'App\Controlle
 
 $isCli = PHP_SAPI === 'cli';
 $conf = (array)Cake\Core\Configure::read('Error');
-if ($isCli) {
-    (new Cake\Error\ConsoleErrorHandler($conf))->register();
-} else {
-    (new Cake\Error\ErrorHandler($conf))->register();
-}
+(new ErrorTrap($conf))->register();
+(new ExceptionTrap($conf))->register();
 \Cake\Routing\Router::reload();
 $application = new \CakeDC\Api\Test\App\Application(CONFIG);
 $application->bootstrap();