mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-07-11 21:22:17 +00:00
Removed PHP 7 specific functionality.
This commit is contained in:
@@ -92,8 +92,7 @@ composer require pecee/simple-router
|
|||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
- PHP 5.4 or greater
|
- PHP 5.5 or greater
|
||||||
- mcrypt extension
|
|
||||||
|
|
||||||
## Notes
|
## Notes
|
||||||
|
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ class Input
|
|||||||
*/
|
*/
|
||||||
public function findPost($index, $defaultValue = null)
|
public function findPost($index, $defaultValue = null)
|
||||||
{
|
{
|
||||||
return $this->post[$index] ?? $defaultValue;
|
return isset($this->post[$index]) ? $this->post[$index] : $defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -175,7 +175,7 @@ class Input
|
|||||||
*/
|
*/
|
||||||
public function findFile($index, $defaultValue = null)
|
public function findFile($index, $defaultValue = null)
|
||||||
{
|
{
|
||||||
return $this->file[$index] ?? $defaultValue;
|
return isset($this->file[$index]) ? $this->file[$index] : $defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -187,7 +187,7 @@ class Input
|
|||||||
*/
|
*/
|
||||||
public function findGet($index, $defaultValue = null)
|
public function findGet($index, $defaultValue = null)
|
||||||
{
|
{
|
||||||
return $this->get[$index] ?? $defaultValue;
|
return isset($this->get[$index]) ? $this->get[$index] : $defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ class Request
|
|||||||
|
|
||||||
public function __get($name)
|
public function __get($name)
|
||||||
{
|
{
|
||||||
return $this->data[$name] ?? null;
|
return isset($this->data[$name]) ? $this->data[$name] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -121,7 +121,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
|
|||||||
$param = $keys[$i];
|
$param = $keys[$i];
|
||||||
$value = $params[$param];
|
$value = $params[$param];
|
||||||
|
|
||||||
$value = $parameters[$param] ?? $value;
|
$value = isset($parameters[$param]) ? $parameters[$param] : $value;
|
||||||
|
|
||||||
if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
|
if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
|
||||||
$url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
|
$url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ abstract class Route implements IRoute
|
|||||||
|
|
||||||
$name = $parameterNames[$i];
|
$name = $parameterNames[$i];
|
||||||
|
|
||||||
$parameterValue = $parameterValues[$name['name']] ?? null;
|
$parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
|
||||||
|
|
||||||
if ($parameterValue === null && $name['required']) {
|
if ($parameterValue === null && $name['required']) {
|
||||||
throw new HttpException('Missing required parameter ' . $name['name'], 404);
|
throw new HttpException('Missing required parameter ' . $name['name'], 404);
|
||||||
@@ -386,7 +386,7 @@ abstract class Route implements IRoute
|
|||||||
if (count($this->parameters) > 0) {
|
if (count($this->parameters) > 0) {
|
||||||
|
|
||||||
/* Ensure the right order + values */
|
/* Ensure the right order + values */
|
||||||
$parameters = ($values['parameters'] ?? []) + $this->parameters;
|
$parameters = (isset($values['parameters']) ? $values['parameters'] : []) + $this->parameters;
|
||||||
$parameters = array_merge($parameters, $this->parameters);
|
$parameters = array_merge($parameters, $this->parameters);
|
||||||
|
|
||||||
$this->setParameters($parameters);
|
$this->setParameters($parameters);
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
|
|||||||
|
|
||||||
$parameters = array_merge($this->parameters, (array)$parameters);
|
$parameters = array_merge($this->parameters, (array)$parameters);
|
||||||
|
|
||||||
$action = $parameters['action'] ?? null;
|
$action = isset($parameters['action']) ? $parameters['action'] : null;
|
||||||
unset($parameters['action']);
|
unset($parameters['action']);
|
||||||
|
|
||||||
$method = $request->getMethod();
|
$method = $request->getMethod();
|
||||||
|
|||||||
Reference in New Issue
Block a user