Merge pull request #119 from skipperbent/development

Optimised for cli-usage
2026-06-29 22:49:15 +00:00 · 2016-10-28 07:41:21 +02:00 · 2016-10-28 07:40:51 +02:00 · 2016-10-27 19:15:59 +02:00 · 2016-10-27 19:15:38 +02:00 · 2016-10-27 17:06:24 +02:00
2 changed files with 10 additions and 9 deletions
@@ -96,7 +96,7 @@ class Request {
     * @return string
     */
    public function getIp() {
-        return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : $_SERVER['REMOTE_ADDR']);
+        return ((isset($_SERVER['HTTP_X_FORWARDED_FOR']) && strlen($_SERVER['HTTP_X_FORWARDED_FOR'])) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null);
    }

    /**
@@ -303,15 +303,16 @@ class RouterBase {

    public function arrayToParams(array $getParams = null, $includeEmpty = true) {

-        if(is_array($getParams)) {
+        if(is_array($getParams) && count($getParams)) {
            if ($includeEmpty === false) {
                $getParams = array_filter($getParams, function ($item) {
                    return (!empty($item));
                });
            }

-            return http_build_query($getParams);
+            return '?' . http_build_query($getParams);
        }
+
        return '';
    }

@@ -366,8 +367,8 @@ class RouterBase {

        $url = rtrim($url, '/') . '/';

-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
        }

        return $url;
@@ -389,8 +390,8 @@ class RouterBase {

            $url = parse_url($this->request->getUri(), PHP_URL_PATH);

-            if(count($getParams)) {
-                $url .= '?' . $this->arrayToParams($getParams);
+            if($getParams !== null) {
+                $url .= $this->arrayToParams($getParams);
            }

            return $url;
@@ -461,8 +462,8 @@ class RouterBase {

        $url = '/' . trim(join('/', $url), '/') . '/';

-        if($getParams !== null && count($getParams)) {
-            $url .= '?' . $this->arrayToParams($getParams);
+        if($getParams !== null) {
+            $url .= $this->arrayToParams($getParams);
        }

        return $url;
Author	SHA1	Message	Date
Simon Sessingø	9fed6ffb3f	Merge pull request #119 from skipperbent/development Optimised for cli-usage	2016-10-28 07:41:21 +02:00
Simon Sessingø	832aff0358	Optimised for cli-usage	2016-10-28 07:40:51 +02:00
Simon Sessingø	15da599e82	Merge pull request #118 from skipperbent/development Minor optimisations	2016-10-27 19:15:59 +02:00
Simon Sessingø	43e05ad821	Minor optimisations	2016-10-27 19:15:38 +02:00
Simon Sessingø	9274acb591	Merge pull request #117 from skipperbent/development Optimisations and bugfixes	2016-10-27 17:06:24 +02:00
Simon Sessingø	2fd32868c2	Optimisations and bugfixes	2016-10-27 17:06:05 +02:00
Simon Sessingø	5c7759ab72	Merge pull request #116 from skipperbent/development Development	2016-10-27 16:45:29 +02:00
Simon Sessingø	e51b72f0e0	Development - Changed from http_build_query to custom solution as it doesn't support querystrings with "%" on some php versions.	2016-10-27 16:44:35 +02:00