v1.4.1 Release

ルーティング設定のグルーピング機能追加

Author: socket-manager

app/InitClass/InitForRestApi.php

@@ -76,6 +76,7 @@ public function __construct(ParameterForRestApi $p_unit_parameter, array $p_rout
         if($p_routing === [])
         {
             $this->routing['routes'] = [];
+            $this->routing['expect'] = null;
             $this->routing['mismatch'] = null;
         }
         $this->parsers = $p_parsers;
@@ -159,14 +160,16 @@ public function getCommandDispatcher()
                     continue;
                 }
 
-                $uri = trim($route['uri'], '/');
+                $base_uri = trim($route['uri'], '/');
+                $uri = trim($route['prefix'] . $route['uri'], '/');
 
                 /**
                  * URI 全体正規表現ルート
                  */
-                if(preg_match('/^:(.+):$/', $uri, $m))
+                if(preg_match('/^:(.+):$/', $base_uri, $m))
                 {
                     $regex = $m[1];
+                    $regex = $route['prefix'] . $regex;
                     $regex = trim($regex, '/');
 
                     $regex = str_replace('/', '\\/', $regex);

app/MainClass/MainForRestApi.php

@@ -171,6 +171,40 @@ public function exec()
         }
         $ins_command = new $class_command();
 
+        /**
+         * ルーティングのパース
+         */
+        $flat_routing = [];
+        foreach($conf_routing['routes'] as $route)
+        {
+            // グループ形式
+            if(isset($route['group']))
+            {
+                $prefix = $route['uri'];
+                foreach($route['group'] as $child)
+                {
+                    $flat_routing[] = [
+                        'prefix' => $prefix,
+                        'method' => $child['method'],
+                        'uri'    => $child['uri'],
+                        'event'  => $child['event'],
+                    ];
+                }
+            }
+
+            // 単独ルート
+            else
+            {
+                $flat_routing[] = [
+                    'prefix' => '',
+                    'method' => $route['method'],
+                    'uri'    => $route['uri'],
+                    'event'  => $route['event'],
+                ];
+            }
+        }
+        $conf_routing['routes'] = $flat_routing;
+
         $queues = [];
         foreach($conf_routing['routes'] as $route)
         {