fixes php version merge conflict

frameworks/PHP/README.md

@@ -55,9 +55,9 @@ Ask if you are not certain.
 
 ## Install.sh and Setup.sh Files
 
-Most PHP frameworks use `fw_depends php nginx composer` in their `install.sh` file, 
-which installs PHP, Nginx, and Composer automatically. They then create a `setup.sh`
-containing these lines (comments added to clarify what's happening)
+Most PHP frameworks use `fw_depends php5 nginx composer` in their `install.sh` file, 
+which installs PHP5, Nginx, and Composer automatically. They then create a `setup.sh`
+containing these lines (comments added to clarify what's happening). `fw_depends php7` is now also available.
 
     # Explanation of variables provided by toolset:
     #   FWROOT - absolute path to framework toolset, normally 

frameworks/PHP/cakephp/benchmark_config.json

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

frameworks/PHP/cakephp/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php composer nginx
+fw_depends php5 composer nginx
 
 php-fpm --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 

frameworks/PHP/clancats/benchmark_config.json

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

frameworks/PHP/clancats/setup.sh

@@ -4,7 +4,7 @@ sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root /home/ubuntu/FrameworkBenchmarks|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 rm -fr clancatsapp
 rm -fr CCF

frameworks/PHP/codeigniter/benchmark_config.json

@@ -9,15 +9,15 @@
       "classification": "Fullstack",
       "database": "None",
       "framework": "codeigniter",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -27,15 +27,15 @@
       "classification": "Fullstack",
       "database": "None",
       "framework": "codeigniter",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "hhvm",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter_hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -47,15 +47,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "codeigniter",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "raw_hhvm": {
       "setup_file": "setup_hhvm",
@@ -67,15 +67,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "codeigniter",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "hhvm",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "codeigniter_hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/codeigniter/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/php-codeigniter|root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/codeigniter/setup_hhvm.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer hhvm
+fw_depends php5 nginx composer hhvm
 
 sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/codeigniter|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf

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

@@ -10,15 +10,15 @@
       "classification": "Fullstack",
       "database": "None",
       "framework": "cygnite",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cygnite",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -29,15 +29,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "cygnite",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cygnite",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 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

frameworks/PHP/fat-free/benchmark_config.json

@@ -13,7 +13,7 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "Fat Free Framework",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Full",
       "platform": "PHP-FPM",
       "webserver": "nginx",
@@ -21,7 +21,7 @@
       "database_os": "Linux",
       "display_name": "fat-free",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
     "raw": {
       "setup_file": "setup",
@@ -34,15 +34,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "Fat Free Framework",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP7-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "fat-free",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     }    
   }]
 }

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

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

frameworks/PHP/fuel/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' fuel/app/config/production/db.php
 sed -i 's|root .*/FrameworkBenchmarks/php-fuel|root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/hhvm/benchmark_config.json

@@ -15,15 +15,15 @@
         "classification" : "Platform",
         "database"       : "MySQL",
         "framework"      : "hhvm",
-        "language"       : "PHP",
+        "language"       : "PHP7",
         "orm"            : "Raw",
         "platform"       : "hhvm",
-        "webserver"      : "HPHP",
+        "webserver"      : "hhvm",
         "os"             : "Linux",
         "database_os"    : "Linux",
         "display_name"   : "hhvm",
         "notes"          : "",
-        "versus"         : "php"
+        "versus"         : "php7"
       }
     }]
 }

frameworks/PHP/kohana/benchmark_config.json

@@ -9,15 +9,15 @@
       "classification": "Fullstack",
       "database": "None",
       "framework": "kohana",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "kohana",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -29,15 +29,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "kohana",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "kohana",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/laravel/benchmark_config.json

