Clear the cached facade after internal requests as well.

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

Author: jasonlewis

src/Dispatcher.php

@@ -490,13 +490,7 @@ protected function createRequest($verb, $uri, $parameters)
             $this->version = $this->config->getVersion();
         }
 
-        $groups = $this->router->getApiGroups();
-
-        if (isset($this->domain)) {
-            $api = $groups->getByDomain($this->domain, $this->version);
-        } else {
-            $api = $groups->getByVersion($this->version);
-        }
+        $api = $this->router->getApiGroups()->getByDomainOrVersion($this->domain, $this->version);
 
         if (($prefix = $api->option('prefix')) && ! starts_with($uri, $prefix)) {
             $uri = sprintf('%s/%s', $prefix, $uri);
@@ -586,6 +580,8 @@ protected function refreshRequestStack()
 
         $this->replaceRequestInstance();
 
+        $this->clearCachedFacadeInstance();
+
         $this->raw = false;
 
         $this->version = $this->domain = $this->content = null;

src/Routing/GroupCollection.php

@@ -151,7 +151,7 @@ public function getByDomainOrVersion($domain, $version)
     public function getByOptions($options)
     {
         return array_where($this->groups, function ($key, $collection) use ($options) {
-            if ($collection->matchesDomain($options['domain'], $options['version'])) {
+            if (isset($options['domain']) && $collection->matchesDomain($options['domain'], $options['version'])) {
                 return true;
             } elseif ($collection->matchesVersion($options['version'])) {
                 return true;

src/Routing/Router.php

@@ -154,12 +154,12 @@ protected function setupGroupOptions($options)
 
         $options['version'] = (array) $options['version'];
 
-        if (! isset($options['prefix'])) {
-            $options['prefix'] = $this->config->getPrefix();
+        if (! isset($options['prefix']) && $prefix = $this->config->getPrefix()) {
+            $options['prefix'] = $prefix;
         }
 
-        if (! isset($options['domain'])) {
-            $options['domain'] = $this->config->getDomain();
+        if (! isset($options['domain']) && $domain = $this->config->getDomain()) {
+            $options['domain'] = $domain;
         }
 
         if (isset($options['conditional_request'])) {