Join cygnite and cygnite-raw (#3644)

* Join cygnite and cygnite-raw
Cygnite only have json and plaintest.
And the raw: db, query and fortune

* Fix header
For the strict headers test

* Change position apt install
For use the docker cache

frameworks/PHP/cygnite/apps/routes.php

@@ -22,7 +22,7 @@ $app->router->get('/json', function ()
 
 $app->router->get('/plaintext', function ()
 {
-    header("Content-Type: text/plain;");
+    header("Content-Type: text/plain");
     echo 'Hello, World!';
 });
 

frameworks/PHP/cygnite/benchmark_config.json

@@ -4,23 +4,6 @@
     "default": {
       "json_url": "/index.php/json",
       "plaintext_url": "/index.php/plaintext",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "None",
-      "framework": "cygnite",
-      "language": "PHP",
-      "flavor": "PHP5",
-      "orm": "Raw",
-      "platform": "None",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "cygnite",
-      "notes": "",
-      "versus": "php-php5"
-    },
-    "raw": {
       "db_url": "/index.php/bench/db",
       "query_url": "/index.php/bench/queries/",
       "fortune_url": "/index.php/bench/fortunes",

frameworks/PHP/cygnite/cygnite-raw.dockerfile

@@ -1,29 +0,0 @@
-FROM ubuntu:16.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
-RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq  > /dev/null
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt  > /dev/null
-
-RUN mkdir /composer
-WORKDIR /composer
-
-ENV PATH /composer:${PATH}
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-RUN php composer-setup.php
-RUN php -r "unlink('composer-setup.php');"
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
-
-ADD ./ /cygnite
-WORKDIR /cygnite
-
-RUN composer.phar install --quiet
-
-CMD service php5.6-fpm start && \
-    nginx -c /cygnite/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/lumen/lumen.dockerfile

@@ -6,7 +6,7 @@ RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /de
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq  > /dev/null
 RUN apt-get install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql  > /dev/null
-RUN apt-get install -yqq php7.2-xml php7.2-mbstring  > /dev/null
+RUN apt-get install -yqq php7.2-mbstring php7.2-xml  > /dev/null
 
 RUN mkdir /composer
 WORKDIR /composer