Allow the user to connect pipes

Author: na2axl

src/WaterPipe/HTTP/Request/RequestUri.php

@@ -168,6 +168,13 @@ public static function pattern2regex(string $pattern): string
         return preg_replace(self::URI_PARAM_PATTERN, "([a-zA-Z0-9-_\.]+)", $pattern);
     }
 
+    public static function makeUri(...$parts)
+    {
+        $uri = implode("/", $parts);
+
+        return "/" . trim(preg_replace("#/+#", "/", $uri), "/");
+    }
+
     /**
      * Whether a offset exists
      * @link http://php.net/manual/en/arrayaccess.offsetexists.php

src/WaterPipe/WaterPipe.php

@@ -174,8 +174,8 @@ private function _runBase(string $baseUri)
     private function _findSubPipe()
     {
         foreach ($this->_pipesRegistry as $baseUri => $pipe) {
-            if (preg_match("#^" . RequestUri::pattern2regex($baseUri) . "#", Request::getInstance()->uri->getUri())) {
-                return array($baseUri, $pipe);
+            if (preg_match("#^" . RequestUri::makeUri($this->_baseUri, RequestUri::pattern2regex($baseUri)) . "#", Request::getInstance()->uri->getUri())) {
+                return array(RequestUri::makeUri($this->_baseUri, $baseUri), $pipe);
             }
         }
 
@@ -246,7 +246,7 @@ private function _getActionForRoutes(array $routes)
         $runner = null;
 
         foreach ($routes as $pattern => $action) {
-            if (RequestUri::isMatch($pattern = "/" . trim($this->_baseUri . $pattern, "/"), Request::getInstance()->uri->getUri())) {
+            if (RequestUri::isMatch($pattern = RequestUri::makeUri($this->_baseUri, $pattern), Request::getInstance()->uri->getUri())) {
                 Request::getInstance()->uri->setPattern($pattern)->build();
                 $runner = $action;
                 break;