Upgrade to CakePHP 5 - Fixing types and unit tests

psalm.xml

@@ -14,7 +14,6 @@
     <issueHandlers>
         <LessSpecificReturnType errorLevel="info" />
         <RedundantConditionGivenDocblockType errorLevel="info" />
-        <TypeCoercion errorLevel="info" />
         <DocblockTypeContradiction errorLevel="info" />
     </issueHandlers>
 </psalm>

src/Controller/AppController.php

@@ -28,7 +28,7 @@ class AppController extends BaseController
     public function initialize(): void
     {
         parent::initialize();
-        $this->loadComponent('Security');
+        $this->loadComponent('FormProtection');
         if ($this->request->getParam('_csrfToken') === false) {
             $this->loadComponent('Csrf');
         }

src/Controller/Traits/PasswordManagementTrait.php

@@ -209,6 +209,6 @@ public function resetOneTimePasswordAuthenticator($id = null)
             }
         }
 
-        return $this->redirect($this->getRequest()->referer());
+        return $this->redirect($this->getRequest()->referer() ?? '/');
     }
 }

tests/Fixture/UsersFixture.php

@@ -64,8 +64,9 @@ public function init(): void
                                 'type' => 'Webauthn\TrustPath\EmptyTrustPath',
                             ],
                             'aaguid' => '00000000-0000-0000-0000-000000000000',
-                            'credentialPublicKey' => Base64Url::encode('000000000000000000000000000000000000-9999999999999999999999999999999999999999-XXXXXXXXXXXXX-ZZZZZZZZZZZ'),
-                            'userHandle' => Base64Url::encode('00000000-0000-0000-0000-000000000001'),
+                            //add this when migrated webauthn
+//                            'credentialPublicKey' => Base64Url::encode('000000000000000000000000000000000000-9999999999999999999999999999999999999999-XXXXXXXXXXXXX-ZZZZZZZZZZZ'),
+//                            'userHandle' => Base64Url::encode('00000000-0000-0000-0000-000000000001'),
                             'counter' => 190,
                             'otherUI' => null,
                         ],

tests/TestCase/Authenticator/SocialAuthenticatorTest.php

@@ -36,7 +36,7 @@
  */
 class SocialAuthenticatorTest extends TestCase
 {
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];

tests/TestCase/Authenticator/SocialPendingEmailAuthenticatorTest.php

@@ -25,7 +25,7 @@
 
 class SocialPendingEmailAuthenticatorTest extends TestCase
 {
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];

tests/TestCase/Controller/SocialAccountsControllerTest.php

@@ -15,7 +15,7 @@
 
 use Cake\Core\Configure;
 use Cake\Http\ServerRequest;
-use Cake\Mailer\Email;
+use Cake\Mailer\Mailer;
 use Cake\Mailer\TransportFactory;
 use Cake\TestSuite\TestCase;
 
@@ -26,7 +26,7 @@ class SocialAccountsControllerTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.SocialAccounts',
         'plugin.CakeDC/Users.Users',
     ];
@@ -46,9 +46,9 @@ public function setUp(): void
         Configure::write('Users.RememberMe.active', false);
 
         TransportFactory::setConfig('test', ['className' => 'Debug']);
