geckon01/simple-php-router
1
0
Fork 0
mirror of https://github.com/skipperbent/simple-php-router.git synced 2026-07-11 22:12:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from skipperbent/development

Browse Source 
Development
This commit is contained in:
Simon Sessingø
2015-12-11 18:23:53 +01:00
parent 4dd6417f71 23ee53060e
commit 5a19d6339c
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Pecee/SimpleRouter/RouterBase.php
+13 -9
View File
@@ -219,13 +219,16 @@ class RouterBase {
return $this; return $this;
} }
protected function getParamsToArray($query) { public function arrayToParams(array $getParams = null, $includeEmpty = true) {
$output = array(); if (is_array($getParams) && count($getParams) > 0) {
if($query[0] === '?') { foreach ($getParams as $key => $val) {
$query = substr($query, 1); if (!empty($val) || empty($val) && $includeEmpty) {
$getParams[$key] = $key . '=' . $val;
} }
parse_str($query, $output); }
return $output; return join('&', $getParams);
}
return '';
} }
protected function processUrl($route, $method = null, $parameters = null, $getParams = null) { protected function processUrl($route, $method = null, $parameters = null, $getParams = null) {
@@ -261,7 +264,7 @@ class RouterBase {
$url = rtrim($url, '/') . '/'; $url = rtrim($url, '/') . '/';
if($getParams !== null && count($getParams)) { if($getParams !== null && count($getParams)) {
$url .= '?' . $this->getParamsToArray($getParams); $url .= '?' . $this->arrayToParams($getParams);
} }
return $url; return $url;
@@ -342,8 +345,9 @@ class RouterBase {
$url = '/' . trim(join('/', $url), '/') . '/'; $url = '/' . trim(join('/', $url), '/') . '/';
if(is_array($getParams)) {
$url .= '?' . $this->getParamsToArray($getParams); if($getParams !== null && count($getParams)) {
$url .= '?' . $this->arrayToParams($getParams);
} }
return $url; return $url;