Attempting to clean up PHP metadata

.travis.yml

@@ -130,7 +130,7 @@ env:
     - "TESTDIR=PHP/cakephp"
     - "TESTDIR=PHP/hhvm"
     - "TESTDIR=PHP/php"
-    - "TESTDIR=PHP/cygnite-php-framework"
+    - "TESTDIR=PHP/cygnite"
     - "TESTDIR=PHP/codeigniter"
     - "TESTDIR=PHP/clancats"
     - "TESTDIR=PHP/fat-free"

frameworks/PHP/cakephp/benchmark_config.json

@@ -14,14 +14,15 @@
       "database": "MySQL",
       "framework": "cakephp",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "CakePHP",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/clancats/benchmark_config.json

@@ -15,14 +15,15 @@
 	  "database": "MySQL",
 	  "framework": "clancatsframework",
 	  "language": "PHP",
+	  "flavor": "PHP5",
 	  "orm": "Raw",
-	  "platform": "PHP-FPM",
+	  "platform": "None",
 	  "webserver": "nginx",
 	  "os": "Linux",
 	  "database_os": "Linux",
 	  "display_name": "clancatsframework",
 	  "notes": "",
-	  "versus": "php"
+	  "versus": "php-php5"
 	}
   }]
 }

frameworks/PHP/codeigniter/benchmark_config.json

@@ -10,14 +10,15 @@
       "database": "None",
       "framework": "codeigniter",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -28,14 +29,15 @@
       "database": "None",
       "framework": "codeigniter",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "HHVM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter_hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -48,14 +50,15 @@
       "database": "MySQL",
       "framework": "codeigniter",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw_hhvm": {
       "setup_file": "setup_hhvm",
@@ -68,14 +71,15 @@
       "database": "MySQL",
       "framework": "codeigniter",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "HHVM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter_hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/cygnite-php-framework/benchmark_config.json → frameworks/PHP/cygnite/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "cygnite-php-framework",
