Modified PhpArray config writer to generate better readable array for…

…mat.
zendframework · Oct 12, 2013 · dc75eea · dc75eea
1 parent dd327e7
commit dc75eea
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 19 deletions.
diff --git a/library/Zend/Config/Writer/PhpArray.php b/library/Zend/Config/Writer/PhpArray.php
@@ -19,9 +19,25 @@ class PhpArray extends AbstractWriter
      */
     public function processConfig(array $config)
     {
-        $arrayString = "<?php\n"
-                     . "return " . var_export($config, true) . ";\n";
+        $arrayString = "<?php\n\n"
+                     . "return";
+        $indentLevel = 0;
 
-        return $arrayString;
+        foreach (explode("\n", var_export($config, true)) as $line) {
+            $line = trim($line);
+
+            if ($line === '),' || $line === ')') {
+                $indentLevel--;
+            } else if (preg_match('/^\s*array \(/', $line)) {
+                $line = 'array(';
+                $indentLevel++;
+                $arrayString .= ' ' . $line;
+                continue;
+            }
+
+            $arrayString .= "\n" . str_repeat('    ', $indentLevel) . $line;
+        }
+
+        return $arrayString . ";\n";
     }
 }
diff --git a/tests/ZendTest/Config/FactoryTest.php b/tests/ZendTest/Config/FactoryTest.php
@@ -176,14 +176,13 @@ public function testFactoryWriteToFile()
         $result = Factory::toFile($file, $config);
 
         // build string line by line as we are trailing-whitespace sensitive.
-        $expected = "<?php\n";
-        $expected .= "return array (\n";
-        $expected .= "  'test' => 'foo',\n";
-        $expected .= "  'bar' => \n";
-        $expected .= "  array (\n";
-        $expected .= "    0 => 'baz',\n";
-        $expected .= "    1 => 'foo',\n";
-        $expected .= "  ),\n";
+        $expected = "<?php\n\n";
+        $expected .= "return array(\n";
+        $expected .= "    'test' => 'foo',\n";
+        $expected .= "    'bar' => array(\n";
+        $expected .= "        0 => 'baz',\n";
+        $expected .= "        1 => 'foo',\n";
+        $expected .= "    ),\n";
         $expected .= ");\n";
 
         $this->assertEquals(true, $result);

diff --git a/tests/ZendTest/Config/Writer/PhpArrayTest.php b/tests/ZendTest/Config/Writer/PhpArrayTest.php
@@ -36,14 +36,13 @@ public function testRender()
         $configString = $this->writer->toString($config);
 
         // build string line by line as we are trailing-whitespace sensitive.
-        $expected = "<?php\n";
-        $expected .= "return array (\n";
-        $expected .= "  'test' => 'foo',\n";
-        $expected .= "  'bar' => \n";
-        $expected .= "  array (\n";
-        $expected .= "    0 => 'baz',\n";
-        $expected .= "    1 => 'foo',\n";
-        $expected .= "  ),\n";
+        $expected = "<?php\n\n";
+        $expected .= "return array(\n";
+        $expected .= "    'test' => 'foo',\n";
+        $expected .= "    'bar' => array(\n";
+        $expected .= "        0 => 'baz',\n";
+        $expected .= "        1 => 'foo',\n";
+        $expected .= "    ),\n";
         $expected .= ");\n";
 
         $this->assertEquals($expected, $configString);