Throw an Exception for invalid API version

When requesting invalid API version, throw an exception which gets transformed into JSON response.

Author: Andreyco

src/Routing/GroupCollection.php

@@ -4,6 +4,7 @@
 
 use Dingo\Api\Config;
 use Illuminate\Http\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 class GroupCollection
 {
@@ -31,8 +32,7 @@ class GroupCollection
     /**
      * Create a new version collection instance.
      *
-     * @param \Dingo\Api\Config $config
-     *
+     * @param  \Dingo\Api\Config  $config
      * @return void
      */
     public function __construct(Config $config)
@@ -43,9 +43,8 @@ public function __construct(Config $config)
     /**
      * Add a group to the collection.
      *
-     * @param string $version
-     * @param array  $options
-     *
+     * @param  string  $version
+     * @param  array  $options
      * @return \Dingo\Api\Routing\RouteCollection
      */
     public function add($version, array $options)
@@ -58,8 +57,7 @@ public function add($version, array $options)
     /**
      * Determine if the version exists on the collection.
      *
-     * @param string $version
-     *
+     * @param  string  $version
      * @return bool
      */
     public function has($version)
@@ -70,8 +68,7 @@ public function has($version)
     /**
      * Get a matching API route collection from the request.
      *
-     * @param \Illuminate\Http\Request $request
-     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Dingo\Api\Routing\RouteCollection|null
      */
     public function getByRequest(Request $request)
@@ -94,23 +91,28 @@ public function getDefault()
     /**
      * Get an API route collection for a given version.
      *
-     * @param string $version
-     *
+     * @param  string  $version
      * @return \Dingo\Api\Routing\RouteCollection|null
+     * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
      */
     public function getByVersion($version)
     {
-        return array_first($this->groups, function ($key, $collection) use ($version) {
+        $group = array_first($this->groups, function ($key, $collection) use ($version) {
             return $collection->matchesVersion($version);
         });
+
+        if (is_null($group)) {
+            throw new BadRequestHttpException("Requested API version is invalid.");
+        }
+
+        return $group;
     }
 
     /**
      * Get an API route collection for a given domain and optionally a version.
      *
-     * @param string $domain
-     * @param string $version
-     *
+     * @param  string  $domain
+     * @param  string  $version
      * @return \Dingo\Api\Routing\RouteCollection|null
      */
     public function getByDomain($domain, $version = null)
@@ -127,9 +129,8 @@ public function getByDomain($domain, $version = null)
     /**
      * Get an aPI route collection for a given domain or a given version.
      *
-     * @param string $domain
-     * @param string $version
-     *
+     * @param  string  $domain
+     * @param  string  $version
      * @return \Dingo\Api\Routing\RouteCollection|null
      */
     public function getByDomainOrVersion($domain, $version)
@@ -144,8 +145,7 @@ public function getByDomainOrVersion($domain, $version)
     /**
      * Get an API route collection for a given array of options.
      *
-     * @param array $options
-     *
+     * @param  array  $options
      * @return array
      */
     public function getByOptions($options)