Fixes

nicollassilva · Jun 10, 2021 · fcf2008 · fcf2008
1 parent 5eb5e7d
commit fcf2008
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -63,15 +63,13 @@ protected function resolveHeaders()
      * Method responsible for returning the
      * current route in parts.
      * 
-     * @return array|string|null
+     * @return string|null|array
      */
     protected function getParsedRoute(?String $data = null)
     {
         $parsedRoute = parse_url($this->fullUrl ?? "/");
 
-        if (empty($data)) {
-            return $parsedRoute;
-        }
+        if (empty($data)) return $parsedRoute;
 
         if (isset($parsedRoute[$data])) {
             return $parsedRoute[$data];
@@ -84,7 +82,7 @@ protected function getParsedRoute(?String $data = null)
      * Method responsible for returning
      * the current route path.
      * 
-     * @return string|array
+     * @return string
      */
     public function path()
     {
@@ -190,7 +188,7 @@ public function __get(String $data)
      */
     protected function resolveRouteData(String $route, array $routeParams): void
     {
-        $params = $this->path();
+        $params = (string) $this->path();
 
         $diff = array_diff(explode('/', $params), explode('/', $route));
 

diff --git a/src/Router/Middlewares/MiddlewareCollection.php b/src/Router/Middlewares/MiddlewareCollection.php
@@ -123,7 +123,11 @@ public function execute()
      */
     protected function executeMiddleware()
     {
-        $middlewares = explode(',', $this->middlewares);
+        $middlewares = $this->middlewares;
+
+        if(is_string($middlewares)) {
+            $middlewares = explode(',', $middlewares);
+        }
 
         $this->resolveNestedMiddleware($middlewares);
 

diff --git a/src/Router/RouteManager.php b/src/Router/RouteManager.php
@@ -297,7 +297,7 @@ protected function setName(String $value)
     /**
      * Get the route default name.
      * 
-     * @return void
+     * @return string|null
      */
     protected function getDefaultName()
     {