Fixed request targetting API returning false positives for APIs not operating under a prefix or domain.

Signed-off-by: Jason Lewis <[email protected]>

Author: jasonlewis

src/Routing/Router.php

@@ -400,7 +400,23 @@ public function requestTargettingApi($request = null)
 			return true;
 		}
 
-		return $this->getApiRouteCollectionFromRequest($request) instanceof ApiRouteCollection;
+		if ($collection = $this->getApiRouteCollectionFromRequest($request))
+		{
+			try
+			{
+				$collection->match($request);
+
+				return true;
+			}
+			catch (NotFoundHttpException $exception)
+			{
+				// If we don't find a matching route then we'll let this
+				// fall through so that false is returned as the
+				// request is not targetting the API.
+			}
+		}
+
+		return false;
 	}
 
 	/**

tests/RoutingRouterTest.php

@@ -342,4 +342,17 @@ public function testRouterIgnoresRouteGroupsWithAnApiPrefix()
 	}
 
 
+	public function testRequestTargettingAnApiWithNoPrefixOrDomain()
+	{
+		$this->router->get('/', function() { return 'foo'; });
+
+		$this->router->api(['version' => 'v1'], function()
+		{
+			$this->router->get('foo', function() { return 'bar'; });
+		});
+
+		$this->assertFalse($this->router->requestTargettingApi(Request::create('/', 'GET')));
+	}
+
+
 }