update

Author: solocommand

src/Rest/RestRequest.php

@@ -117,11 +117,6 @@ class RestRequest
      */
     private $config;
 
-    /**
-     * @var string
-     */
-    private $uri;
-
     /**
      * Constructor.
      *
@@ -136,10 +131,6 @@ public function __construct(RestConfiguration $config, $method, $uri, $payload =
         $this->uri = $uri;
         $this->requestMethod = strtoupper($method);
 
-        if ($this->config->getRootEndpoint() !== $this->getEndpointPrefix()) {
-            $this->config->setRootEndpoint($this->getEndpointPrefix());
-        }
-
         $this->sorting      = $config->getDefaultSorting();
         $this->pagination   = $config->getDefaultPagination();
 
@@ -163,23 +154,20 @@ public function getUrl()
         return sprintf('%s://%s/%s/%s%s',
             $this->getScheme(),
             trim($this->getHost(), '/'),
-            trim($this->getEndpointPrefix(), '/'),
+            trim($this->config->getRootEndpoint(), '/'),
             $this->getEntityType(),
             empty($query) ? '' : sprintf('?%s', $query)
         );
     }
 
-    protected function getEndpointPrefix()
+    protected function adjustRootEndpoint($path)
     {
-        $path = parse_url($this->uri)['path'];
-        return substr(
-            $path,
-            0,
-            strrpos(
-                $path,
-                $this->config->getRootEndpoint()
-            ) + strlen($this->config->getRootEndpoint())
-        );
+        $root = $this->config->getRootEndpoint();
+        if (0 !== strpos($path, $root)) {
+            $end = strrpos($path, $root) + strlen($root);
+            $endpoint = substr($path, 0, $end);
+            $this->config->setRootEndpoint($endpoint);
+        }
     }
 
     /**
@@ -572,6 +560,8 @@ private function parse($uri)
             throw RestException::invalidEndpoint($this->parsedUri['path']);
         }
 
+        $this->adjustRootEndpoint($this->parsedUri['path']);
+
         $this->parsedUri['path'] = str_replace($this->config->getRootEndpoint(), '', $this->parsedUri['path']);
         $this->parsePath($this->parsedUri['path']);