Merge branch 'develop'

shlinkio · Oct 23, 2016 · 48acded · 48acded
2 parents 27b08ff + 6821f5c
commit 48acded
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/module/Rest/src/Middleware/PathVersionMiddleware.php b/module/Rest/src/Middleware/PathVersionMiddleware.php
@@ -37,6 +37,11 @@ public function __invoke(Request $request, Response $response, callable $out = n
         $uri = $request->getUri();
         $path = $uri->getPath();
 
+        // Exclude non-rest route
+        if (strpos($path, '/rest') !== 0) {
+            return $out($request, $response);
+        }
+
         // If the path does not begin with the version number, prepend v1 by default for retrocompatibility purposes
         if (strpos($path, '/rest/v') !== 0) {
             $parts = explode('/', $path);

diff --git a/module/Rest/test/Middleware/PathVersionMiddlewareTest.php b/module/Rest/test/Middleware/PathVersionMiddlewareTest.php
@@ -44,4 +44,16 @@ public function versionOneIsPrependedWhenNoVersionIsDefined()
             $this->assertEquals('/rest/v1/bar/baz', $req->getUri()->getPath());
         });
     }
+
+    /**
+     * @test
+     */
+    public function nonRestPathsAreNotProcessed()
+    {
+        $request = ServerRequestFactory::fromGlobals()->withUri(new Uri('/non-rest'));
+        $test = $this;
+        $this->middleware->__invoke($request, new Response(), function ($req) use ($request, $test) {
+            $test->assertSame($request, $req);
+        });
+    }
 }