update versions

CakeDC · Sep 15, 2023 · 45720fb · 45720fb
1 parent 23406df
commit 45720fb
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=8.1.0",
-        "cakephp/cakephp": "5.x-dev"
+        "cakephp/cakephp": "^5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
@@ -40,9 +40,9 @@
         "google/recaptcha": "@stable",
         "robthree/twofactorauth": "^2.0",
         "league/oauth1-client": "^1.7",
-        "cakephp/authorization": "3.x-dev",
+        "cakephp/authorization": "^3.0",
         "cakephp/cakephp-codesniffer": "^5.0",
-        "cakephp/authentication": "3.x-dev",
+        "cakephp/authentication": "^3.0",
         "yubico/u2flib-server": "^1.0"
     },
     "suggest": {

diff --git a/tests/TestCase/Authenticator/FormAuthenticatorTest.php b/tests/TestCase/Authenticator/FormAuthenticatorTest.php
@@ -14,6 +14,7 @@
 
 use Authentication\Authenticator\FormAuthenticator as CakeFormAuthenticator;
 use Authentication\Authenticator\Result;
+use Authentication\Identifier\AbstractIdentifier;
 use Authentication\Identifier\IdentifierCollection;
 use Authentication\Identifier\IdentifierInterface;
 use Cake\Core\Configure;
@@ -58,8 +59,8 @@ public function testAuthenticateBaseFailed()
             $identifiers,
             [
                 'fields' => [
-                    IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                    IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                    AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                    AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                 ],
                 'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
             ],
@@ -72,8 +73,8 @@ public function testAuthenticateBaseFailed()
                 $this->equalTo($identifiers),
                 $this->equalTo([
                     'fields' => [
-                        IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                        IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                        AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                        AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                     ],
                     'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
                 ])
@@ -126,8 +127,8 @@ public function testAuthenticate()
             $identifiers,
             [
                 'fields' => [
-                    IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                    IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                    AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                    AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                 ],
                 'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
             ],
@@ -140,8 +141,8 @@ public function testAuthenticate()
                 $this->equalTo($identifiers),
                 $this->equalTo([
                     'fields' => [
-                        IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                        IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                        AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                        AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                     ],
                     'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
                 ])
@@ -199,8 +200,8 @@ public function testAuthenticateNotRequiredReCaptcha()
             $identifiers,
             [
                 'fields' => [
-                    IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                    IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                    AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                    AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                 ],
             ],
         ])->onlyMethods(['createBaseAuthenticator', 'validateReCaptcha'])->getMock();
@@ -212,8 +213,8 @@ public function testAuthenticateNotRequiredReCaptcha()
                 $this->equalTo($identifiers),
                 $this->equalTo([
                     'fields' => [
-                        IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                        IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                        AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                        AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                     ],
                     'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
                 ])
@@ -266,8 +267,8 @@ public function testAuthenticateInvalidRecaptcha()
             $identifiers,
             [
                 'fields' => [
-                    IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                    IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                    AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                    AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                 ],
             ],
         ])->onlyMethods(['createBaseAuthenticator', 'validateReCaptcha'])->getMock();
@@ -279,8 +280,8 @@ public function testAuthenticateInvalidRecaptcha()
                 $this->equalTo($identifiers),
                 $this->equalTo([
                     'fields' => [
-                        IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                        IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                        AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                        AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                     ],
                     'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
                 ])
@@ -314,8 +315,8 @@ public function testGetBaseAuthenticator()
             $identifiers,
             [
                 'fields' => [
-                    IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                    IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                    AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                    AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                 ],
                 'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
             ]
@@ -325,8 +326,8 @@ public function testGetBaseAuthenticator()
         $this->assertNotInstanceOf(FormAuthenticator::class, $actual);
         $expected = [
             'fields' => [
-                IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
             ],
             'loginUrl' => null,
             'urlChecker' => 'Authentication.Default',
@@ -349,8 +350,8 @@ public function testGetBaseAuthenticatorCustom()
             $identifiers,
             [
                 'fields' => [
-                    IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                    IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                    AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                    AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                 ],
                 'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
                 'baseClassName' => CakeFormAuthenticator::class,
@@ -361,8 +362,8 @@ public function testGetBaseAuthenticatorCustom()
         $this->assertNotInstanceOf(FormAuthenticator::class, $actual);
         $expected = [
             'fields' => [
-                IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
             ],
             'loginUrl' => null,
             'urlChecker' => 'Authentication.Default',
@@ -385,8 +386,8 @@ public function testGetBaseAuthenticatorError()
             $identifiers,
             [
                 'fields' => [
-                    IdentifierInterface::CREDENTIAL_USERNAME => 'email',
-                    IdentifierInterface::CREDENTIAL_PASSWORD => 'password',
+                    AbstractIdentifier::CREDENTIAL_USERNAME => 'email',
+                    AbstractIdentifier::CREDENTIAL_PASSWORD => 'password',
                 ],
                 'keyCheckEnabledRecaptcha' => 'Users.reCaptcha.login',
                 'baseClassName' => 'NotExistingAuthenticator',

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -134,3 +134,13 @@
     $loader = new SchemaLoader();
     $loader->loadInternalFile(env('FIXTURE_SCHEMA_METADATA'));
 }
+
+$error = [
+    'errorLevel' => E_ALL,
+    'skipLog' => [],
+    'log' => true,
+    'trace' => true,
+    'ignoredDeprecationPaths' => [],
+];
+(new Cake\Error\ErrorTrap($error))->register();
+