ramon
2010-08-21 13:58:00 UTC
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22869] standard/branches/release-1.10: [ZF-6289]</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22869</dd>
<dt>Author</dt> <dd>ramon</dd>
<dt>Date</dt> <dd>2010-08-21 06:57:59 -0700 (Sat, 21 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-6289]
merge r21983 to branch release-1.10. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110libraryZendConfigWriterIniphp">standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php</a></li>
<li><a href="#standardbranchesrelease110testsZendConfigWriterIniTestphp">standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110libraryZendConfigWriterIniphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php (22868 => 22869)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php 2010-08-21 13:26:42 UTC (rev 22868)
+++ standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php 2010-08-21 13:57:59 UTC (rev 22869) </span><span class="lines">@@ -93,7 +93,8 @@ </span><span class="cx"> . $this->_addBranch($this->_config) </span><span class="cx"> . "\n"; </span><span class="cx"> } else { </span><del>- foreach ($this->_config as $sectionName => $data) { </del><ins>+ $config = $this->_sortRootElements($this->_config);
+ foreach ($config as $sectionName => $data) {
</ins><span class="cx"> if (!($data instanceof Zend_Config)) {
</span><span class="cx"> $iniString .= $sectionName
</span><span class="cx"> . ' = '
</span><span class="lines">@@ -160,4 +161,33 @@
</span><span class="cx"> throw new Zend_Config_Exception('Value can not contain double quotes "');
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Root elements that are not assigned to any section needs to be
+ * on the top of config.
+ *
+ * @see http://framework.zend.com/issues/browse/ZF-6289
+ * @param Zend_Config
+ * @return Zend_Config
+ */
+ protected function _sortRootElements(Zend_Config $config)
+ {
+ $configArray = $config->toArray();
+ $sections = array();
+
+ // remove sections from config array
+ foreach ($configArray as $key => $value) {
+ if (is_array($value)) {
+ $sections[$key] = $value;
+ unset($configArray[$key]);
+ }
+ }
+
+ // readd sections to the end
+ foreach ($sections as $key => $value) {
+ $configArray[$key] = $value;
+ }
+
+ return new Zend_Config($configArray);
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="standardbranchesrelease110testsZendConfigWriterIniTestphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php (22868 => 22869)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php 2010-08-21 13:26:42 UTC (rev 22868)
+++ standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php 2010-08-21 13:57:59 UTC (rev 22869) </span><span class="lines">@@ -246,4 +246,39 @@ </span><span class="cx"> $this->assertContains('Value can not contain double quotes "', $expected->getMessage());
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group ZF-6289
+ */
+ public function testZF6289_NonSectionElementsAndSectionJumbling()
+ {
+ $config = new Zend_Config(array(
+ 'one' => 'element',
+ 'two' => array('type' => 'section'),
+ 'three' => 'element',
+ 'four' => array('type' => 'section'),
+ 'five' => 'element'
+ ));
+
+ $writer = new Zend_Config_Writer_Ini;
+ $iniString = $writer->setConfig($config)->render($config);
+
+ $expected = <<<ECS
+one = "element"
+three = "element"
+five = "element"
+[two]
+type = "section"
+
+[four]
+type = "section"
+
+
+ECS;
+
+ $this->assertEquals(
+ $expected,
+ $iniString
+ );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[framework-svn][22869] standard/branches/release-1.10: [ZF-6289]</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>22869</dd>
<dt>Author</dt> <dd>ramon</dd>
<dt>Date</dt> <dd>2010-08-21 06:57:59 -0700 (Sat, 21 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ZF-6289]
merge r21983 to branch release-1.10. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#standardbranchesrelease110libraryZendConfigWriterIniphp">standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php</a></li>
<li><a href="#standardbranchesrelease110testsZendConfigWriterIniTestphp">standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="standardbranchesrelease110libraryZendConfigWriterIniphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php (22868 => 22869)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php 2010-08-21 13:26:42 UTC (rev 22868)
+++ standard/branches/release-1.10/library/Zend/Config/Writer/Ini.php 2010-08-21 13:57:59 UTC (rev 22869) </span><span class="lines">@@ -93,7 +93,8 @@ </span><span class="cx"> . $this->_addBranch($this->_config) </span><span class="cx"> . "\n"; </span><span class="cx"> } else { </span><del>- foreach ($this->_config as $sectionName => $data) { </del><ins>+ $config = $this->_sortRootElements($this->_config);
+ foreach ($config as $sectionName => $data) {
</ins><span class="cx"> if (!($data instanceof Zend_Config)) {
</span><span class="cx"> $iniString .= $sectionName
</span><span class="cx"> . ' = '
</span><span class="lines">@@ -160,4 +161,33 @@
</span><span class="cx"> throw new Zend_Config_Exception('Value can not contain double quotes "');
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Root elements that are not assigned to any section needs to be
+ * on the top of config.
+ *
+ * @see http://framework.zend.com/issues/browse/ZF-6289
+ * @param Zend_Config
+ * @return Zend_Config
+ */
+ protected function _sortRootElements(Zend_Config $config)
+ {
+ $configArray = $config->toArray();
+ $sections = array();
+
+ // remove sections from config array
+ foreach ($configArray as $key => $value) {
+ if (is_array($value)) {
+ $sections[$key] = $value;
+ unset($configArray[$key]);
+ }
+ }
+
+ // readd sections to the end
+ foreach ($sections as $key => $value) {
+ $configArray[$key] = $value;
+ }
+
+ return new Zend_Config($configArray);
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="standardbranchesrelease110testsZendConfigWriterIniTestphp"></a>
<div class="modfile"><h4>Modified: standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php (22868 => 22869)</h4>
<pre class="diff"><span>
<span class="info">--- standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php 2010-08-21 13:26:42 UTC (rev 22868)
+++ standard/branches/release-1.10/tests/Zend/Config/Writer/IniTest.php 2010-08-21 13:57:59 UTC (rev 22869) </span><span class="lines">@@ -246,4 +246,39 @@ </span><span class="cx"> $this->assertContains('Value can not contain double quotes "', $expected->getMessage());
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group ZF-6289
+ */
+ public function testZF6289_NonSectionElementsAndSectionJumbling()
+ {
+ $config = new Zend_Config(array(
+ 'one' => 'element',
+ 'two' => array('type' => 'section'),
+ 'three' => 'element',
+ 'four' => array('type' => 'section'),
+ 'five' => 'element'
+ ));
+
+ $writer = new Zend_Config_Writer_Ini;
+ $iniString = $writer->setConfig($config)->render($config);
+
+ $expected = <<<ECS
+one = "element"
+three = "element"
+five = "element"
+[two]
+type = "section"
+
+[four]
+type = "section"
+
+
+ECS;
+
+ $this->assertEquals(
+ $expected,
+ $iniString
+ );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>