-        $this->configEmail = Email::getConfig('default');
-        Email::drop('default');
-        Email::setConfig('default', [
+        $this->configEmail = Mailer::getConfig('default');
+        Mailer::drop('default');
+        Mailer::setConfig('default', [
             'transport' => 'test',
             'from' => '[email protected]',
         ]);
@@ -69,9 +69,9 @@ public function setUp(): void
      */
     public function tearDown(): void
     {
-        Email::drop('default');
+        Mailer::drop('default');
         TransportFactory::drop('test');
-        //Email::setConfig('default', $this->configEmail);
+        //Mailer::setConfig('default', $this->configEmail);
 
         Configure::write('Opauth', $this->configOpauth);
         Configure::write('Users.RememberMe.active', $this->configRememberMe);

tests/TestCase/Controller/Traits/BaseTraitTest.php

@@ -21,7 +21,8 @@
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;
 use Cake\Event\Event;
-use Cake\Mailer\Email;
+use Cake\Http\ServerRequest;
+use Cake\Mailer\Mailer;
 use Cake\Mailer\TransportFactory;
 use Cake\ORM\Entity;
 use Cake\ORM\TableRegistry;
@@ -42,7 +43,7 @@ abstract class BaseTraitTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
     ];
 
@@ -85,6 +86,7 @@ public function setUp(): void
         try {
             $this->Trait = $this->getMockBuilder($this->traitClassName)
                     ->setMethods($traitMockMethods)
+                    ->setConstructorArgs([new ServerRequest()])
                     ->getMock();
             $this->Trait->expects($this->any())
                     ->method('getUsersTable')
@@ -98,9 +100,9 @@ public function setUp(): void
             TransportFactory::setConfig('test', [
                 'className' => 'Debug',
             ]);
-            $this->configEmail = Email::getConfig('default');
-            Email::drop('default');
-            Email::setConfig('default', [
+            $this->configEmail = Mailer::getConfig('default');
+            Mailer::drop('default');
+            Mailer::setConfig('default', [
                 'transport' => 'test',
                 'from' => '[email protected]',
             ]);
@@ -116,9 +118,9 @@ public function tearDown(): void
     {
         unset($this->table, $this->Trait);
         if ($this->mockDefaultEmail) {
-            Email::drop('default');
+            Mailer::drop('default');
             TransportFactory::drop('test');
-            //Email::setConfig('default', $this->setConfigEmail);
+            //Mailer::setConfig('default', $this->setConfigEmail);
         }
         parent::tearDown();
     }

tests/TestCase/Controller/Traits/CustomUsersTableTraitTest.php

@@ -13,6 +13,7 @@
 
 namespace CakeDC\Users\Test\TestCase\Controller\Traits;
 
+use Cake\Http\ServerRequest;
 use Cake\ORM\Table;
 use Cake\TestSuite\TestCase;
 
@@ -23,6 +24,7 @@ public function setUp(): void
         parent::setUp();
         $this->controller = $this->getMockBuilder('Cake\Controller\Controller')
                 ->setMethods(['header', 'redirect', 'render', '_stop'])
+                ->setConstructorArgs([new ServerRequest()])
                 ->getMock();
         $this->controller->Trait = $this->getMockForTrait('CakeDC\Users\Controller\Traits\CustomUsersTableTrait');
     }

tests/TestCase/Controller/Traits/Integration/LoginTraitIntegrationTest.php

@@ -28,7 +28,7 @@ class LoginTraitIntegrationTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
     ];
 
@@ -72,6 +72,7 @@ public function testLoginGetRequestNoSocialLogin()
         });
 
         $this->get('/login');
+        file_put_contents(TMP . 'testLoginGetRequestNoSocialLogin.html', $this->_response->getBody());
         $this->assertResponseOk();
         $this->assertResponseNotContains('Username or password is incorrect');
         $this->assertResponseContains('<form method="post" accept-charset="utf-8" action="/login">');

tests/TestCase/Controller/Traits/Integration/PasswordManagementTraitIntegrationTest.php

@@ -27,7 +27,7 @@ class PasswordManagementTraitIntegrationTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
     ];
 

tests/TestCase/Controller/Traits/Integration/ProfileTraitIntegrationTest.php

@@ -26,7 +26,7 @@ class ProfileTraitIntegrationTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];

tests/TestCase/Controller/Traits/Integration/RegisterTraitIntegrationTest.php

@@ -26,7 +26,7 @@ class RegisterTraitIntegrationTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
     ];
 

tests/TestCase/Controller/Traits/Integration/SimpleCrudTraitIntegrationTest.php

@@ -29,7 +29,7 @@ class SimpleCrudTraitIntegrationTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];

tests/TestCase/Controller/Traits/LinkSocialTraitTest.php

@@ -18,7 +18,7 @@
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Http\ServerRequestFactory;
-use Cake\I18n\FrozenTime;
+use Cake\I18n\DateTime;
 use Cake\ORM\TableRegistry;
 use Laminas\Diactoros\Uri;
 use League\OAuth2\Client\Provider\FacebookUser;
@@ -30,7 +30,7 @@ class LinkSocialTraitTest extends BaseTraitTest
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.SocialAccounts',
         'plugin.CakeDC/Users.Users',
     ];
@@ -274,7 +274,7 @@ public function testCallbackLinkSocialHappy()
 
         $actual = $Table->SocialAccounts->find('all')->where(['reference' => '9999911112255'])->firstOrFail();
 
-        $expiresTime = new FrozenTime();
+        $expiresTime = new DateTime();
         $tokenExpires = $expiresTime->setTimestamp($Token->getExpires())->format('Y-m-d H:i:s');
 
         $expected = [

tests/TestCase/Controller/Traits/LoginTraitTest.php

@@ -17,7 +17,7 @@
 use Authentication\Authenticator\SessionAuthenticator;
 use Authentication\Identifier\IdentifierCollection;
 use Authentication\Identifier\PasswordIdentifier;
-use Cake\Auth\DefaultPasswordHasher;
+use Authentication\PasswordHasher\DefaultPasswordHasher;
 use Cake\Controller\ComponentRegistry;
 use Cake\Event\Event;
 use Cake\Http\Response;
@@ -134,7 +134,7 @@ public function testLoginHappy()
         $this->assertSame($passwordBefore, $passwordAfter);
         $lastLoginAfter = $userAfter['last_login'];
         $this->assertNotEmpty($lastLoginAfter);
-        $now = \Cake\I18n\FrozenTime::now();
+        $now = \Cake\I18n\DateTime::now();
         $this->assertEqualsWithDelta($lastLoginAfter->timestamp, $now->timestamp, 2);
     }
 

