Update cycle-related code

samdark · web-flow · commit 3f322e0955c5 · 2021-01-13T23:49:50.000+03:00
diff --git a/src/Blog/PostRepository.php b/src/Blog/PostRepository.php
@@ -7,7 +7,7 @@
 use Cycle\ORM\ORMInterface;
 use Cycle\ORM\Select;
 use Cycle\ORM\Transaction;
-use Yiisoft\Yii\Cycle\DataReader\SelectDataReader;
+use Yiisoft\Yii\Cycle\Data\Reader\EntityReader;
 
 final class PostRepository extends Select\Repository
 {
@@ -19,9 +19,9 @@ public function __construct(Select $select, ORMInterface $orm)
         parent::__construct($select);
     }
 
-    public function findAll(array $scope = [], array $orderBy = []): SelectDataReader
+    public function findAll(array $scope = [], array $orderBy = []): EntityReader
     {
-        return new SelectDataReader(
+        return new EntityReader(
             $this->select()->where($scope)->orderBy($orderBy)
         );
     }
diff --git a/src/User/UserRepository.php b/src/User/UserRepository.php
@@ -10,7 +10,7 @@
 use Yiisoft\Auth\IdentityInterface;
 use Yiisoft\Auth\IdentityWithTokenRepositoryInterface;
 use Yiisoft\Data\Reader\Sort;
-use Yiisoft\Yii\Cycle\DataReader\SelectDataReader;
+use Yiisoft\Yii\Cycle\Data\Reader\EntityReader;
 
 final class UserRepository extends Select\Repository implements IdentityWithTokenRepositoryInterface
 {
@@ -22,9 +22,9 @@ public function __construct(Select $select, ORMInterface $orm)
         parent::__construct($select);
     }
 
-    public function findAllOrderByLogin(): SelectDataReader
+    public function findAllOrderByLogin(): EntityReader
     {
-        return (new SelectDataReader($this->select()))
+        return (new EntityReader($this->select()))
             ->withSort(
                 (new Sort(['login']))->withOrderString('login')
             );

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Cycle\ORM\ORMInterface;`
`8`	`8`	`use Cycle\ORM\Select;`
`9`	`9`	`use Cycle\ORM\Transaction;`
`10`		`-use Yiisoft\Yii\Cycle\DataReader\SelectDataReader;`
	`10`	`+use Yiisoft\Yii\Cycle\Data\Reader\EntityReader;`
`11`	`11`
`12`	`12`	`final class PostRepository extends Select\Repository`
`13`	`13`	`{`
`@@ -19,9 +19,9 @@ public function __construct(Select $select, ORMInterface $orm)`
`19`	`19`	`parent::__construct($select);`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function findAll(array $scope = [], array $orderBy = []): SelectDataReader`
	`22`	`+ public function findAll(array $scope = [], array $orderBy = []): EntityReader`
`23`	`23`	`{`
`24`		`- return new SelectDataReader(`
	`24`	`+ return new EntityReader(`
`25`	`25`	`$this->select()->where($scope)->orderBy($orderBy)`
`26`	`26`	`);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`use Yiisoft\Auth\IdentityInterface;`
`11`	`11`	`use Yiisoft\Auth\IdentityWithTokenRepositoryInterface;`
`12`	`12`	`use Yiisoft\Data\Reader\Sort;`
`13`		`-use Yiisoft\Yii\Cycle\DataReader\SelectDataReader;`
	`13`	`+use Yiisoft\Yii\Cycle\Data\Reader\EntityReader;`
`14`	`14`
`15`	`15`	`final class UserRepository extends Select\Repository implements IdentityWithTokenRepositoryInterface`
`16`	`16`	`{`
`@@ -22,9 +22,9 @@ public function __construct(Select $select, ORMInterface $orm)`
`22`	`22`	`parent::__construct($select);`
`23`	`23`	`}`
`24`	`24`
`25`		`- public function findAllOrderByLogin(): SelectDataReader`
	`25`	`+ public function findAllOrderByLogin(): EntityReader`
`26`	`26`	`{`
`27`		`- return (new SelectDataReader($this->select()))`
	`27`	`+ return (new EntityReader($this->select()))`
`28`	`28`	`->withSort(`
`29`	`29`	`(new Sort(['login']))->withOrderString('login')`
`30`	`30`	`);`