Merge pull request #60 from WebFiori/fix-get-uri

fix: Add Missing Query String to URI
WebFiori · Nov 20, 2024 · 2a78061 · 2a78061
2 parents 00d1afe + 4db2020
commit 2a78061
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/.github/workflows/php83.yml b/.github/workflows/php83.yml
@@ -41,4 +41,26 @@ jobs:
       - name: CodeCov
         uses: codecov/codecov-action@v4
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}
+  release_staging:
+    needs:
+      - "test"
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/dev'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: google-github-actions/release-please-action@v3
+        with:
+          release-type: php
+          token: ${{ secrets.GITHUB_TOKEN }}
+  release_prod:
+    needs:
+      - "test"
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: google-github-actions/release-please-action@v3
+        with:
+          release-type: php
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/tests/webfiori/tests/http/RequestTest.php b/tests/webfiori/tests/http/RequestTest.php
@@ -31,6 +31,7 @@ public function testGetParam02() {
         putenv('REQUEST_METHOD=GET');
         $_GET['ok'] = 'I not Ok';
         $this->assertEquals('I not Ok', Request::getParam('ok'));
+        $_GET = [];
     }
     /**
      * @test
@@ -53,6 +54,7 @@ public function testGetParam05() {
         putenv('REQUEST_METHOD=GET');
         $_GET['hello'] = 'This%20is%20an%20encoded%20string.';
         $this->assertEquals('This is an encoded string.', Request::getParam('hello'));
+        $_GET = [];
     }
     /**
      * @test
@@ -61,6 +63,7 @@ public function testGetParam06() {
         putenv('REQUEST_METHOD=GET');
         $_GET['hello'] = 'This+is+an+encoded%20string.';
         $this->assertEquals('This is an encoded string.', Request::getParam('hello'));
+        $_GET = [];
     }
     /**
      * @test
@@ -69,6 +72,7 @@ public function testGetParams06() {
         putenv('REQUEST_METHOD=GET');
         $_GET['arabic'] = '%D9%86%D8%B5%20%D8%B9%D8%B1%D8%A8%D9%8A';
         $this->assertEquals('نص عربي', Request::getParam('arabic'));
+        $_GET = [];
     }
     /**
      * @test
@@ -104,6 +108,16 @@ public function testGetRequestedURL00() {
         $_SERVER['PATH_INFO'] = '/my/app';
         $this->assertEquals('http://127.0.0.1/my/app', Request::getRequestedURI());
     }
+    /**
+     * @test
+     */
+    public function testGetRequestedURL01() {
+        $_SERVER['PATH_INFO'] = '/my/app';
+        $_GET['param1'] = 'something';
+        $_GET['param2'] = 'something_else';
+        $this->assertEquals('http://127.0.0.1/my/app?param1=something&param2=something_else', Request::getRequestedURI());
+        $_GET = [];
+    }
     /**
      * @test
      */

diff --git a/webfiori/http/Request.php b/webfiori/http/Request.php
@@ -313,8 +313,21 @@ public static function getRequestedURI(string $pathToAppend = '') : string {
         } 
 
         $cleanedPath = str_replace(trim(str_replace('\\', '/', $pathToAppend), '/'),'' ,trim(filter_var($path),'/'));
-
-        return $base.'/'.trim($cleanedPath, '/');
+        $requestMethod = self::getMethod();
+        $queryString = '';
+
+        if ($requestMethod == RequestMethod::DELETE || $requestMethod == RequestMethod::GET) {
+            $getParams = Request::getParams();
+
+            if (count($getParams) != 0) {
+                $queryArr = [];
+                foreach ($getParams as $name => $val) {
+                    $queryArr[] = $name.'='.$val;
+                }
+                $queryString = '?'.implode('&', $queryArr);
+            }
+        }
+        return $base.'/'.trim($cleanedPath, '/').$queryString;
     }
     /**
      * Returns an object that holds all information about requested URI.