Merge branch 'master' of https://github.com/WebFiori/http

Author: usernane

.github/workflows/php7.yml

@@ -0,0 +1,35 @@
+name: Build PHP 7
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }} 
+    strategy: 
+      fail-fast: true
+      matrix: 
+        os: [ ubuntu-latest ]
+        php: [7.1, 7.0, 5.6]
+            
+    name: PHP${{matrix.php}} - ${{matrix.os}}
+    
+    steps: 
+      - name: Clone Repo
+        uses: actions/checkout@v1
+      
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }} 
+          extensions: mysqli, mbstring
+          tools: phpunit:5.7.27, composer
+      
+      - name: Install Dependencies
+        run: composer install --prefer-source --no-interaction --no-dev
+      
+      - name: Execute Tests
+        run: phpunit

.github/workflows/php8.yml

@@ -0,0 +1,46 @@
+name: Build PHP 7,8
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }} 
+    strategy: 
+      fail-fast: true
+      matrix: 
+        os: [ ubuntu-latest ]
+        php: [ 8.0, 7.4, 7.3, 7.2]
+            
+    name: PHP${{matrix.php}} - ${{matrix.os}}
+    
+    steps: 
+      - name: Clone Repo
+        uses: actions/checkout@v1
+      
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }} 
+          extensions: mysqli, mbstring
+          tools: phpunit:8.5.13, composer
+      
+      - name: Install Dependencies
+        run: composer install --prefer-source --no-interaction --no-dev
+        
+      - name: Execute Tests
+        run: phpunit
+      
+      - name: CodeCov
+        uses: codecov/codecov-action@v1
+        
+      - name: SonarCloud
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      
+        

.travis.yml

@@ -3,8 +3,8 @@ A simple library for creating RESTful web APIs in aadition to providing the deve
 It includes inputs feltering and data validation in addion to creating user-defined inputs filters.
 
 <p align="center">
-  <a href="https://travis-ci.com/github/WebFiori/http">
-    <img src="https://travis-ci.com/WebFiori/http.svg?branch=master">
+  <a href="https://github.com/WebFiori/http/actions">
+    <img src="https://github.com/WebFiori/http/workflows/Build%20PHP%207,8/badge.svg?branch=master">
   </a>
   <a href="https://codecov.io/gh/WebFiori/http">
     <img src="https://codecov.io/gh/WebFiori/http/branch/master/graph/badge.svg" />

README.md

@@ -189,8 +189,8 @@ public static function filter(APIFilter $apiFilter, array $arr) {
             $defaultVal = $def[$paramIdx]->getDefault();
 
             if (isset($arr[$name])) {
-                $toBeFiltered = $arr[$name];
-                $retVal[$noFIdx][$name] = $arr[$name];
+                $toBeFiltered = urldecode($arr[$name]);
+                $retVal[$noFIdx][$name] = $toBeFiltered;
 
                 if (isset($def[$optIdx]['filter-func'])) {
                     $retVal[$filteredIdx][$name] = self::_applyCustomFilterFunc($def, $toBeFiltered);

src/APIFilter.php

@@ -601,11 +601,12 @@ public static function splitURI($uri) {
             ],
         ];
         //First step, extract the fragment
-        $split1 = explode('#', $uri);
+        $split1 = self::_queryOrFragment($uri, '#', '%23');
         $retVal['fragment'] = isset($split1[1]) ? $split1[1] : '';
 
         //after that, extract the query string
-        $split2 = explode('?', $split1[0]);
+        $split2 = self::_queryOrFragment($split1[0], '?', '%3F');
+
         $retVal['query-string'] = isset($split2[1]) ? $split2[1] : '';
 
         //next comes the scheme
@@ -651,6 +652,28 @@ public static function splitURI($uri) {
 
         return $retVal;
     }
+    private static function _queryOrFragment($split, $char, $encoded) {
+        $split2 = explode($char, $split);
+        $spCount = count($split2);
+        if ($spCount > 2) {
+            $temp = [];
+            for ($x = 0 ; $x < $spCount - 1 ; $x++) {
+                $temp[] = $split2[$x];
+            }
+            $lastStr = $split2[$spCount - 1];
+            if (strlen($lastStr) == 0) {
+                $split2 = [
+                    implode($encoded, $temp).$encoded
+                ];
+            } else {
+                $split2 = [
+                    implode($encoded, $temp),
+                    $split2[$spCount - 1]
+                ];
+            }
+        }
+        return $split2;
+    }
     /**
      * Validate the path part of original URI and the requested one.
      * 

src/Uri.php

@@ -186,4 +186,29 @@ public function testSplitURI_08() {
         $uriObj = new Uri($uri, '');
         $this->assertEquals('/Hello World',$uriObj->getPath());
     }
+    /**
+     * @test
+     */
+    public function testSplitURI_09() {
+        $uri = 'https://programmingacademia.com/Hello World? or Not?';
+        $uriObj = new Uri($uri, '');
+        $this->assertEquals('/Hello World? or Not?',$uriObj->getPath());
+    }
+    /**
+     * @test
+     */
+    public function testSplitURI_10() {
+        $uri = 'https://programmingacademia.com/Hello World? or Not?Yes';
+        $uriObj = new Uri($uri, '');
+        $this->assertEquals('/Hello World? or Not',$uriObj->getPath());
+    }
+    /**
+     * @test
+     */
+    public function testSplitURI_11() {
+        $uri = 'https://programmingacademia.com/Hello World#or Not#Yes';
+        $uriObj = new Uri($uri, '');
+        $this->assertEquals('/Hello World#or Not',$uriObj->getPath());
+        $this->assertEquals('Yes',$uriObj->getFragment());
+    }
 }