public/rmphp-router
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: public:1.0
Branches Tags
public:2.x public:1.x
public:2.1 public:2.0 public:1.2.1 public:1.2 public:1.1 public:1.0
...
compare: public:1.x
Branches Tags
public:2.x public:1.x
public:2.1 public:2.0 public:1.2.1 public:1.2 public:1.1 public:1.0

6 Commits
1.0 ... 1.x

Author SHA1 Message Date
User
d60557e9d6 20240412#1 2024-04-12 02:43:39 +03:00
User
66893b670b 20240410#4 2024-04-10 02:37:25 +03:00
User
0af415b46b 20230926#3 2023-09-26 21:43:24 +03:00
User
5327c96bf1 20230926#3 2023-09-26 21:41:19 +03:00
User
8407b31894 20230626#2 2023-06-26 20:14:31 +03:00
User
9b88375743 20230626#1 2023-06-26 19:58:05 +03:00
3 changed files with 9 additions and 9 deletions
Expand all files Collapse all files

2
README.md
View File

@@ -17,5 +17,5 @@ composer require rmphp/router:"^1.0"
Dev version contains the latest changes
```bash
composer require rmphp/router:"1.0.x-dev"
composer require rmphp/router:"1.x-dev"
```

2
composer.json
View File

@@ -9,7 +9,7 @@
],
"require": {
"php": "^8.1",
"rmphp/foundation": "^1.0"
"rmphp/foundation": "^2.0"
},
"autoload": {
"psr-4": {

14
src/Router.php
View File

@@ -12,10 +12,10 @@ class Router implements RouterInterface {
private string $startPoint = "/";
/**
* @param string $startPoint
* @param string $mountPoint
*/
public function setStartPoint(string $startPoint): void {
$this->startPoint = $startPoint;
public function setStartPoint(string $mountPoint): void {
$this->startPoint = $mountPoint;
}
/**
@@ -29,11 +29,11 @@ class Router implements RouterInterface {
if (!isset($rulesNode['key'], $rulesNode['routes'])) continue;
// преобразуем псевдомаску в реальную маску
// заменяем алиасы на регвыражения
$realPattern = preg_replace("'<([A-z0-9]+?):@any>'", "(?P<$1>.*)", $rulesNode['key']);
$realPattern = preg_replace("'<([A-z0-9]+?):@num>'", "(?P<$1>[0-9]+)", $realPattern);
$realPattern = preg_replace("'<([A-z0-9]+?):@path>'", "(?P<$1>[^/]+)", $realPattern);
$realPattern = preg_replace("'<([A-z0-9_]+?):@any>'", "(?P<$1>.*)", $rulesNode['key']);
$realPattern = preg_replace("'<([A-z0-9_]+?):@num>'", "(?P<$1>[0-9]+)", $realPattern);
$realPattern = preg_replace("'<([A-z0-9_]+?):@path>'", "(?P<$1>[^/]+)", $realPattern);
// поддерживаем свободное регулярное выражение в псевдомаске
$realPattern = preg_replace("'<([A-z0-9]+?):(.+?)>'", "(?P<$1>$2)", $realPattern);
$realPattern = preg_replace("'<([A-z0-9_]+?):(.+?)>'", "(?P<$1>$2)", $realPattern);
// заменяем алиасы на регвыражения
$realPattern = str_replace(["<@any>", "<@num>", "<@path>"], [".*", "[0-9]+", "[^/]+"], $realPattern);
// при наличии слеша в конце правила url должно строго ему соответствовать