Wojtek/router
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust code for php 8

Browse Source 
Adds new public method
This commit is contained in:
Wojciech Burda
2024-02-15 22:50:07 +01:00
parent d8e1bbe920
commit 1ff6be602e
5 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -3,10 +3,10 @@ Simple routing library for web applications.
# Usage
1. Require kavalanche/security
1. Require kavalanche/router
```bash
composer require kavalanche/security
composer require kavalanche/router
```
2. Create `Router` instance.
composer.json
+22 -22
View File
@@ -1,22 +1,22 @@
{
"name": "kavalanche/router",
"description": "Router component for web applications",
"type": "library",
"authors": [
{
"name": "Wojtek",
"email": "w.lk@wp.pl"
}
],
"autoload": {
"psr-4": {
"Kavalanche\\Router\\": "src/"
}
},
"require": {
},
"require-dev": {
"phpunit/phpunit": "^8.4"
}
}
{
"name": "kavalanche/router",
"description": "Router component for web applications",
"type": "library",
"authors": [
{
"name": "Wojtek",
"email": "w.lk@wp.pl"
}
],
"autoload": {
"psr-4": {
"Kavalanche\\Router\\": "src/"
}
},
"require": {
},
"require-dev": {
"phpunit/phpunit": "^8.4"
}
}
src/Route.php
+4 -2
View File
@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Kavalanche\Router;
/**
@@ -7,8 +9,8 @@ namespace Kavalanche\Router;
*/
class Route {
public $method;
public $path;
public string $method;
public string $path;
public $callback;
}
src/RouteNotFoundException.php
+2
View File
@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Kavalanche\Router;
/**
src/Router.php
+23 -14
View File
@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Kavalanche\Router;
/**
@@ -7,13 +9,13 @@ namespace Kavalanche\Router;
*/
class Router {
private $allowedMethods = [
private array $allowedMethods = [
'get',
'post'
];
private $routes = [];
private array $routes = [];
public function request($method, $path, $callback) {
public function request(string $method, string $path, callable $callback) {
$route = new Route();
$route->method = $method;
$route->path = $path;
@@ -21,11 +23,11 @@ class Router {
$this->routes[] = $route;
}
public function get($path, $callback) {
public function get(string $path, callable $callback) {
return $this->request('get', $path, $callback);
}
public function post($path, $callback) {
public function post(string $path, callable $callback) {
return $this->request('post', $path, $callback);
}
@@ -35,19 +37,26 @@ class Router {
foreach ($this->routes as $route) {
$path = str_replace('/', '\/', $route->path);
$path = '/^' . $path . '\/?$/';
if (in_array($requestMethod, $this->allowedMethods, true)) {
if ($requestMethod === $route->method) {
if (preg_match($path, $requestUri['path'], $params) === 1) {
array_shift($params);
call_user_func_array($route->callback, $params);
exit;
}
}
if (in_array($requestMethod, $this->allowedMethods, true) && $requestMethod === $route->method && preg_match($path, $requestUri['path'], $params) === 1) {
array_shift($params);
call_user_func_array($route->callback, $params);
exit;
}
}
http_response_code(404);
throw new RouteNotFoundException('Route not found!');
exit;
}
public function isRequestInRoutes(): bool {
$requestMethod = strtolower($_SERVER['REQUEST_METHOD']);
$requestUri = parse_url($_SERVER['REQUEST_URI']);
foreach ($this->routes as $route) {
$path = str_replace('/', '\/', $route->path);
$path = '/^' . $path . '\/?$/';
if (in_array($requestMethod, $this->allowedMethods, true) && $requestMethod === $route->method && preg_match($path, $requestUri['path'], $params) === 1) {
return true;
}
}
return false;
}
}