Merge b4b83c1 into 7872c61

composer.json

@@ -14,8 +14,7 @@
     }
   ],
   "require": {
-    "psr/cache": "^1.0",
-    "bavix/slice": "^1.0"
+    "psr/cache": "^1.0"
   },
   "require-dev": {
     "tedivm/stash": "^0.14",
@@ -33,10 +32,7 @@
   "autoload": {
     "psr-4": {
       "Bavix\\": "src/"
-    },
-    "files": [
-      "libs/helper.php"
-    ]
+    }
   },
   "autoload-dev": {
     "psr-4": {

demo/build.php

@@ -0,0 +1,7 @@
+<?php
+
+include_once \dirname(__DIR__) . '/vendor/autoload.php';
+
+var_dump(\Bavix\Router\Server::url('/hello')); // https://cli/hello
+var_dump(\Bavix\Router\Server::url('/hello', 'router.local'));
+var_dump(\Bavix\Router\Server::url('/hello', 'router.local', 'cli')); // https://cli/hello

demo/global.php

@@ -4,7 +4,7 @@
 
     'http' => [
 
-        'type'   => 'http',
+        'type'   => 'prefix',
 
         'protocol' => 'http', // optional null
         'host'     => '(.+\.)?example.com', // optional null
@@ -82,7 +82,7 @@
     'default' => [
         'type' => 'pattern',
         'path' => [
-            '/<any:\w+>',
+            '/<any>',
             [
                 'any' => '.*'
             ]

demo/groups.php

@@ -0,0 +1,10 @@
+<?php
+
+include_once \dirname(__DIR__) . '/vendor/autoload.php';
+
+$group = new \Bavix\Router\Group('/api', function (\Bavix\Router\GroupResolution $route) {
+    $route->get('/hello');
+    $route->resource('/users');
+});
+
+var_dump((new \Bavix\Router\Loader($group->toArray()))->simplify());

demo/index.php

@@ -12,11 +12,12 @@
 $route = $router->getCurrentRoute();
 
 var_dump(
-    \Bavix\Router\route($route),
     $route->getAttributes(),
     $route->getDefaults(),
-    $route->getHttp(),
+    $route->getProtocol(),
+    $route->getHost(),
     $route->getPath(),
-    $route->getRegex(),
-    $route->getRegexPath()
+    $route->getPattern(),
+    $route->getPathPattern(),
+    $route->getName()
 );

demo/loader-v2.php

@@ -0,0 +1,9 @@
+<?php
+
+include_once dirname(__DIR__) . '/vendor/autoload.php';
+
+$loader = new \Bavix\Router\Loader(require __DIR__ . '/global.php');
+
+foreach ($loader->simplify() as $key => $route) {
+    var_dump([$key => $route]);
+}

demo/loader.php

@@ -5,10 +5,10 @@
 $driver = new \Stash\Driver\FileSystem();
 $pool   = new \Stash\Pool($driver);
 
-//$loader = new \Bavix\SDK\FileLoader\PHPLoader(__DIR__ . '/global.php');
+$loader = new \Bavix\SDK\FileLoader\PHPLoader(__DIR__ . '/global.php');
 //$loader = new \Bavix\SDK\FileLoader\JSONLoader(__DIR__ . '/global.json');
 //$loader = new \Bavix\SDK\FileLoader\YamlLoader(__DIR__ . '/global.yaml');
-$loader = new \Bavix\SDK\FileLoader\XmlLoader(__DIR__ . '/global.xml');
+//$loader = new \Bavix\SDK\FileLoader\XmlLoader(__DIR__ . '/global.xml');
 $slice = $loader->asSlice();
 
 $router = new \Bavix\Router\Router($slice, $pool);

demo/pattern.php

@@ -0,0 +1,4 @@
+<?php
+
+include_once \dirname(__DIR__) . '/vendor/autoload.php';
+