tweet_live: comparison web/lib/Zend/Form.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Form
-* @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
 */
 /** @see Zend_Validate_Interface */
 require_once 'Zend/Validate/Interface.php';
 /**
 * Zend_Form
 *
 * @category   Zend
 * @package    Zend_Form
-* @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: Form.php 23429 2010-11-22 23:06:46Z bittarman $
+* @version    $Id: Form.php 25223 2013-01-17 14:44:54Z frosch $
 */
 class Zend_Form implements Iterator, Countable, Zend_Validate_Interface
 {
 /**#@+
 * Plugin loader type constants
 }
 if (isset($options['attribs'])) {
 $this->addAttribs($options['attribs']);
 unset($options['attribs']);
+}
+if (isset($options['subForms'])) {
+$this->addSubForms($options['subForms']);
+unset($options['subForms']);
 }
 $forbidden = array(
 'Options', 'Config', 'PluginLoader', 'SubForms', 'Translator',
 'Attrib', 'Default',
 case self::ELEMENT:
 $loader = $this->getPluginLoader($type);
 $loader->addPrefixPath($prefix, $path);
 return $this;
 case null:
-$prefix = rtrim($prefix, '_');
+$nsSeparator = (false !== strpos($prefix, '\\'))?'\\':'_';
+$prefix = rtrim($prefix, $nsSeparator);
 $path   = rtrim($path, DIRECTORY_SEPARATOR);
 foreach (array(self::DECORATOR, self::ELEMENT) as $type) {
 $cType        = ucfirst(strtolower($type));
 $pluginPath   = $path . DIRECTORY_SEPARATOR . $cType . DIRECTORY_SEPARATOR;
-$pluginPrefix = $prefix . '_' . $cType;
+$pluginPrefix = $prefix . $nsSeparator . $cType;
 $loader       = $this->getPluginLoader($type);
 $loader->addPrefixPath($pluginPrefix, $pluginPath);
 }
 return $this;
 default:
 * and any provided $options will be ignored.
 *
 * @param  string|Zend_Form_Element $element
 * @param  string $name
 * @param  array|Zend_Config $options
+* @throws Zend_Form_Exception on invalid element
 * @return Zend_Form
 */
 public function addElement($element, $name = null, $options = null)
 {
 if (is_string($element)) {
 if (null === $name) {
 require_once 'Zend/Form/Exception.php';
-throw new Zend_Form_Exception('Elements specified by string must have an accompanying name');
+throw new Zend_Form_Exception(
-}
+'Elements specified by string must have an accompanying name'
+);
-if (is_array($this->_elementDecorators)) {
-if (null === $options) {
-$options = array('decorators' => $this->_elementDecorators);
-} elseif ($options instanceof Zend_Config) {
-$options = $options->toArray();
-}
-if (is_array($options)
-&& !array_key_exists('decorators', $options)
-) {
-$options['decorators'] = $this->_elementDecorators;
-}
 }
 $this->_elements[$name] = $this->createElement($element, $name, $options);
 } elseif ($element instanceof Zend_Form_Element) {
 $prefixPaths              = array();
 $prefixPaths['decorator'] = $this->getPluginLoader('decorator')->getPaths();
 if (!empty($this->_elementPrefixPaths)) {
 $prefixPaths = array_merge($prefixPaths, $this->_elementPrefixPaths);
 }
+if (is_array($this->_elementDecorators)
+&& 0 == count($element->getDecorators())
+) {
+$element->setDecorators($this->_elementDecorators);
+}
 if (null === $name) {
 $name = $element->getName();
 }
 $this->_elements[$name] = $element;
 $this->_elements[$name]->addPrefixPaths($prefixPaths);
+} else {
+require_once 'Zend/Form/Exception.php';
+throw new Zend_Form_Exception(
+'Element must be specified by string or Zend_Form_Element instance'
+);
 }
 $this->_order[$name] = $this->_elements[$name]->getOrder();
 $this->_orderUpdated = true;
 $this->_setElementsBelongTo($name);
 $options = $options->toArray();
 }
 if ((null === $options) || !is_array($options)) {
 $options = array('prefixPath' => $prefixPaths);
+if (is_array($this->_elementDecorators)) {
+$options['decorators'] = $this->_elementDecorators;
+}
 } elseif (is_array($options)) {
 if (array_key_exists('prefixPath', $options)) {
 $options['prefixPath'] = array_merge($prefixPaths, $options['prefixPath']);
 } else {
 $options['prefixPath'] = $prefixPaths;
+}
+if (is_array($this->_elementDecorators)
+&& !array_key_exists('decorators', $options)
+) {
+$options['decorators'] = $this->_elementDecorators;
 }
 }
 $class = $this->getPluginLoader(self::ELEMENT)->load($type);
 $element = new $class($name, $options);
 */
 public function getValues($suppressArrayNotation = false)
 {
 $values = array();
 $eBelongTo = null;
 if ($this->isArray()) {
 $eBelongTo = $this->getElementsBelongTo();
 }
 foreach ($this->getElements() as $key => $element) {
 if (!$element->getIgnore()) {
 $merge = array();
 if (($belongsTo = $element->getBelongsTo()) !== $eBelongTo) {
 if ('' !== (string)$belongsTo) {
 * @param  array $subForms
 * @return Zend_Form
 */
 public function addSubForms(array $subForms)
 {
 foreach ($subForms as $key => $spec) {
-$name = null;
+$name = (string) $key;
-if (!is_numeric($key)) {
-$name = $key;
-}
 if ($spec instanceof Zend_Form) {
 $this->addSubForm($spec, $name);
 continue;
 }
 switch ($argc) {
 case 0:
 continue;
 case (1 <= $argc):
 $subForm = array_shift($spec);
+if (!$subForm instanceof Zend_Form) {
+$subForm = new Zend_Form_SubForm($subForm);
+}
 case (2 <= $argc):
 $name  = array_shift($spec);
 case (3 <= $argc):
 $order = array_shift($spec);
 default:
 public function addDisplayGroup(array $elements, $name, $options = null)
 {
 $group = array();
 foreach ($elements as $element) {
 if($element instanceof Zend_Form_Element) {
-$element = $element->getId();
+$elementName = $element->getName();
+if (!isset($this->_elements[$elementName])) {
+$this->addElement($element);
+}
+$element = $elementName;
 }
 if (isset($this->_elements[$element])) {
 $add = $this->getElement($element);
 if (null !== $add) {
 /**
 * Given an array, an optional arrayPath and a key this method
 * dissolves the arrayPath and unsets the key within the array
 * if it exists.
 *
 * @param array $array
 * @param string|null $arrayPath
 * @param string $key
 * @return array
 */
 protected function _dissolveArrayUnsetKey($array, $arrayPath, $key)
 {
 $unset =& $array;
 $path  = trim(strtr((string)$arrayPath, array('[' => '/', ']' => '')), '/');
 $segs  = ('' !== $path) ? explode('/', $path) : array();
 foreach ($segs as $seg) {
 if (!array_key_exists($seg, (array)$unset)) {
 return $array;
 }
 $unset =& $unset[$seg];
 * Elements, SubForms and Elements from DisplayGroups as Values.
 *
 * Subitems are inserted based on their order Setting if set,
 * otherwise they are appended, the resulting numerical index
 * may differ from the order value.
 *
 * @access protected
 * @return array
 */
 public function getElementsAndSubFormsOrdered()
 {
 $ordered = array();
 foreach ($this->_order as $name => $order) {
 }
 return $ordered;
 }
 /**
 * This is a helper function until php 5.3 is widespreaded
 *
 * @param array $into
 * @access protected
 * @return void
 */
 protected function _array_replace_recursive(array $into)
 $valid = $element->isValid($check[$key], $context) && $valid;
 $data = $this->_dissolveArrayUnsetKey($data, $belongsTo, $key);
 }
 }
 foreach ($this->getSubForms() as $key => $form) {
-if (null !== $translator && !$form->hasTranslator()) {
+if (null !== $translator && $this->hasTranslator()
+&& !$form->hasTranslator()) {
 $form->setTranslator($translator);
 }
 if (isset($data[$key]) && !$form->isArray()) {
 $valid = $form->isValid($data[$key]) && $valid;
 } else {
 }
 /**
 * Are there errors in the form?
 *
+* @deprecated since 1.11.1 - use hasErrors() instead
 * @return bool
 */
 public function isErrors()
+{
+return $this->hasErrors();
+}
+/**
+* Are there errors in the form?
+*
+* @return bool
+*/
+public function hasErrors()
 {
 return $this->_errorsExist;
 }
 /**
 return $this->getElement($name)->getErrors();
 } else if (isset($this->_subForms[$name])) {
 return $this->getSubForm($name)->getErrors(null, true);
 }
 }
 foreach ($this->_elements as $key => $element) {
 $errors[$key] = $element->getErrors();
 }
 foreach ($this->getSubForms() as $key => $subForm) {
 $merge = array();
 }
 /**
 * Retrieve translated custom error messages
 * Proxies to {@link _getErrorMessages()}.
 *
 * @return array
 */
 public function getCustomMessages()
 {
 return $this->_getErrorMessages();
 return self::getDefaultTranslator();
 }
 return $this->_translator;
 }
 /**
 * Does this form have its own specific translator?
 *
 * @return bool
 */
 public function hasTranslator()
 {
 return (bool)$this->_translator;
 }
 /**
 * Get global default translator object
 *
 * @return null|Zend_Translate
 return self::$_translatorDefault;
 }
 /**
 * Is there a default translation object set?
 *
 * @return boolean
 */
 public static function hasDefaultTranslator()
 {
 return (bool)self::$_translatorDefault;
 }
 /**
 * Indicate whether or not translation should be disabled
 *
 * @param  bool $flag
 * @return Zend_Form
 }
 /**
 * Load the default decorators
 *
-* @return void
+* @return Zend_Form
 */
 public function loadDefaultDecorators()
 {
 if ($this->loadDefaultDecoratorsIsDisabled()) {
 return $this;
 return $this;
 }
 /**
 * Remove an element from iteration
 *
 * @param  string $name Element/group/form name
 * @return void
 */
 public function removeFromIteration($name)
 {

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