@@ -10,15 +10,15 @@
       "classification": "Fullstack",
       "database": "None",
       "framework": "laravel",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP7-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "laravel",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
     "raw": {
       "setup_file": "setup",
@@ -30,15 +30,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "laravel",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP7-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "laravel-raw",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -49,15 +49,15 @@
       "classification": "Fullstack",
       "database": "None",
       "framework": "laravel",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "hhvm",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "laravel_hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
     "hhvm-raw": {
       "setup_file": "setup_hhvm",
@@ -69,15 +69,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "laravel",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "hhvm",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "laravel_hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
     "php5": {
       "setup_file": "setup_php5",
@@ -88,15 +88,15 @@
       "classification": "Fullstack",
       "database": "None",
       "framework": "laravel",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "laravel",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "php5-raw": {
       "setup_file": "setup_php5",
@@ -110,13 +110,13 @@
       "framework": "laravel",
       "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "laravel-php5-raw",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/laravel/setup_php5.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' app/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/frameworks/PHP/php-laravel|root '"${TROOT}"'|g' deploy/nginx.conf 

frameworks/PHP/limonade/benchmark_config.json

@@ -14,13 +14,14 @@
       "classification": "Micro",
       "database": "MySQL",
       "framework": "Limonade",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "Limonade"
+      "display_name": "Limonade",
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/lithium/benchmark_config.json

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

frameworks/PHP/lithium/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|192.168.100.102|'"${DBHOST}"'|g' app/config/bootstrap/connections.php
 sed -i 's|root .*/FrameworkBenchmarks/php-lithium|root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/lumen/benchmark_config.json

@@ -15,9 +15,9 @@
       "classification": "Micro",
       "database": "MySQL",
       "framework": "Lumen",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/PHP/lumen/setup.sh

@@ -4,7 +4,7 @@ sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/lumen|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 rm vendor/illuminate/view/FileViewFinder.php
 cp modifiedVendorFiles/FileViewFinder.php vendor/illuminate/view/

frameworks/PHP/micromvc/benchmark_config.json

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

frameworks/PHP/micromvc/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx
+fw_depends php5 nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' Config/Config.php
 sed -i 's|root .*/FrameworkBenchmarks/php-micromvc|root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/phalcon-micro/benchmark_config.json

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

frameworks/PHP/phalcon/benchmark_config.json

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

frameworks/PHP/php/benchmark_config.json

@@ -12,17 +12,17 @@
       "classification": "Platform",
       "database": "MySQL",
       "framework": "php",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP7-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "php",
+      "display_name": "php7",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
-    "raw": {
+    "raw7": {
       "setup_file": "setup",
       "db_url": "/dbraw.php",
       "query_url": "/dbraw.php?queries=",
@@ -33,15 +33,15 @@
       "classification": "Platform",
       "database": "MySQL",
       "framework": "php",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Raw",
       "platform": "PHP-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "php",
+      "display_name": "php7",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
     "php5": {
       "setup_file": "setup_php5",
@@ -56,7 +56,7 @@
       "framework": "php",
       "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -77,13 +77,13 @@
       "framework": "php",
       "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "php5-raw",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/php/setup_php5.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i "s|localhost|${DBHOST}|g" dborm.php
 sed -i "s|localhost|${DBHOST}|g" dbraw.php

frameworks/PHP/phpixie/benchmark_config.json

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

frameworks/PHP/phreeze/benchmark_config.json

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

frameworks/PHP/phreeze/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|localhost:3306|'"${DBHOST}"':3306|g' index.php
 sed -i 's|.*/FrameworkBenchmarks/phreeze|"'"${TROOT}"'|g' deploy/phreeze

frameworks/PHP/pimf/benchmark_config.json

@@ -10,15 +10,15 @@
       "classification": "Platform",
       "database": "MySQL",
       "framework": "pimf",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Micro",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "pimf",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "raw": {
       "setup_file": "setup_raw",
@@ -33,15 +33,15 @@
       "classification": "Platform",
       "database": "MySQL",
       "framework": "pimf",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Micro",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "pimf",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/pimf/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer cphalcon
+fw_depends php5 nginx composer cphalcon
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' app/config.app.php
 sed -i 's|".*/FrameworkBenchmarks/php-pimf|"'"${TROOT}"'|g' deploy/php-pimf

frameworks/PHP/pimf/setup_raw.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer cphalcon
+fw_depends php5 nginx composer cphalcon
 
 sed -i 's|127.0.0.1|'"${DBHOST}"'|g' app/config.app.php
 sed -i 's|".*/FrameworkBenchmarks/php-pimf|"'"${TROOT}"'|g' deploy/php-pimf

frameworks/PHP/silex-orm/benchmark_config.json

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

frameworks/PHP/silex/benchmark_config.json

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

frameworks/PHP/slim/benchmark_config.json

@@ -11,15 +11,15 @@
       "classification": "Micro",
       "database": "MySQL",
       "framework": "slim",
-      "language": "PHP",
+      "language": "PHP7",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP7-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "slim",
       "notes": "",
-      "versus": "php"
+      "versus": "php7"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -31,15 +31,15 @@
       "classification": "Micro",
       "database": "MySQL",
       "framework": "slim",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "HPHP",
+      "platform": "hhvm",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "slim_hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "php5": {
       "setup_file": "setup_php5",
@@ -53,13 +53,13 @@
       "framework": "slim",
       "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "slim-php5",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/slim/setup_hhvm.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer hhvm
+fw_depends php5 nginx composer hhvm
 
 sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/php-slim|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf

frameworks/PHP/slim/setup_php5.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-slim| root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/symfony2-stripped/benchmark_config.json

@@ -12,15 +12,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "symfony2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "php-templates": {
       "setup_file": "setup",
@@ -30,15 +30,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "symfony2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -50,15 +50,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "symfony2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/symfony2-stripped/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php composer nginx
+fw_depends php5 composer nginx
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|root .*/FrameworkBenchmarks/php-symfony2-stripped| root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/symfony2/benchmark_config.json

@@ -12,15 +12,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "symfony2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "php-templates": {
       "setup_file": "setup",
@@ -30,15 +30,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "symfony2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "raw": {
       "setup_file": "setup",
@@ -50,15 +50,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "symfony2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Raw",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -71,15 +71,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "symfony2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
       "platform": "hhvm",
-      "webserver": "HPHP",
+      "webserver": "hhvm",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "symfony2-hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/symfony2/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|root .*/FrameworkBenchmarks/php-symfony2| root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/symfony2/setup_hhvm.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer hhvm
+fw_depends php5 nginx composer hhvm
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/symfony2|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf

frameworks/PHP/yaf/benchmark_config.json

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

frameworks/PHP/yaf/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php yaf nginx
+fw_depends php5 yaf nginx
 
 sed -i 's|host=localhost|host='"${DBHOST}"'|g' app/conf/application.ini
 sed -i 's|root .*/FrameworkBenchmarks/php-yaf|root '"${TROOT}"'|g' deploy/nginx.conf 

frameworks/PHP/yii2/benchmark_config.json

@@ -13,15 +13,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "yii2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
+      "platform": "PHP5-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "yii2",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     },
     "hhvm": {
       "setup_file": "setup_hhvm",
@@ -35,15 +35,15 @@
       "classification": "Fullstack",
       "database": "MySQL",
       "framework": "yii2",
-      "language": "PHP",
+      "language": "PHP5",
       "orm": "Full",
-      "platform": "PHP-FPM",
-      "webserver": "HPHP",
+      "platform": "PHP5-FPM",
+      "webserver": "hhvm",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "yii2-hhvm",
       "notes": "",
-      "versus": "php"
+      "versus": "php5"
     }
   }]
 }

frameworks/PHP/yii2/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer
+fw_depends php5 nginx composer
 
 sed -i 's|localhost|'"${DBHOST}"'|g' app/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-yii2|root '"${TROOT}"'|g' deploy/nginx.conf

frameworks/PHP/yii2/setup_hhvm.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx composer hhvm
+fw_depends php5 nginx composer hhvm
 
 sed -i 's|localhost|'"${DBHOST}"'|g' app/index.php
 sed -i 's|SourceRoot = .*/FrameworkBenchmarks/Yii2|SourceRoot = '"${TROOT}"'|g' deploy/config.hdf

frameworks/PHP/zend/benchmark_config.json

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

frameworks/PHP/zend1/benchmark_config.json

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

toolset/setup/linux/frameworks/phalcon.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php
+fw_depends php5
 
 RETCODE=$(fw_exists ${IROOT}/phalcon.installed)
 [ ! "$RETCODE" == 0 ] || { \

toolset/setup/linux/frameworks/yaf.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php
+fw_depends php5
 
 RETCODE=$(fw_exists ${IROOT}/yaf.installed)
 [ ! "$RETCODE" == 0 ] || { \

toolset/setup/linux/languages/php.sh → toolset/setup/linux/languages/php5.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists ${IROOT}/php.installed)
+RETCODE=$(fw_exists ${IROOT}/php5.installed)
 [ ! "$RETCODE" == 0 ] || { \
   echo "Moving PHP config files into place"; 
   sudo cp $FWROOT/config/php.ini /usr/local/lib/php.ini
   sudo cp $FWROOT/config/php-fpm.conf /usr/local/lib/php-fpm.conf
-  source $IROOT/php.installed
+  source $IROOT/php5.installed
   return 0; }
 
 VERSION="5.5.17"
@@ -16,17 +16,17 @@ rm -rf $IROOT/php PHP_HOME cphalcon
 
 fw_get -o php-${VERSION}.tar.gz http://php.net/distributions/php-${VERSION}.tar.gz
 fw_untar php-${VERSION}.tar.gz
-mv php-${VERSION} php
-cd php
+mv php-${VERSION} php5
+cd php5
 
-echo "Configuring PHP quietly..."
+echo "Configuring PHP5 quietly..."
 ./configure --prefix=$PHP_HOME --with-pdo-mysql \
   --with-mysql --with-mcrypt --enable-intl --enable-mbstring \
   --enable-fpm --with-fpm-user=testrunner --with-fpm-group=testrunner \
   --with-openssl --with-mysqli --with-zlib --enable-opcache --quiet
-echo "Making PHP quietly..."
+echo "Making PHP5 quietly..."
 make --quiet
-echo "Installing PHP quietly"
+echo "Installing PHP5 quietly"
 make --quiet install
 cd ..
 
@@ -61,7 +61,7 @@ printf "\n" | $PHP_HOME/bin/pecl -q install -f mongo
 # Clean up a bit
 rm -rf $IROOT/php
 
-echo "export PHP_HOME=${PHP_HOME}" > $IROOT/php.installed
-echo -e "export PATH=\$PHP_HOME/bin:\$PHP_HOME/sbin:\$PATH" >> $IROOT/php.installed
+echo "export PHP_HOME=${PHP_HOME}" > $IROOT/php5.installed
+echo -e "export PATH=\$PHP_HOME/bin:\$PHP_HOME/sbin:\$PATH" >> $IROOT/php5.installed
 
-source $IROOT/php.installed
+source $IROOT/php5.installed