Merge branch hamiltont/cakephp-patch

- Fixes all cakephp URL verification errors
- Renames cake to cakephp

.travis.yml

@@ -34,7 +34,7 @@ env:
     - TESTDIR=aspnet
     - TESTDIR=beego
     - TESTDIR=bottle
-    - TESTDIR=cake
+    - TESTDIR=cakephp
     - TESTDIR=compojure
     - TESTDIR=cowboy
     - TESTDIR=cpoll_cppsp

cake/app/Controller/WorldController.php → cakephp/app/Controller/WorldController.php

@@ -13,8 +13,16 @@ class WorldController extends AppController {
     // Read number of queries to run from URL parameter
     // http://book.cakephp.org/2.0/en/controllers/request-response.html#accessing-request-parameters
     $query_count = $this->request->query('queries');
+    $should_return_array = True;
     if ($query_count == null) {
       $query_count = 1;
+      $should_return_array = False;
+    }
+    $query_count = intval($query_count);
+    if ($query_count == 0) {
+      $query_count = 1;
+    } elseif ($query_count > 500) {
+      $query_count = 500;
     }
 
     // Create an array with the response string.
@@ -33,11 +41,18 @@ class WorldController extends AppController {
       $arr[] = array("id" => $world['World']['id'], "randomNumber" => $world['World']['randomNumber']);
     }
 
+    # Return either one object or a json list
+    if ($should_return_array == False) {
+      $this->set('worlds', $arr[0]);
+    } else {
+      $this->set('worlds', $arr);  
+    }
+
     // Use the CakePHP JSON View
     // http://book.cakephp.org/2.0/en/views/json-and-xml-views.html
-    $this->set('worlds', $arr);
-    $this->set('_serialize', array('worlds'));
+    $this->set('_serialize', 'worlds');
   }
+
 }
 ?>
 

cake/benchmark_config → cakephp/benchmark_config

@@ -1,10 +1,10 @@
 {
-  "framework": "cake",
+  "framework": "cakephp",
   "tests": [{
     "default": {
       "setup_file": "setup",
       "json_url": "/json.json",
-      "db_url": "/world.json",
+      "db_url": "/world/index.json",
       "query_url": "/world.json?queries=",
       "fortunes_url": "/fortunes",
       "plaintext_url": "/plaintext",
@@ -12,16 +12,16 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "cake",
+      "framework": "cakephp",
       "language": "PHP",
       "orm": "Full",
       "platform": "PHP-FPM",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "cake",
+      "display_name": "CakePHP",
       "notes": "",
       "versus": "php"
     }
   }]
-}
+}

cake/deploy/cake → cakephp/deploy/cake

@@ -1,6 +1,6 @@
 <VirtualHost *:8080>
-  Alias /cake/ "/home/hyoung/FrameworkBenchmarks/cake/app/webroot/"
-  <Directory /home/hyoung/FrameworkBenchmarks/cake/app/webroot/>
+  Alias /cake/ "/home/hyoung/FrameworkBenchmarks/cakephp/app/webroot/"
+  <Directory /home/hyoung/FrameworkBenchmarks/cakephp/app/webroot/>
           Options Indexes FollowSymLinks MultiViews
           #AllowOverride None
           Order allow,deny

cake/deploy/nginx.conf → cakephp/deploy/nginx.conf

@@ -61,7 +61,7 @@ http {
         #    proxy_pass   http://127.0.0.1;
         #}
         
-        root /home/hyoung/FrameworkBenchmarks/cake/app/webroot/;
+        root /home/hyoung/FrameworkBenchmarks/cakephp/app/webroot/;
         index  index.php;
 
         location / {