From c89f6338c28caae52ec5b0159ed8256053e26aa3 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Tue, 8 Aug 2017 10:11:35 +0200
Subject: [PATCH] CS tweaks, refs #6592

---
 src/Composer/Repository/Vcs/GitLabDriver.php        |  6 +++---
 .../Test/Repository/Vcs/GitLabDriverTest.php        | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Composer/Repository/Vcs/GitLabDriver.php b/src/Composer/Repository/Vcs/GitLabDriver.php
index 9de8e5f96..bfd3b894a 100644
--- a/src/Composer/Repository/Vcs/GitLabDriver.php
+++ b/src/Composer/Repository/Vcs/GitLabDriver.php
@@ -447,12 +447,12 @@ class GitLabDriver extends VcsDriver
         return true;
     }
 
-    protected function getNextPage()
+    private function getNextPage()
     {
         $headers = $this->remoteFilesystem->getLastHeaders();
         foreach ($headers as $header) {
-            if (substr($header, 0, 5) === 'Link:') {
-                $links = explode(',', substr($header, 5));
+            if (preg_match('{^link:\s*(.+?)\s*$}i', $header, $match)) {
+                $links = explode(',', $match[1]);
                 foreach ($links as $link) {
                     if (preg_match('{<(.+?)>; *rel="next"}', $link, $match)) {
                         return $match[1];
diff --git a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
index c5d1c8357..66b457054 100644
--- a/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
+++ b/tests/Composer/Test/Repository/Vcs/GitLabDriverTest.php
@@ -217,8 +217,8 @@ JSON;
             ->shouldBeCalledTimes(1)
         ;
         $this->remoteFilesystem->getLastHeaders()
-          ->willReturn(array());
-        
+            ->willReturn(array());
+
         $driver->setRemoteFilesystem($this->remoteFilesystem->reveal());
 
         $expected = array(
@@ -268,8 +268,11 @@ JSON;
         ;
 
         $this->remoteFilesystem->getLastHeaders()
-          ->willReturn(array('Link: <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20>; rel="next", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=1&per_page=20>; rel="first", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=3&per_page=20>; rel="last"'), array('Link: <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20>; rel="prev", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=1&per_page=20>; rel="first", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=3&per_page=20>; rel="last"'))
-          ->shouldBeCalledTimes(2);
+            ->willReturn(
+                array('Link: <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20>; rel="next", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=1&per_page=20>; rel="first", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=3&per_page=20>; rel="last"'),
+                array('Link: <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=2&per_page=20>; rel="prev", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=1&per_page=20>; rel="first", <http://gitlab.com/api/v4/projects/mygroup%2Fmyproject/repository/tags?id=mygroup%2Fmyproject&page=3&per_page=20>; rel="last"')
+            )
+            ->shouldBeCalledTimes(2);
 
         $driver->setRemoteFilesystem($this->remoteFilesystem->reveal());
 
@@ -314,7 +317,7 @@ JSON;
             ->shouldBeCalledTimes(1)
         ;
         $this->remoteFilesystem->getLastHeaders()
-          ->willReturn(array());
+            ->willReturn(array());
 
         $driver->setRemoteFilesystem($this->remoteFilesystem->reveal());