Zend\Config\Writer\PhpArray - quote strings as var_export would

zendframework · Jan 28, 2014 · d997fc4 · d997fc4
1 parent f92a07b
commit d997fc4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/library/Zend/Config/Writer/PhpArray.php b/library/Zend/Config/Writer/PhpArray.php
@@ -76,12 +76,10 @@ protected function processIndented(array $config, array $arraySyntax, &$indentLe
                                   . $this->processIndented($value, $arraySyntax, $indentLevel)
                                   . str_repeat(self::INDENT_STRING, --$indentLevel) . $arraySyntax['close'] . ",\n";
                 }
-            } elseif (is_object($value)) {
+            } elseif (is_object($value) || is_string($value)) {
                 $arrayString .= var_export($value, true) . ",\n";
             } elseif (is_bool($value)) {
                 $arrayString .= ($value ? 'true' : 'false') . ",\n";
-            } elseif (is_string($value)) {
-                $arrayString .= "'" . addslashes($value) . "',\n";
             } elseif ($value === null) {
                 $arrayString .= "null,\n";
             } else {

diff --git a/tests/ZendTest/Config/Writer/PhpArrayTest.php b/tests/ZendTest/Config/Writer/PhpArrayTest.php
@@ -84,6 +84,21 @@ public function testRenderWithBracketArraySyntax()
         $this->assertEquals($expected, $configString);
     }
 
+    public function testRenderWithQuotesInString()
+    {
+        $config = new Config(array('one' => 'Test with "double" quotes', 'two' => 'Test with \'single\' quotes'));
+
+        $configString = $this->writer->toString($config);
+
+        $expected = "<?php\n";
+        $expected .= "return array(\n";
+        $expected .= "    'one' => 'Test with \"double\" quotes',\n";
+        $expected .= "    'two' => 'Test with \\'single\\' quotes',\n";
+        $expected .= ");\n";
+
+        $this->assertEquals($expected, $configString);
+    }
+
     public function testSetUseBracketArraySyntaxReturnsFluentInterface()
     {
         $this->assertSame($this->writer, $this->writer->setUseBracketArraySyntax(true));