Fix typo and failing test.

cakephp · Aug 24, 2014 · 9fffa47 · 9fffa47
1 parent 9bb8f68
commit 9fffa47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Collection/CollectionTrait.php b/src/Collection/CollectionTrait.php
@@ -656,7 +656,7 @@ public function append($items) {
  * [
  *	1 => 'foo',
  *	2 => 'bar',
- *	3 => 'baz,
+ *	3 => 'baz',
  * ];
  *
  * $combined = (new Collection($items))->combine('id', 'name', 'parent');

diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
@@ -2060,7 +2060,7 @@ public function testAutoFieldsWithContainQueryBuilder() {
 			->autoFields(true)
 			->hydrate(false)
 			->contain(['Authors' => function($q) {
-				return $q->select(['compute' => '2 + 20'])
+				return $q->select(['compute' => '(SELECT 2 + 20)'])
 					->autoFields(true);
 			}])
 			->first();