Merge remote-tracking branch 'origin/master'

Author: WyriHaximus

composer.json

@@ -20,6 +20,7 @@
     "api-clients/rx": "^2.1",
     "api-clients/rx-operators": "^2.0",
     "api-clients/transport": "^3.0",
+    "kelunik/link-header-rfc5988": "^1.0",
     "react/promise-stream": "^0.1.1",
     "wyrihaximus/react-stream-base64": "^1.0",
     "wyrihaximus/react-stream-json": "^1.0"

composer.lock

@@ -9,6 +9,7 @@
 use Rx\Observable;
 use Rx\Scheduler;
 use Rx\Subject\Subject;
+use function Kelunik\LinkHeaderRfc5988\parseLinks;
 
 class IteratePagesService
 {
@@ -46,23 +47,18 @@ public function iterate(string $path): Observable
                     return;
                 }
 
+                $parsedLinks = parseLinks($response->getHeaderLine('link'));
                 $links = [
-                    'next' => false,
-                    'last' => false,
+                    'next' => $parsedLinks->getByRel('next'),
+                    'last' => $parsedLinks->getByRel('last'),
                 ];
-                foreach (explode(', ', $response->getHeader('link')[0]) as $link) {
-                    list($url, $rel) = explode('>; rel="', ltrim(rtrim($link, '"'), '<'));
-                    if (isset($links[$rel])) {
-                        $links[$rel] = $url;
-                    }
-                }
 
-                if ($links['next'] === false || $links['last'] === false) {
+                if ($links['next'] === null || $links['last'] === null) {
                     return;
                 }
 
                 $this->scheduler->schedule(function () use ($paths, $links) {
-                    $paths->onNext($links['next']);
+                    $paths->onNext($links['next']->getUri());
                 });
             })
             ->map(function (ResponseInterface $response) {