From c1835152b6f3112df0d6e08d1d6e6a6a253052f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sat, 26 Nov 2016 04:53:05 +0100 Subject: [PATCH] Removed PHP 7 specific functionality. --- README.md | 3 +-- src/Pecee/Http/Input/Input.php | 6 +++--- src/Pecee/Http/Request.php | 2 +- src/Pecee/SimpleRouter/Route/LoadableRoute.php | 2 +- src/Pecee/SimpleRouter/Route/Route.php | 4 ++-- src/Pecee/SimpleRouter/Route/RouteResource.php | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index feed827..d2f290d 100644 --- a/README.md +++ b/README.md @@ -92,8 +92,7 @@ composer require pecee/simple-router ## Requirements -- PHP 5.4 or greater -- mcrypt extension +- PHP 5.5 or greater ## Notes diff --git a/src/Pecee/Http/Input/Input.php b/src/Pecee/Http/Input/Input.php index f7b4b4e..aff0f31 100644 --- a/src/Pecee/Http/Input/Input.php +++ b/src/Pecee/Http/Input/Input.php @@ -163,7 +163,7 @@ class Input */ 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) { - 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) { - return $this->get[$index] ?? $defaultValue; + return isset($this->get[$index]) ? $this->get[$index] : $defaultValue; } /** diff --git a/src/Pecee/Http/Request.php b/src/Pecee/Http/Request.php index b6ada6b..8215a27 100644 --- a/src/Pecee/Http/Request.php +++ b/src/Pecee/Http/Request.php @@ -225,7 +225,7 @@ class Request public function __get($name) { - return $this->data[$name] ?? null; + return isset($this->data[$name]) ? $this->data[$name] : null; } } \ No newline at end of file diff --git a/src/Pecee/SimpleRouter/Route/LoadableRoute.php b/src/Pecee/SimpleRouter/Route/LoadableRoute.php index a23c73f..81b0297 100644 --- a/src/Pecee/SimpleRouter/Route/LoadableRoute.php +++ b/src/Pecee/SimpleRouter/Route/LoadableRoute.php @@ -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); diff --git a/src/Pecee/SimpleRouter/Route/Route.php b/src/Pecee/SimpleRouter/Route/Route.php index 8649e9a..cb2a8d3 100644 --- a/src/Pecee/SimpleRouter/Route/Route.php +++ b/src/Pecee/SimpleRouter/Route/Route.php @@ -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); diff --git a/src/Pecee/SimpleRouter/Route/RouteResource.php b/src/Pecee/SimpleRouter/Route/RouteResource.php index 0a5cfba..a4ea2b3 100644 --- a/src/Pecee/SimpleRouter/Route/RouteResource.php +++ b/src/Pecee/SimpleRouter/Route/RouteResource.php @@ -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();