Fix test of the size of lines in MagicDb (included test for it).

Signed-off-by: Mark Story <mark@mark-story.com>
cakephp · Nov 22, 2009 · c6c7474 · c6c7474
1 parent 7e889d8
commit c6c7474
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cake/libs/magic_db.php b/cake/libs/magic_db.php
@@ -95,7 +95,7 @@ function toArray($data = null) {
 		$lines = explode("\r\n", $data);
 		$db = array();
 
-		$validHeader = count($lines > 3)
+		$validHeader = count($lines) > 3
 					&& preg_match('/^# Date:([0-9]{4}-[0-9]{2}-[0-9]{2})$/', $lines[1], $date)
 					&& preg_match('/^# Source:(.+)$/', $lines[2], $source)
 					&& strlen($lines[3]) == 0;

diff --git a/cake/tests/cases/libs/magic_db.test.php b/cake/tests/cases/libs/magic_db.test.php
@@ -116,6 +116,9 @@ function testToArray() {
 		$r = $this->Db->toArray(array('yeah'));
 		$this->assertTrue($r === array('yeah'));
 
+		$r = $this->Db->toArray("# FILE_ID DB\r\n# Date:2009-10-10\r\n# Source:xxx.php");
+		$this->assertTrue($r === array());
+
 		$r = $this->Db->toArray('foo');
 		$this->assertTrue($r === array());