as2252258/kiri-router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

qqq

Browse Source
This commit is contained in:
xl
2023-06-12 17:43:15 +08:00
parent a75690d91c
commit 6a30446d1c
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RouterCollector.php
+17 -9
View File
@@ -154,13 +154,13 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
public function register(string $path, string $method, Handler $handler): void public function register(string $path, string $method, Handler $handler): void
{ {
$hashMap = HashMap::Tree($this->methods, $method); $hashMap = HashMap::Tree($this->methods, $method);
// foreach (str_split($path, 4) as $item) { foreach (str_split($path, 4) as $item) {
// if ($hashMap->has($item)) { if ($hashMap->has($item)) {
// $hashMap = $hashMap->get($item); $hashMap = $hashMap->get($item);
// } else { } else {
$hashMap->put($path, $hashMap = new HashMap()); $hashMap->put($path, $hashMap = new HashMap());
// } }
// } }
$hashMap->put('handler', $handler); $hashMap->put('handler', $handler);
$this->registerMiddleware($handler->getClass(), $handler->getMethod()); $this->registerMiddleware($handler->getClass(), $handler->getMethod());
} }
@@ -212,13 +212,21 @@ class RouterCollector implements \ArrayAccess, \IteratorAggregate
*/ */
public function query(string $path, string $method): ?Handler public function query(string $path, string $method): ?Handler
{ {
if (!$this->methods->has($method)) { $parent = $this->methods->get($method);
if ($parent === null) {
return $this->default->get('handler'); return $this->default->get('handler');
} }
if ($method === 'OPTIONS') { if ($method === 'OPTIONS') {
$path = '/*'; $path = '/*';
} }
$parent = $this->methods->get($method);
$lists = str_split($path, 4);
foreach ($lists as $list) {
$parent = $parent->get($list);
if ($parent === null) {
return $this->default->get('handler');
}
}
/** @var HashMap $parent */ /** @var HashMap $parent */
$parent = $parent->get($path, $this->default); $parent = $parent->get($path, $this->default);