geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-06-17 08:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed PHP 7 specific functionality.

Browse Source
This commit is contained in:
Simon Sessingø
2016-11-26 04:53:05 +01:00
parent 6213f2fb75
commit c1835152b6
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/Route/LoadableRoute.php
+1 -1
View File
@@ -121,7 +121,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
$param = $keys[$i];
$value = $params[$param];
$value = $parameters[$param] ?? $value;
$value = isset($parameters[$param]) ? $parameters[$param] : $value;
if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
$url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
src/Pecee/SimpleRouter/Route/Route.php
+2 -2
View File
@@ -136,7 +136,7 @@ abstract class Route implements IRoute
$name = $parameterNames[$i];
$parameterValue = $parameterValues[$name['name']] ?? null;
$parameterValue = isset($parameterValues[$name['name']]) ? $parameterValues[$name['name']] : null;
if ($parameterValue === null && $name['required']) {
throw new HttpException('Missing required parameter ' . $name['name'], 404);
@@ -386,7 +386,7 @@ abstract class Route implements IRoute
if (count($this->parameters) > 0) {
/* Ensure the right order + values */
$parameters = ($values['parameters'] ?? []) + $this->parameters;
$parameters = (isset($values['parameters']) ? $values['parameters'] : []) + $this->parameters;
$parameters = array_merge($parameters, $this->parameters);
$this->setParameters($parameters);
src/Pecee/SimpleRouter/Route/RouteResource.php
+1 -1
View File
@@ -115,7 +115,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
$parameters = array_merge($this->parameters, (array)$parameters);
$action = $parameters['action'] ?? null;
$action = isset($parameters['action']) ? $parameters['action'] : null;
unset($parameters['action']);
$method = $request->getMethod();