Merge branch 'akrabat/ZendConfigWriterIniFixup'

zendframework · Jul 26, 2010 · 196ca18 · 196ca18
4 parents 8f4a51f + 88ec12d + 17cbc64 + 914b7ad
commit 196ca18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Writer/Ini.php b/src/Writer/Ini.php
@@ -78,7 +78,7 @@ public function setRenderWithoutSections($withoutSections=true)
     }
 
     /**
-     * Render a Zend_Config into a INI config string.
+     * Render a Zend\Config into a INI config string.
      *
      * @since 1.10
      * @return string
@@ -168,10 +168,10 @@ protected function _prepareValue($value)
      * on the top of config.
      * 
      * @see    http://framework.zend.com/issues/browse/ZF-6289
-     * @param  Zend_Config
-     * @return Zend_Config
+     * @param  Zend\Config
+     * @return Zend\Config
      */
-    protected function _sortRootElements(Zend_Config $config)
+    protected function _sortRootElements(\Zend\Config\Config $config)
     {
         $configArray = $config->toArray();
         $sections = array();
@@ -189,6 +189,6 @@ protected function _sortRootElements(Zend_Config $config)
             $configArray[$key] = $value;
         }
 
-        return new Zend_Config($configArray);
+        return new \Zend\Config\Config($configArray);
     }
 }
diff --git a/test/Writer/IniTest.php b/test/Writer/IniTest.php
@@ -223,15 +223,15 @@ public function testNoDoubleQuoutesInValue()
      */
     public function testZF6289_NonSectionElementsAndSectionJumbling()
     {
-        $config = new Zend_Config(array(
+        $config = new \Zend\Config\Config(array(
             'one'   => 'element',
             'two'   => array('type' => 'section'),
             'three' => 'element',
             'four'  => array('type' => 'section'),
             'five'  => 'element'
         ));
 
-        $writer = new Zend_Config_Writer_Ini;
+        $writer = new \Zend\Config\Writer\Ini;
         $iniString = $writer->setConfig($config)->render($config);
 
         $expected = <<<ECS