fix compatibility with 2.5 (#72)

atk4 · Apr 20, 2021 · 481411b · 481411b
1 parent e13c2c2
commit 481411b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Auth.php b/src/Auth.php
@@ -231,7 +231,7 @@ public function tryLogin(string $email, string $password): bool
         // first logout
         $this->logout();
 
-        $user = $this->user->newInstance();
+        $user = new $this->user($this->user->persistence);
 
         $user->tryLoadBy($this->fieldLogin, $email);
         if ($user->loaded()) {

diff --git a/tests/AuthTest.php b/tests/AuthTest.php
@@ -33,10 +33,10 @@ public function testDb()
 
         // test traversal
         $this->assertSame(2, count((clone $u)->load(2)->ref('AccessRules')->export()));
-        $this->assertSame(1, count((clone $u)->load(2)->ref('role_id')->export()));
+        $this->assertSame(2, (clone $u)->load(2)->ref('role_id')->getId());
         $this->assertSame(2, count((clone $r)->load(2)->ref('AccessRules')->export()));
         $this->assertSame(1, count((clone $r)->load(2)->ref('Users')->export()));
-        $this->assertSame(1, count((clone $a)->load(2)->ref('role_id')->export()));
+        $this->assertSame(2, (clone $a)->load(2)->ref('role_id')->getId());
     }
 
     public function testAuth($cacheEnabled = true)

diff --git a/tests/Feature/SignupTest.php b/tests/Feature/SignupTest.php
@@ -15,10 +15,12 @@ public function testBasic()
 
         $this->assertTrue($m->hasUserAction('register_new_user'));
 
+        // as result it makes model loaded (as entity) with new user record
         $m->executeUserAction(
             'register_new_user',
             ['name' => 'New user', 'email' => 'test', 'password' => 'testpass']
         );
-        $this->assertSame(1, count((clone $m)->addCondition('email', 'test')->export()));
+
+        $this->assertSame(1, count((new $m($m->persistence))->addCondition('email', 'test')->export()));
     }
 }