Clean php-ngx (#5164)

* Clean php-ngx

* Use min()

frameworks/PHP/php-ngx/app-async.php

@@ -1,6 +1,6 @@
 <?php
 require_once '/ngx_php7/t/lib/mysql.php';
-define('DBIP', gethostbyname('localhost'));
+
 define('DB_HOST', gethostbyname('tfb-database'));
 define('DB_PORT', '3306');
 define('DB_USER', 'benchmarkdbuser');
@@ -13,9 +13,8 @@ function fortune()
     ngx_header_set('Content-Type', 'text/html;charset=UTF-8');
     $my = new php\ngx\mysql();
     yield from $my->connect(DB_HOST, DB_PORT, DB_USER, DB_PASS, DB_NAME);
-    $ret = yield from $my->query('SELECT id, message FROM Fortune');
+    $ret = yield from $my->query('SELECT id,message FROM Fortune');
 
-    $arr = [];
     foreach ($ret as $row) {
         $arr[$row['id']] = $row['message'];
     }
@@ -40,14 +39,13 @@ function query()
     $my = new php\ngx\mysql();
     yield from $my->connect(DB_HOST, DB_PORT, DB_USER, DB_PASS, DB_NAME);
     $query_count = 1;
-    $params      = ngx_query_args();
-    if ($params['queries'] > 1) {
-        $query_count = $params['queries'] > 500 ? 500 : $params['queries'];
+    $params      = ngx::query_args()['queries'];
+    if ($params > 1) {
+        $query_count = min($params, 500);
     }
-    $arr = [];
+
     while ($query_count--) {
-        $rand  = mt_rand(1, 10000);
-        $arr[] = (yield from $my->query("SELECT id,randomNumber FROM World WHERE id = {$rand}"))[0];
+        $arr[] = (yield from $my->query('SELECT id,randomNumber FROM World WHERE id = '.mt_rand(1, 10000)))[0];
     }
     unset($my);
     echo json_encode($arr);
@@ -59,10 +57,11 @@ function db()
 
     $my = new php\ngx\mysql();
     yield from $my->connect(DB_HOST, DB_PORT, DB_USER, DB_PASS, DB_NAME);
-    $data = (yield from $my->query('SELECT id,randomNumber FROM World WHERE id = '.mt_rand(1, 10000)))[0];
 
+    echo json_encode(
+        (yield from $my->query('SELECT id,randomNumber FROM World WHERE id = '.mt_rand(1, 10000)))[0]
+    );
     unset($my);
-    echo json_encode($data);
 }
 
 function update()
@@ -71,17 +70,17 @@ function update()
     $my = new php\ngx\mysql();
     yield from $my->connect(DB_HOST, DB_PORT, DB_USER, DB_PASS, DB_NAME);
     $query_count = 1;
-    $params      = ngx_query_args();
-    if ($params['queries'] > 1) {
-        $query_count = $params['queries'] > 500 ? 500 : $params['queries'];
+    $params      = ngx::query_args()['queries'];
+    if ($params > 1) {
+        $query_count = min($params, 500);
     }
-    $arr = [];
+
     while ($query_count--) {
         $id                    = mt_rand(1, 10000);
-        $world                 = (yield from $my->query("SELECT id, randomNumber FROM World WHERE id = {$id}"))[0];
-        $world['id']           = $id;
+        $world                 = (yield from $my->query("SELECT id,randomNumber FROM World WHERE id = $id"))[0];
+        
         $world['randomNumber'] = mt_rand(1, 10000);
-        yield from $my->query("UPDATE World SET randomNumber = {$world['randomNumber']} WHERE id = {$world['id']}");
+        yield from $my->query("UPDATE World SET randomNumber = {$world['randomNumber']} WHERE id = $id");
         $arr[] = $world;
     }
     unset($my);

frameworks/PHP/php-ngx/app.php

@@ -20,8 +20,9 @@ function query()
     $statement = $pdo->prepare('SELECT id,randomNumber FROM World WHERE id=?');
 
     $query_count = 1;
-    if ($_GET['queries'] > 1) {
-        $query_count = min($_GET['queries'], 500);
+    $params      = ngx::query_args()['queries'];
+    if ($params > 1) {
+        $query_count = min($params, 500);
     }
 
     while ($query_count--) {
@@ -36,8 +37,9 @@ function update()
 {
     global $pdo;
     $query_count = 1;
-    if ($_GET['queries'] > 1) {
-        $query_count = min($_GET['queries'], 500);
+    $params      = ngx::query_args()['queries'];
+    if ($params > 1) {
+        $query_count = min($params, 500);
     }
 
     $statement       = $pdo->prepare('SELECT randomNumber FROM World WHERE id=?');

frameworks/PHP/php-ngx/deploy/nginx.conf

@@ -67,7 +67,6 @@ http {
         location /query {
             add_header Content-Type application/json;
             content_by_php '
-                $_GET = ngx::query_args();
                 query();
             ';
         }
@@ -75,7 +74,6 @@ http {
         location /update {
             add_header Content-Type application/json;
             content_by_php '
-                $_GET = ngx::query_args();
                 update();
             ';
         }