Merge pull request #30 from php-api-clients/iterate-pages-bug-not-call-oncomplete-sometimes

Ensure onComplete is called when both next and last link don't have anything for us anymore

Author: WyriHaximus

src/Service/IteratePagesService.php

@@ -55,7 +55,9 @@ public function iterate(string $path): Observable
                     'last' => $parsedLinks->getByRel('last'),
                 ];
 
-                if ($links['next'] === null || $links['last'] === null) {
+                if ($links['next'] === null && $links['last'] === null) {
+                    $paths->onCompleted();
+
                     return;
                 }
 

tests/Service/IteratePagesServiceTest.php

@@ -53,7 +53,15 @@ public function testHandle()
          * Third request.
          */
         $thirdRequest = new Request('GET', 'https://api.example.com/2');
-        $client->request($thirdRequest, Argument::type('array'))->shouldNotBeCalled();
+        $thirdBody = [];
+        $thirdStream = new JsonStream($thirdBody);
+        $thirdHeaders = [
+            'Link' => [
+                '<https://api.example.com/1>; rel="prev"',
+            ],
+        ];
+        $thirdResponse = new Response(200, $thirdHeaders, $thirdStream);
+        $client->request($thirdRequest, Argument::type('array'))->shouldBeCalled()->willReturn(resolve($thirdResponse));
 
         $requestService = new RequestService($client->reveal());
         $testScheduler = new TestScheduler();
@@ -62,8 +70,8 @@ public function testHandle()
         $items = [];
         $completed = false;
 
-        $stream = $iteratePagesService->iterate($path)->take(2)->subscribe(
-            function ($item) use (&$items, &$stream) {
+        $iteratePagesService->iterate($path)->subscribe(
+            function ($item) use (&$items) {
                 $items[] = $item;
             },
             function ($t) {
@@ -77,6 +85,6 @@ function () use (&$completed) {
         $testScheduler->start();
 
         self::assertTrue($completed);
-        self::assertSame([$firstBody, $secondBody], $items);
+        self::assertSame([$firstBody, $secondBody, $thirdBody], $items);
     }
 }