Merge branch '0.9' into develop

bytic · Mar 26, 2019 · 7450cab · 7450cab
2 parents 4153179 + 7a15985
commit 7450cab
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 48 deletions.
diff --git a/src/Generator/UrlGenerator.php b/src/Generator/UrlGenerator.php
@@ -7,6 +7,7 @@
 use Nip\Router\Generator\Traits\HasPreviousUrlTrait;
 use Nip\Router\Generator\Traits\UrlFunctionTrait;
 use Nip\Router\RequestContext;
+use Nip\Router\Route\Route;
 
 /**
  * Class UrlGenerator
@@ -32,4 +33,38 @@ public function setRequest(Request $request)
         $this->cachedSchema = null;
         return $this->setContext($context);
     }
+
+    public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)
+    {
+        $name = $this->initDefaultRoute($name, $parameters);
+        return parent::generate($name, $parameters, $referenceType);
+    }
+
+
+    /**
+     * @param $name
+     * @param array $params
+     * @return null|Route
+     */
+    protected function initDefaultRoute($name, &$params = [])
+    {
+        $route = $this->routes->get($name);
+        if ($route) {
+            return $name;
+        }
+        $parts = explode(".", $name);
+        $count = count($parts);
+        if ($count <= 3) {
+            if (in_array(reset($parts), app('mvc.modules')->getNames())) {
+                $module = array_shift($parts);
+                $params['controller'] = isset($parts[0]) ? $parts[0] : null;
+                $params['action'] = isset($parts[1]) ? $parts[1] : null;
+                $route = $this->routes->get($module . '.default');
+                if ($route) {
+                    return $route->getName();
+                }
+            }
+        }
+        return $name;
+    }
 }
diff --git a/src/RequestContext/Traits/HasUrlFunctionsTrait.php b/src/RequestContext/Traits/HasUrlFunctionsTrait.php
@@ -80,4 +80,4 @@ public function getHttpHost()
 
         return $this->getHost() . ':' . $port;
     }
-}
+}
diff --git a/src/RouteFactory.php b/src/RouteFactory.php
@@ -87,7 +87,7 @@ public static function generateStandardRoute(
         $name,
         $class,
         $mapPrefix = '',
-        $map = '/:controller/:action',
+        $map = '/{controller}/{action?index}',
         $params = []
     ) {
         return self::generateGenericRoute($collection, $name, $class, $mapPrefix . $map, $params);

diff --git a/src/Router/Traits/HasGeneratorTrait.php b/src/Router/Traits/HasGeneratorTrait.php
@@ -2,6 +2,7 @@
 
 namespace Nip\Router\Router\Traits;
 
+use Nip\Router\Route\Route;
 use Nip\Router\Router;
 
 /**
@@ -13,61 +14,21 @@ trait HasGeneratorTrait
 
     /**
      * @param $name
-     * @param boolean $params
+     * @param array $params
      * @return string|null
      */
     public function assemble($name, $params = [])
     {
-        $route = $this->getDefaultRoute($name, $params);
-
-        if ($route) {
-            $route->setRequest($this->getRequest());
-            return $route->assemble($params);
-        }
-
-        trigger_error("Route \"$name\" not connected", E_USER_ERROR);
-        return null;
+        return $this->generate($name, $params);
     }
 
     /**
      * @param $name
-     * @param boolean $params
+     * @param array $params
      * @return string
      */
     public function assembleFull($name, $params = [])
     {
-        $route = $this->getDefaultRoute($name, $params);
-        if ($route) {
-            $route->setRequest($this->getRequest());
-            return $route->assembleFull($params);
-        }
-
-        trigger_error("Route \"$name\" not connected", E_USER_ERROR);
-
-        return null;
-    }
-
-    /**
-     * @param $name
-     * @param array $params
-     * @return null|Route\Route
-     */
-    public function getDefaultRoute($name, &$params = [])
-    {
-        $route = $this->getRoute($name);
-        if (!$route) {
-            $parts = explode(".", $name);
-            $count = count($parts);
-            if ($count <= 3) {
-                if (in_array(reset($parts), app('mvc.modules')->getNames())) {
-                    $module = array_shift($parts);
-                    $params['controller'] = isset($parts[0]) ? $parts[0] : null;
-                    $params['action'] = isset($parts[1]) ? $parts[1] : null;
-                    $route = $this->getRoute($module . '.default');
-                }
-            }
-        }
-
-        return $route;
+        return $this->generate($name, $params, self::ABSOLUTE_URL);
     }
 }
diff --git a/tests/src/RouteCollections/Traits/CollectionsOperationsTraitTest.php b/tests/src/RouteCollections/Traits/CollectionsOperationsTraitTest.php
@@ -35,4 +35,4 @@ public function testPrependRoute()
         $firstRoute = reset($allRoutes);
         self::assertSame('route3', $firstRoute->getName());
     }
-}
+}
diff --git a/tests/src/Router/Traits/HasGeneratorTraitTest.php b/tests/src/Router/Traits/HasGeneratorTraitTest.php
@@ -2,6 +2,7 @@
 
 namespace Nip\Router\Tests\Router\Traits;
 
+use Nip\Router\Generator\UrlGenerator;
 use Nip\Router\Route\Route;
 use Nip\Router\RouteFactory;
 use Nip\Router\Router;
@@ -14,6 +15,13 @@
  */
 class HasGeneratorTraitTest extends AbstractTest
 {
+
+    public function testGetGenerator()
+    {
+        $router = new Router();
+        self::assertInstanceOf(UrlGenerator::class, $router->getGenerator());
+    }
+
     public function testAssemble()
     {
         $router = new Router();
@@ -28,7 +36,7 @@ public function testAssemble()
         );
 
         self::assertSame(
-            '/api/posts/',
+            '/api/posts',
             $router->assemble('api.index', ['controller' => 'posts'])
         );