tests/TestCase/Controller/Traits/OneTimePasswordVerifyTraitTest.php

@@ -41,6 +41,7 @@ public function setUp(): void
         $request = new ServerRequest();
         $this->Trait = $this->getMockBuilder($this->traitClassName)
             ->setMethods(['dispatchEvent', 'redirect', 'set', 'getUsersTable'])
+            ->setConstructorArgs([new ServerRequest()])
             ->getMock();
 
         $this->Trait->setRequest($request);

tests/TestCase/Controller/Traits/PasswordManagementTraitTest.php

@@ -13,7 +13,7 @@
 
 namespace CakeDC\Users\Test\TestCase\Controller\Traits;
 
-use Cake\Auth\PasswordHasherFactory;
+use Authentication\PasswordHasher\PasswordHasherFactory;
 use Cake\Core\Configure;
 use Cake\Event\Event;
 use Cake\TestSuite\TestCase;
@@ -72,7 +72,7 @@ public function testChangePasswordHappy()
             ->method('success')
             ->with('Password has been changed successfully');
         $this->Trait->changePassword();
-        $hasher = PasswordHasherFactory::build('Default');
+        $hasher = PasswordHasherFactory::build('Authentication.Default');
         $this->assertTrue($hasher->check('new', $this->table->get('00000000-0000-0000-0000-000000000001')->password));
     }
 
@@ -130,7 +130,7 @@ public function testChangePasswordWithAfterChangeEvent()
             ->method('success')
             ->with('Password has been changed successfully');
         $this->Trait->changePassword();
-        $hasher = PasswordHasherFactory::build('Default');
+        $hasher = PasswordHasherFactory::build('Authentication.Default');
         $this->assertTrue($hasher->check('new', $this->table->get('00000000-0000-0000-0000-000000000001')->password));
     }
 

tests/TestCase/Controller/Traits/ProfileTraitTest.php

@@ -20,7 +20,7 @@ class ProfileTraitTest extends BaseTraitTest
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];

tests/TestCase/Controller/Traits/ReCaptchaTraitTest.php

@@ -14,6 +14,7 @@
 namespace CakeDC\Users\Test\TestCase\Controller\Traits;
 
 use Cake\Core\Configure;
+use Cake\Http\ServerRequest;
 use Cake\TestSuite\TestCase;
 use ReflectionMethod;
 
@@ -29,6 +30,7 @@ public function setUp(): void
         parent::setUp();
         $this->Trait = $this->getMockBuilder('CakeDC\Users\Controller\Traits\ReCaptchaTrait')
             ->setMethods(['_getReCaptchaInstance'])
+            ->setConstructorArgs([new ServerRequest()])
             ->getMockForTrait();
     }
 

tests/TestCase/Controller/Traits/SocialTraitTest.php

@@ -41,6 +41,7 @@ public function setUp(): void
         $request = new ServerRequest();
         $this->Trait = $this->getMockBuilder($this->traitClassName)
             ->setMethods(['dispatchEvent', 'redirect', 'set', 'loadComponent'])
+            ->setConstructorArgs([new ServerRequest()])
             ->getMock();
 
         $this->Trait->request = $request;

tests/TestCase/Controller/Traits/U2fTraitTest.php

@@ -35,7 +35,7 @@ class U2fTraitTest extends BaseTraitTest
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
     ];
 

tests/TestCase/Controller/Traits/Webauthn2faTraitTest.php

@@ -36,7 +36,7 @@ class Webauthn2faTraitTest extends BaseTraitTest
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
     ];
 

tests/TestCase/Controller/UsersControllerTest.php

@@ -28,7 +28,7 @@ class UsersControllerTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
     ];
 

tests/TestCase/Identifier/SocialIdentifierTest.php

@@ -19,7 +19,7 @@
 
 class SocialIdentifierTest extends TestCase
 {
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];

tests/TestCase/Mailer/UsersMailerTest.php

@@ -28,7 +28,7 @@ class UsersMailerTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.SocialAccounts',
         'plugin.CakeDC/Users.Users',
     ];

tests/TestCase/Middleware/SocialAuthMiddlewareTest.php

@@ -32,7 +32,7 @@
 
 class SocialAuthMiddlewareTest extends TestCase
 {
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];

tests/TestCase/Middleware/SocialEmailMiddlewareTest.php

@@ -26,7 +26,7 @@
 
 class SocialEmailMiddlewareTest extends TestCase
 {
-    public $fixtures = [
+    protected array $fixtures = [
         'plugin.CakeDC/Users.Users',
         'plugin.CakeDC/Users.SocialAccounts',
     ];