geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-10 21:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Development + bugfixes

Browse Source
This commit is contained in:
Simon Sessingø
2016-11-15 03:43:26 +01:00
parent 6de0700e17
commit d5e7a13d89
20 changed files with 472 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterEntry.php
+75 -114
View File
@@ -14,24 +14,22 @@ abstract class RouterEntry {
const REQUEST_TYPE_PATCH = 'patch';
const REQUEST_TYPE_DELETE = 'delete';
public static $allowedRequestTypes = array(
public static $allowedRequestTypes = [
self::REQUEST_TYPE_DELETE,
self::REQUEST_TYPE_GET,
self::REQUEST_TYPE_POST,
self::REQUEST_TYPE_PUT,
self::REQUEST_TYPE_PATCH
);
self::REQUEST_TYPE_PATCH,
];
protected $settings = [
'requestMethods' => array(),
'where' => array(),
'parameters' => array(),
];
protected $settings;
protected $callback;
public function __construct() {
$this->settings = array();
$this->settings['requestMethods'] = array();
$this->settings['where'] = array();
$this->settings['parameters'] = array();
}
/**
* Returns callback name/identifier for the current route based on the callback.
* Useful if you need to get a unique identifier for the loaded route, for instance
@@ -48,7 +46,7 @@ abstract class RouterEntry {
/**
* @param string $callback
* @return self;
* @return static
*/
public function setCallback($callback) {
$this->callback = $callback;
@@ -90,50 +88,43 @@ abstract class RouterEntry {
/**
* @param string $prefix
* @return self
*/
* @return static
*
public function setPrefix($prefix) {
$this->prefix = '/' . ltrim($prefix, '/');
$this->settings['prefix'] = '/' . ltrim($prefix, '/');
return $this;
}
}*/
/**
* @param string $middleware
* @return self
* @return static
*/
public function setMiddleware($middleware) {
$this->middleware = $middleware;
$this->settings['middleware'] = $middleware;
return $this;
}
/**
* @param string $namespace
* @return self
* @return static
*/
public function setNamespace($namespace) {
$this->namespace = $namespace;
$this->settings['namespace'] = $namespace;
return $this;
}
/**
* @return string
*/
public function getPrefix() {
return $this->prefix;
}
/**
* @return string|array
*/
public function getMiddleware() {
return $this->middleware;
return $this->settingArray('middleware');
}
/**
* @return string
*/
public function getNamespace() {
return $this->namespace;
return $this->setting('namespace');
}
/**
@@ -144,18 +135,18 @@ abstract class RouterEntry {
}
/**
* @return mixed
* @return array
*/
public function getParameters(){
return ($this->parameters === null) ? array() : $this->parameters;
return $this->setting('parameters', array());
}
/**
* @param mixed $parameters
* @return self
* @return static
*/
public function setParameters($parameters) {
$this->parameters = $parameters;
$this->settings['parameters'] = $parameters;
return $this;
}
@@ -163,10 +154,10 @@ abstract class RouterEntry {
* Add regular expression parameter match
*
* @param array $options
* @return self
* @return static
*/
public function where(array $options) {
$this->where = array_merge($this->where, $options);
$this->settings['where'] = array_merge($this->settings['where'], $options);
return $this;
}
@@ -174,10 +165,10 @@ abstract class RouterEntry {
* Add regular expression match for url
*
* @param string $regex
* @return self
* @return static
*/
public function match($regex) {
$this->regexMatch = $regex;
$this->settings['regexMatch'] = $regex;
return $this;
}
@@ -187,60 +178,27 @@ abstract class RouterEntry {
* @return array
*/
public function getMergeableSettings() {
$settings = $this->settings;
if(isset($settings['prefix'])) {
unset($settings['prefix']);
}
return $settings;
return $this->settings;
}
/**
* @param array $settings
* @return self
* @return static
*/
public function addSettings(array $settings = null) {
if(is_array($settings)) {
$this->settings = array_merge($this->settings, $settings);
}
public function addSettings(array $settings) {
$this->settings = array_merge($this->settings, $settings);
return $this;
}
/**
* @param array $settings
* @return self
* @return static
*/
public function setSettings($settings) {
$this->settings = $settings;
if(isset($settings['prefix'])) {
$this->setPrefix($settings['prefix']);
}
return $this;
}
/**
* Dynamically access settings value
*
* @param $name
* @return mixed|null
*/
public function __get($name) {
return (isset($this->settings[$name]) ? $this->settings[$name] : null);
}
/**
* Dynamically set settings value
*
* @param string $name
* @param mixed|null $value
*/
public function __set($name, $value = null) {
$this->settings[$name] = $value;
}
protected function loadClass($name) {
if(!class_exists($name)) {
throw new RouterException(sprintf('Class %s does not exist', $name));
@@ -273,8 +231,8 @@ abstract class RouterEntry {
// Check for optional parameter
// Use custom parameter regex if it exists
if(is_array($this->where) && isset($this->where[$parameter])) {
$parameterRegex = $this->where[$parameter];
if(is_array($this->setting('where')) && isset($this->settings['where'][$parameter])) {
$parameterRegex = $this->settings['where'][$parameter];
}
if($lastCharacter === '?') {
@@ -284,7 +242,12 @@ abstract class RouterEntry {
} else {
$regex .= '\/?(?P<' . $parameter . '>'. $parameterRegex .')[^\/]?';
}
$parameterNames[] = array('name' => $parameter, 'required' => $required);
$parameterNames[] = [
'name' => $parameter,
'required' => $required
];
$parameter = '';
$isParameter = false;
@@ -307,21 +270,19 @@ abstract class RouterEntry {
$max = count($parameterNames);
if($max) {
for($i = 0; $i < $max; $i++) {
$name = $parameterNames[$i];
$parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
for($i = 0; $i < $max; $i++) {
$name = $parameterNames[$i];
$parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
if($name['required'] && $parameterValue === null) {
throw new RouterException('Missing required parameter ' . $name['name'], 404);
}
if(!$name['required'] && $parameterValue === null) {
continue;
}
$parameters[$name['name']] = $parameterValue;
if($name['required'] && $parameterValue === null) {
throw new RouterException('Missing required parameter ' . $name['name'], 404);
}
if(!$name['required'] && $parameterValue === null) {
continue;
}
$parameters[$name['name']] = $parameterValue;
}
return $parameters;
@@ -331,21 +292,11 @@ abstract class RouterEntry {
}
public function loadMiddleware(Request $request) {
if($this->getMiddleware()) {
if(is_array($this->getMiddleware())) {
foreach($this->getMiddleware() as $middleware) {
$middleware = $this->loadClass($middleware);
if (!($middleware instanceof IMiddleware)) {
throw new RouterException($middleware . ' must be instance of Middleware');
}
/* @var $class IMiddleware */
$middleware->handle($request);
}
} else {
$middleware = $this->loadClass($this->getMiddleware());
if(count($this->getMiddleware())) {
foreach($this->getMiddleware() as $middleware) {
$middleware = $this->loadClass($middleware);
if (!($middleware instanceof IMiddleware)) {
throw new RouterException($this->getMiddleware() . ' must be instance of Middleware');
throw new RouterException($middleware . ' must be instance of Middleware');
}
/* @var $class IMiddleware */
@@ -371,7 +322,7 @@ abstract class RouterEntry {
}
$parameters = array_filter($this->getParameters(), function($var){
return !is_null($var);
return ($var !== null);
});
call_user_func_array(array($class, $method), $parameters);
@@ -386,7 +337,7 @@ abstract class RouterEntry {
* Set allowed request methods
*
* @param array $methods
* @return self $this
* @return static $this
*/
public function setRequestMethods(array $methods) {
$this->settings['requestMethods'] = $methods;
@@ -399,22 +350,32 @@ abstract class RouterEntry {
* @return array
*/
public function getRequestMethods() {
if(!isset($this->settings['requestMethods']) || isset($this->settings['requestMethods']) && !is_array($this->settings['requestMethods'])) {
$value = isset($this->settings['requestMethods']) ? $this->settings['requestMethods'] : null;
return array($value);
}
return $this->settings['requestMethods'];
return $this->settingArray('requestMethods');
}
public function getGroup() {
return $this->group;
return $this->setting('group');
}
public function setGroup($group) {
$this->group = $group;
$this->settings['group'] = $group;
return $this;
}
protected function setting($name, $defaultValue = null) {
return isset($this->settings[$name]) ? $this->settings[$name] : $defaultValue;
}
protected function settingArray($name) {
$value = $this->setting($name);
if($value === null) {
return [];
}
return (!is_array($value)) ? array($value) : $value;
}
abstract function matchRoute(Request $request);
}