Fix string '0' not being exported correctly.

Fixes #3518
cakephp · Jan 10, 2013 · 7008b81 · 7008b81
1 parent 735517a
commit 7008b81
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php
@@ -408,6 +408,32 @@ public function testExportVar() {
 		$this->assertTextEquals($expected, $result);
 	}
 
+/**
+ * Test exporting various kinds of false.
+ *
+ * @return void
+ */
+	public function testExportVarZero() {
+		$data = array(
+			'nothing' => '',
+			'null' => null,
+			'false' => false,
+			'szero' => '0',
+			'zero' => 0
+		);;
+		$result = Debugger::exportVar($data);
+		$expected = <<<TEXT
+array(
+	'nothing' => '',
+	'null' => null,
+	'false' => false,
+	'szero' => '0',
+	'zero' => (int) 0
+)
+TEXT;
+		$this->assertTextEquals($expected, $result);
+	}
+
 /**
  * testLog method
  *

diff --git a/lib/Cake/Utility/Debugger.php b/lib/Cake/Utility/Debugger.php
@@ -489,7 +489,7 @@ protected static function _export($var, $depth, $indent) {
 			case 'float':
 				return '(float) ' . $var;
 			case 'string':
-				if (!trim($var)) {
+				if (trim($var) === '') {
 					return "''";
 				}
 				return "'" . $var . "'";