[ci skip] Better names for the platforms (#4974)

* [ci skip] Better names for the platforms
to prevent confusions

* Change unit dockerfile name

* Small change to rerun travis

* Move ubiquity framework to another travis job

To fix in travis:
The job exceeded the maximum time limit for jobs, and has been terminated.

As ubiquity is trying more platforms: swool, react, ...  is better move it to the other travis job.

* Move laravel and lumen to another job

As they also use swoole, need more time.
To distribute the time between jobs, so we will have faster travis runs.

.travis.yml

@@ -99,8 +99,8 @@ env:
     - "TESTLANG=Nim"
     - "TESTLANG=Perl"
     - 'TESTDIR="PHP/php"'
-    - 'TESTDIR="PHP/cakephp PHP/codeigniter PHP/fat-free PHP/fuel PHP/kumbiaphp PHP/laravel PHP/lithium PHP/lumen PHP/phpixie PHP/slim PHP/symfony PHP/ubiquity PHP/yii2 PHP/zend"'
-    - 'TESTDIR="PHP/amp PHP/hamlet PHP/hhvm PHP/peachpie PHP/swoole PHP/workerman PHP/phalcon"'
+    - 'TESTDIR="PHP/cakephp PHP/codeigniter PHP/fat-free PHP/fuel PHP/kumbiaphp PHP/lithium PHP/phpixie PHP/slim PHP/symfony PHP/yii2 PHP/zend"'
+    - 'TESTDIR="PHP/amp PHP/hamlet PHP/laravel PHP/lumen PHP/hhvm PHP/peachpie PHP/swoole PHP/workerman PHP/phalcon PHP/ubiquity"'
     - 'TESTDIR="Python/aiohttp Python/api_hour Python/blacksheep Python/bottle Python/cherrypy Python/django Python/eve Python/falcon Python/fastapi Python/flask"'
     - 'TESTDIR="Python/hug Python/japronto Python/klein Python/morepath Python/pyramid Python/quart Python/responder Python/sanic Python/spyne Python/starlette"'
     - 'TESTDIR="Python/tornado Python/turbogears Python/uvicorn Python/uwsgi Python/vibora Python/web2py Python/webware Python/weppy Python/wsgi"'

frameworks/PHP/cakephp/benchmark_config.json

@@ -16,7 +16,7 @@
             "language": "PHP",
             "flavor": "PHP7",
             "orm": "Full",
-            "platform": "php-fpm",
+            "platform": "FPM/FastCGI",
             "webserver": "nginx",
             "os": "Linux",
             "database_os": "Linux",

frameworks/PHP/codeigniter/benchmark_config.json

@@ -15,7 +15,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/fat-free/benchmark_config.json

@@ -15,7 +15,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,7 +36,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/fuel/benchmark_config.json

@@ -14,7 +14,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/hamlet/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "micro",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/kumbiaphp/benchmark_config.json

@@ -16,7 +16,7 @@
             "language": "PHP",
             "flavor": "PHP7",
             "orm": "micro",
-            "platform": "php-fpm",
+            "platform": "FPM/FastCGI",
             "webserver": "nginx",
             "os": "Linux",
             "database_os": "Linux",
@@ -37,7 +37,7 @@
             "language": "PHP",
             "flavor": "PHP7",
             "orm": "Raw",
-            "platform": "php-fpm",
+            "platform": "FPM/FastCGI",
             "webserver": "nginx",
             "os": "Linux",
             "database_os": "Linux",

frameworks/PHP/laravel/benchmark_config.json

@@ -16,7 +16,7 @@
 			"language": "PHP",
 			"flavor": "PHP7",
 			"orm": "Full",
-			"platform": "php-fpm",
+			"platform": "FPM/FastCGI",
 			"webserver": "nginx",
 			"os": "Linux",
 			"database_os": "Linux",

frameworks/PHP/lithium/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP5",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/lumen/benchmark_config.json

@@ -17,7 +17,7 @@
 			"language": "PHP",
 			"flavor": "PHP7",
 			"orm": "Full",
-			"platform": "php-fpm",
+			"platform": "FPM/FastCGI",
 			"webserver": "nginx",
 			"os": "Linux",
 			"database_os": "Linux",

frameworks/PHP/phalcon/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,7 +36,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -57,7 +57,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/php/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -35,7 +35,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -56,7 +56,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -77,7 +77,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -100,7 +100,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "h2o",
       "os": "Linux",
       "database_os": "Linux",
@@ -108,7 +108,7 @@
       "notes": "",
       "versus": "php"
     },
-    "nginx-unit": {
+    "unit": {
       "json_url": "/json.php",
       "plaintext_url": "/plaintext.php",
       "db_url": "/dbraw.php",
@@ -123,11 +123,11 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "nginx-unit",
+      "platform": "Unit Nginx",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "PHP-nginx-unit",
+      "display_name": "PHP Unit Nginx",
       "notes": "",
       "versus": "php"
     },
@@ -167,7 +167,7 @@
       "language": "PHP",
       "flavor": "PHP5",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -188,7 +188,7 @@
       "language": "PHP",
       "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -211,7 +211,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -232,7 +232,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -251,7 +251,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Micro",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/php/php-nginx-unit.dockerfile → frameworks/PHP/php/php-unit.dockerfile

@@ -9,5 +9,5 @@ WORKDIR /php
 # RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/7.3/fpm/php-fpm.conf ; fi;
 
 RUN unitd --control unix:/var/run/control.unit.sock && \
-    curl -X PUT --data-binary @/php/deploy/nginx-unit.json --unix-socket           \
+    curl -X PUT --data-binary @/php/deploy/nginx-unit.json --unix-socket \
         /var/run/control.unit.sock http://localhost/config 

frameworks/PHP/phpixie/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/slim/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -39,7 +39,7 @@
       "language": "PHP",
       "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/symfony/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,7 +36,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/ubiquity/benchmark_config.json

@@ -17,7 +17,7 @@
         "language": "PHP",
         "flavor": "PHP7",
         "orm": "Full",
-        "platform": "php-fpm",
+        "platform": "FPM/FastCGI",
         "webserver": "nginx",
         "os": "Linux",
         "database_os": "Linux",
@@ -38,7 +38,7 @@
             "language": "PHP",
             "flavor": "PHP7",
             "orm": "Raw",
-            "platform": "php-fpm",
+            "platform": "FPM/FastCGI",
             "webserver": "nginx",
             "os": "Linux",
             "database_os": "Linux",

frameworks/PHP/yii2/benchmark_config.json

@@ -16,7 +16,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,7 +36,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/zend/benchmark_config.json

@@ -15,7 +15,7 @@
       "language": "PHP",
       "flavor": "PHP7",
       "orm": "Full",
-      "platform": "php-fpm",
+      "platform": "FPM/FastCGI",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",