Separate chain calls (#97)

yiisoft · May 22, 2022 · d6a1fd0 · d6a1fd0
1 parent 0c0121e
commit d6a1fd0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 6 deletions.
diff --git a/src/Paginator/KeysetPaginator.php b/src/Paginator/KeysetPaginator.php
@@ -292,7 +292,10 @@ private function previousPageExist(ReadableDataInterface $dataReader, Sort $sort
     {
         $reverseFilter = $this->getReverseFilter($sort);
 
-        foreach ($dataReader->withFilter($reverseFilter)->withLimit(1)->read() as $void) {
+        foreach ($dataReader
+                     ->withFilter($reverseFilter)
+                     ->withLimit(1)
+                     ->read() as $void) {
             return true;
         }
 

diff --git a/src/Paginator/OffsetPaginator.php b/src/Paginator/OffsetPaginator.php
@@ -170,7 +170,9 @@ public function read(): iterable
             throw new PaginatorException('Page not found.');
         }
 
-        $this->cachedReader = $this->dataReader->withLimit($this->pageSize)->withOffset($this->getOffset());
+        $this->cachedReader = $this->dataReader
+            ->withLimit($this->pageSize)
+            ->withOffset($this->getOffset());
         yield from $this->cachedReader->read();
     }
 

diff --git a/src/Reader/Iterable/IterableDataReader.php b/src/Reader/Iterable/IterableDataReader.php
@@ -185,7 +185,10 @@ public function read(): array
      */
     public function readOne()
     {
-        return $this->withLimit(1)->getIterator()->current();
+        return $this
+            ->withLimit(1)
+            ->getIterator()
+            ->current();
     }
 
     protected function matchFilter(array $item, array $filter): bool

diff --git a/tests/Paginator/KeysetPaginatorTest.php b/tests/Paginator/KeysetPaginatorTest.php
@@ -214,7 +214,9 @@ public function testReadObjectsWithGetters(string $orderByField, string $getter)
             $this->createObjectWithGetters(3, 'Codename Boris 3'),
         ];
 
-        $dataReader = $this->createObjectDataReader($data)->withSort($sort);
+        $dataReader = $this
+            ->createObjectDataReader($data)
+            ->withSort($sort);
         $paginator = (new KeysetPaginator($dataReader))->withPageSize(2);
 
         $this->assertSame([$data[0], $data[1]], $this->iterableToArray($paginator->read()));

diff --git a/tests/Reader/Iterable/IterableDataReaderTest.php b/tests/Reader/Iterable/IterableDataReaderTest.php
@@ -333,7 +333,12 @@ public function testIteratorIteratorAsDataSet(): void
             'name',
         ]);
         $sorting = $sorting->withOrder(['name' => 'asc']);
-        $this->assertSame($this->getDataSetAscSortedByName(), $reader->withSort($sorting)->read());
+        $this->assertSame(
+            $this->getDataSetAscSortedByName(),
+            $reader
+                ->withSort($sorting)
+                ->read(),
+        );
     }
 
     public function testGeneratorAsDataSet(): void
@@ -344,7 +349,12 @@ public function testGeneratorAsDataSet(): void
             'name',
         ]);
         $sorting = $sorting->withOrder(['name' => 'asc']);
-        $this->assertSame($this->getDataSetAscSortedByName(), $reader->withSort($sorting)->read());
+        $this->assertSame(
+            $this->getDataSetAscSortedByName(),
+            $reader
+                ->withSort($sorting)
+                ->read(),
+        );
     }
 
     public function testCustomFilter(): void