Merge pull request #661 from naderman/fix-ghe-pager

Nyholm · web-flow · commit dc10d86d2141 · 2017-12-11T15:27:06.000+01:00
Fix GitHub Enterprise API Pagination: do not prepend api/vX/ to the path if it already starts that way
diff --git a/lib/Github/HttpClient/Plugin/PathPrepend.php b/lib/Github/HttpClient/Plugin/PathPrepend.php
@@ -28,7 +28,9 @@ public function __construct($path)
     public function handleRequest(RequestInterface $request, callable $next, callable $first)
     {
         $currentPath = $request->getUri()->getPath();
-        $uri = $request->getUri()->withPath($this->path.$currentPath);
+        if (strpos($currentPath, $this->path) !== 0) {
+            $uri = $request->getUri()->withPath($this->path.$currentPath);
+        }
 
         $request = $request->withUri($uri);
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,9 @@ public function __construct($path)`
`28`	`28`	`public function handleRequest(RequestInterface $request, callable $next, callable $first)`
`29`	`29`	`{`
`30`	`30`	`$currentPath = $request->getUri()->getPath();`
`31`		`- $uri = $request->getUri()->withPath($this->path.$currentPath);`
	`31`	`+ if (strpos($currentPath, $this->path) !== 0) {`
	`32`	`+ $uri = $request->getUri()->withPath($this->path.$currentPath);`
	`33`	`+ }`
`32`	`34`
`33`	`35`	`$request = $request->withUri($uri);`
`34`	`36`