tweet_live: comparison web/lib/Zend/Tool/Project/Context/Zf/ApplicationConfigFile.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Tool
 * @subpackage Framework
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: ApplicationConfigFile.php 20851 2010-02-02 21:45:51Z ralph $
+* @version    $Id: ApplicationConfigFile.php 24593 2012-01-05 20:35:02Z matthew $
 */
 /**
 * @see Zend_Tool_Project_Context_Filesystem_File
 */
 * A profile is a hierarchical set of resources that keep track of
 * items within a specific project.
 *
 * @category   Zend
 * @package    Zend_Tool
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Tool_Project_Context_Zf_ApplicationConfigFile extends Zend_Tool_Project_Context_Filesystem_File
 {
 /**
 * @var string
 */
 protected $_content = null;
 /**
 * getName()
 *
 * @return string
 */
 if (file_exists($this->getPath())) {
 $this->_content = file_get_contents($this->getPath());
 } else {
 $this->_content = $this->_getDefaultContents();
 }
 }
 return $this->_content;
 }
 public function getAsZendConfig($section = 'production')
 {
 return new Zend_Config_Ini($this->getPath(), $section);
 }
 /**
 * addStringItem()
 *
 * @param string $key
 * @param string $value
 * @param string $section
 * @param bool   $quoteValue
 * @return Zend_Tool_Project_Context_Zf_ApplicationConfigFile
 */
 {
 // null quote value means to auto-detect
 if ($quoteValue === null) {
 $quoteValue = preg_match('#[\"\']#', $value) ? false : true;
 }
 if ($quoteValue == true) {
 $value = '"' . $value . '"';
 }
 $contentLines = preg_split('#[\n\r]#', $this->getContents());
 $newLines = array();
 $insideSection = false;
 foreach ($contentLines as $contentLineIndex => $contentLine) {
 if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) {
 $insideSection = true;
 }
+$newLines[] = $contentLine;
 if ($insideSection) {
 // if its blank, or a section heading
-if ((trim($contentLine) == null) || (isset($contentLines[$contentLineIndex + 1]{0}) && $contentLines[$contentLineIndex + 1]{0} == '[')) {
+if (isset($contentLines[$contentLineIndex + 1]{0}) && $contentLines[$contentLineIndex + 1]{0} == '[') {
+$newLines[] = $key . ' = ' . $value;
+$insideSection = null;
+} else if (!isset($contentLines[$contentLineIndex + 1])){
 $newLines[] = $key . ' = ' . $value;
 $insideSection = null;
 }
 }
-$newLines[] = $contentLine;
 }
 $this->_content = implode("\n", $newLines);
 return $this;
 }
 /**
 *
 * @param array $item
 * @param string $section
 * @param bool $quoteValue
 * @return Zend_Tool_Project_Context_Zf_ApplicationConfigFile
 */
 public function addItem($item, $section = 'production', $quoteValue = true)
 {
 $stringItems = array();
 $stringValues = array();
 $configKeyNames = array();
 $rii = new RecursiveIteratorIterator(
 new RecursiveArrayIterator($item),
 RecursiveIteratorIterator::SELF_FIRST
 );
 $lastDepth = 0;
 // loop through array structure recursively to create proper keys
 foreach ($rii as $name => $value) {
 $lastDepth = $rii->getDepth();
 if (is_array($value)) {
 array_push($configKeyNames, $name);
 } else {
 $stringItems[] = implode('.', $configKeyNames) . '.' . $name;
 $stringValues[] = $value;
 }
 }
 foreach ($stringItems as $stringItemIndex => $stringItem) {
 $this->addStringItem($stringItem, $stringValues[$stringItemIndex], $section, $quoteValue);
 }
 return $this;
 }
 public function removeStringItem($key, $section = 'production')
 {
 $contentLines = file($this->getPath());
 $newLines = array();
 $insideSection = false;
 foreach ($contentLines as $contentLineIndex => $contentLine) {
 if ($insideSection === false && preg_match('#^\[' . $section . '#', $contentLine)) {
 $insideSection = true;
 }
 if ($insideSection) {
 // if its blank, or a section heading
 if ((trim($contentLine) == null) || ($contentLines[$contentLineIndex + 1][0] == '[')) {
 $insideSection = null;
 }
 }
 if (!preg_match('#' . $key . '\s?=.*#', $contentLine)) {
 $newLines[] = $contentLine;
 }
 }
 $this->_content = implode('', $newLines);
 }
 public function removeItem($item, $section = 'production')
 {
 $stringItems = array();
 $stringValues = array();
 $configKeyNames = array();
 $rii = new RecursiveIteratorIterator(
 new RecursiveArrayIterator($item),
 RecursiveIteratorIterator::SELF_FIRST
 );
 $lastDepth = 0;
 // loop through array structure recursively to create proper keys
 foreach ($rii as $name => $value) {
 $lastDepth = $rii->getDepth();
 if (is_array($value)) {
 array_push($configKeyNames, $name);
 } else {
 $stringItems[] = implode('.', $configKeyNames) . '.' . $name;
 $stringValues[] = $value;
 }
 }
 foreach ($stringItems as $stringItemIndex => $stringItem) {
 $this->removeStringItem($stringItem, $section);
 }
 return $this;
 }
 protected function _getDefaultContents()
 {
 $contents =<<<EOS
 [production]
 EOS;
 return $contents;
 }
 }

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c