Removed PHP 7 specific functionality.

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
+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);