Change how a single view var is inferred with '_serialize' => true

Now if a single view var is set it's inferred as `'_serialize' => ['var']` instead of `'_serialize' => 'var'`. Closes #7482
cakephp · Sep 30, 2015 · ddc3902 · ddc3902
1 parent 543b49b
commit ddc3902
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/View/JsonView.php b/src/View/JsonView.php
@@ -173,10 +173,6 @@ protected function _dataToSerialize($serialize = true)
                 return null;
             }
 
-            if (count($data) === 1) {
-                return current($data);
-            }
-
             return $data;
         }
 

diff --git a/tests/TestCase/View/JsonViewTest.php b/tests/TestCase/View/JsonViewTest.php
@@ -119,6 +119,14 @@ public static function renderWithoutViewProvider()
                 json_encode(['no' => 'nope', 'user' => 'fake', 'list' => ['item1', 'item2']])
             ],
 
+            // Test render with True in _serialize and single var
+            [
+                ['no' => 'nope'],
+                true,
+                null,
+                json_encode(['no' => 'nope'])
+            ],
+
             // Test render with empty string in _serialize.
             [
                 ['no' => 'nope', 'user' => 'fake', 'list' => ['item1', 'item2']],