From be20fe4dd168eb048f57d014092b895530cbad7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Sat, 8 Jul 2017 12:20:49 +0200 Subject: [PATCH 1/2] Updated composer.json tags. --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3412fd4..879566f 100644 --- a/composer.json +++ b/composer.json @@ -2,11 +2,14 @@ "name": "pecee/simple-router", "description": "Simple, fast PHP router that is easy to get integrated and in almost any project. Heavily inspired by the Laravel router.", "keywords": [ + "router", "router", "routing", + "route", + "simple-php-router", "laravel", "pecee", - "route" + "php" ], "license": "MIT", "support": { From 410fa3c9f58626149f334987996bd5a8f33d4a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20Sessing=C3=B8?= Date: Tue, 18 Jul 2017 11:26:45 +0200 Subject: [PATCH 2/2] Fixed PHP 5.5 compatibility (issue: #244 - thanks @thexeos) --- src/Pecee/Http/Input/Input.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Pecee/Http/Input/Input.php b/src/Pecee/Http/Input/Input.php index 0bd5ec1..e34d05c 100644 --- a/src/Pecee/Http/Input/Input.php +++ b/src/Pecee/Http/Input/Input.php @@ -283,15 +283,7 @@ class Input } } - $output = array_merge($_GET, $output); - - if ($filter !== null) { - $output = array_filter($output, function ($key) use ($filter) { - return (in_array($key, $filter) === true); - }, ARRAY_FILTER_USE_KEY); - } - - return $output; + return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : array_merge($_GET, $output); } } \ No newline at end of file