Merge pull request #23 from huntie/routing-updates

Extended router fixes

src/JsonApiServiceProvider.php → src/Providers/JsonApiServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Huntie\JsonApi;
+namespace Huntie\JsonApi\Providers;
 
 use Illuminate\Support\ServiceProvider;
 

src/Routing/KernelRouterAssociation.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Huntie\JsonApi\Routing;
+
+trait KernelRouterAssociation
+{
+    /**
+     * Get the route dispatcher callback.
+     *
+     * @return \Closure
+     */
+    protected function dispatchToRouter()
+    {
+        // Whilst Laravel provides the package Router instance within all app
+        // code, it is hardcoded in the base Kernel class and needs to be set
+        // directly here when we are using custom JSON API router extensions.
+        parent::__construct($this->app, $this->app['router']);
+
+        return parent::dispatchToRouter();
+    }
+}