tweet_live: comparison web/lib/Zend/CodeGenerator/Php/Class.php

equal deleted inserted replaced

-:2251fb41dbc7
+:1e110b03ae96
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_CodeGenerator
 * @subpackage PHP
-* @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: Class.php 21915 2010-04-16 20:40:15Z matthew $
+* @version    $Id: Class.php 24593 2012-01-05 20:35:02Z matthew $
 */
 /**
 * @see Zend_CodeGenerator_Php_Abstract
 */
 require_once 'Zend/CodeGenerator/Php/Docblock.php';
 /**
 * @category   Zend
 * @package    Zend_CodeGenerator
-* @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_CodeGenerator_Php_Class extends Zend_CodeGenerator_Php_Abstract
 {
 /**
 * @var array Array of properties
 */
 protected $_properties = null;
+/**
+* @var array Array of constants
+*/
+protected $_constants = null;
 /**
 * @var array Array of methods
 */
 protected $_methods = null;
 $docblock = array('shortDescription' => $docblock);
 }
 if (is_array($docblock)) {
 $docblock = new Zend_CodeGenerator_Php_Docblock($docblock);
-} elseif (!$docblock instanceof Zend_CodeGenerator_Php_Docblock) {
+} elseif ((!is_null($docblock)) && (!$docblock instanceof Zend_CodeGenerator_Php_Docblock)) {
 require_once 'Zend/CodeGenerator/Php/Exception.php';
 throw new Zend_CodeGenerator_Php_Exception('setDocblock() is expecting either a string, array or an instance of Zend_CodeGenerator_Php_Docblock');
 }
 $this->_docblock = $docblock;
 */
 public function setProperties(Array $properties)
 {
 foreach ($properties as $property) {
 $this->setProperty($property);
+}
+return $this;
+}
+/**
+* setConstants()
+*
+* @param array $constants
+* @return Zend_CodeGenerator_Php_Class
+*/
+public function setConstants(Array $constants)
+{
+foreach ($constants as $const) {
+$this->setConstant($const);
 }
 return $this;
 }
 } else {
 require_once 'Zend/CodeGenerator/Php/Exception.php';
 throw new Zend_CodeGenerator_Php_Exception('setProperty() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property');
 }
+if ($property->isConst()) {
+return $this->setConstant($property);
+}
 if (isset($this->_properties[$propertyName])) {
 require_once 'Zend/CodeGenerator/Php/Exception.php';
 throw new Zend_CodeGenerator_Php_Exception('A property by name ' . $propertyName . ' already exists in this class.');
 }
 $this->_properties[$propertyName] = $property;
 return $this;
 }
 /**
+* setConstant()
+*
+* @param array|Zend_CodeGenerator_Php_Property $const
+* @return Zend_CodeGenerator_Php_Class
+*/
+public function setConstant($const)
+{
+if (is_array($const)) {
+$const = new Zend_CodeGenerator_Php_Property($const);
+$constName = $const->getName();
+} elseif ($const instanceof Zend_CodeGenerator_Php_Property) {
+$constName = $const->getName();
+} else {
+require_once 'Zend/CodeGenerator/Php/Exception.php';
+throw new Zend_CodeGenerator_Php_Exception('setConstant() expects either an array of property options or an instance of Zend_CodeGenerator_Php_Property');
+}
+if (!$const->isConst()) {
+require_once 'Zend/CodeGenerator/Php/Exception.php';
+throw new Zend_CodeGenerator_Php_Exception('setProperty() expects argument to define a constant');
+}
+if (isset($this->_constants[$constName])) {
+require_once 'Zend/CodeGenerator/Php/Exception.php';
+throw new Zend_CodeGenerator_Php_Exception('A constant by name ' . $constName . ' already exists in this class.');
+}
+$this->_constants[$constName] = $const;
+return $this;
+}
+/**
 * getProperties()
 *
 * @return array
 */
 public function getProperties()
 {
 return $this->_properties;
+}
+/**
+* getConstants()
+*
+* @return array
+*/
+public function getConstants()
+{
+return $this->_constants;
 }
 /**
 * getProperty()
 *
 }
 return false;
 }
 /**
+* getConstant()
+*
+* @param string $constName
+* @return Zend_CodeGenerator_Php_Property
+*/
+public function getConstant($constName)
+{
+foreach ($this->_constants as $const) {
+if ($const->getName() == $constName) {
+return $const;
+}
+}
+return false;
+}
+/**
 * hasProperty()
 *
 * @param string $propertyName
 * @return bool
 */
 public function hasProperty($propertyName)
 {
 return isset($this->_properties[$propertyName]);
+}
+/**
+* hasConstant()
+*
+* @param string $constName
+* @return bool
+*/
+public function hasConstant($constName)
+{
+return isset($this->_constants[$constName]);
 }
 /**
 * setMethods()
 *
 if ($property->isSourceDirty()) {
 return true;
 }
 }
+foreach ($this->_constants as $constant) {
+if ($constant->isSourceDirty()) {
+return true;
+}
+}
 foreach ($this->_methods as $method) {
 if ($method->isSourceDirty()) {
 return true;
 }
 }
 if (!empty($implemented)) {
 $output .= ' implements ' . implode(', ', $implemented);
 }
 $output .= self::LINE_FEED . '{' . self::LINE_FEED . self::LINE_FEED;
+$constants = $this->getConstants();
+if (!empty($constants)) {
+foreach ($constants as $const) {
+$output .= $const->generate() . self::LINE_FEED . self::LINE_FEED;
+}
+}
 $properties = $this->getProperties();
 if (!empty($properties)) {
 foreach ($properties as $property) {
 $output .= $property->generate() . self::LINE_FEED . self::LINE_FEED;
 *
 */
 protected function _init()
 {
 $this->_properties = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_PROPERTY);
+$this->_constants = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_PROPERTY);
 $this->_methods = new Zend_CodeGenerator_Php_Member_Container(Zend_CodeGenerator_Php_Member_Container::TYPE_METHOD);
 }
 }

changeset 886	1e110b03ae96
parent 807	877f952ae2bd
child 1230	68c69c656a2c