fix: url bug

Author: devxian96

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "urlarg"
+    ]
+}

example/get.test.php

@@ -3,40 +3,40 @@
 
 $app = new phpExpress();
 
-// Request : http://localhost:3000/test/get.test.php/3/get
+// Request : http://localhost:3000/example/get.test.php/3/urlarg
 // Result : 3
-$app->get('/{id}/get', function ($req, $res) {
+$app->get('/{id}/urlarg', function ($req, $res) {
     try {
         $res->send($req["id"]);
     } catch (Exception $e) {
         http_response_code(500);
-        return $e;
+        $res->send($e);
     }
 });
 
-// Request : http://localhost:3000/test/get.test.php/test
+// Request : http://localhost:3000/example/get.test.php/text
 // Result : phpExpress
-$app->get('/test', function ($req, $res) {
+$app->get('/text', function ($req, $res) {
     try {
         $res->send("phpExpress");
     } catch (Exception $e) {
         http_response_code(500);
-        return $e;
+        $res->send($e);
     }
 });
 
-// Request : http://localhost:3000/test/get.test.php/test2
+// Request : http://localhost:3000/example/get.test.php/json
 // Result : {"msg":"phpExpress"}
-$app->get('/test2', function ($req, $res) {
+$app->get('/json', function ($req, $res) {
     try {
         $res->send((object) ["msg" => "phpExpress"]);
     } catch (Exception $e) {
         http_response_code(500);
-        return $e;
+        $res->send($e);
     }
 });
 
-// Request : http://localhost:3000/test/get.test.php/argument?a=1
+// Request : http://localhost:3000/example/get.test.php/argument?a=1
 // body : json {"b":2}
 // Result : 3
 $app->get('/argument', function ($req, $res) {
@@ -45,7 +45,7 @@
         $res->send($result);
     } catch (Exception $e) {
         http_response_code(500);
-        return $e;
+        $res->send($e);
     }
 });
 

example/retrun.test.php

@@ -0,0 +1,33 @@
+<?php
+require '../lib/phpExpress.php';
+
+$app = new phpExpress();
+
+/*
+ * If you read that data from a web browser,
+ */
+
+// Request : http://localhost:3000/example/retrun.test.php/get
+// Result :
+$app->get('/get', function ($req, $res) {
+    try {
+        $res->send((object) ["msg" => "phpExpress"]);
+    } catch (Exception $e) {
+        http_response_code(500);
+        $res->send($e);
+    }
+});
+
+// Request : http://localhost:3000/example/retrun.test.php/post
+// Result : {"msg": "phpExpress"}
+$app->post('/post', function ($req, $res) {
+    try {
+        $res->send((object) ["msg" => "phpExpress"]);
+    } catch (Exception $e) {
+        http_response_code(500);
+        $res->send($e);
+    }
+});
+
+// 404 return
+$app->listen();

lib/phpExpress.php

@@ -75,8 +75,14 @@ public function listen()
      */
     private function removePhpUrl($url)
     {
-        $result = substr($url, strpos($url, ".php") + 4);
-        return substr($result, 0, strpos($result, "?"));
+        $result = $url; // org url
+        if (strpos($url, ".php")) {
+            $result = substr($url, strpos($url, ".php") + 4);
+        }
+        if (strpos($result, "?")) {
+            $result = substr($result, 0, strpos($result, "?"));
+        }
+        return $result;
     }
 
     /*
@@ -85,13 +91,8 @@ private function removePhpUrl($url)
      */
     private function convertParm($parm)
     {
-        // If Same parm
-        if (strcmp($_SERVER['REQUEST_URI'], $parm)) {
-            return $parm;
-        }
-
         $replaceParm = $parm;
-        $count = preg_match_all('/{/u', $parm);
+        $count = preg_match_all('/{/u', $replaceParm);
         for ($dataEnd = 0, $end = 0, $i = 0; $i < $count; ++$i) {
             // parm spread
             $start = strpos($parm, "{", $end) + 1;
@@ -113,6 +114,8 @@ private function convertParm($parm)
     public function get($parm, $function)
     {
         $parm = $this->convertParm($parm);
+        // echo $this->removePhpUrl($_SERVER['REQUEST_URI']) . "===" . $parm . "<br/>";
+
         if ($_SERVER['REQUEST_METHOD'] !== 'GET') {
             return;
         } else if (strcmp($this->removePhpUrl($_SERVER['REQUEST_URI']), $parm)) {