Update yiisoft/auth, fix tests

dependabot[bot] · web-flow · commit b1b4d27a350b · 2021-01-25T23:19:02.000+03:00
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "yiisoft/access": "^1.0",
         "yiisoft/aliases": "^1.0",
         "yiisoft/arrays": "^3.0@dev",
-        "yiisoft/auth": "^2.0",
+        "yiisoft/auth": "^3.0",
         "yiisoft/cache": "^3.0@dev",
         "yiisoft/cache-file": "^3.0@dev",
         "yiisoft/composer-config-plugin": "^1.0@dev",
diff --git a/src/Auth/AuthRequest.php b/src/Auth/AuthRequest.php
@@ -20,12 +20,12 @@ final class AuthRequest extends RequestModel implements ValidatableModelInterfac
 {
     public function getLogin(): string
     {
-        return (string)$this->getValue('body.login');
+        return (string)$this->getAttributeValue('body.login');
     }
 
     public function getPassword(): string
     {
-        return (string)$this->getValue('body.password');
+        return (string)$this->getAttributeValue('body.password');
     }
 
     public function getRules(): array
diff --git a/src/Blog/EditPostRequest.php b/src/Blog/EditPostRequest.php
@@ -23,22 +23,22 @@ final class EditPostRequest extends RequestModel implements ValidatableModelInte
 {
     public function getId(): int
     {
-        return (int)$this->getValue('attributes.id');
+        return (int)$this->getAttributeValue('attributes.id');
     }
 
     public function getTitle(): string
     {
-        return (string)$this->getValue('body.title');
+        return (string)$this->getAttributeValue('body.title');
     }
 
     public function getText(): string
     {
-        return (string)$this->getValue('body.text');
+        return (string)$this->getAttributeValue('body.text');
     }
 
     public function getStatus(): PostStatus
     {
-        return new PostStatus($this->getValue('body.status'));
+        return new PostStatus($this->getAttributeValue('body.status'));
     }
 
     public function getRules(): array
diff --git a/src/Blog/PageRequest.php b/src/Blog/PageRequest.php
@@ -24,8 +24,8 @@ final class PageRequest extends RequestModel
 
     public function getPage(): int
     {
-        if ($this->hasValue('query.page')) {
-            return (int)$this->getValue('query.page');
+        if ($this->hasAttribute('query.page')) {
+            return (int)$this->getAttributeValue('query.page');
         }
 
         return self::DEFAULT_PAGE_PARAM;
diff --git a/src/Blog/ViewPostRequest.php b/src/Blog/ViewPostRequest.php
@@ -10,6 +10,6 @@ final class ViewPostRequest extends RequestModel
 {
     public function getId(): int
     {
-        return (int)$this->getValue('attributes.id');
+        return (int)$this->getAttributeValue('attributes.id');
     }
 }
diff --git a/src/User/UserRepository.php b/src/User/UserRepository.php
@@ -8,11 +8,12 @@
 use Cycle\ORM\Select;
 use Cycle\ORM\Transaction;
 use Yiisoft\Auth\IdentityInterface;
+use Yiisoft\Auth\IdentityRepositoryInterface;
 use Yiisoft\Auth\IdentityWithTokenRepositoryInterface;
 use Yiisoft\Data\Reader\Sort;
 use Yiisoft\Yii\Cycle\Data\Reader\EntityReader;
 
-final class UserRepository extends Select\Repository implements IdentityWithTokenRepositoryInterface
+final class UserRepository extends Select\Repository implements IdentityWithTokenRepositoryInterface, IdentityRepositoryInterface
 {
     private ORMInterface $orm;
 
diff --git a/src/User/UserRequest.php b/src/User/UserRequest.php
@@ -14,6 +14,6 @@ public function getUser(): User
         /**
          * @var User $identity
          */
-        return $this->getValue('attributes.' . Authentication::class);
+        return $this->getAttributeValue('attributes.' . Authentication::class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ final class AuthRequest extends RequestModel implements ValidatableModelInterfac`
`20`	`20`	`{`
`21`	`21`	`public function getLogin(): string`
`22`	`22`	`{`
`23`		`- return (string)$this->getValue('body.login');`
	`23`	`+ return (string)$this->getAttributeValue('body.login');`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function getPassword(): string`
`27`	`27`	`{`
`28`		`- return (string)$this->getValue('body.password');`
	`28`	`+ return (string)$this->getAttributeValue('body.password');`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`public function getRules(): array`
Original file line number	Diff line number	Diff line change
`@@ -23,22 +23,22 @@ final class EditPostRequest extends RequestModel implements ValidatableModelInte`
`23`	`23`	`{`
`24`	`24`	`public function getId(): int`
`25`	`25`	`{`
`26`		`- return (int)$this->getValue('attributes.id');`
	`26`	`+ return (int)$this->getAttributeValue('attributes.id');`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public function getTitle(): string`
`30`	`30`	`{`
`31`		`- return (string)$this->getValue('body.title');`
	`31`	`+ return (string)$this->getAttributeValue('body.title');`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function getText(): string`
`35`	`35`	`{`
`36`		`- return (string)$this->getValue('body.text');`
	`36`	`+ return (string)$this->getAttributeValue('body.text');`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public function getStatus(): PostStatus`
`40`	`40`	`{`
`41`		`- return new PostStatus($this->getValue('body.status'));`
	`41`	`+ return new PostStatus($this->getAttributeValue('body.status'));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public function getRules(): array`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ final class PageRequest extends RequestModel`
`24`	`24`
`25`	`25`	`public function getPage(): int`
`26`	`26`	`{`
`27`		`- if ($this->hasValue('query.page')) {`
`28`		`- return (int)$this->getValue('query.page');`
	`27`	`+ if ($this->hasAttribute('query.page')) {`
	`28`	`+ return (int)$this->getAttributeValue('query.page');`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`return self::DEFAULT_PAGE_PARAM;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ final class ViewPostRequest extends RequestModel`
`10`	`10`	`{`
`11`	`11`	`public function getId(): int`
`12`	`12`	`{`
`13`		`- return (int)$this->getValue('attributes.id');`
	`13`	`+ return (int)$this->getAttributeValue('attributes.id');`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ public function getUser(): User`
`14`	`14`	`/**`
`15`	`15`	`* @var User $identity`
`16`	`16`	`*/`
`17`		`- return $this->getValue('attributes.' . Authentication::class);`
	`17`	`+ return $this->getAttributeValue('attributes.' . Authentication::class);`
`18`	`18`	`}`
`19`	`19`	`}`