+  "framework": "cygnite",
   "tests": [{
     "default": {
       "setup_file": "setup",
@@ -11,14 +11,15 @@
       "database": "None",
       "framework": "cygnite",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cygnite",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -31,14 +32,15 @@
       "database": "MySQL",
       "framework": "cygnite",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cygnite",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/cygnite-php-framework/deploy/cygnite-php-framework → frameworks/PHP/cygnite/deploy/cygnite-php-framework

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /cygnite-php-framework/ "/home/ubuntu/FrameworkBenchmarks/cygnite-php-framework/"
-  <Directory /home/ubuntu/FrameworkBenchmarks/cygnite-php-framework>
+  Alias /cygnite/ "/home/ubuntu/FrameworkBenchmarks/cygnite/"
+  <Directory /home/ubuntu/FrameworkBenchmarks/cygnite>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

frameworks/PHP/cygnite-php-framework/deploy/nginx.conf → frameworks/PHP/cygnite/deploy/nginx.conf

@@ -65,7 +65,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
 
-        root /home/ubuntu/FrameworkBenchmarks/cygnite-php-framework/;
+        root /home/ubuntu/FrameworkBenchmarks/cygnite/;
         index  index.php;
 
         location / {

frameworks/PHP/cygnite-php-framework/setup.sh → frameworks/PHP/cygnite/setup.sh

@@ -3,7 +3,7 @@
 fw_depends php nginx composer
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' apps/configs/database.php
-sed -i 's|root .*/FrameworkBenchmarks/cygnite-php-framework|root '"${TROOT}"'|g' deploy/nginx.conf
+sed -i 's|root .*/FrameworkBenchmarks/cygnite|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid

frameworks/PHP/fat-free/benchmark_config.json

@@ -12,10 +12,11 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "Fat Free Framework",
+      "framework": "Fat Free",
       "language": "PHP",
+      "flavor": "PHP7",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -33,10 +34,11 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "Fat Free Framework",
+      "framework": "Fat Free",
       "language": "PHP",
+      "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/fat-free/benchmark_config_bak.json

@@ -1,91 +0,0 @@
-{
-  "framework": "fat-free",
-  "tests": [{
-    "default": {
-      "setup_file": "setup",
-      "json_url": "/json",
-      "plaintext_url": "/plaintext",
-      "db_url": "/db-orm",
-      "query_url": "/db-orm-multiple/",
-      "update_url": "/update-orm/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "Fat Free Framework",
-      "language": "PHP",
-      "orm": "Full",
-      "platform": "PHP-FPM",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "fat-free",
-      "notes": "",
-      "versus": "php"
-    },
-    "raw": {
-      "setup_file": "setup",
-      "db_url": "/db",
-      "query_url": "/db-multiple/",
-      "fortune_url": "/fortune",
-      "update_url": "/update-raw/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "Fat Free Framework",
-      "language": "PHP",
-      "orm": "Raw",
-      "platform": "PHP-FPM",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "fat-free",
-      "notes": "",
-      "versus": "php"
-    },
-    "php5": {
-      "setup_file": "setup_php5",
-      "json_url": "/json",
-      "plaintext_url": "/plaintext",
-      "db_url": "/db-orm",
-      "query_url": "/db-orm-multiple/",
-      "update_url": "/update-orm/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "Fat Free Framework",
-      "language": "PHP5",
-      "orm": "Full",
-      "platform": "PHP-FPM",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "fat-free",
-      "notes": "",
-      "versus": "php"
-    },
-    "php5-raw": {
-      "setup_file": "setup_php5",
-      "db_url": "/db",
-      "query_url": "/db-multiple/",
-      "fortune_url": "/fortune",
-      "update_url": "/update-raw/",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "MySQL",
-      "framework": "Fat Free Framework",
-      "language": "PHP5",
-      "orm": "Raw",
-      "platform": "PHP-FPM",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "fat-free",
-      "notes": "",
-      "versus": "php"
-    }
-  }]
-}

frameworks/PHP/fat-free/setup_php5.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-fw_depends php nginx
-
-sed -i 's|localhost|'"${DBHOST}"'|g' index.php
-sed -i 's|root .*/FrameworkBenchmarks/fat-free|root '"${TROOT}"'|g' deploy/nginx.conf
-sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
-
-
-F3DIR="$TROOT/src"
-
-[[ ! -e "$F3DIR" ]] || rm -rf "$F3DIR"
-
-git clone "https://github.com/bcosca/fatfree-core.git" "$F3DIR"
-pushd "$F3DIR" > /dev/null
-git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
-popd > /dev/null
-
-php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
-nginx -c $TROOT/deploy/nginx.conf

frameworks/PHP/fuel/benchmark_config.json

@@ -11,16 +11,17 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "fuel",
+      "framework": "Fuel",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "fuel",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/hhvm/benchmark_config.json

@@ -16,9 +16,10 @@
         "database"       : "MySQL",
         "framework"      : "hhvm",
         "language"       : "PHP",
+        "flavor"         : "HHVM",
         "orm"            : "Raw",
-        "platform"       : "hhvm",
-        "webserver"      : "HPHP",
+        "platform"       : "None",
+        "webserver"      : "nginx",
         "os"             : "Linux",
         "database_os"    : "Linux",
         "display_name"   : "hhvm",

frameworks/PHP/kohana/benchmark_config.json

@@ -10,14 +10,15 @@
       "database": "None",
       "framework": "kohana",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "kohana",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -30,14 +31,15 @@
       "database": "MySQL",
       "framework": "kohana",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "kohana",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/laravel/benchmark_config.json

@@ -11,8 +11,9 @@
       "database": "None",
       "framework": "laravel",
       "language": "PHP",
+      "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -31,8 +32,9 @@
       "database": "MySQL",
       "framework": "laravel",
       "language": "PHP",
+      "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -50,12 +52,13 @@
       "database": "None",
       "framework": "laravel",
       "language": "PHP",
+      "flavor": "HHVM",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "laravel_hhvm",
+      "display_name": "laravel",
       "notes": "",
       "versus": "php"
     },
@@ -70,12 +73,13 @@
       "database": "MySQL",
       "framework": "laravel",
       "language": "PHP",
+      "flavor": "HHVM",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "laravel_hhvm",
+      "display_name": "laravel-raw",
       "notes": "",
       "versus": "php"
     },
@@ -89,14 +93,15 @@
       "database": "None",
       "framework": "laravel",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "laravel",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "php5-raw": {
       "setup_file": "setup_php5",
@@ -108,13 +113,14 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "laravel",
-      "language": "PHP5",
+      "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "laravel-php5-raw",
+      "display_name": "laravel-raw",
       "notes": "",
       "versus": "php"
     }

frameworks/PHP/limonade/benchmark_config.json

@@ -15,12 +15,14 @@
       "database": "MySQL",
       "framework": "Limonade",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "Limonade"
+      "display_name": "Limonade",
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/lithium/benchmark_config.json

@@ -12,14 +12,15 @@
       "database": "MySQL",
       "framework": "lithium",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "lithium",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/lumen/benchmark_config.json

@@ -16,12 +16,14 @@
       "database": "MySQL",
       "framework": "Lumen",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "Lumen"
+      "display_name": "Lumen",
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/micromvc/benchmark_config.json

@@ -12,14 +12,15 @@
       "database": "MySQL",
       "framework": "micromvc",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "micromvc",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/phalcon-micro/benchmark_config.json

@@ -13,14 +13,15 @@
       "database": "MySQL",
       "framework": "phalcon",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "phalcon",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/phalcon/benchmark_config.json

@@ -14,14 +14,15 @@
       "database": "MySQL",
       "framework": "phalcon",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "phalcon",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "mongodb": {
       "setup_file": "setup",
@@ -34,14 +35,15 @@
       "database": "MongoDB",
       "framework": "phalcon",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "phalcon",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/php/benchmark_config.json

@@ -11,14 +11,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "php",
+      "framework": "None",
       "language": "PHP",
+      "flavor": "PHP7",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "php",
+      "display_name": "PHP",
       "notes": "",
       "versus": "php"
     },
@@ -32,14 +33,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "php",
+      "framework": "None",
       "language": "PHP",
+      "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "php",
+      "display_name": "PHP-raw",
       "notes": "",
       "versus": "php"
     },
@@ -53,16 +55,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "php",
-      "language": "PHP5",
+      "framework": "None",
+      "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "php5",
+      "display_name": "PHP",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "php5-raw": {
       "setup_file": "setup",
@@ -74,16 +77,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "php",
-      "language": "PHP5",
+      "framework": "None",
+      "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "php5-raw",
+      "display_name": "PHP-raw",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/phpixie/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "MySQL",
       "framework": "phpixie",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "phpixie",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/phreeze/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "MySQL",
       "framework": "phreeze",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Micro",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "phreeze",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/pimf/benchmark_config.json

@@ -11,14 +11,15 @@
       "database": "MySQL",
       "framework": "pimf",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Micro",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "pimf",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw": {
       "setup_file": "setup_raw",
@@ -34,14 +35,15 @@
       "database": "MySQL",
       "framework": "pimf",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Micro",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "pimf",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/silex-orm/benchmark_config.json

@@ -12,14 +12,15 @@
       "database": "MySQL",
       "framework": "silex",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silex",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/silex/benchmark_config.json

@@ -12,14 +12,15 @@
       "database": "MySQL",
       "framework": "silex",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silex",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw": {
       "setup_file": "setup_raw",
@@ -35,14 +36,15 @@
       "database": "MySQL",
       "framework": "silex",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silex",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/slim/benchmark_config.json

@@ -12,8 +12,9 @@
       "database": "MySQL",
       "framework": "slim",
       "language": "PHP",
+      "flavor": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -32,12 +33,13 @@
       "database": "MySQL",
       "framework": "slim",
       "language": "PHP",
+      "flavor": "HHVM",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "slim_hhvm",
+      "display_name": "slim",
       "notes": "",
       "versus": "php"
     },
@@ -52,14 +54,15 @@
       "database": "MySQL",
       "framework": "slim",
       "language": "PHP5",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "slim-php5",
+      "display_name": "slim",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/symfony2-stripped/benchmark_config.json

@@ -13,14 +13,15 @@
       "database": "MySQL",
       "framework": "symfony2",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "php-templates": {
       "setup_file": "setup",
@@ -31,14 +32,15 @@
       "database": "MySQL",
       "framework": "symfony2",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -51,14 +53,15 @@
       "database": "MySQL",
       "framework": "symfony2",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/symfony2/benchmark_config.json

@@ -13,14 +13,15 @@
       "database": "MySQL",
       "framework": "symfony2",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "php-templates": {
       "setup_file": "setup",
@@ -31,14 +32,15 @@
       "database": "MySQL",
       "framework": "symfony2",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -51,14 +53,15 @@
       "database": "MySQL",
       "framework": "symfony2",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -72,9 +75,10 @@
       "database": "MySQL",
       "framework": "symfony2",
       "language": "PHP",
+      "flavor": "HHVM",
       "orm": "Full",
-      "platform": "hhvm",
-      "webserver": "HPHP",
+      "platform": "None",
+      "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2-hhvm",

frameworks/PHP/yaf/benchmark_config.json

@@ -13,14 +13,15 @@
       "database": "MySQL",
       "framework": "yaf",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "yaf",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/yii2/benchmark_config.json

@@ -14,14 +14,15 @@
       "database": "MySQL",
       "framework": "yii2",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "yii2",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -36,12 +37,13 @@
       "database": "MySQL",
       "framework": "yii2",
       "language": "PHP",
+      "flavor": "HHVM",
       "orm": "Full",
-      "platform": "PHP-FPM",
-      "webserver": "HPHP",
+      "platform": "None",
+      "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "yii2-hhvm",
+      "display_name": "yii2",
       "notes": "",
       "versus": "php"
     }

frameworks/PHP/zend/benchmark_config.json

@@ -12,14 +12,15 @@
       "database": "MySQL",
       "framework": "Zend",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "zend",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }

frameworks/PHP/zend1/benchmark_config.json

@@ -12,14 +12,15 @@
       "database": "MySQL",
       "framework": "ZendFramework1",
       "language": "PHP",
+      "flavor": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ZendFramework1",
       "notes": "",
-      "versus": "php"
+      "versus": "php-php5"
     }
   }]
 }