diff --git a/lib/zend/Zend/Amf/Adobe/Auth.php b/lib/zend/Zend/Amf/Adobe/Auth.php index a83903492ea..33549890a09 100755 --- a/lib/zend/Zend/Amf/Adobe/Auth.php +++ b/lib/zend/Zend/Amf/Adobe/Auth.php @@ -14,18 +14,18 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Auth_Abstract */ +/** @see Zend_Amf_Auth_Abstract */ require_once 'Zend/Amf/Auth/Abstract.php'; -/** Zend_Acl */ +/** @see Zend_Acl */ require_once 'Zend/Acl.php'; -/** Zend_Auth_Result */ +/** @see Zend_Auth_Result */ require_once 'Zend/Auth/Result.php'; /** @@ -33,29 +33,29 @@ require_once 'Zend/Auth/Result.php'; * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_Auth extends Zend_Amf_Auth_Abstract { - + /** * ACL for authorization - * + * * @var Zend_Acl */ protected $_acl; - + /** * Username/password array - * + * * @var array */ protected $_users = array(); - + /** * Create auth adapter - * + * * @param string $rolefile File containing XML with users and roles */ public function __construct($rolefile) @@ -70,31 +70,31 @@ Roles file format: - + */ foreach($xml->role as $role) { $this->_acl->addRole(new Zend_Acl_Role((string)$role["id"])); foreach($role->user as $user) { - $this->_users[(string)$user["name"]] = array("password" => (string)$user["password"], - "role" => (string)$role["id"]); - } + $this->_users[(string)$user["name"]] = array("password" => (string)$user["password"], + "role" => (string)$role["id"]); + } } } - + /** * Get ACL with roles from XML file - * + * * @return Zend_Acl */ public function getAcl() { return $this->_acl; } - + /** * Perform authentication - * + * * @throws Zend_Auth_Adapter_Exception * @return Zend_Auth_Result * @see Zend_Auth_Adapter_Interface#authenticate() @@ -109,14 +109,14 @@ Roles file format: require_once 'Zend/Auth/Adapter/Exception.php'; throw new Zend_Auth_Adapter_Exception('Username/password should be set'); } - + if(!isset($this->_users[$this->_username])) { return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_IDENTITY_NOT_FOUND, null, array('Username not found') ); } - + $user = $this->_users[$this->_username]; if($user["password"] != $this->_password) { return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID, @@ -124,7 +124,7 @@ Roles file format: array('Authentication failed') ); } - + $id = new stdClass(); $id->role = $user["role"]; $id->name = $this->_username; diff --git a/lib/zend/Zend/Amf/Adobe/DbInspector.php b/lib/zend/Zend/Amf/Adobe/DbInspector.php index fb540c5064b..d756787ad6f 100755 --- a/lib/zend/Zend/Amf/Adobe/DbInspector.php +++ b/lib/zend/Zend/Amf/Adobe/DbInspector.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,80 +24,80 @@ * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Adobe_DbInspector { - /** - * Connect to the database - * - * @param string $dbType Database adapter type for Zend_Db - * @param array|object $dbDescription Adapter-specific connection settings - * @return Zend_Db_Adapter_Abstract - * @see Zend_Db::factory() - */ - protected function _connect($dbType, $dbDescription) - { - if(is_object($dbDescription)) { - $dbDescription = get_object_vars($dbDescription); - } - return Zend_Db::factory($dbType, $dbDescription); - } - - /** - * Describe database object. - * - * Usage example: - * $inspector->describeTable('Pdo_Mysql', - * array( - * 'host' => '127.0.0.1', - * 'username' => 'webuser', - * 'password' => 'xxxxxxxx', - * 'dbname' => 'test' - * ), - * 'mytable' - * ); - * - * @param string $dbType Database adapter type for Zend_Db - * @param array|object $dbDescription Adapter-specific connection settings - * @param string $tableName Table name - * @return array Table description - * @see Zend_Db::describeTable() - * @see Zend_Db::factory() - */ - public function describeTable($dbType, $dbDescription, $tableName) - { - $db = $this->_connect($dbType, $dbDescription); - return $db->describeTable($tableName); - } + /** + * Connect to the database + * + * @param string $dbType Database adapter type for Zend_Db + * @param array|object $dbDescription Adapter-specific connection settings + * @return Zend_Db_Adapter_Abstract + * @see Zend_Db::factory() + */ + protected function _connect($dbType, $dbDescription) + { + if(is_object($dbDescription)) { + $dbDescription = get_object_vars($dbDescription); + } + return Zend_Db::factory($dbType, $dbDescription); + } - /** - * Test database connection - * - * @param string $dbType Database adapter type for Zend_Db - * @param array|object $dbDescription Adapter-specific connection settings - * @return bool - * @see Zend_Db::factory() - */ - public function connect($dbType, $dbDescription) - { - $db = $this->_connect($dbType, $dbDescription); - $db->listTables(); - return true; - } - - /** - * Get the list of database tables - * - * @param string $dbType Database adapter type for Zend_Db - * @param array|object $dbDescription Adapter-specific connection settings - * @return array List of the tables - */ - public function getTables($dbType, $dbDescription) - { - $db = $this->_connect($dbType, $dbDescription); - return $db->listTables(); - } + /** + * Describe database object. + * + * Usage example: + * $inspector->describeTable('Pdo_Mysql', + * array( + * 'host' => '127.0.0.1', + * 'username' => 'webuser', + * 'password' => 'xxxxxxxx', + * 'dbname' => 'test' + * ), + * 'mytable' + * ); + * + * @param string $dbType Database adapter type for Zend_Db + * @param array|object $dbDescription Adapter-specific connection settings + * @param string $tableName Table name + * @return array Table description + * @see Zend_Db::describeTable() + * @see Zend_Db::factory() + */ + public function describeTable($dbType, $dbDescription, $tableName) + { + $db = $this->_connect($dbType, $dbDescription); + return $db->describeTable($tableName); + } + + /** + * Test database connection + * + * @param string $dbType Database adapter type for Zend_Db + * @param array|object $dbDescription Adapter-specific connection settings + * @return bool + * @see Zend_Db::factory() + */ + public function connect($dbType, $dbDescription) + { + $db = $this->_connect($dbType, $dbDescription); + $db->listTables(); + return true; + } + + /** + * Get the list of database tables + * + * @param string $dbType Database adapter type for Zend_Db + * @param array|object $dbDescription Adapter-specific connection settings + * @return array List of the tables + */ + public function getTables($dbType, $dbDescription) + { + $db = $this->_connect($dbType, $dbDescription); + return $db->listTables(); + } } diff --git a/lib/zend/Zend/Amf/Adobe/Introspector.php b/lib/zend/Zend/Amf/Adobe/Introspector.php index f734db1300f..f746e38f470 100755 --- a/lib/zend/Zend/Amf/Adobe/Introspector.php +++ b/lib/zend/Zend/Amf/Adobe/Introspector.php @@ -14,18 +14,18 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Parse_TypeLoader */ +/** @see Zend_Amf_Parse_TypeLoader */ require_once 'Zend/Amf/Parse/TypeLoader.php'; -/** Zend_Reflection_Class */ +/** @see Zend_Reflection_Class */ require_once 'Zend/Reflection/Class.php'; -/** Zend_Server_Reflection */ +/** @see Zend_Server_Reflection */ require_once 'Zend/Server/Reflection.php'; /** @@ -33,10 +33,10 @@ require_once 'Zend/Server/Reflection.php'; * * @package Zend_Amf * @subpackage Adobe - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Amf_Adobe_Introspector +class Zend_Amf_Adobe_Introspector { /** * Options used: @@ -61,28 +61,28 @@ class Zend_Amf_Adobe_Introspector * @var DOMDocument XML document to store data */ protected $_xml; - + /** * Constructor - * + * * @return void */ public function __construct() { $this->_xml = new DOMDocument('1.0', 'utf-8'); } - + /** * Create XML definition on an AMF service class - * + * * @param string $serviceClass Service class name * @param array $options invocation options * @return string XML with service class introspection */ - public function introspect($serviceClass, $options = array()) + public function introspect($serviceClass, $options = array()) { $this->_options = $options; - + if (strpbrk($serviceClass, '\\/<>')) { return $this->_returnError('Invalid service name'); } @@ -95,7 +95,7 @@ class Zend_Amf_Adobe_Introspector require_once 'Zend/Loader.php'; Zend_Loader::loadClass($serviceClass, $this->_getServicePath()); } - + $serv = $this->_xml->createElement('service-description'); $serv->setAttribute('xmlns', 'http://ns.adobe.com/flex/service-description/2008'); @@ -104,17 +104,17 @@ class Zend_Amf_Adobe_Introspector $r = Zend_Server_Reflection::reflectClass($serviceClass); $this->_addService($r, $this->_ops); - + $serv->appendChild($this->_types); $serv->appendChild($this->_ops); $this->_xml->appendChild($serv); return $this->_xml->saveXML(); } - + /** * Authentication handler - * + * * @param Zend_Acl $acl * @return unknown_type */ @@ -125,14 +125,14 @@ class Zend_Amf_Adobe_Introspector /** * Generate map of public class attributes - * + * * @param string $typename type name - * @param DOMElement $typexml target XML element + * @param DOMElement $typexml target XML element * @return void */ protected function _addClassAttributes($typename, DOMElement $typexml) { - // Do not try to autoload here because _phpTypeToAS should + // Do not try to autoload here because _phpTypeToAS should // have already attempted to load this class if (!class_exists($typename, false)) { return; @@ -156,15 +156,15 @@ class Zend_Amf_Adobe_Introspector /** * Build XML service description from reflection class - * - * @param Zend_Server_Reflection_Class $refclass + * + * @param Zend_Server_Reflection_Class $refclass * @param DOMElement $target target XML element * @return void */ protected function _addService(Zend_Server_Reflection_Class $refclass, DOMElement $target) { foreach ($refclass->getMethods() as $method) { - if (!$method->isPublic() + if (!$method->isPublic() || $method->isConstructor() || ('__' == substr($method->name, 0, 2)) ) { @@ -190,6 +190,10 @@ class Zend_Amf_Adobe_Introspector $ptype = $this->_registerType($type); $arg->setAttribute('type', $ptype); + if($param->isDefaultValueAvailable()) { + $arg->setAttribute('defaultvalue', $param->getDefaultValue()); + } + $op->appendChild($arg); } @@ -197,10 +201,10 @@ class Zend_Amf_Adobe_Introspector } } } - + /** * Extract type of the property from DocBlock - * + * * @param Zend_Reflection_Property $prop reflection property object * @return string Property type */ @@ -219,13 +223,13 @@ class Zend_Amf_Adobe_Introspector $tag = $docBlock->getTag('var'); return trim($tag->getDescription()); } - + /** * Get the array of service directories - * + * * @return array Service class directories */ - protected function _getServicePath() + protected function _getServicePath() { if (isset($this->_options['server'])) { return $this->_options['server']->getDirectory(); @@ -240,7 +244,7 @@ class Zend_Amf_Adobe_Introspector /** * Map from PHP type name to AS type name - * + * * @param string $typename PHP type name * @return string AS type name */ @@ -263,11 +267,11 @@ class Zend_Amf_Adobe_Introspector /** * Register new type on the system - * + * * @param string $typename type name * @return string New type name */ - protected function _registerType($typename) + protected function _registerType($typename) { // Known type - return its AS name if (isset($this->_typesMap[$typename])) { @@ -291,19 +295,19 @@ class Zend_Amf_Adobe_Introspector $typeEl = $this->_xml->createElement('type'); $typeEl->setAttribute('name', $asTypeName); $this->_addClassAttributes($typename, $typeEl); - $this->_types->appendChild($typeEl); + $this->_types->appendChild($typeEl); return $asTypeName; } - + /** * Return error with error message - * + * * @param string $msg Error message - * @return string + * @return string */ - protected function _returnError($msg) + protected function _returnError($msg) { - return 'ERROR: $msg'; + return 'ERROR: $msg'; } } diff --git a/lib/zend/Zend/Amf/Auth/Abstract.php b/lib/zend/Zend/Amf/Auth/Abstract.php index 8fe0ead27d1..617d2b412c4 100755 --- a/lib/zend/Zend/Amf/Auth/Abstract.php +++ b/lib/zend/Zend/Amf/Auth/Abstract.php @@ -14,12 +14,12 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Auth_Adapter_Interface */ +/** @see Zend_Auth_Adapter_Interface */ require_once 'Zend/Auth/Adapter/Interface.php'; /** @@ -27,16 +27,16 @@ require_once 'Zend/Auth/Adapter/Interface.php'; * * @package Zend_Amf * @subpackage Auth - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Auth_Abstract implements Zend_Auth_Adapter_Interface { protected $_username; protected $_password; - + public function setCredentials($username, $password) { - $this->_username = $username; - $this->_password = $password; - } + $this->_username = $username; + $this->_password = $password; + } } diff --git a/lib/zend/Zend/Amf/Constants.php b/lib/zend/Zend/Amf/Constants.php index c4087f6dc32..4cf60025a1a 100644 --- a/lib/zend/Zend/Amf/Constants.php +++ b/lib/zend/Zend/Amf/Constants.php @@ -14,20 +14,20 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * The following constants are used throughout serialization and + * The following constants are used throughout serialization and * deserialization to detect the AMF marker and encoding types. * * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -final class Zend_Amf_Constants +final class Zend_Amf_Constants { const AMF0_NUMBER = 0x00; const AMF0_BOOLEAN = 0x01; @@ -68,11 +68,11 @@ final class Zend_Amf_Constants const ET_EXTERNAL = 0x01; const ET_DYNAMIC = 0x02; const ET_PROXY = 0x03; - + const FMS_OBJECT_ENCODING = 0x01; /** - * Special content length value that indicates "unknown" content length + * Special content length value that indicates "unknown" content length * per AMF Specification */ const UNKNOWN_CONTENT_LENGTH = -1; @@ -82,6 +82,6 @@ final class Zend_Amf_Constants const CREDENTIALS_HEADER = 'Credentials'; const PERSISTENT_HEADER = 'RequestPersistentHeader'; const DESCRIBE_HEADER = 'DescribeService'; - + const GUEST_ROLE = 'anonymous'; } diff --git a/lib/zend/Zend/Amf/Exception.php b/lib/zend/Zend/Amf/Exception.php index 2b359a46349..fa45da335d5 100644 --- a/lib/zend/Zend/Amf/Exception.php +++ b/lib/zend/Zend/Amf/Exception.php @@ -14,19 +14,19 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * Zend_Exception + * @see Zend_Exception */ require_once 'Zend/Exception.php'; /** * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Exception extends Zend_Exception diff --git a/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php b/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php index 157e73b2cdd..e80492d6b16 100644 --- a/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php +++ b/lib/zend/Zend/Amf/Parse/Amf0/Deserializer.php @@ -15,28 +15,31 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Parse_Deserializer */ +/** Zend_Amf_Constants */ +require_once 'Zend/Amf/Constants.php'; + +/** @see Zend_Amf_Parse_Deserializer */ require_once 'Zend/Amf/Parse/Deserializer.php'; /** * Read an AMF0 input stream and convert it into PHP data types * * @todo Implement Typed Object Class Mapping - * @todo Class could be implmented as Factory Class with each data type it's own class + * @todo Class could be implemented as Factory Class with each data type it's own class * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer { /** - * An array of objects used for recursivly deserializing an object. + * An array of objects used for recursively deserializing an object. * @var array */ protected $_reference = array(); @@ -167,7 +170,7 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer /** * Read reference objects * - * Used to gain access to the private array of refrence objects. + * Used to gain access to the private array of reference objects. * Called when marker type is 7. * * @return object @@ -200,7 +203,7 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer } /** - * Converts numberically indexed actiosncript arrays into php arrays. + * Converts numerically indexed actiosncript arrays into php arrays. * * Called when marker type is 10 * @@ -270,9 +273,9 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer $returnObject->$key = $value; } } - if($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) { - $returnObject = get_object_vars($returnObject); - } + if($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) { + $returnObject = get_object_vars($returnObject); + } return $returnObject; } @@ -284,7 +287,7 @@ class Zend_Amf_Parse_Amf0_Deserializer extends Zend_Amf_Parse_Deserializer */ public function readAmf3TypeMarker() { - require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; + require_once 'Zend/Amf/Parse/Amf3/Deserializer.php'; $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($this->_stream); $this->_objectEncoding = Zend_Amf_Constants::AMF3_OBJECT_ENCODING; return $deserializer->readTypeMarker(); diff --git a/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php b/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php index 859dfab64b5..9ecc352b8e5 100644 --- a/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php +++ b/lib/zend/Zend/Amf/Parse/Amf0/Serializer.php @@ -15,21 +15,24 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Parse_Serializer */ +/** Zend_Amf_Constants */ +require_once 'Zend/Amf/Constants.php'; + +/** @see Zend_Amf_Parse_Serializer */ require_once 'Zend/Amf/Parse/Serializer.php'; /** - * Serializer php misc types back to there corresponding AMF0 Type Marker. + * Serializer PHP misc types back to there corresponding AMF0 Type Marker. * * @uses Zend_Amf_Parse_Serializer * @package Zend_Amf * @subpackage Parse_Amf0 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer @@ -38,7 +41,7 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer * @var string Name of the class to be returned */ protected $_className = ''; - + /** * An array of reference objects * @var array @@ -52,17 +55,22 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer * auto negotiates the type or relies on the user defined markerType to * serialize the data into amf * - * @param misc $data - * @param misc $markerType + * @param mixed $data + * @param mixed $markerType + * @param mixed $dataByVal * @return Zend_Amf_Parse_Amf0_Serializer * @throws Zend_Amf_Exception for unrecognized types or data */ - public function writeTypeMarker($data, $markerType = null) + public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) { + // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // variables should be passed by reference" + if ((null === $data) && ($dataByVal !== false)) { + $data = &$dataByVal; + } if (null !== $markerType) { - //try to refrence the given object - if( !$this->writeObjectReference($data, $markerType) ) { - + //try to reference the given object + if (!$this->writeObjectReference($data, $markerType)) { // Write the Type Marker to denote the following action script data type $this->_stream->writeByte($markerType); switch($markerType) { @@ -109,11 +117,11 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer } } } else { - if(is_resource($data)) { + if (is_resource($data)) { $data = Zend_Amf_Parse_TypeLoader::handleResource($data); } switch (true) { - case (is_int($data) || is_float($data)): + case (is_int($data) || is_float($data)): $markerType = Zend_Amf_Constants::AMF0_NUMBER; break; case (is_bool($data)): @@ -149,13 +157,13 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer $i = 0; foreach (array_keys($data) as $key) { // check if it contains non-integer keys - if (!is_numeric($key) || intval($key) != $key) { - $markerType = Zend_Amf_Constants::AMF0_OBJECT; - break; + if (!is_numeric($key) || intval($key) != $key) { + $markerType = Zend_Amf_Constants::AMF0_OBJECT; + break; // check if it is a sparse indexed array - } else if ($key != $i) { - $markerType = Zend_Amf_Constants::AMF0_MIXEDARRAY; - break; + } else if ($key != $i) { + $markerType = Zend_Amf_Constants::AMF0_MIXEDARRAY; + break; } $i++; } @@ -174,22 +182,30 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer } return $this; } - - /** + + /** * Check if the given object is in the reference table, write the reference if it exists, * otherwise add the object to the reference table - * - * @param mixed $object object to check for reference + * + * @param mixed $object object reference to check for reference * @param $markerType AMF type of the object to write + * @param mixed $objectByVal object to check for reference * @return Boolean true, if the reference was written, false otherwise */ - protected function writeObjectReference($object, $markerType){ - if( $markerType == Zend_Amf_Constants::AMF0_OBJECT || - $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY || - $markerType == Zend_Amf_Constants::AMF0_ARRAY || - $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT ) { - - $ref = array_search($object, $this->_referenceObjects,true); + protected function writeObjectReference(&$object, $markerType, $objectByVal = false) + { + // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // variables should be passed by reference" + if ((null === $object) && ($objectByVal !== false)) { + $object = &$objectByVal; + } + + if ($markerType == Zend_Amf_Constants::AMF0_OBJECT + || $markerType == Zend_Amf_Constants::AMF0_MIXEDARRAY + || $markerType == Zend_Amf_Constants::AMF0_ARRAY + || $markerType == Zend_Amf_Constants::AMF0_TYPEDOBJECT + ) { + $ref = array_search($object, $this->_referenceObjects, true); //handle object reference if($ref !== false){ $this->writeTypeMarker($ref,Zend_Amf_Constants::AMF0_REFERENCE); @@ -198,12 +214,12 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer $this->_referenceObjects[] = $object; } - + return false; } /** - * Write a php array with string or mixed keys. + * Write a PHP array with string or mixed keys. * * @param object $data * @return Zend_Amf_Parse_Amf0_Serializer @@ -211,9 +227,9 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer public function writeObject($object) { // Loop each element and write the name of the property. - foreach ($object as $key => $value) { - // skip variables starting with an _ provate transient - if( $key[0] == "_") continue; + foreach ($object as $key => &$value) { + // skip variables starting with an _ private transient + if( $key[0] == "_") continue; $this->_stream->writeUTF($key); $this->writeTypeMarker($value); } @@ -231,14 +247,14 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer * @param array $array * @return Zend_Amf_Parse_Amf0_Serializer */ - public function writeArray($array) + public function writeArray(&$array) { $length = count($array); if (!$length < 0) { // write the length of the array $this->_stream->writeLong(0); } else { - // Write the length of the numberic array + // Write the length of the numeric array $this->_stream->writeLong($length); for ($i=0; $i<$length; $i++) { $value = isset($array[$i]) ? $array[$i] : null; @@ -290,12 +306,12 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer /** * Encountered and AMF3 Type Marker use AMF3 serializer. Once AMF3 is - * enountered it will not return to AMf0. + * encountered it will not return to AMf0. * * @param string $data * @return Zend_Amf_Parse_Amf0_Serializer */ - public function writeAmf3TypeMarker($data) + public function writeAmf3TypeMarker(&$data) { require_once 'Zend/Amf/Parse/Amf3/Serializer.php'; $serializer = new Zend_Amf_Parse_Amf3_Serializer($this->_stream); @@ -332,9 +348,9 @@ class Zend_Amf_Parse_Amf0_Serializer extends Zend_Amf_Parse_Serializer case ($object instanceof stdClass): $className = ''; break; - // By default, use object's class name + // By default, use object's class name default: - $className = get_class($object); + $className = get_class($object); break; } if(!$className == '') { diff --git a/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php b/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php index 108fc818cf6..0144798eb80 100644 --- a/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php +++ b/lib/zend/Zend/Amf/Parse/Amf3/Deserializer.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,10 +31,10 @@ require_once 'Zend/Amf/Parse/TypeLoader.php'; * * @todo readObject to handle Typed Objects * @todo readXMLStrimg to be implemented. - * @todo Class could be implmented as Factory Class with each data type it's own class. + * @todo Class could be implemented as Factory Class with each data type it's own class. * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer @@ -291,7 +291,7 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer } $returnObject = $this->_referenceObjects[$ref]; } else { - // Check if the Object is in the stored Definistions reference table + // Check if the Object is in the stored Definitions reference table $storedClass = ($traitsInfo & 0x01) == 0; $traitsInfo = $traitsInfo >> 1; if ($storedClass) { @@ -319,7 +319,7 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer $returnObject = new stdClass(); } else { // Defined object - // Typed object lookup agsinst registered classname maps + // Typed object lookup against registered classname maps if ($loader = Zend_Amf_Parse_TypeLoader::loadType($className)) { $returnObject = new $loader(); } else { @@ -329,7 +329,7 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer } } - // Add the Object ot the reference table + // Add the Object to the reference table $this->_referenceObjects[] = $returnObject; $properties = array(); // clear value @@ -355,7 +355,7 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer 'propertyNames' => $propertyNames, ); } - // not a refrence object read name value properties from byte stream + // not a reference object read name value properties from byte stream do { $property = $this->readString(); if ($property != "") { @@ -371,7 +371,7 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer for($i=0; $i< $count; $i++) { $propertyNames[] = $this->readString(); } - // Add a refrence to the class. + // Add a reference to the class. $this->_referenceDefinitions[] = array( 'className' => $className, 'encoding' => $encoding, @@ -390,18 +390,18 @@ class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer $returnObject->$key = $value; } } - - + + } - - if($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) { - if(isset($returnObject->externalizedData)) { - $returnObject = $returnObject->externalizedData; - } else { - $returnObject = get_object_vars($returnObject); - } - } - + + if ($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) { + if (isset($returnObject->externalizedData)) { + $returnObject = $returnObject->externalizedData; + } else { + $returnObject = get_object_vars($returnObject); + } + } + return $returnObject; } diff --git a/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php b/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php index 8dfc478d2cb..80d191bf5aa 100644 --- a/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php +++ b/lib/zend/Zend/Amf/Parse/Amf3/Serializer.php @@ -15,11 +15,15 @@ * @category Zend * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** Zend_Amf_Constants */ +require_once 'Zend/Amf/Constants.php'; + + /** Zend_Amf_Parse_Serializer */ require_once 'Zend/Amf/Parse/Serializer.php'; @@ -31,11 +35,17 @@ require_once 'Zend/Amf/Parse/TypeLoader.php'; * * @package Zend_Amf * @subpackage Parse_Amf3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer { + /** + * A constant empty string + * @var string + */ + protected $_strEmpty = ''; + /** * An array of reference objects per amf body * @var array @@ -47,13 +57,13 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer * @var array */ protected $_referenceStrings = array(); - + /** * An array of reference class definitions, indexed by classname * @var array */ protected $_referenceDefinitions = array(); - + /** * Serialize PHP types to AMF3 and write to stream * @@ -61,12 +71,18 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer * auto negotiates the type or use the user defined markerType to * serialize the data from php back to AMF3 * - * @param mixed $content + * @param mixed $data * @param int $markerType + * @param mixed $dataByVal * @return void */ - public function writeTypeMarker($data, $markerType=null) + public function writeTypeMarker(&$data, $markerType = null, $dataByVal = false) { + // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // variables should be passed by reference" + if ((null === $data) && ($dataByVal !== false)) { + $data = &$dataByVal; + } if (null !== $markerType) { // Write the Type Marker to denote the following action script data type $this->_stream->writeByte($markerType); @@ -108,11 +124,11 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer } } else { // Detect Type Marker - if(is_resource($data)) { + if (is_resource($data)) { $data = Zend_Amf_Parse_TypeLoader::handleResource($data); } - switch (true) { - case (null === $data): + switch (true) { + case (null === $data): $markerType = Zend_Amf_Constants::AMF3_NULL; break; case (is_bool($data)): @@ -150,10 +166,10 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $markerType = Zend_Amf_Constants::AMF3_OBJECT; } break; - default: + default: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data)); - } + } $this->writeTypeMarker($data, $markerType); } } @@ -190,7 +206,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $this->_stream->writeByte($int & 0xff); return $this; } - + /** * Send string to output stream, without trying to reference it. * The string is prepended with strlen($string) << 1 | 0x01 @@ -198,11 +214,11 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer * @param string $string * @return Zend_Amf_Parse_Amf3_Serializer */ - protected function writeBinaryString($string){ + protected function writeBinaryString(&$string){ $ref = strlen($string) << 1 | 0x01; $this->writeInteger($ref); $this->_stream->writeBytes($string); - + return $this; } @@ -212,14 +228,14 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer * @param string $string * @return Zend_Amf_Parse_Amf3_Serializer */ - public function writeString($string) + public function writeString(&$string) { $len = strlen($string); if(!$len){ $this->writeInteger(0x01); return $this; } - + $ref = array_search($string, $this->_referenceStrings, true); if($ref === false){ $this->_referenceStrings[] = $string; @@ -228,22 +244,23 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $ref <<= 1; $this->writeInteger($ref); } - + return $this; } - + /** * Send ByteArray to output stream * * @param string|Zend_Amf_Value_ByteArray $data * @return Zend_Amf_Parse_Amf3_Serializer */ - public function writeByteArray($data){ - if($this->writeObjectReference($data)){ + public function writeByteArray(&$data) + { + if ($this->writeObjectReference($data)) { return $this; } - - if(is_string($data)) { + + if (is_string($data)) { //nothing to do } else if ($data instanceof Zend_Amf_Value_ByteArray) { $data = $data->getData(); @@ -251,13 +268,13 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid ByteArray specified; must be a string or Zend_Amf_Value_ByteArray'); } - + $this->writeBinaryString($data); - + return $this; } - - /** + + /** * Send xml to output stream * * @param DOMDocument|SimpleXMLElement $xml @@ -265,9 +282,9 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer */ public function writeXml($xml) { - if($this->writeObjectReference($xml)){ + if ($this->writeObjectReference($xml)) { return $this; - } + } if(is_string($xml)) { //nothing to do @@ -279,9 +296,9 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid xml specified; must be a DOMDocument or SimpleXMLElement'); } - + $this->writeBinaryString($xml); - + return $this; } @@ -293,10 +310,10 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer */ public function writeDate($date) { - if($this->writeObjectReference($date)){ + if ($this->writeObjectReference($date)) { return $this; } - + if ($date instanceof DateTime) { $dateString = $date->format('U') * 1000; } elseif ($date instanceof Zend_Date) { @@ -318,16 +335,15 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer * @param array $array * @return Zend_Amf_Parse_Amf3_Serializer */ - public function writeArray(array $array) + public function writeArray(&$array) { - if($this->writeObjectReference($array)){ - return $this; - } - + // arrays aren't reference here but still counted + $this->_referenceObjects[] = $array; + // have to seperate mixed from numberic keys. $numeric = array(); $string = array(); - foreach ($array as $key => $value) { + foreach ($array as $key => &$value) { if (is_int($key)) { $numeric[] = $value; } else { @@ -341,30 +357,39 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $this->writeInteger($id); //Write the mixed type array to the output stream - foreach($string as $key => $value) { + foreach($string as $key => &$value) { $this->writeString($key) ->writeTypeMarker($value); } - $this->writeString(''); + $this->writeString($this->_strEmpty); // Write the numeric array to ouput stream - foreach($numeric as $value) { + foreach($numeric as &$value) { $this->writeTypeMarker($value); } return $this; } - + /** * Check if the given object is in the reference table, write the reference if it exists, * otherwise add the object to the reference table - * - * @param mixed $object object to check for reference + * + * @param mixed $object object reference to check for reference + * @param mixed $objectByVal object to check for reference * @return Boolean true, if the reference was written, false otherwise */ - protected function writeObjectReference($object){ + protected function writeObjectReference(&$object, $objectByVal = false) + { + // Workaround for PHP5 with E_STRICT enabled complaining about "Only + // variables should be passed by reference" + if ((null === $object) && ($objectByVal !== false)) { + $object = &$objectByVal; + } + $ref = array_search($object, $this->_referenceObjects,true); - //quickly handle object references - if($ref !== false){ + + // quickly handle object references + if ($ref !== false){ $ref <<= 1; $this->writeInteger($ref); return true; @@ -384,7 +409,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer if($this->writeObjectReference($object)){ return $this; } - + $className = ''; //Check to see if the object is a typed object and we need to change @@ -408,59 +433,59 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $className = ''; break; - // By default, use object's class name + // By default, use object's class name default: - $className = get_class($object); + $className = get_class($object); break; } - + $writeTraits = true; - + //check to see, if we have a corresponding definition if(array_key_exists($className, $this->_referenceDefinitions)){ $traitsInfo = $this->_referenceDefinitions[$className]['id']; $encoding = $this->_referenceDefinitions[$className]['encoding']; $propertyNames = $this->_referenceDefinitions[$className]['propertyNames']; - + $traitsInfo = ($traitsInfo << 2) | 0x01; - + $writeTraits = false; } else { $propertyNames = array(); - + if($className == ''){ //if there is no className, we interpret the class as dynamic without any sealed members $encoding = Zend_Amf_Constants::ET_DYNAMIC; } else { $encoding = Zend_Amf_Constants::ET_PROPLIST; - + foreach($object as $key => $value) { if( $key[0] != "_") { $propertyNames[] = $key; } } } - + $this->_referenceDefinitions[$className] = array( 'id' => count($this->_referenceDefinitions), 'encoding' => $encoding, 'propertyNames' => $propertyNames, ); - + $traitsInfo = Zend_Amf_Constants::AMF3_OBJECT_ENCODING; $traitsInfo |= $encoding << 2; $traitsInfo |= (count($propertyNames) << 4); } - + $this->writeInteger($traitsInfo); - + if($writeTraits){ $this->writeString($className); foreach ($propertyNames as $value) { $this->writeString($value); } } - + try { switch($encoding) { case Zend_Amf_Constants::ET_PROPLIST: @@ -474,7 +499,7 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer foreach ($propertyNames as $key) { $this->writeTypeMarker($object->$key); } - + //Write remaining properties foreach($object as $key => $value){ if(!in_array($key,$propertyNames) && $key[0] != "_"){ @@ -482,21 +507,21 @@ class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer $this->writeTypeMarker($value); } } - + //Write an empty string to end the dynamic part - $this->writeString(''); + $this->writeString($this->_strEmpty); break; case Zend_Amf_Constants::ET_EXTERNAL: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('External Object Encoding not implemented'); break; - default: + default: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Object Encoding type: ' . $encoding); } } catch (Exception $e) { require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception('Unable to writeObject output: ' . $e->getMessage()); + throw new Zend_Amf_Exception('Unable to writeObject output: ' . $e->getMessage(), 0, $e); } return $this; diff --git a/lib/zend/Zend/Amf/Parse/Deserializer.php b/lib/zend/Zend/Amf/Parse/Deserializer.php index ca4d0b7dbbf..a72aa15ed2f 100644 --- a/lib/zend/Zend/Amf/Parse/Deserializer.php +++ b/lib/zend/Zend/Amf/Parse/Deserializer.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -23,14 +23,14 @@ /** * Abstract cass that all deserializer must implement. * - * Logic for deserialization of the AMF envelop is based on resources supplied - * by Adobe Blaze DS. For and example of deserialization please review the BlazeDS + * Logic for deserialization of the AMF envelop is based on resources supplied + * by Adobe Blaze DS. For and example of deserialization please review the BlazeDS * source tree. * * @see http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/ * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Deserializer diff --git a/lib/zend/Zend/Amf/Parse/InputStream.php b/lib/zend/Zend/Amf/Parse/InputStream.php index ef86d085262..ec8c88a19a7 100644 --- a/lib/zend/Zend/Amf/Parse/InputStream.php +++ b/lib/zend/Zend/Amf/Parse/InputStream.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,12 +26,12 @@ require_once 'Zend/Amf/Util/BinaryStream.php'; /** * InputStream is used to iterate at a binary level through the AMF request. * - * InputStream extends BinaryStream as eventually BinaryStream could be placed + * InputStream extends BinaryStream as eventually BinaryStream could be placed * outside of Zend_Amf in order to allow other packages to use the class. * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream diff --git a/lib/zend/Zend/Amf/Parse/OutputStream.php b/lib/zend/Zend/Amf/Parse/OutputStream.php index 0f7eac0bb1a..d06e75076c1 100644 --- a/lib/zend/Zend/Amf/Parse/OutputStream.php +++ b/lib/zend/Zend/Amf/Parse/OutputStream.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,20 +26,20 @@ require_once 'Zend/Amf/Util/BinaryStream.php'; /** * Iterate at a binary level through the AMF response * - * OutputStream extends BinaryStream as eventually BinaryStream could be placed + * OutputStream extends BinaryStream as eventually BinaryStream could be placed * outside of Zend_Amf in order to allow other packages to use the class. * * @uses Zend_Amf_Util_BinaryStream * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream { /** * Constructor - * + * * @return void */ public function __construct() diff --git a/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php b/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php index d4f9bf4b134..b3e004662f1 100755 --- a/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php +++ b/lib/zend/Zend/Amf/Parse/Resource/MysqlResult.php @@ -15,36 +15,36 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * This class will convert mysql result resource to array suitable for passing + * This class will convert mysql result resource to array suitable for passing * to the external entities. * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Amf_Parse_Resource_MysqlResult +class Zend_Amf_Parse_Resource_MysqlResult { /** * @var array List of Mysql types with PHP counterparts - * + * * Key => Value is Mysql type (exact string) => PHP type */ static public $fieldTypes = array( "int" => "int", "timestamp" => "int", "year" => "int", - "real" => "float", + "real" => "float", ); /** * Parse resource into array - * + * * @param resource $resource * @return array */ diff --git a/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php b/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php index 1d2d3d6b57b..fbb9caefed3 100644 --- a/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php +++ b/lib/zend/Zend/Amf/Parse/Resource/MysqliResult.php @@ -15,103 +15,103 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * This class will convert mysql result resource to array suitable for passing + * This class will convert mysql result resource to array suitable for passing * to the external entities. * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Amf_Parse_Resource_MysqliResult +class Zend_Amf_Parse_Resource_MysqliResult { - /** - * mapping taken from http://forums.mysql.com/read.php?52,255868,255895#msg-255895 - */ + /** + * mapping taken from http://forums.mysql.com/read.php?52,255868,255895#msg-255895 + */ static public $mysqli_type = array( - 0 => "MYSQLI_TYPE_DECIMAL", - 1 => "MYSQLI_TYPE_TINYINT", - 2 => "MYSQLI_TYPE_SMALLINT", - 3 => "MYSQLI_TYPE_INTEGER", - 4 => "MYSQLI_TYPE_FLOAT", - 5 => "MYSQLI_TYPE_DOUBLE", - 7 => "MYSQLI_TYPE_TIMESTAMP", - 8 => "MYSQLI_TYPE_BIGINT", - 9 => "MYSQLI_TYPE_MEDIUMINT", - 10 => "MYSQLI_TYPE_DATE", - 11 => "MYSQLI_TYPE_TIME", - 12 => "MYSQLI_TYPE_DATETIME", - 13 => "MYSQLI_TYPE_YEAR", - 14 => "MYSQLI_TYPE_DATE", - 16 => "MYSQLI_TYPE_BIT", - 246 => "MYSQLI_TYPE_DECIMAL", - 247 => "MYSQLI_TYPE_ENUM", - 248 => "MYSQLI_TYPE_SET", - 249 => "MYSQLI_TYPE_TINYBLOB", - 250 => "MYSQLI_TYPE_MEDIUMBLOB", - 251 => "MYSQLI_TYPE_LONGBLOB", - 252 => "MYSQLI_TYPE_BLOB", - 253 => "MYSQLI_TYPE_VARCHAR", - 254 => "MYSQLI_TYPE_CHAR", - 255 => "MYSQLI_TYPE_GEOMETRY", + 0 => "MYSQLI_TYPE_DECIMAL", + 1 => "MYSQLI_TYPE_TINYINT", + 2 => "MYSQLI_TYPE_SMALLINT", + 3 => "MYSQLI_TYPE_INTEGER", + 4 => "MYSQLI_TYPE_FLOAT", + 5 => "MYSQLI_TYPE_DOUBLE", + 7 => "MYSQLI_TYPE_TIMESTAMP", + 8 => "MYSQLI_TYPE_BIGINT", + 9 => "MYSQLI_TYPE_MEDIUMINT", + 10 => "MYSQLI_TYPE_DATE", + 11 => "MYSQLI_TYPE_TIME", + 12 => "MYSQLI_TYPE_DATETIME", + 13 => "MYSQLI_TYPE_YEAR", + 14 => "MYSQLI_TYPE_DATE", + 16 => "MYSQLI_TYPE_BIT", + 246 => "MYSQLI_TYPE_DECIMAL", + 247 => "MYSQLI_TYPE_ENUM", + 248 => "MYSQLI_TYPE_SET", + 249 => "MYSQLI_TYPE_TINYBLOB", + 250 => "MYSQLI_TYPE_MEDIUMBLOB", + 251 => "MYSQLI_TYPE_LONGBLOB", + 252 => "MYSQLI_TYPE_BLOB", + 253 => "MYSQLI_TYPE_VARCHAR", + 254 => "MYSQLI_TYPE_CHAR", + 255 => "MYSQLI_TYPE_GEOMETRY", ); - + // Build an associative array for a type look up static $mysqli_to_php = array( - "MYSQLI_TYPE_DECIMAL" => 'float', - "MYSQLI_TYPE_NEWDECIMAL" => 'float', - "MYSQLI_TYPE_BIT" => 'integer', - "MYSQLI_TYPE_TINYINT" => 'integer', - "MYSQLI_TYPE_SMALLINT" => 'integer', - "MYSQLI_TYPE_MEDIUMINT" => 'integer', - "MYSQLI_TYPE_BIGINT" => 'integer', - "MYSQLI_TYPE_INTEGER" => 'integer', - "MYSQLI_TYPE_FLOAT" => 'float', - "MYSQLI_TYPE_DOUBLE" => 'float', - "MYSQLI_TYPE_NULL" => 'null', - "MYSQLI_TYPE_TIMESTAMP" => 'string', - "MYSQLI_TYPE_INT24" => 'integer', - "MYSQLI_TYPE_DATE" => 'string', - "MYSQLI_TYPE_TIME" => 'string', - "MYSQLI_TYPE_DATETIME" => 'string', - "MYSQLI_TYPE_YEAR" => 'string', - "MYSQLI_TYPE_NEWDATE" => 'string', - "MYSQLI_TYPE_ENUM" => 'string', - "MYSQLI_TYPE_SET" => 'string', - "MYSQLI_TYPE_TINYBLOB" => 'object', - "MYSQLI_TYPE_MEDIUMBLOB" => 'object', - "MYSQLI_TYPE_LONGBLOB" => 'object', - "MYSQLI_TYPE_BLOB" => 'object', - "MYSQLI_TYPE_CHAR" => 'string', - "MYSQLI_TYPE_VARCHAR" => 'string', - "MYSQLI_TYPE_GEOMETRY" => 'object', - "MYSQLI_TYPE_BIT" => 'integer', - ); + "MYSQLI_TYPE_DECIMAL" => 'float', + "MYSQLI_TYPE_NEWDECIMAL" => 'float', + "MYSQLI_TYPE_BIT" => 'integer', + "MYSQLI_TYPE_TINYINT" => 'integer', + "MYSQLI_TYPE_SMALLINT" => 'integer', + "MYSQLI_TYPE_MEDIUMINT" => 'integer', + "MYSQLI_TYPE_BIGINT" => 'integer', + "MYSQLI_TYPE_INTEGER" => 'integer', + "MYSQLI_TYPE_FLOAT" => 'float', + "MYSQLI_TYPE_DOUBLE" => 'float', + "MYSQLI_TYPE_NULL" => 'null', + "MYSQLI_TYPE_TIMESTAMP" => 'string', + "MYSQLI_TYPE_INT24" => 'integer', + "MYSQLI_TYPE_DATE" => 'string', + "MYSQLI_TYPE_TIME" => 'string', + "MYSQLI_TYPE_DATETIME" => 'string', + "MYSQLI_TYPE_YEAR" => 'string', + "MYSQLI_TYPE_NEWDATE" => 'string', + "MYSQLI_TYPE_ENUM" => 'string', + "MYSQLI_TYPE_SET" => 'string', + "MYSQLI_TYPE_TINYBLOB" => 'object', + "MYSQLI_TYPE_MEDIUMBLOB" => 'object', + "MYSQLI_TYPE_LONGBLOB" => 'object', + "MYSQLI_TYPE_BLOB" => 'object', + "MYSQLI_TYPE_CHAR" => 'string', + "MYSQLI_TYPE_VARCHAR" => 'string', + "MYSQLI_TYPE_GEOMETRY" => 'object', + "MYSQLI_TYPE_BIT" => 'integer', + ); /** * Parse resource into array - * + * * @param resource $resource * @return array */ public function parse($resource) { - + $result = array(); $fieldcnt = mysqli_num_fields($resource); - - + + $fields_transform = array(); for($i=0;$i<$fieldcnt;$i++) { $finfo = mysqli_fetch_field_direct($resource, $i); - + if(isset(self::$mysqli_type[$finfo->type])) { $fields_transform[$finfo->name] = self::$mysqli_to_php[self::$mysqli_type[$finfo->type]]; } diff --git a/lib/zend/Zend/Amf/Parse/Resource/Stream.php b/lib/zend/Zend/Amf/Parse/Resource/Stream.php index 007df138f8c..3fcd560ef19 100755 --- a/lib/zend/Zend/Amf/Parse/Resource/Stream.php +++ b/lib/zend/Zend/Amf/Parse/Resource/Stream.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,14 +25,14 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Parse_Resource_Stream { /** * Parse resource into string - * + * * @param resource $resource Stream resource * @return array */ diff --git a/lib/zend/Zend/Amf/Parse/Serializer.php b/lib/zend/Zend/Amf/Parse/Serializer.php index 4e35cd01cd5..2a0e4a9bf8c 100644 --- a/lib/zend/Zend/Amf/Parse/Serializer.php +++ b/lib/zend/Zend/Amf/Parse/Serializer.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,13 +25,13 @@ * * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Amf_Parse_Serializer { /** - * Refrence to the current output stream being constructed + * Reference to the current output stream being constructed * * @var string */ @@ -39,8 +39,8 @@ abstract class Zend_Amf_Parse_Serializer /** * Constructor - * - * @param Zend_Amf_Parse_OutputStream $stream + * + * @param Zend_Amf_Parse_OutputStream $stream * @return void */ public function __construct(Zend_Amf_Parse_OutputStream $stream) @@ -53,7 +53,8 @@ abstract class Zend_Amf_Parse_Serializer * * @param mixed $content * @param int $markerType + * @param mixed $contentByVal * @return void */ - public abstract function writeTypeMarker($content, $markerType=null); + public abstract function writeTypeMarker(&$content, $markerType = null, $contentByVal = false); } diff --git a/lib/zend/Zend/Amf/Parse/TypeLoader.php b/lib/zend/Zend/Amf/Parse/TypeLoader.php index cd62f1e39cb..5eda3b0ec2d 100644 --- a/lib/zend/Zend/Amf/Parse/TypeLoader.php +++ b/lib/zend/Zend/Amf/Parse/TypeLoader.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -47,7 +47,7 @@ require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php'; * @todo PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace * @package Zend_Amf * @subpackage Parse - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Amf_Parse_TypeLoader @@ -80,7 +80,7 @@ final class Zend_Amf_Parse_TypeLoader 'flex.messaging.messages.RemotingMessage' => 'Zend_Amf_Value_Messaging_RemotingMessage', 'flex.messaging.io.ArrayCollection' => 'Zend_Amf_Value_Messaging_ArrayCollection', ); - + /** * @var Zend_Loader_PluginLoader_Interface */ @@ -153,79 +153,79 @@ final class Zend_Amf_Parse_TypeLoader { self::$classMap = self::$_defaultClassMap; } - + /** * Set loader for resource type handlers - * - * @param Zend_Loader_PluginLoader_Interface $loader + * + * @param Zend_Loader_PluginLoader_Interface $loader */ public static function setResourceLoader(Zend_Loader_PluginLoader_Interface $loader) { - self::$_resourceLoader = $loader; + self::$_resourceLoader = $loader; } - + /** - * Add directory to the list of places where to look for resource handlers - * + * Add directory to the list of places where to look for resource handlers + * * @param string $prefix * @param string $dir */ public static function addResourceDirectory($prefix, $dir) { - if(self::$_resourceLoader) { - self::$_resourceLoader->addPrefixPath($prefix, $dir); - } + if(self::$_resourceLoader) { + self::$_resourceLoader->addPrefixPath($prefix, $dir); + } } - + /** * Get plugin class that handles this resource - * + * * @param resource $resource Resource type * @return string Class name */ public static function getResourceParser($resource) { - if(self::$_resourceLoader) { - $type = preg_replace("/[^A-Za-z0-9_]/", " ", get_resource_type($resource)); - $type = str_replace(" ","", ucwords($type)); - return self::$_resourceLoader->load($type); - } - return false; + if(self::$_resourceLoader) { + $type = preg_replace("/[^A-Za-z0-9_]/", " ", get_resource_type($resource)); + $type = str_replace(" ","", ucwords($type)); + return self::$_resourceLoader->load($type); + } + return false; } - + /** * Convert resource to a serializable object - * + * * @param resource $resource * @return mixed */ public static function handleResource($resource) { - if(!self::$_resourceLoader) { - require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception('Unable to handle resources - resource plugin loader not set'); - } - try { - while(is_resource($resource)) { - $resclass = self::getResourceParser($resource); - if(!$resclass) { - require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource)); - } - $parser = new $resclass(); - if(is_callable(array($parser, 'parse'))) { - $resource = $parser->parse($resource); - } else { - require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception("Could not call parse() method on class $resclass"); - } - } - return $resource; - } catch(Zend_Amf_Exception $e) { - throw $e; - } catch(Exception $e) { - require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource)); - } + if(!self::$_resourceLoader) { + require_once 'Zend/Amf/Exception.php'; + throw new Zend_Amf_Exception('Unable to handle resources - resource plugin loader not set'); + } + try { + while(is_resource($resource)) { + $resclass = self::getResourceParser($resource); + if(!$resclass) { + require_once 'Zend/Amf/Exception.php'; + throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource)); + } + $parser = new $resclass(); + if(is_callable(array($parser, 'parse'))) { + $resource = $parser->parse($resource); + } else { + require_once 'Zend/Amf/Exception.php'; + throw new Zend_Amf_Exception("Could not call parse() method on class $resclass"); + } + } + return $resource; + } catch(Zend_Amf_Exception $e) { + throw new Zend_Amf_Exception($e->getMessage(), $e->getCode(), $e); + } catch(Exception $e) { + require_once 'Zend/Amf/Exception.php'; + throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource), 0, $e); + } } } diff --git a/lib/zend/Zend/Amf/Request.php b/lib/zend/Zend/Amf/Request.php index b9ded882aa4..0fa7f3e8e70 100644 --- a/lib/zend/Zend/Amf/Request.php +++ b/lib/zend/Zend/Amf/Request.php @@ -14,24 +14,24 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Parse_InputStream */ +/** @see Zend_Amf_Parse_InputStream */ require_once 'Zend/Amf/Parse/InputStream.php'; -/** Zend_Amf_Parse_Amf0_Deserializer */ +/** @see Zend_Amf_Parse_Amf0_Deserializer */ require_once 'Zend/Amf/Parse/Amf0/Deserializer.php'; -/** Zend_Amf_Constants */ +/** @see Zend_Amf_Constants */ require_once 'Zend/Amf/Constants.php'; -/** Zend_Amf_Value_MessageHeader */ +/** @see Zend_Amf_Value_MessageHeader */ require_once 'Zend/Amf/Value/MessageHeader.php'; -/** Zend_Amf_Value_MessageBody */ +/** @see Zend_Amf_Value_MessageBody */ require_once 'Zend/Amf/Value/MessageBody.php'; /** @@ -40,7 +40,7 @@ require_once 'Zend/Amf/Value/MessageBody.php'; * * @todo Currently not checking if the object needs to be Type Mapped to a server object. * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Request @@ -151,7 +151,7 @@ class Zend_Amf_Request $data = $this->_deserializer->readTypeMarker(); } catch (Exception $e) { require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception('Unable to parse ' . $name . ' header data: ' . $e->getMessage() . ' '. $e->getLine()); + throw new Zend_Amf_Exception('Unable to parse ' . $name . ' header data: ' . $e->getMessage() . ' '. $e->getLine(), 0, $e); } $header = new Zend_Amf_Value_MessageHeader($name, $mustRead, $data, $length); @@ -173,7 +173,7 @@ class Zend_Amf_Request $data = $this->_deserializer->readTypeMarker(); } catch (Exception $e) { require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception('Unable to parse ' . $targetURI . ' body data ' . $e->getMessage()); + throw new Zend_Amf_Exception('Unable to parse ' . $targetURI . ' body data ' . $e->getMessage(), 0, $e); } // Check for AMF3 objectEncoding diff --git a/lib/zend/Zend/Amf/Request/Http.php b/lib/zend/Zend/Amf/Request/Http.php index 0174ce6c2fd..30059f06045 100644 --- a/lib/zend/Zend/Amf/Request/Http.php +++ b/lib/zend/Zend/Amf/Request/Http.php @@ -15,12 +15,12 @@ * @category Zend * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Request */ +/** @see Zend_Amf_Request */ require_once 'Zend/Amf/Request.php'; /** @@ -32,7 +32,7 @@ require_once 'Zend/Amf/Request.php'; * * @package Zend_Amf * @subpackage Request - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Request_Http extends Zend_Amf_Request @@ -54,8 +54,8 @@ class Zend_Amf_Request_Http extends Zend_Amf_Request */ public function __construct() { - // php://input allows you to read raw POST data. It is a less memory - // intensive alternative to $HTTP_RAW_POST_DATA and does not need any + // php://input allows you to read raw POST data. It is a less memory + // intensive alternative to $HTTP_RAW_POST_DATA and does not need any // special php.ini directives $amfRequest = file_get_contents('php://input'); @@ -70,7 +70,7 @@ class Zend_Amf_Request_Http extends Zend_Amf_Request /** * Retrieve raw AMF Request - * + * * @return string */ public function getRawRequest() diff --git a/lib/zend/Zend/Amf/Response.php b/lib/zend/Zend/Amf/Response.php index 52f224be7f6..d069ecf9cb3 100644 --- a/lib/zend/Zend/Amf/Response.php +++ b/lib/zend/Zend/Amf/Response.php @@ -14,25 +14,25 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Constants */ +/** @see Zend_Amf_Constants */ require_once 'Zend/Amf/Constants.php'; -/** Zend_Amf_Parse_OutputStream */ +/** @see Zend_Amf_Parse_OutputStream */ require_once 'Zend/Amf/Parse/OutputStream.php'; -/** Zend_Amf_Parse_Amf0_Serializer */ +/** @see Zend_Amf_Parse_Amf0_Serializer */ require_once 'Zend/Amf/Parse/Amf0/Serializer.php'; /** * Handles converting the PHP object ready for response back into AMF * * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Response @@ -94,7 +94,14 @@ class Zend_Amf_Response $stream->writeUTF($header->name); $stream->writeByte($header->mustRead); $stream->writeLong(Zend_Amf_Constants::UNKNOWN_CONTENT_LENGTH); - $serializer->writeTypeMarker($header->data); + if (is_object($header->data)) { + // Workaround for PHP5 with E_STRICT enabled complaining about + // "Only variables should be passed by reference" + $placeholder = null; + $serializer->writeTypeMarker($placeholder, null, $header->data); + } else { + $serializer->writeTypeMarker($header->data); + } } // loop through the AMF bodies that need to be returned. @@ -105,11 +112,15 @@ class Zend_Amf_Response $stream->writeUTF($body->getTargetURI()); $stream->writeUTF($body->getResponseURI()); $stream->writeLong(Zend_Amf_Constants::UNKNOWN_CONTENT_LENGTH); - if($this->_objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) { - $serializer->writeTypeMarker($body->getData()); + $bodyData = $body->getData(); + $markerType = ($this->_objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) ? null : Zend_Amf_Constants::AMF0_AMF3; + if (is_object($bodyData)) { + // Workaround for PHP5 with E_STRICT enabled complaining about + // "Only variables should be passed by reference" + $placeholder = null; + $serializer->writeTypeMarker($placeholder, $markerType, $bodyData); } else { - // Content is AMF3 - $serializer->writeTypeMarker($body->getData(),Zend_Amf_Constants::AMF0_AMF3); + $serializer->writeTypeMarker($bodyData, $markerType); } } @@ -172,7 +183,7 @@ class Zend_Amf_Response /** * Retrieve attached AMF message headers - * + * * @return array Array of Zend_Amf_Value_MessageHeader objects */ public function getAmfHeaders() diff --git a/lib/zend/Zend/Amf/Response/Http.php b/lib/zend/Zend/Amf/Response/Http.php index 59d412d7bcd..961ffdf84ae 100644 --- a/lib/zend/Zend/Amf/Response/Http.php +++ b/lib/zend/Zend/Amf/Response/Http.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,7 +28,7 @@ require_once 'Zend/Amf/Response.php'; * * @package Zend_Amf * @subpackage Response - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Response_Http extends Zend_Amf_Response diff --git a/lib/zend/Zend/Amf/Server.php b/lib/zend/Zend/Amf/Server.php index d01e7ce6f33..241041f3e17 100644 --- a/lib/zend/Zend/Amf/Server.php +++ b/lib/zend/Zend/Amf/Server.php @@ -14,45 +14,45 @@ * * @category Zend * @package Zend_Amf - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Server_Interface */ +/** @see Zend_Server_Interface */ require_once 'Zend/Server/Interface.php'; -/** Zend_Server_Reflection */ +/** @see Zend_Server_Reflection */ require_once 'Zend/Server/Reflection.php'; -/** Zend_Amf_Constants */ +/** @see Zend_Amf_Constants */ require_once 'Zend/Amf/Constants.php'; -/** Zend_Amf_Value_MessageBody */ +/** @see Zend_Amf_Value_MessageBody */ require_once 'Zend/Amf/Value/MessageBody.php'; -/** Zend_Amf_Value_MessageHeader */ +/** @see Zend_Amf_Value_MessageHeader */ require_once 'Zend/Amf/Value/MessageHeader.php'; -/** Zend_Amf_Value_Messaging_CommandMessage */ +/** @see Zend_Amf_Value_Messaging_CommandMessage */ require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; -/** Zend_Loader_PluginLoader */ +/** @see Zend_Loader_PluginLoader */ require_once 'Zend/Loader/PluginLoader.php'; -/** Zend_Amf_Parse_TypeLoader */ +/** @see Zend_Amf_Parse_TypeLoader */ require_once 'Zend/Amf/Parse/TypeLoader.php'; -/** Zend_Auth */ +/** @see Zend_Auth */ require_once 'Zend/Auth.php'; /** * An AMF gateway server implementation to allow the connection of the Adobe Flash Player to * Zend Framework * - * @todo Make the relection methods cache and autoload. + * @todo Make the reflection methods cache and autoload. * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Server implements Zend_Server_Interface @@ -62,10 +62,10 @@ class Zend_Amf_Server implements Zend_Server_Interface * @var array */ protected $_methods = array(); - + /** * Array of classes that can be called without being explicitly loaded - * + * * Keys are class names. * * @var array @@ -121,13 +121,13 @@ class Zend_Amf_Server implements Zend_Server_Interface /** * Authentication handler object - * + * * @var Zend_Amf_Auth_Abstract */ protected $_auth; /** * ACL handler object - * + * * @var Zend_Acl */ protected $_acl; @@ -136,9 +136,9 @@ class Zend_Amf_Server implements Zend_Server_Interface */ public function __construct() { - Zend_Amf_Parse_TypeLoader::setResourceLoader(new Zend_Loader_PluginLoader(array("Zend_Amf_Parse_Resource" => "Zend/Amf/Parse/Resource"))); + Zend_Amf_Parse_TypeLoader::setResourceLoader(new Zend_Loader_PluginLoader(array("Zend_Amf_Parse_Resource" => "Zend/Amf/Parse/Resource"))); } - + /** * Set authentication adapter * @@ -159,7 +159,7 @@ class Zend_Amf_Server implements Zend_Server_Interface { return $this->_auth; } - + /** * Set ACL adapter * @@ -180,7 +180,7 @@ class Zend_Amf_Server implements Zend_Server_Interface { return $this->_acl; } - + /** * Set production flag * @@ -225,10 +225,10 @@ class Zend_Amf_Server implements Zend_Server_Interface } /** - * Check if the ACL allows accessing the function or method - * + * Check if the ACL allows accessing the function or method + * * @param string|object $object Object or class being accessed - * @param string $function Function or method being acessed + * @param string $function Function or method being accessed * @return unknown_type */ protected function _checkAcl($object, $function) @@ -239,7 +239,7 @@ class Zend_Amf_Server implements Zend_Server_Interface if($object) { $class = is_object($object)?get_class($object):$object; if(!$this->_acl->has($class)) { - require_once 'Zend/Acl/Resource.php'; + require_once 'Zend/Acl/Resource.php'; $this->_acl->add(new Zend_Acl_Resource($class)); } $call = array($object, "initAcl"); @@ -250,15 +250,15 @@ class Zend_Amf_Server implements Zend_Server_Interface } else { $class = null; } - + $auth = Zend_Auth::getInstance(); if($auth->hasIdentity()) { $role = $auth->getIdentity()->role; } else { - if($this->_acl->hasRole(Zend_Amf_Constants::GUEST_ROLE)) { + if($this->_acl->hasRole(Zend_Amf_Constants::GUEST_ROLE)) { $role = Zend_Amf_Constants::GUEST_ROLE; } else { - require_once 'Zend/Amf/Server/Exception.php'; + require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception("Unauthenticated access not allowed"); } } @@ -269,7 +269,7 @@ class Zend_Amf_Server implements Zend_Server_Interface throw new Zend_Amf_Server_Exception("Access not allowed"); } } - + /** * Get PluginLoader for the Server * @@ -277,13 +277,13 @@ class Zend_Amf_Server implements Zend_Server_Interface */ protected function getLoader() { - if(empty($this->_loader)) { - require_once 'Zend/Loader/PluginLoader.php'; - $this->_loader = new Zend_Loader_PluginLoader(); - } - return $this->_loader; + if(empty($this->_loader)) { + require_once 'Zend/Loader/PluginLoader.php'; + $this->_loader = new Zend_Loader_PluginLoader(); + } + return $this->_loader; } - + /** * Loads a remote class or method and executes the function and returns * the result @@ -295,26 +295,26 @@ class Zend_Amf_Server implements Zend_Server_Interface */ protected function _dispatch($method, $params = null, $source = null) { - if($source) { - if(($mapped = Zend_Amf_Parse_TypeLoader::getMappedClassName($source)) !== false) { - $source = $mapped; - } - } + if($source) { + if(($mapped = Zend_Amf_Parse_TypeLoader::getMappedClassName($source)) !== false) { + $source = $mapped; + } + } $qualifiedName = empty($source) ? $method : $source.".".$method; - + if (!isset($this->_table[$qualifiedName])) { // if source is null a method that was not defined was called. if ($source) { - $className = str_replace(".", "_", $source); - if(class_exists($className, false) && !isset($this->_classAllowed[$className])) { - require_once 'Zend/Amf/Server/Exception.php'; + $className = str_replace(".", "_", $source); + if(class_exists($className, false) && !isset($this->_classAllowed[$className])) { + require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Can not call "' . $className . '" - use setClass()'); - } + } try { - $this->getLoader()->load($className); + $this->getLoader()->load($className); } catch (Exception $e) { require_once 'Zend/Amf/Server/Exception.php'; - throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage()); + throw new Zend_Amf_Server_Exception('Class "' . $className . '" does not exist: '.$e->getMessage(), 0, $e); } // Add the new loaded class to the server. $this->setClass($className, $source); @@ -326,7 +326,7 @@ class Zend_Amf_Server implements Zend_Server_Interface $info = $this->_table[$qualifiedName]; $argv = $info->getInvokeArguments(); - + if (0 < count($argv)) { $params = array_merge($params, $argv); } @@ -350,7 +350,7 @@ class Zend_Amf_Server implements Zend_Server_Interface $object = $info->getDeclaringClass()->newInstance(); } catch (Exception $e) { require_once 'Zend/Amf/Server/Exception.php'; - throw new Zend_Amf_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $info->getName() . ': '.$e->getMessage(), 621); + throw new Zend_Amf_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $info->getName() . ': '.$e->getMessage(), 621, $e); } $this->_checkAcl($object, $info->getName()); $return = $info->invokeArgs($object, $params); @@ -377,13 +377,13 @@ class Zend_Amf_Server implements Zend_Server_Interface require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; switch($message->operation) { case Zend_Amf_Value_Messaging_CommandMessage::DISCONNECT_OPERATION : - case Zend_Amf_Value_Messaging_CommandMessage::CLIENT_PING_OPERATION : + case Zend_Amf_Value_Messaging_CommandMessage::CLIENT_PING_OPERATION : $return = new Zend_Amf_Value_Messaging_AcknowledgeMessage($message); break; case Zend_Amf_Value_Messaging_CommandMessage::LOGIN_OPERATION : $data = explode(':', base64_decode($message->body)); - $userid = $data[0]; - $password = isset($data[1])?$data[1]:""; + $userid = $data[0]; + $password = isset($data[1])?$data[1]:""; if(empty($userid)) { require_once 'Zend/Amf/Server/Exception.php'; throw new Zend_Amf_Server_Exception('Login failed: username not supplied'); @@ -410,7 +410,7 @@ class Zend_Amf_Server implements Zend_Server_Interface /** * Create appropriate error message - * + * * @param int $objectEncoding Current AMF encoding * @param string $message Message that was being processed when error happened * @param string $description Error description @@ -422,55 +422,55 @@ class Zend_Amf_Server implements Zend_Server_Interface protected function _errorMessage($objectEncoding, $message, $description, $detail, $code, $line) { $return = null; - switch ($objectEncoding) { - case Zend_Amf_Constants::AMF0_OBJECT_ENCODING : - return array ( - 'description' => ($this->isProduction ()) ? '' : $description, - 'detail' => ($this->isProduction ()) ? '' : $detail, - 'line' => ($this->isProduction ()) ? 0 : $line, - 'code' => $code - ); - case Zend_Amf_Constants::AMF3_OBJECT_ENCODING : - require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; - $return = new Zend_Amf_Value_Messaging_ErrorMessage ( $message ); - $return->faultString = $this->isProduction () ? '' : $description; - $return->faultCode = $code; - $return->faultDetail = $this->isProduction () ? '' : $detail; - break; - } + switch ($objectEncoding) { + case Zend_Amf_Constants::AMF0_OBJECT_ENCODING : + return array ( + 'description' => ($this->isProduction ()) ? '' : $description, + 'detail' => ($this->isProduction ()) ? '' : $detail, + 'line' => ($this->isProduction ()) ? 0 : $line, + 'code' => $code + ); + case Zend_Amf_Constants::AMF3_OBJECT_ENCODING : + require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; + $return = new Zend_Amf_Value_Messaging_ErrorMessage ( $message ); + $return->faultString = $this->isProduction () ? '' : $description; + $return->faultCode = $code; + $return->faultDetail = $this->isProduction () ? '' : $detail; + break; + } return $return; } - /** - * Handle AMF authenticaton - * - * @param string $userid - * @param string $password - * @return boolean - */ - protected function _handleAuth( $userid, $password) - { - if (!$this->_auth) { - return true; - } - $this->_auth->setCredentials($userid, $password); - $auth = Zend_Auth::getInstance(); - $result = $auth->authenticate($this->_auth); - if ($result->isValid()) { - if (!$this->isSession()) { - $this->setSession(); - } - return true; - } else { - // authentication failed, good bye - require_once 'Zend/Amf/Server/Exception.php'; - throw new Zend_Amf_Server_Exception( - "Authentication failed: " . join("\n", - $result->getMessages()), $result->getCode()); - } - + /** + * Handle AMF authentication + * + * @param string $userid + * @param string $password + * @return boolean + */ + protected function _handleAuth( $userid, $password) + { + if (!$this->_auth) { + return true; + } + $this->_auth->setCredentials($userid, $password); + $auth = Zend_Auth::getInstance(); + $result = $auth->authenticate($this->_auth); + if ($result->isValid()) { + if (!$this->isSession()) { + $this->setSession(); + } + return true; + } else { + // authentication failed, good bye + require_once 'Zend/Amf/Server/Exception.php'; + throw new Zend_Amf_Server_Exception( + "Authentication failed: " . join("\n", + $result->getMessages()), $result->getCode()); + } + } - + /** * Takes the deserialized AMF request and performs any operations. * @@ -488,40 +488,40 @@ class Zend_Amf_Server implements Zend_Server_Interface // create a response object to place the output from the services. $response = $this->getResponse(); - // set reponse encoding + // set response encoding $response->setObjectEncoding($objectEncoding); - + $responseBody = $request->getAmfBodies(); $handleAuth = false; - if ($this->_auth) { - $headers = $request->getAmfHeaders(); - if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) && - isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)) { - $handleAuth = true; - } - } - + if ($this->_auth) { + $headers = $request->getAmfHeaders(); + if (isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]) && + isset($headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid)) { + $handleAuth = true; + } + } + // Iterate through each of the service calls in the AMF request foreach($responseBody as $body) { try { - if ($handleAuth) { - if ($this->_handleAuth( - $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid, - $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)) { - // use RequestPersistentHeader to clear credentials - $response->addAmfHeader( - new Zend_Amf_Value_MessageHeader( - Zend_Amf_Constants::PERSISTENT_HEADER, - false, - new Zend_Amf_Value_MessageHeader( - Zend_Amf_Constants::CREDENTIALS_HEADER, - false, null))); - $handleAuth = false; - } - } - + if ($handleAuth) { + if ($this->_handleAuth( + $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->userid, + $headers[Zend_Amf_Constants::CREDENTIALS_HEADER]->password)) { + // use RequestPersistentHeader to clear credentials + $response->addAmfHeader( + new Zend_Amf_Value_MessageHeader( + Zend_Amf_Constants::PERSISTENT_HEADER, + false, + new Zend_Amf_Value_MessageHeader( + Zend_Amf_Constants::CREDENTIALS_HEADER, + false, null))); + $handleAuth = false; + } + } + if ($objectEncoding == Zend_Amf_Constants::AMF0_OBJECT_ENCODING) { // AMF0 Object Encoding $targetURI = $body->getTargetURI(); @@ -567,7 +567,7 @@ class Zend_Amf_Server implements Zend_Server_Interface } $responseType = Zend_AMF_Constants::RESULT_METHOD; } catch (Exception $e) { - $return = $this->_errorMessage($objectEncoding, $message, + $return = $this->_errorMessage($objectEncoding, $message, $e->getMessage(), $e->getTraceAsString(),$e->getCode(), $e->getLine()); $responseType = Zend_AMF_Constants::STATUS_METHOD; } @@ -584,10 +584,10 @@ class Zend_Amf_Server implements Zend_Server_Interface if(!strpos($_SERVER['QUERY_STRING'], $currentID) !== FALSE) { if(strrpos($_SERVER['QUERY_STRING'], "?") !== FALSE) { $joint = "&"; - } - } + } + } } - + // create a new AMF message header with the session id as a variable. $sessionValue = $joint . $this->_sessionName . "=" . $currentID; $sessionHeader = new Zend_Amf_Value_MessageHeader(Zend_Amf_Constants::URL_APPEND_HEADER, false, $sessionValue); @@ -628,7 +628,7 @@ class Zend_Amf_Server implements Zend_Server_Interface } catch (Exception $e) { // Handle any errors in the serialization and service calls. require_once 'Zend/Amf/Server/Exception.php'; - throw new Zend_Amf_Server_Exception('Handle error: ' . $e->getMessage() . ' ' . $e->getLine()); + throw new Zend_Amf_Server_Exception('Handle error: ' . $e->getMessage() . ' ' . $e->getLine(), 0, $e); } // Return the Amf serialized output string @@ -673,7 +673,7 @@ class Zend_Amf_Server implements Zend_Server_Interface } /** - * Public access method to private Zend_Amf_Server_Response refrence + * Public access method to private Zend_Amf_Server_Response reference * * @param string|Zend_Amf_Server_Response $response * @return Zend_Amf_Server @@ -695,7 +695,7 @@ class Zend_Amf_Server implements Zend_Server_Interface } /** - * get a refrence to the Zend_Amf_response instance + * get a reference to the Zend_Amf_response instance * * @return Zend_Amf_Server_Response */ @@ -739,11 +739,11 @@ class Zend_Amf_Server implements Zend_Server_Interface } // Use the class name as the name space by default. - + if ($namespace == '') { $namespace = is_object($class) ? get_class($class) : $class; } - + $this->_classAllowed[is_object($class) ? get_class($class) : $class] = true; $this->_methods[] = Zend_Server_Reflection::reflectClass($class, $argv, $namespace); @@ -793,12 +793,12 @@ class Zend_Amf_Server implements Zend_Server_Interface /** * Creates an array of directories in which services can reside. * TODO: add support for prefixes? - * + * * @param string $dir */ public function addDirectory($dir) { - $this->getLoader()->addPrefixPath("", $dir); + $this->getLoader()->addPrefixPath("", $dir); } /** diff --git a/lib/zend/Zend/Amf/Server/Exception.php b/lib/zend/Zend/Amf/Server/Exception.php index 572ed74fe0c..10fe6762857 100644 --- a/lib/zend/Zend/Amf/Server/Exception.php +++ b/lib/zend/Zend/Amf/Server/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Amf/Exception.php'; * @category Zend * @package Zend_Amf * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Server_Exception extends Zend_Amf_Exception diff --git a/lib/zend/Zend/Amf/Util/BinaryStream.php b/lib/zend/Zend/Amf/Util/BinaryStream.php index 6f2135b358a..fefc271de99 100644 --- a/lib/zend/Zend/Amf/Util/BinaryStream.php +++ b/lib/zend/Zend/Amf/Util/BinaryStream.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,7 +25,7 @@ * * @package Zend_Amf * @subpackage Util - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Util_BinaryStream @@ -53,8 +53,8 @@ class Zend_Amf_Util_BinaryStream /** * Constructor * - * Create a refrence to a byte stream that is going to be parsed or created - * by the methods in the class. Detect if the class should use big or + * Create a reference to a byte stream that is going to be parsed or created + * by the methods in the class. Detect if the class should use big or * little Endian encoding. * * @param string $stream use '' if creating a new stream or pass a string if reading. @@ -70,8 +70,7 @@ class Zend_Amf_Util_BinaryStream $this->_stream = $stream; $this->_needle = 0; $this->_streamLength = strlen($stream); - $testEndian = unpack("C*", pack("S*", 256)); - $this->_bigEndian = 1; + $this->_bigEndian = (pack('l', 1) === "\x00\x00\x00\x01"); } /** @@ -94,12 +93,12 @@ class Zend_Amf_Util_BinaryStream */ public function readBytes($length) { - if (($length + $this->_needle) > strlen($this->_stream)) { + if (($length + $this->_needle) > $this->_streamLength) { require_once 'Zend/Amf/Exception.php'; - throw new Zend_Amf_Exception("Buffer underrun at needle position: " . $this->_needle . " while requesting length: " . $length); + throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); } $bytes = substr($this->_stream, $this->_needle, $length); - $this->_needle += $length; + $this->_needle+= $length; return $bytes; } @@ -113,7 +112,7 @@ class Zend_Amf_Util_BinaryStream */ public function writeBytes($bytes) { - $this->_stream .= $bytes; + $this->_stream.= $bytes; return $this; } @@ -124,8 +123,12 @@ class Zend_Amf_Util_BinaryStream */ public function readByte() { - $byte = ord($this->_stream[$this->_needle++]); - return $byte; + if (($this->_needle + 1) > $this->_streamLength) { + require_once 'Zend/Amf/Exception.php'; + throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); + } + + return ord($this->_stream{$this->_needle++}); } /** @@ -136,7 +139,7 @@ class Zend_Amf_Util_BinaryStream */ public function writeByte($stream) { - $this->_stream .= pack("c",$stream); + $this->_stream.= pack('c', $stream); return $this; } @@ -147,8 +150,7 @@ class Zend_Amf_Util_BinaryStream */ public function readInt() { - $int = ($this->readByte() << 8) + $this->readByte(); - return $int; + return ($this->readByte() << 8) + $this->readByte(); } /** @@ -159,7 +161,7 @@ class Zend_Amf_Util_BinaryStream */ public function writeInt($stream) { - $this->_stream .= pack("n", $stream); + $this->_stream.= pack('n', $stream); return $this; } @@ -183,7 +185,7 @@ class Zend_Amf_Util_BinaryStream public function writeUtf($stream) { $this->writeInt(strlen($stream)); - $this->_stream .= $stream; + $this->_stream.= $stream; return $this; } @@ -208,7 +210,7 @@ class Zend_Amf_Util_BinaryStream public function writeLongUtf($stream) { $this->writeLong(strlen($stream)); - $this->_stream .= $stream; + $this->_stream.= $stream; } /** @@ -218,8 +220,7 @@ class Zend_Amf_Util_BinaryStream */ public function readLong() { - $long = ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte(); - return $long; + return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte(); } /** @@ -230,7 +231,7 @@ class Zend_Amf_Util_BinaryStream */ public function writeLong($stream) { - $this->_stream .= pack("N",$stream); + $this->_stream.= pack('N', $stream); return $this; } @@ -244,8 +245,7 @@ class Zend_Amf_Util_BinaryStream { $byte1 = $this->readByte(); $byte2 = $this->readByte(); - $short = (($byte1 << 8) | $byte2); - return $short; + return (($byte1 << 8) | $byte2); } /** @@ -255,9 +255,14 @@ class Zend_Amf_Util_BinaryStream */ public function readDouble() { - $bytes = substr($this->_stream, $this->_needle, 8); - $this->_needle += 8; - $double = unpack("dflt", strrev($bytes)); + $bytes = substr($this->_stream, $this->_needle, 8); + $this->_needle+= 8; + + if (!$this->_bigEndian) { + $bytes = strrev($bytes); + } + + $double = unpack('dflt', $bytes); return $double['flt']; } @@ -269,11 +274,12 @@ class Zend_Amf_Util_BinaryStream */ public function writeDouble($stream) { - $stream = pack("d", $stream); - if ($this->_bigEndian) { + $stream = pack('d', $stream); + if (!$this->_bigEndian) { $stream = strrev($stream); } - $this->_stream .= $stream; + $this->_stream.= $stream; return $this; } + } diff --git a/lib/zend/Zend/Amf/Value/ByteArray.php b/lib/zend/Zend/Amf/Value/ByteArray.php index 24218807e88..3555f300f35 100644 --- a/lib/zend/Zend/Amf/Value/ByteArray.php +++ b/lib/zend/Zend/Amf/Value/ByteArray.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,10 +25,10 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Amf_Value_ByteArray +class Zend_Amf_Value_ByteArray { /** * @var string ByteString Data diff --git a/lib/zend/Zend/Amf/Value/MessageBody.php b/lib/zend/Zend/Amf/Value/MessageBody.php index 0a04b6ea2f2..4d4e67ed300 100644 --- a/lib/zend/Zend/Amf/Value/MessageBody.php +++ b/lib/zend/Zend/Amf/Value/MessageBody.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_MessageBody @@ -54,7 +54,7 @@ class Zend_Amf_Value_MessageBody * contains the connection state information. Passing/specifying this * provides a convenient mechanism for the client/server to share access * to an object that is managing the state of the shared connection. - * + * * Since the server will use this field in the event of an error, * this field is required even if a successful server request would * not be expected to return a value to the client. @@ -80,10 +80,10 @@ class Zend_Amf_Value_MessageBody /** * Constructor - * - * @param string $targetUri - * @param string $responseUri - * @param string $data + * + * @param string $targetUri + * @param string $responseUri + * @param string $data * @return void */ public function __construct($targetUri, $responseUri, $data) @@ -95,7 +95,7 @@ class Zend_Amf_Value_MessageBody /** * Retrieve target Uri - * + * * @return string */ public function getTargetUri() @@ -105,8 +105,8 @@ class Zend_Amf_Value_MessageBody /** * Set target Uri - * - * @param string $targetUri + * + * @param string $targetUri * @return Zend_Amf_Value_MessageBody */ public function setTargetUri($targetUri) @@ -120,7 +120,7 @@ class Zend_Amf_Value_MessageBody /** * Get target Uri - * + * * @return string */ public function getResponseUri() @@ -130,8 +130,8 @@ class Zend_Amf_Value_MessageBody /** * Set response Uri - * - * @param string $responseUri + * + * @param string $responseUri * @return Zend_Amf_Value_MessageBody */ public function setResponseUri($responseUri) @@ -145,7 +145,7 @@ class Zend_Amf_Value_MessageBody /** * Retrieve response data - * + * * @return string */ public function getData() @@ -155,8 +155,8 @@ class Zend_Amf_Value_MessageBody /** * Set response data - * - * @param mixed $data + * + * @param mixed $data * @return Zend_Amf_Value_MessageBody */ public function setData($data) @@ -167,8 +167,8 @@ class Zend_Amf_Value_MessageBody /** * Set reply method - * - * @param string $methodName + * + * @param string $methodName * @return Zend_Amf_Value_MessageBody */ public function setReplyMethod($methodName) diff --git a/lib/zend/Zend/Amf/Value/MessageHeader.php b/lib/zend/Zend/Amf/Value/MessageHeader.php index 1bc04370ffb..3058db1e0f4 100644 --- a/lib/zend/Zend/Amf/Value/MessageHeader.php +++ b/lib/zend/Zend/Amf/Value/MessageHeader.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -23,15 +23,15 @@ /** * Message Headers provide context for the processing of the * the AMF Packet and all subsequent Messages. - * + * * Multiple Message Headers may be included within an AMF Packet. * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Amf_Value_MessageHeader +class Zend_Amf_Value_MessageHeader { /** * Name of the header diff --git a/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php b/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php index 797f195ba47..fab2b9d6e5e 100644 --- a/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php +++ b/lib/zend/Zend/Amf/Value/Messaging/AbstractMessage.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AbstractMessage diff --git a/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php index 757feb3f4f6..8f54c333077 100644 --- a/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php +++ b/lib/zend/Zend/Amf/Value/Messaging/AcknowledgeMessage.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage diff --git a/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php b/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php index 0e39193af0f..0b1b9301a42 100755 --- a/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php +++ b/lib/zend/Zend/Amf/Value/Messaging/ArrayCollection.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_ArrayCollection diff --git a/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php b/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php index 93c81baf342..8787e57ce03 100644 --- a/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php +++ b/lib/zend/Zend/Amf/Value/Messaging/AsyncMessage.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff --git a/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php b/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php index a8e2d828a3a..05f4534883e 100644 --- a/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php +++ b/lib/zend/Zend/Amf/Value/Messaging/CommandMessage.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -36,48 +36,42 @@ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage { /** * This operation is used to subscribe to a remote destination. - * @const int */ const SUBSCRIBE_OPERATION = 0; /** * This operation is used to unsubscribe from a remote destination. - * @const int */ const UNSUSBSCRIBE_OPERATION = 1; /** * This operation is used to poll a remote destination for pending, * undelivered messages. - * @const int */ const POLL_OPERATION = 2; /** * This operation is used by a remote destination to sync missed or cached messages * back to a client as a result of a client issued poll command. - * @const int */ const CLIENT_SYNC_OPERATION = 4; /** * This operation is used to test connectivity over the current channel to * the remote endpoint. - * @const int */ const CLIENT_PING_OPERATION = 5; /** * This operation is used to request a list of failover endpoint URIs * for the remote destination based on cluster membership. - * @const int */ const CLUSTER_REQUEST_OPERATION = 7; @@ -86,40 +80,34 @@ class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_A * the user can be logged in over the current channel. * The credentials need to be Base64 encoded and stored in the body * of the message. - * @const int */ const LOGIN_OPERATION = 8; /** * This operation is used to log the user out of the current channel, and * will invalidate the server session if the channel is HTTP based. - * @const int */ const LOGOUT_OPERATION = 9; /** * This operation is used to indicate that the client's subscription to a * remote destination has been invalidated. - * @const int */ const SESSION_INVALIDATE_OPERATION = 10; /** * This operation is used by the MultiTopicConsumer to subscribe/unsubscribe * from multiple subtopics/selectors in the same message. - * @const int */ const MULTI_SUBSCRIBE_OPERATION = 11; /** * This operation is used to indicate that a channel has disconnected - * @const int */ const DISCONNECT_OPERATION = 12; /** * This is the default operation for new CommandMessage instances. - * @const int */ const UNKNOWN_OPERATION = 10000; diff --git a/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php b/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php index bc4d3ec1be8..d3f7f950e8b 100644 --- a/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php +++ b/lib/zend/Zend/Amf/Value/Messaging/ErrorMessage.php @@ -15,12 +15,12 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Amf_Value_Messaging_AcknowledgeMessage */ +/** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */ require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; /** @@ -30,7 +30,7 @@ require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage diff --git a/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php b/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php index 7ea9e879dad..075fe9ee125 100644 --- a/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php +++ b/lib/zend/Zend/Amf/Value/Messaging/RemotingMessage.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage diff --git a/lib/zend/Zend/Amf/Value/TraitsInfo.php b/lib/zend/Zend/Amf/Value/TraitsInfo.php index f3c2c5f5e3d..c92ffc21d37 100644 --- a/lib/zend/Zend/Amf/Value/TraitsInfo.php +++ b/lib/zend/Zend/Amf/Value/TraitsInfo.php @@ -15,17 +15,17 @@ * @category Zend * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * Zend_Amf_Value_TraitsInfo - * + * Zend_Amf_Value_TraitsInfo + * * @package Zend_Amf * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Amf_Value_TraitsInfo diff --git a/lib/zend/Zend/Auth.php b/lib/zend/Zend/Auth.php index 7fbd5bfa160..39659507e82 100644 --- a/lib/zend/Zend/Auth.php +++ b/lib/zend/Zend/Auth.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -23,7 +23,7 @@ /** * @category Zend * @package Zend_Auth - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Auth @@ -119,11 +119,11 @@ class Zend_Auth /** * ZF-7546 - prevent multiple succesive calls from storing inconsistent results * Ensure storage has clean state - */ + */ if ($this->hasIdentity()) { $this->clearIdentity(); } - + if ($result->isValid()) { $this->getStorage()->write($result->getIdentity()); } diff --git a/lib/zend/Zend/Date.php b/lib/zend/Zend/Date.php index 158aed16055..17e1c520b54 100644 --- a/lib/zend/Zend/Date.php +++ b/lib/zend/Zend/Date.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Locale/Math.php'; /** * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Date extends Zend_Date_DateObject @@ -202,7 +202,7 @@ class Zend_Date extends Zend_Date_DateObject $date['hour'] = 0; } - $hour = $this->toString('H'); + $hour = $this->toString('H', 'iso', true); $hour = $date['hour'] - $hour; switch ($hour) { case 1 : @@ -240,6 +240,7 @@ class Zend_Date extends Zend_Date_DateObject if (empty($options)) { return self::$_options; } + foreach ($options as $name => $value) { $name = strtolower($name); @@ -248,36 +249,46 @@ class Zend_Date extends Zend_Date_DateObject case 'format_type' : if ((strtolower($value) != 'php') && (strtolower($value) != 'iso')) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("Unknown format type ($value) for dates, only 'iso' and 'php' supported", $value); + throw new Zend_Date_Exception("Unknown format type ($value) for dates, only 'iso' and 'php' supported", 0, null, $value); } break; case 'fix_dst' : if (!is_bool($value)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("'fix_dst' has to be boolean", $value); + throw new Zend_Date_Exception("'fix_dst' has to be boolean", 0, null, $value); } break; case 'extend_month' : if (!is_bool($value)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("'extend_month' has to be boolean", $value); + throw new Zend_Date_Exception("'extend_month' has to be boolean", 0, null, $value); } break; case 'cache' : - if (!$value instanceof Zend_Cache_Core) { - require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("Instance of Zend_Cache expected"); + if ($value === null) { + parent::$_cache = null; + } else { + if (!$value instanceof Zend_Cache_Core) { + require_once 'Zend/Date/Exception.php'; + throw new Zend_Date_Exception("Instance of Zend_Cache expected"); + } + + parent::$_cache = $value; + Zend_Locale_Data::setCache($value); } - parent::$_cache = $value; - Zend_Locale_Data::setCache($value); break; case 'timesync' : - if (!$value instanceof Zend_TimeSync_Protocol) { - require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("Instance of Zend_TimeSync expected"); + if ($value === null) { + parent::$_defaultOffset = 0; + } else { + if (!$value instanceof Zend_TimeSync_Protocol) { + require_once 'Zend/Date/Exception.php'; + throw new Zend_Date_Exception("Instance of Zend_TimeSync expected"); + } + + $date = $value->getInfo(); + parent::$_defaultOffset = $date['offset']; } - $date = $value->getInfo(); - parent::$_defaultOffset = $date['offset']; break; } self::$_options[$name] = $value; @@ -315,7 +326,7 @@ class Zend_Date extends Zend_Date_DateObject { if ($stamp instanceof Zend_Date) { // extract timestamp from object - $stamp = $stamp->get(self::TIMESTAMP, true); + $stamp = $stamp->getTimestamp(); } if (is_array($stamp)) { @@ -342,7 +353,7 @@ class Zend_Date extends Zend_Date_DateObject * Sets a new timestamp * * @param integer|string|array|Zend_Date $timestamp Timestamp to set - * @return Zend_Date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setTimestamp($timestamp) @@ -354,7 +365,7 @@ class Zend_Date extends Zend_Date_DateObject * Adds a timestamp * * @param integer|string|array|Zend_Date $timestamp Timestamp to add - * @return Zend_Date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addTimestamp($timestamp) @@ -366,7 +377,7 @@ class Zend_Date extends Zend_Date_DateObject * Subtracts a timestamp * * @param integer|string|array|Zend_Date $timestamp Timestamp to sub - * @return Zend_Date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subTimestamp($timestamp) @@ -428,8 +439,9 @@ class Zend_Date extends Zend_Date_DateObject } } - if (($format !== null) and !defined($format) and - ($format != 'ee') and ($format != 'ss') and Zend_Locale::isLocale($format, null, false)) { + if (($format !== null) && !defined($format) + && ($format != 'ee') && ($format != 'ss') && ($format != 'GG') && ($format != 'MM') && ($format != 'EE') && ($format != 'TT') + && Zend_Locale::isLocale($format, null, false)) { $locale = $format; $format = null; } @@ -450,7 +462,7 @@ class Zend_Date extends Zend_Date_DateObject $format = Zend_Locale_Format::convertPhpToIsoFormat($format); } - return $this->get($format, $locale); + return $this->date($this->_toToken($format, $locale), $this->getUnixTimestamp(), false); } /** @@ -487,18 +499,18 @@ class Zend_Date extends Zend_Date_DateObject */ public function toArray() { - return array('day' => $this->get(self::DAY_SHORT), - 'month' => $this->get(self::MONTH_SHORT), - 'year' => $this->get(self::YEAR), - 'hour' => $this->get(self::HOUR_SHORT), - 'minute' => $this->get(self::MINUTE_SHORT), - 'second' => $this->get(self::SECOND_SHORT), - 'timezone' => $this->get(self::TIMEZONE), - 'timestamp' => $this->get(self::TIMESTAMP), - 'weekday' => $this->get(self::WEEKDAY_8601), - 'dayofyear' => $this->get(self::DAY_OF_YEAR), - 'week' => $this->get(self::WEEK), - 'gmtsecs' => $this->get(self::TIMEZONE_SECS)); + return array('day' => $this->toString(self::DAY_SHORT, 'iso'), + 'month' => $this->toString(self::MONTH_SHORT, 'iso'), + 'year' => $this->toString(self::YEAR, 'iso'), + 'hour' => $this->toString(self::HOUR_SHORT, 'iso'), + 'minute' => $this->toString(self::MINUTE_SHORT, 'iso'), + 'second' => $this->toString(self::SECOND_SHORT, 'iso'), + 'timezone' => $this->toString(self::TIMEZONE, 'iso'), + 'timestamp' => $this->toString(self::TIMESTAMP, 'iso'), + 'weekday' => $this->toString(self::WEEKDAY_8601, 'iso'), + 'dayofyear' => $this->toString(self::DAY_OF_YEAR, 'iso'), + 'week' => $this->toString(self::WEEK, 'iso'), + 'gmtsecs' => $this->toString(self::TIMEZONE_SECS, 'iso')); } /** @@ -517,13 +529,17 @@ class Zend_Date extends Zend_Date_DateObject $locale = $this->getLocale(); } - if (($part !== null) && (strlen($part) !== 2) && (Zend_Locale::isLocale($part, null, false))) { + if (($part !== null) && !defined($part) + && ($part != 'ee') && ($part != 'ss') && ($part != 'GG') && ($part != 'MM') && ($part != 'EE') && ($part != 'TT') + && Zend_Locale::isLocale($part, null, false)) { $locale = $part; $part = null; } if ($part === null) { $part = self::TIMESTAMP; + } else if (self::$_options['format_type'] == 'php') { + $part = Zend_Locale_Format::convertPhpToIsoFormat($part); } return $this->date($this->_toToken($part, $locale), $this->getUnixTimestamp(), false); @@ -740,7 +756,7 @@ class Zend_Date extends Zend_Date_DateObject break; case self::MILLISECOND : - return $this->_toComment($this->_fractional); + return $this->_toComment($this->getMilliSecond()); break; case self::TIMEZONE_NAME : @@ -936,7 +952,7 @@ class Zend_Date extends Zend_Date_DateObject case 'A' : $length = iconv_strlen($token, 'UTF-8'); - $result = $this->_fractional; + $result = substr($this->getMilliSecond(), 0, 3); $result += $this->date('s', $this->getUnixTimestamp(), false) * 1000; $result += $this->date('i', $this->getUnixTimestamp(), false) * 60000; $result += $this->date('H', $this->getUnixTimestamp(), false) * 3600000; @@ -1046,16 +1062,20 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $date Date or datepart to set * @param string $part OPTIONAL Part of the date to set, if null the timestamp is set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|string new datepart + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function set($date, $part = null, $locale = null) { + if (self::$_options['format_type'] == 'php') { + $part = Zend_Locale_Format::convertPhpToIsoFormat($part); + } + $zone = $this->getTimezoneFromString($date); $this->setTimezone($zone); - $result = $this->_calculate('set', $date, $part, $locale); - return $result; + $this->_calculate('set', $date, $part, $locale); + return $this; } /** @@ -1070,15 +1090,17 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $date Date or datepart to add * @param string $part OPTIONAL Part of the date to add, if null the timestamp is added * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|string new datepart + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ - public function add($date, $part = null, $locale = null) + public function add($date, $part = self::TIMESTAMP, $locale = null) { - $this->_calculate('add', $date, $part, $locale); - $result = $this->get($part, $locale); + if (self::$_options['format_type'] == 'php') { + $part = Zend_Locale_Format::convertPhpToIsoFormat($part); + } - return $result; + $this->_calculate('add', $date, $part, $locale); + return $this; } /** @@ -1091,15 +1113,17 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $date Date or datepart to subtract * @param string $part OPTIONAL Part of the date to sub, if null the timestamp is subtracted * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|string new datepart + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ - public function sub($date, $part = null, $locale = null) + public function sub($date, $part = self::TIMESTAMP, $locale = null) { - $this->_calculate('sub', $date, $part, $locale); - $result = $this->get($part, $locale); + if (self::$_options['format_type'] == 'php') { + $part = Zend_Locale_Format::convertPhpToIsoFormat($part); + } - return $result; + $this->_calculate('sub', $date, $part, $locale); + return $this; } /** @@ -1112,8 +1136,12 @@ class Zend_Date extends Zend_Date_DateObject * @return integer 0 = equal, 1 = later, -1 = earlier * @throws Zend_Date_Exception */ - public function compare($date, $part = null, $locale = null) + public function compare($date, $part = self::TIMESTAMP, $locale = null) { + if (self::$_options['format_type'] == 'php') { + $part = Zend_Locale_Format::convertPhpToIsoFormat($part); + } + $compare = $this->_calculate('cmp', $date, $part, $locale); if ($compare > 0) { @@ -1136,7 +1164,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string $part Part of the date to compare, if null the timestamp is subtracted * @param string|Zend_Locale $locale OPTIONAL New object's locale. No adjustments to timezone are made. - * @return Zend_Date + * @return Zend_Date New clone with requested part */ public function copyPart($part, $locale = null) { @@ -1232,7 +1260,7 @@ class Zend_Date extends Zend_Date_DateObject // dst-correction if 'fix_dst' = true and dst !== false but only for non UTC and non GMT if ((self::$_options['fix_dst'] === true) and ($dst !== false) and ($this->_dst === true)) { - $hour = $this->get(self::HOUR); + $hour = $this->toString(self::HOUR, 'iso'); if ($hour != $dst) { if (($dst == ($hour + 1)) or ($dst == ($hour - 23))) { $value += 3600; @@ -1275,15 +1303,15 @@ class Zend_Date extends Zend_Date_DateObject $locale = (string) $locale; // Create date parts - $year = $this->get(self::YEAR); - $month = $this->get(self::MONTH_SHORT); - $day = $this->get(self::DAY_SHORT); - $hour = $this->get(self::HOUR_SHORT); - $minute = $this->get(self::MINUTE_SHORT); - $second = $this->get(self::SECOND_SHORT); + $year = $this->toString(self::YEAR, 'iso'); + $month = $this->toString(self::MONTH_SHORT, 'iso'); + $day = $this->toString(self::DAY_SHORT, 'iso'); + $hour = $this->toString(self::HOUR_SHORT, 'iso'); + $minute = $this->toString(self::MINUTE_SHORT, 'iso'); + $second = $this->toString(self::SECOND_SHORT, 'iso'); // If object extract value if ($date instanceof Zend_Date) { - $date = $date->get($part, $locale); + $date = $date->toString($part, 'iso', $locale); } if (is_array($date) === true) { @@ -1421,13 +1449,14 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + intval($date), 1970, true), $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, day expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; case self::WEEKDAY_SHORT: $daylist = Zend_Locale_Data::getList($locale, 'day'); - $weekday = (int) $this->get(self::WEEKDAY_DIGIT, $locale); + $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale); $cnt = 0; foreach ($daylist as $key => $value) { @@ -1446,7 +1475,7 @@ class Zend_Date extends Zend_Date_DateObject // Weekday not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; case self::DAY_SHORT: @@ -1454,13 +1483,14 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + intval($date), 1970, true), $this->mktime(0, 0, 0, 1, 1 + intval($day), 1970, true), $hour); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, day expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; case self::WEEKDAY: $daylist = Zend_Locale_Data::getList($locale, 'day'); - $weekday = (int) $this->get(self::WEEKDAY_DIGIT, $locale); + $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale); $cnt = 0; foreach ($daylist as $key => $value) { @@ -1479,11 +1509,11 @@ class Zend_Date extends Zend_Date_DateObject // Weekday not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; case self::WEEKDAY_8601: - $weekday = (int) $this->get(self::WEEKDAY_8601, $locale); + $weekday = (int) $this->toString(self::WEEKDAY_8601, 'iso', $locale); if ((intval($date) > 0) and (intval($date) < 8)) { return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + intval($date), 1970, true), $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour); @@ -1491,16 +1521,16 @@ class Zend_Date extends Zend_Date_DateObject // Weekday not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; case self::DAY_SUFFIX: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('day suffix not supported', $date); + throw new Zend_Date_Exception('day suffix not supported', 0, null, $date); break; case self::WEEKDAY_DIGIT: - $weekday = (int) $this->get(self::WEEKDAY_DIGIT, $locale); + $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale); if (is_numeric($date) and (intval($date) >= 0) and (intval($date) < 7)) { return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + $date, 1970, true), $this->mktime(0, 0, 0, 1, 1 + $weekday, 1970, true), $hour); @@ -1508,21 +1538,28 @@ class Zend_Date extends Zend_Date_DateObject // Weekday not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; case self::DAY_OF_YEAR: if (is_numeric($date)) { - return $this->_assign($calc, $this->mktime(0, 0, 0, 1, 1 + $date, 1970, true), - $this->mktime(0, 0, 0, $month, 1 + $day, 1970, true), $hour); + if (($calc == 'add') || ($calc == 'sub')) { + $year = 1970; + ++$date; + ++$day; + } + + return $this->_assign($calc, $this->mktime(0, 0, 0, 1, $date, $year, true), + $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, day expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, day expected", 0, null, $date); break; case self::WEEKDAY_NARROW: $daylist = Zend_Locale_Data::getList($locale, 'day', array('gregorian', 'format', 'abbreviated')); - $weekday = (int) $this->get(self::WEEKDAY_DIGIT, $locale); + $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale); $cnt = 0; foreach ($daylist as $key => $value) { if (strtoupper(iconv_substr($value, 0, 1, 'UTF-8')) == strtoupper($date)) { @@ -1540,12 +1577,12 @@ class Zend_Date extends Zend_Date_DateObject // Weekday not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; case self::WEEKDAY_NAME: $daylist = Zend_Locale_Data::getList($locale, 'day', array('gregorian', 'format', 'abbreviated')); - $weekday = (int) $this->get(self::WEEKDAY_DIGIT, $locale); + $weekday = (int) $this->toString(self::WEEKDAY_DIGIT, 'iso', $locale); $cnt = 0; foreach ($daylist as $key => $value) { if (strtoupper($value) == strtoupper($date)) { @@ -1563,18 +1600,19 @@ class Zend_Date extends Zend_Date_DateObject // Weekday not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, weekday expected", 0, null, $date); break; // week formats case self::WEEK: if (is_numeric($date)) { - $week = (int) $this->get(self::WEEK, $locale); + $week = (int) $this->toString(self::WEEK, 'iso', $locale); return $this->_assign($calc, parent::mktime(0, 0, 0, 1, 1 + ($date * 7), 1970, true), parent::mktime(0, 0, 0, 1, 1 + ($week * 7), 1970, true), $hour); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, week expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, week expected", 0, null, $date); break; // month formats @@ -1618,7 +1656,7 @@ class Zend_Date extends Zend_Date_DateObject // Monthname not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, month expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; case self::MONTH: @@ -1646,8 +1684,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, $date, $day + $fixday, $year, true), $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, month expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; case self::MONTH_NAME_SHORT: @@ -1690,7 +1729,7 @@ class Zend_Date extends Zend_Date_DateObject // Monthname not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, month expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; case self::MONTH_SHORT: @@ -1719,13 +1758,14 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, 0, $date, $day + $fixday, $year, true), $this->mktime(0, 0, 0, $month, $day, $year, true), $hour); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, month expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; case self::MONTH_DAYS: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('month days not supported', $date); + throw new Zend_Date_Exception('month days not supported', 0, null, $date); break; case self::MONTH_NAME_NARROW: @@ -1768,13 +1808,13 @@ class Zend_Date extends Zend_Date_DateObject // Monthname not found require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, month expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, month expected", 0, null, $date); break; // year formats case self::LEAPYEAR: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('leap year not supported', $date); + throw new Zend_Date_Exception('leap year not supported', 0, null, $date); break; case self::YEAR_8601: @@ -1786,11 +1826,13 @@ class Zend_Date extends Zend_Date_DateObject $date = $year - $date; $calc = 'set'; } + return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, intval($date), true), $this->mktime(0, 0, 0, $month, $day, $year, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, year expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; case self::YEAR: @@ -1802,11 +1844,13 @@ class Zend_Date extends Zend_Date_DateObject $date = $year - $date; $calc = 'set'; } + return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, intval($date), true), $this->mktime(0, 0, 0, $month, $day, $year, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, year expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; case self::YEAR_SHORT: @@ -1822,11 +1866,13 @@ class Zend_Date extends Zend_Date_DateObject $date = $year - $date; $calc = 'set'; } + return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, $date, true), $this->mktime(0, 0, 0, $month, $day, $year, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, year expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; case self::YEAR_SHORT_8601: @@ -1842,17 +1888,19 @@ class Zend_Date extends Zend_Date_DateObject $date = $year - $date; $calc = 'set'; } + return $this->_assign($calc, $this->mktime(0, 0, 0, $month, $day, $date, true), $this->mktime(0, 0, 0, $month, $day, $year, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, year expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, year expected", 0, null, $date); break; // time formats case self::MERIDIEM: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('meridiem not supported', $date); + throw new Zend_Date_Exception('meridiem not supported', 0, null, $date); break; case self::SWATCH: @@ -1866,8 +1914,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime($hours, $minutes, $seconds, 1, 1, 1970, true), $this->mktime($hour, $minute, $second, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, swatchstamp expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, swatchstamp expected", 0, null, $date); break; case self::HOUR_SHORT_AM: @@ -1875,8 +1924,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true), $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; case self::HOUR_SHORT: @@ -1884,8 +1934,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true), $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; case self::HOUR_AM: @@ -1893,8 +1944,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true), $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; case self::HOUR: @@ -1902,8 +1954,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(intval($date), 0, 0, 1, 1, 1970, true), $this->mktime($hour, 0, 0, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, hour expected", 0, null, $date); break; case self::MINUTE: @@ -1911,8 +1964,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, intval($date), 0, 1, 1, 1970, true), $this->mktime(0, $minute, 0, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date); break; case self::SECOND: @@ -1920,8 +1974,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, intval($date), 1, 1, 1970, true), $this->mktime(0, 0, $second, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, second expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date); break; case self::MILLISECOND: @@ -1937,10 +1992,12 @@ class Zend_Date extends Zend_Date_DateObject return $this->subMillisecond($date); break; } + return $this->compareMillisecond($date); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, milliseconds expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, milliseconds expected", 0, null, $date); break; case self::MINUTE_SHORT: @@ -1948,8 +2005,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, intval($date), 0, 1, 1, 1970, true), $this->mktime(0, $minute, 0, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, minute expected", 0, null, $date); break; case self::SECOND_SHORT: @@ -1957,8 +2015,9 @@ class Zend_Date extends Zend_Date_DateObject return $this->_assign($calc, $this->mktime(0, 0, intval($date), 1, 1, 1970, true), $this->mktime(0, 0, $second, 1, 1, 1970, true), false); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, second expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, second expected", 0, null, $date); break; // timezone formats @@ -1967,18 +2026,18 @@ class Zend_Date extends Zend_Date_DateObject case self::TIMEZONE: case self::TIMEZONE_SECS: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('timezone not supported', $date); + throw new Zend_Date_Exception('timezone not supported', 0, null, $date); break; case self::DAYLIGHT: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('daylight not supported', $date); + throw new Zend_Date_Exception('daylight not supported', 0, null, $date); break; case self::GMT_DIFF: case self::GMT_DIFF_SEP: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('gmtdiff not supported', $date); + throw new Zend_Date_Exception('gmtdiff not supported', 0, null, $date); break; // date strings @@ -2012,7 +2071,7 @@ class Zend_Date extends Zend_Date_DateObject } if (empty($datematch) and empty($timematch)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", $date); + throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", 0, null, $date); } if (!empty($timematch)) { $timeMatchCharCount = iconv_strlen($timematch[0], 'UTF-8'); @@ -2050,7 +2109,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match('/^\w{3},\s(\d{1,2})\s(\w{3})\s(\d{4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4})$/', $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("no RFC 2822 format ($date)", $date); + throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date); } $months = $this->_getDigitFromName($match[2]); @@ -2071,8 +2130,9 @@ class Zend_Date extends Zend_Date_DateObject if (is_numeric($date)) { return $this->_assign($calc, $date, $this->getUnixTimestamp()); } + require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, timestamp expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, timestamp expected", 0, null, $date); break; // additional formats @@ -2080,7 +2140,7 @@ class Zend_Date extends Zend_Date_DateObject case self::ERA: case self::ERA_NAME: require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('era not supported', $date); + throw new Zend_Date_Exception('era not supported', 0, null, $date); break; case self::DATES: @@ -2095,11 +2155,12 @@ class Zend_Date extends Zend_Date_DateObject $parsed['year'] -= 1970; $year -= 1970; } + return $this->_assign($calc, $this->mktime(0, 0, 0, 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], true), $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2120,7 +2181,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2141,7 +2202,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2162,7 +2223,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2185,7 +2246,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime(0, 0, 0, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2201,7 +2262,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2223,7 +2284,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2240,7 +2301,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2257,7 +2318,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2279,7 +2340,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, $month, $day, $year, true), false); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2298,7 +2359,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2324,7 +2385,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2345,7 +2406,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2365,7 +2426,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2393,7 +2454,7 @@ class Zend_Date extends Zend_Date_DateObject $this->mktime($hour, $minute, $second, 1 + $month, 1 + $day, 1970 + $year, true), $hour); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } break; @@ -2403,7 +2464,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\d{0,4}([+-]{1}\d{2}:\d{2}|Z)$/', $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, ATOM format expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, ATOM format expected", 0, null, $date); } if (($calc == 'set') || ($calc == 'cmp')) { @@ -2422,7 +2483,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match("/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,20}$/", $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, COOKIE format expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, COOKIE format expected", 0, null, $date); } $matchStartPos = iconv_strpos($match[0], ' ', 0, 'UTF-8') + 1; $match[0] = iconv_substr($match[0], @@ -2451,7 +2512,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, RFC 822 date format expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, RFC 822 date format expected", 0, null, $date); } $months = $this->_getDigitFromName($match[2]); @@ -2473,7 +2534,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match('/^\w{6,9},\s(\d{2})-(\w{3})-(\d{2})\s(\d{2}):(\d{2}):(\d{2})\s.{3,21}$/', $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, RFC 850 date format expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, RFC 850 date format expected", 0, null, $date); } $months = $this->_getDigitFromName($match[2]); @@ -2495,7 +2556,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match('/^\w{0,3},{0,1}\s{0,1}(\d{1,2})\s(\w{3})\s(\d{2,4})\s(\d{2}):(\d{2}):{0,1}(\d{0,2})\s([+-]{1}\d{4}|\w{1,20})$/', $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, RFC 1123 date format expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, RFC 1123 date format expected", 0, null, $date); } $months = $this->_getDigitFromName($match[2]); @@ -2516,7 +2577,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match('/^\w{3},\s(\d{2})\s(\w{3})\s(\d{2,4})\s(\d{1,2}):(\d{2}):(\d{2})\s.{1,21}$/', $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, RSS date format expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, RSS date format expected", 0, null, $date); } $months = $this->_getDigitFromName($match[2]); @@ -2538,7 +2599,7 @@ class Zend_Date extends Zend_Date_DateObject $result = preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})[+-]{1}\d{2}:\d{2}$/', $date, $match); if (!$result) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid date ($date) operand, W3C date format expected", $date); + throw new Zend_Date_Exception("invalid date ($date) operand, W3C date format expected", 0, null, $date); } if (($calc == 'set') || ($calc == 'cmp')) { @@ -2556,47 +2617,52 @@ class Zend_Date extends Zend_Date_DateObject default: if (!is_numeric($date) || !empty($part)) { try { - if (self::$_options['format_type'] == 'php') { - $part = Zend_Locale_Format::convertPhpToIsoFormat($part); - } if (empty($part)) { $part = Zend_Locale_Format::getDateFormat($locale) . " "; $part .= Zend_Locale_Format::getTimeFormat($locale); } + $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $part, 'locale' => $locale, 'fix_date' => true, 'format_type' => 'iso')); if ((strpos(strtoupper($part), 'YY') !== false) and (strpos(strtoupper($part), 'YYYY') === false)) { $parsed['year'] = self::getFullYear($parsed['year']); } + if (($calc == 'set') || ($calc == 'cmp')) { if (isset($parsed['month'])) { --$parsed['month']; } else { $parsed['month'] = 0; } + if (isset($parsed['day'])) { --$parsed['day']; } else { $parsed['day'] = 0; } + if (isset($parsed['year'])) { $parsed['year'] -= 1970; } else { $parsed['year'] = 0; } } + return $this->_assign($calc, $this->mktime( isset($parsed['hour']) ? $parsed['hour'] : 0, isset($parsed['minute']) ? $parsed['minute'] : 0, isset($parsed['second']) ? $parsed['second'] : 0, - 1 + $parsed['month'], 1 + $parsed['day'], 1970 + $parsed['year'], + isset($parsed['month']) ? (1 + $parsed['month']) : 1, + isset($parsed['day']) ? (1 + $parsed['day']) : 1, + isset($parsed['year']) ? (1970 + $parsed['year']) : 1970, false), $this->getUnixTimestamp(), false); } catch (Zend_Locale_Exception $e) { if (!is_numeric($date)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage(), $date); + throw new Zend_Date_Exception($e->getMessage(), 0, $e, $date); } } } + return $this->_assign($calc, $date, $this->getUnixTimestamp(), false); break; } @@ -2613,13 +2679,14 @@ class Zend_Date extends Zend_Date_DateObject * @return boolean * @throws Zend_Date_Exception */ - public function equals($date, $part = null, $locale = null) + public function equals($date, $part = self::TIMESTAMP, $locale = null) { $result = $this->compare($date, $part, $locale); if ($result == 0) { return true; } + return false; } @@ -2641,6 +2708,7 @@ class Zend_Date extends Zend_Date_DateObject if ($result == -1) { return true; } + return false; } @@ -2663,6 +2731,7 @@ class Zend_Date extends Zend_Date_DateObject if ($result == 1) { return true; } + return false; } @@ -2676,7 +2745,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getTime($locale = null) { - return $this->copyPart(self::TIME_MEDIUM, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'H:i:s'; + } else { + $format = self::TIME_MEDIUM; + } + + return $this->copyPart($format, $locale); } /** @@ -2698,7 +2773,7 @@ class Zend_Date extends Zend_Date_DateObject if ($time instanceof Zend_Date) { // extract time from object - $time = $time->get('HH:mm:ss'); + $time = $time->toString('HH:mm:ss', 'iso'); } else { if (is_array($time)) { if ((isset($time['hour']) === true) or (isset($time['minute']) === true) or @@ -2720,9 +2795,22 @@ class Zend_Date extends Zend_Date_DateObject $parsed = Zend_Locale_Format::getTime($time, array('date_format' => $format, 'locale' => $locale, 'format_type' => 'iso')); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage()); + throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } + + if (!array_key_exists('hour', $parsed)) { + $parsed['hour'] = 0; + } + + if (!array_key_exists('minute', $parsed)) { + $parsed['minute'] = 0; + } + + if (!array_key_exists('second', $parsed)) { + $parsed['second'] = 0; + } + $time = str_pad($parsed['hour'], 2, '0', STR_PAD_LEFT) . ":"; $time .= str_pad($parsed['minute'], 2, '0', STR_PAD_LEFT) . ":"; $time .= str_pad($parsed['second'], 2, '0', STR_PAD_LEFT); @@ -2732,6 +2820,7 @@ class Zend_Date extends Zend_Date_DateObject if ($calc != 'cmp') { return $this; } + return $return; } @@ -2745,7 +2834,7 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $time Time to set * @param string $format OPTIONAL Timeformat for parsing input * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new time + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setTime($time, $format = null, $locale = null) @@ -2763,7 +2852,7 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $time Time to add * @param string $format OPTIONAL Timeformat for parsing input * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new time + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addTime($time, $format = null, $locale = null) @@ -2781,7 +2870,7 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $time Time to sub * @param string $format OPTIONAL Timeformat for parsing input * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new time + * @return Zend_Date Provides fluid inteface * @throws Zend_Date_Exception */ public function subTime($time, $format = null, $locale = null) @@ -2815,8 +2904,15 @@ class Zend_Date extends Zend_Date_DateObject */ public function getDate($locale = null) { + $orig = self::$_options['format_type']; + if (self::$_options['format_type'] == 'php') { + self::$_options['format_type'] = 'iso'; + } + $date = $this->copyPart(self::DATE_MEDIUM, $locale); $date->addTimestamp($this->getGmtOffset()); + self::$_options['format_type'] = $orig; + return $date; } @@ -2839,7 +2935,7 @@ class Zend_Date extends Zend_Date_DateObject if ($date instanceof Zend_Date) { // extract date from object - $date = $date->get('d.M.Y'); + $date = $date->toString('d.M.y', 'iso'); } else { if (is_array($date)) { if ((isset($date['year']) === true) or (isset($date['month']) === true) or @@ -2850,7 +2946,7 @@ class Zend_Date extends Zend_Date_DateObject throw new Zend_Date_Exception("no day,month or year given in array"); } } else { - if (self::$_options['format_type'] == 'php') { + if ((self::$_options['format_type'] == 'php') && !defined($format)) { $format = Zend_Locale_Format::convertPhpToIsoFormat($format); } try { @@ -2864,9 +2960,22 @@ class Zend_Date extends Zend_Date_DateObject } } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage()); + throw new Zend_Date_Exception($e->getMessage(), 0, $e); } } + + if (!array_key_exists('day', $parsed)) { + $parsed['day'] = 1; + } + + if (!array_key_exists('month', $parsed)) { + $parsed['month'] = 1; + } + + if (!array_key_exists('year', $parsed)) { + $parsed['year'] = 0; + } + $date = $parsed['day'] . "." . $parsed['month'] . "." . $parsed['year']; } @@ -2887,7 +2996,7 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $date Date to set * @param string $format OPTIONAL Date format for parsing * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setDate($date, $format = null, $locale = null) @@ -2905,7 +3014,7 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $date Date to add * @param string $format OPTIONAL Date format for parsing input * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addDate($date, $format = null, $locale = null) @@ -2924,7 +3033,7 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $date Date to sub * @param string $format OPTIONAL Date format for parsing input * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subDate($date, $format = null, $locale = null) @@ -2943,7 +3052,7 @@ class Zend_Date extends Zend_Date_DateObject * @param string|integer|array|Zend_Date $date Date to compare * @param string $format OPTIONAL Date format for parsing input * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return integer 0 = equal, 1 = later, -1 = earlier * @throws Zend_Date_Exception */ public function compareDate($date, $format = null, $locale = null) @@ -2963,7 +3072,7 @@ class Zend_Date extends Zend_Date_DateObject */ public function getIso($locale = null) { - return $this->get(self::ISO_8601, $locale); + return $this->toString(self::ISO_8601, 'iso', $locale); } @@ -2975,7 +3084,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|Zend_Date $date ISO Date to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setIso($date, $locale = null) @@ -2992,7 +3101,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|Zend_Date $date ISO Date to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addIso($date, $locale = null) @@ -3009,7 +3118,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|Zend_Date $date ISO Date to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subIso($date, $locale = null) @@ -3044,7 +3153,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getArpa($locale = null) { - return $this->get(self::RFC_822, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'D\, d M y H\:i\:s O'; + } else { + $format = self::RFC_822; + } + + return $this->toString($format, 'iso', $locale); } @@ -3056,7 +3171,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|Zend_Date $date RFC 822 to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setArpa($date, $locale = null) @@ -3074,7 +3189,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|Zend_Date $date RFC 822 Date to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addArpa($date, $locale = null) @@ -3092,7 +3207,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|Zend_Date $date RFC 822 Date to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return integer|Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subArpa($date, $locale = null) @@ -3129,15 +3244,15 @@ class Zend_Date extends Zend_Date_DateObject { if (!isset($location['longitude']) or !isset($location['latitude'])) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('Location must include \'longitude\' and \'latitude\'', $location); + throw new Zend_Date_Exception('Location must include \'longitude\' and \'latitude\'', 0, null, $location); } if (($location['longitude'] > 180) or ($location['longitude'] < -180)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('Longitude must be between -180 and 180', $location); + throw new Zend_Date_Exception('Longitude must be between -180 and 180', 0, null, $location); } if (($location['latitude'] > 90) or ($location['latitude'] < -90)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('Latitude must be between -90 and 90', $location); + throw new Zend_Date_Exception('Latitude must be between -90 and 90', 0, null, $location); } if (!isset($location['horizon'])){ @@ -3251,8 +3366,9 @@ class Zend_Date extends Zend_Date_DateObject public static function checkLeapYear($year) { if ($year instanceof Zend_Date) { - $year = (int) $year->get(self::YEAR); + $year = (int) $year->toString(self::YEAR, 'iso'); } + if (is_array($year)) { if (isset($year['year']) === true) { $year = $year['year']; @@ -3261,9 +3377,10 @@ class Zend_Date extends Zend_Date_DateObject throw new Zend_Date_Exception("no year given in array"); } } + if (!is_numeric($year)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("year ($year) has to be integer for checkLeapYear()", $year); + throw new Zend_Date_Exception("year ($year) has to be integer for checkLeapYear()", 0, null, $year); } return (bool) parent::isYearLeapYear($year); @@ -3346,18 +3463,32 @@ class Zend_Date extends Zend_Date_DateObject */ private function _calcdetail($calc, $date, $type, $locale) { + $old = false; + if (self::$_options['format_type'] == 'php') { + self::$_options['format_type'] = 'iso'; + $old = true; + } + switch($calc) { case 'set' : - return $this->set($date, $type, $locale); + $return = $this->set($date, $type, $locale); break; case 'add' : - return $this->add($date, $type, $locale); + $return = $this->add($date, $type, $locale); break; case 'sub' : - return $this->sub($date, $type, $locale); + $return = $this->sub($date, $type, $locale); + break; + default : + $return = $this->compare($date, $type, $locale); break; } - return $this->compare($date, $type, $locale); + + if ($old) { + self::$_options['format_type'] = 'php'; + } + + return $return; } /** @@ -3382,10 +3513,10 @@ class Zend_Date extends Zend_Date_DateObject if ($value instanceof Zend_Date) { // extract value from object - $value = $value->get($parameter, $locale); + $value = $value->toString($parameter, 'iso', $locale); } else if (!is_array($value) && !is_numeric($value) && ($type != 'iso') && ($type != 'arpa')) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid $type ($value) operand", $value); + throw new Zend_Date_Exception("invalid $type ($value) operand", 0, null, $value); } $return = $this->_calcdetail($calc, $value, $parameter, $locale); @@ -3405,7 +3536,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getYear($locale = null) { - return $this->copyPart(self::YEAR, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'Y'; + } else { + $format = self::YEAR; + } + + return $this->copyPart($format, $locale); } @@ -3419,7 +3556,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $date Year to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setYear($year, $locale = null) @@ -3438,7 +3575,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $date Year to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addYear($year, $locale = null) @@ -3457,7 +3594,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $date Year to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subYear($year, $locale = null) @@ -3491,7 +3628,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getMonth($locale = null) { - return $this->copyPart(self::MONTH, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'm'; + } else { + $format = self::MONTH; + } + + return $this->copyPart($format, $locale); } @@ -3517,7 +3660,7 @@ class Zend_Date extends Zend_Date_DateObject if ($month instanceof Zend_Date) { // extract month from object - $found = $month->get(self::MONTH_SHORT, $locale); + $found = $month->toString(self::MONTH_SHORT, 'iso', $locale); } else { if (is_numeric($month)) { $found = $month; @@ -3553,7 +3696,7 @@ class Zend_Date extends Zend_Date_DateObject } if ($found == 0) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("unknown month name ($month)", $month); + throw new Zend_Date_Exception("unknown month name ($month)", 0, null, $month); } } } @@ -3575,7 +3718,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $month Month to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setMonth($month, $locale = null) @@ -3594,7 +3737,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $month Month to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addMonth($month, $locale = null) @@ -3613,7 +3756,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $month Month to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subMonth($month, $locale = null) @@ -3671,7 +3814,7 @@ class Zend_Date extends Zend_Date_DateObject } if ($day instanceof Zend_Date) { - $day = $day->get(self::DAY_SHORT, $locale); + $day = $day->toString(self::DAY_SHORT, 'iso', $locale); } if (is_numeric($day)) { @@ -3719,7 +3862,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $month Day to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setDay($day, $locale = null) @@ -3734,12 +3877,10 @@ class Zend_Date extends Zend_Date_DateObject * will result in adding or subtracting the relevant month. * If a localized dayname is given it will be parsed with the default locale or the optional * set locale. - * Returned is the new date object - * Example: addDay('Montag', 'de_AT'); will add the number of days until the next monday * * @param string|integer|array|Zend_Date $month Day to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addDay($day, $locale = null) @@ -3754,12 +3895,10 @@ class Zend_Date extends Zend_Date_DateObject * will result in adding or subtracting the relevant month. * If a localized dayname is given it will be parsed with the default locale or the optional * set locale. - * Returned is the new date object - * Example: subDay('Montag', 'de_AT'); will sub the number of days until the previous monday * * @param string|integer|array|Zend_Date $month Day to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subDay($day, $locale = null) @@ -3794,7 +3933,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getWeekday($locale = null) { - return $this->copyPart(self::WEEKDAY, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'l'; + } else { + $format = self::WEEKDAY; + } + + return $this->copyPart($format, $locale); } @@ -3819,7 +3964,7 @@ class Zend_Date extends Zend_Date_DateObject } if ($weekday instanceof Zend_Date) { - $weekday = $weekday->get(self::WEEKDAY_8601, $locale); + $weekday = $weekday->toString(self::WEEKDAY_8601, 'iso', $locale); } if (is_numeric($weekday)) { @@ -3865,7 +4010,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $month Weekday to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setWeekday($weekday, $locale = null) @@ -3885,7 +4030,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $month Weekday to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addWeekday($weekday, $locale = null) @@ -3905,7 +4050,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $month Weekday to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subWeekday($weekday, $locale = null) @@ -3939,7 +4084,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getDayOfYear($locale = null) { - return $this->copyPart(self::DAY_OF_YEAR, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'D'; + } else { + $format = self::DAY_OF_YEAR; + } + + return $this->copyPart($format, $locale); } @@ -3951,7 +4102,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $day Day of Year to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setDayOfYear($day, $locale = null) @@ -3968,7 +4119,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $day Day of Year to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addDayOfYear($day, $locale = null) @@ -3985,7 +4136,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $day Day of Year to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subDayOfYear($day, $locale = null) @@ -4031,7 +4182,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $hour Hour to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setHour($hour, $locale = null) @@ -4048,7 +4199,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $hour Hour to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addHour($hour, $locale = null) @@ -4065,7 +4216,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $hour Hour to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subHour($hour, $locale = null) @@ -4099,7 +4250,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getMinute($locale = null) { - return $this->copyPart(self::MINUTE, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'i'; + } else { + $format = self::MINUTE; + } + + return $this->copyPart($format, $locale); } @@ -4111,7 +4268,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $minute Minute to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setMinute($minute, $locale = null) @@ -4128,7 +4285,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $minute Minute to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addMinute($minute, $locale = null) @@ -4145,7 +4302,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $minute Minute to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subMinute($minute, $locale = null) @@ -4179,7 +4336,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getSecond($locale = null) { - return $this->copyPart(self::SECOND, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 's'; + } else { + $format = self::SECOND; + } + + return $this->copyPart($format, $locale); } @@ -4191,7 +4354,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $second Second to set * @param string|Zend_Locale $locale (Optional) Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setSecond($second, $locale = null) @@ -4208,7 +4371,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $second Second to add * @param string|Zend_Locale $locale (Optional) Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addSecond($second, $locale = null) @@ -4225,7 +4388,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $second Second to sub * @param string|Zend_Locale $locale (Optional) Locale for parsing input - * @return Zend_Date new date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subSecond($second, $locale = null) @@ -4266,22 +4429,30 @@ class Zend_Date extends Zend_Date_DateObject * * @param integer $precision Precision for the fractional datepart 3 = milliseconds * @throws Zend_Date_Exception - * @return void + * @return Zend_Date Provides fluid interface */ public function setFractionalPrecision($precision) { if (!intval($precision) or ($precision < 0) or ($precision > 9)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", $precision); + throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); } + $this->_precision = (int) $precision; + if ($this->_precision < strlen($this->_fractional)) { + $this->_fractional = substr($this->_fractional, 0, $this->_precision); + } else { + $this->_fractional = str_pad($this->_fractional, $this->_precision, '0', STR_PAD_RIGHT); + } + + return $this; } /** * Returns the milliseconds of the date object * - * @return integer + * @return string */ public function getMilliSecond() { @@ -4295,7 +4466,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param integer|Zend_Date $milli (Optional) Millisecond to set, when null the actual millisecond is set * @param integer $precision (Optional) Fraction precision of the given milliseconds - * @return integer|string + * @return Zend_Date Provides fluid interface */ public function setMilliSecond($milli = null, $precision = null) { @@ -4305,19 +4476,21 @@ class Zend_Date extends Zend_Date_DateObject $precision = 6; } else if (!is_numeric($milli)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid milli second ($milli) operand", $milli); + throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } if ($precision === null) { $precision = $this->_precision; - } else if (!is_int($precision) || $precision < 1 || $precision > 9) { + } + + if (!is_int($precision) || $precision < 1 || $precision > 9) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", $precision); + throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); } $this->_fractional = 0; $this->addMilliSecond($milli, $precision); - return $this->_fractional; + return $this; } @@ -4326,7 +4499,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param integer|Zend_Date $milli (Optional) Millisecond to add, when null the actual millisecond is added * @param integer $precision (Optional) Fractional precision for the given milliseconds - * @return integer|string + * @return Zend_Date Provides fluid interface */ public function addMilliSecond($milli = null, $precision = null) { @@ -4335,29 +4508,24 @@ class Zend_Date extends Zend_Date_DateObject $milli = intval($milli); } else if (!is_numeric($milli)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid milli second ($milli) operand", $milli); + throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } if ($precision === null) { - $precision = $this->_precision; - } else if (!is_int($precision) || $precision < 1 || $precision > 9) { - require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", $precision); - } - - if ($precision != $this->_precision) { - if ($precision > $this->_precision) { - $diff = $precision - $this->_precision; - $milli = (int) ($milli / (10 * $diff)); - } else { - $diff = $this->_precision - $precision; - $milli = (int) ($milli * (10 * $diff)); + $precision = strlen($milli); + if ($milli < 0) { + --$precision; } } - $this->_fractional += $milli; - // Add/sub milliseconds + add/sub seconds + if (!is_int($precision) || $precision < 1 || $precision > 9) { + require_once 'Zend/Date/Exception.php'; + throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); + } + $this->_fractional += $milli; + + // Add/sub milliseconds + add/sub seconds $max = pow(10, $this->_precision); // Milli includes seconds if ($this->_fractional >= $max) { @@ -4374,7 +4542,11 @@ class Zend_Date extends Zend_Date_DateObject } } - return $this->_fractional; + if ($this->_precision > strlen($this->_fractional)) { + $this->_fractional = str_pad($this->_fractional, $this->_precision, '0', STR_PAD_LEFT); + } + + return $this; } @@ -4383,11 +4555,12 @@ class Zend_Date extends Zend_Date_DateObject * * @param integer|Zend_Date $milli (Optional) Millisecond to sub, when null the actual millisecond is subtracted * @param integer $precision (Optional) Fractional precision for the given milliseconds - * @return integer + * @return Zend_Date Provides fluid interface */ public function subMilliSecond($milli = null, $precision = null) { - return $this->addMilliSecond(0 - $milli, $precision); + $this->addMilliSecond(0 - $milli, $precision); + return $this; } /** @@ -4395,7 +4568,8 @@ class Zend_Date extends Zend_Date_DateObject * * @param integer|Zend_Date $milli OPTIONAL Millisecond to compare, when null the actual millisecond is compared * @param integer $precision OPTIONAL Fractional precision for the given milliseconds - * @return integer + * @throws Zend_Date_Exception On invalid input + * @return integer 0 = equal, 1 = later, -1 = earlier */ public function compareMilliSecond($milli = null, $precision = null) { @@ -4404,14 +4578,14 @@ class Zend_Date extends Zend_Date_DateObject $milli = intval($milli); } else if (is_numeric($milli) === false) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("invalid milli second ($milli) operand", $milli); + throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli); } if ($precision === null) { - $precision = $this->_precision; + $precision = strlen($milli); } else if (!is_int($precision) || $precision < 1 || $precision > 9) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", $precision); + throw new Zend_Date_Exception("precision ($precision) must be a positive integer less than 10", 0, null, $precision); } if ($precision === 0) { @@ -4447,7 +4621,13 @@ class Zend_Date extends Zend_Date_DateObject */ public function getWeek($locale = null) { - return $this->copyPart(self::WEEK, $locale); + if (self::$_options['format_type'] == 'php') { + $format = 'W'; + } else { + $format = self::WEEK; + } + + return $this->copyPart($format, $locale); } /** @@ -4457,7 +4637,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $week Week to set * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function setWeek($week, $locale = null) @@ -4472,7 +4652,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $week Week to add * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function addWeek($week, $locale = null) @@ -4487,7 +4667,7 @@ class Zend_Date extends Zend_Date_DateObject * * @param string|integer|array|Zend_Date $week Week to sub * @param string|Zend_Locale $locale OPTIONAL Locale for parsing input - * @return Zend_Date + * @return Zend_Date Provides fluid interface * @throws Zend_Date_Exception */ public function subWeek($week, $locale = null) @@ -4527,7 +4707,7 @@ class Zend_Date extends Zend_Date_DateObject $this->_locale = Zend_Locale::findLocale($locale); } catch (Zend_Locale_Exception $e) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception($e->getMessage()); + throw new Zend_Date_Exception($e->getMessage(), 0, $e); } return $this; @@ -4562,7 +4742,8 @@ class Zend_Date extends Zend_Date_DateObject return false; } - if (($format !== null) and (Zend_Locale::isLocale($format, null, false))) { + if (($format !== null) && ($format != 'ee') && ($format != 'ss') && ($format != 'GG') && ($format != 'MM') && ($format != 'EE') && ($format != 'TT') + && (Zend_Locale::isLocale($format, null, false))) { $locale = $format; $format = null; } @@ -4571,7 +4752,7 @@ class Zend_Date extends Zend_Date_DateObject if ($format === null) { $format = Zend_Locale_Format::getDateFormat($locale); - } else if (self::$_options['format_type'] == 'php') { + } else if ((self::$_options['format_type'] == 'php') && !defined($format)) { $format = Zend_Locale_Format::convertPhpToIsoFormat($format); } @@ -4700,7 +4881,7 @@ class Zend_Date extends Zend_Date_DateObject { switch($token) { case self::ISO_8601 : - return "dd mm yy"; + return "yyyy-MM-ddThh:mm:ss"; break; case self::RFC_2822 : return "EEE, dd MMM yyyy HH:mm:ss"; @@ -4721,19 +4902,19 @@ class Zend_Date extends Zend_Date_DateObject return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'short')); break; case self::TIMES : - return Zend_Locale_Data::getContent($locale, 'date'); + return Zend_Locale_Data::getContent($locale, 'time'); break; case self::TIME_FULL : return Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'full')); break; case self::TIME_LONG : - return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'long')); + return Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'long')); break; case self::TIME_MEDIUM : - return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'medium')); + return Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'medium')); break; case self::TIME_SHORT : - return Zend_Locale_Data::getContent($locale, 'date', array('gregorian', 'short')); + return Zend_Locale_Data::getContent($locale, 'time', array('gregorian', 'short')); break; case self::DATETIME : return Zend_Locale_Data::getContent($locale, 'datetime'); diff --git a/lib/zend/Zend/Date/Cities.php b/lib/zend/Zend/Date/Cities.php index 7e47b2b7c50..70bc0592dc0 100644 --- a/lib/zend/Zend/Date/Cities.php +++ b/lib/zend/Zend/Date/Cities.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_Cities - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Date_Cities diff --git a/lib/zend/Zend/Date/DateObject.php b/lib/zend/Zend/Date/DateObject.php index 6e7e81350ce..5435eb4a506 100644 --- a/lib/zend/Zend/Date/DateObject.php +++ b/lib/zend/Zend/Date/DateObject.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * @category Zend * @package Zend_Date * @subpackage Zend_Date_DateObject - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Date_DateObject { @@ -85,7 +85,7 @@ abstract class Zend_Date_DateObject { $this->_unixTimestamp = time(); } else { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception('\'' . $timestamp . '\' is not a valid UNIX timestamp', $timestamp); + throw new Zend_Date_Exception('\'' . $timestamp . '\' is not a valid UNIX timestamp', 0, null, $timestamp); } return $old; @@ -144,7 +144,6 @@ abstract class Zend_Date_DateObject { */ protected function mktime($hour, $minute, $second, $month, $day, $year, $gmt = false) { - // complete date but in 32bit timestamp - use PHP internal if ((1901 < $year) and ($year < 2038)) { @@ -235,7 +234,7 @@ abstract class Zend_Date_DateObject { for ($mcount = 11; $mcount > ($month - 1); $mcount--) { $date += self::$_monthTable[$mcount]; - if (($leapyear === true) and ($mcount == 1)) { + if (($leapyear === true) and ($mcount == 2)) { $date++; } @@ -300,6 +299,7 @@ abstract class Zend_Date_DateObject { if ($this->_timezone != $oldzone) { date_default_timezone_set($this->_timezone); } + if ($timestamp === null) { $result = ($gmt) ? @gmdate($format) : @date($format); date_default_timezone_set($oldzone); @@ -312,7 +312,8 @@ abstract class Zend_Date_DateObject { return $result; } - $jump = false; + $jump = false; + $origstamp = $timestamp; if (isset(self::$_cache)) { $idstamp = strtr('Zend_DateObject_date_' . $this->_offset . '_'. $timestamp . '_'.(int)$gmt, '-','_'); if ($result2 = self::$_cache->load($idstamp)) { @@ -321,18 +322,20 @@ abstract class Zend_Date_DateObject { } } - // check on false or null alone failes + // check on false or null alone fails if (empty($gmt) and empty($jump)) { $tempstamp = $timestamp; if ($tempstamp > 0) { while (abs($tempstamp) > 0x7FFFFFFF) { $tempstamp -= (86400 * 23376); } + $dst = date("I", $tempstamp); if ($dst === 1) { $timestamp += 3600; } - $temp = date('Z', $tempstamp); + + $temp = date('Z', $tempstamp); $timestamp += $temp; } @@ -341,20 +344,17 @@ abstract class Zend_Date_DateObject { } } - if (($timestamp < 0) and ($gmt !== true)) { $timestamp -= $this->_offset; } - date_default_timezone_set($oldzone); - $date = $this->getDateParts($timestamp, true); + date_default_timezone_set($oldzone); + $date = $this->getDateParts($timestamp, true); $length = strlen($format); $output = ''; for ($i = 0; $i < $length; $i++) { - switch($format[$i]) { - // day formats case 'd': // day of month, 2 digits, with leading zero, 01 - 31 $output .= (($date['mday'] < 10) ? '0' . $date['mday'] : $date['mday']); @@ -563,6 +563,7 @@ abstract class Zend_Date_DateObject { case 'c': // ISO 8601 date format $difference = $this->getGmtOffset(); $difference = sprintf('%s%04d', ($difference <= 0) ? '+' : '-', abs($difference) / 36); + $difference = substr($difference, 0, 3) . ':' . substr($difference, 3); $output .= $date['year'] . '-' . (($date['mon'] < 10) ? '0' . $date['mon'] : $date['mon']) . '-' . (($date['mday'] < 10) ? '0' . $date['mday'] : $date['mday']) . 'T' @@ -586,7 +587,7 @@ abstract class Zend_Date_DateObject { break; case 'U': // Unix timestamp - $output .= $timestamp; + $output .= $origstamp; break; @@ -1001,7 +1002,7 @@ abstract class Zend_Date_DateObject { if (function_exists('timezone_open')) { if (!@timezone_open($zone)) { require_once 'Zend/Date/Exception.php'; - throw new Zend_Date_Exception("timezone ($zone) is not a known timezone", $zone); + throw new Zend_Date_Exception("timezone ($zone) is not a known timezone", 0, null, $zone); } } // this can generate an error if the date extension is not available and a false timezone is given diff --git a/lib/zend/Zend/Date/Exception.php b/lib/zend/Zend/Date/Exception.php index 0d2998615b2..bcbfd20be52 100644 --- a/lib/zend/Zend/Date/Exception.php +++ b/lib/zend/Zend/Date/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,17 +29,17 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Date - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Date_Exception extends Zend_Exception { protected $operand = null; - public function __construct($message, $op = null) + public function __construct($message, $code = 0, $e = null, $op = null) { $this->operand = $op; - parent::__construct($message); + parent::__construct($message, $code, $e); } public function getOperand() diff --git a/lib/zend/Zend/Exception.php b/lib/zend/Zend/Exception.php index 04ffa37ef01..bbfb792e936 100644 --- a/lib/zend/Zend/Exception.php +++ b/lib/zend/Zend/Exception.php @@ -14,18 +14,82 @@ * * @category Zend * @package Zend - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id$ */ - /** - * @category Zend - * @package Zend - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License - */ +* @category Zend +* @package Zend +* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) +* @license http://framework.zend.com/license/new-bsd New BSD License +*/ class Zend_Exception extends Exception -{} +{ + /** + * @var null|Exception + */ + private $_previous = null; + /** + * Construct the exception + * + * @param string $msg + * @param int $code + * @param Exception $previous + * @return void + */ + public function __construct($msg = '', $code = 0, Exception $previous = null) + { + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + parent::__construct($msg, (int) $code); + $this->_previous = $previous; + } else { + parent::__construct($msg, (int) $code, $previous); + } + } + + /** + * Overloading + * + * For PHP < 5.3.0, provides access to the getPrevious() method. + * + * @param string $method + * @param array $args + * @return mixed + */ + public function __call($method, array $args) + { + if ('getprevious' == strtolower($method)) { + return $this->_getPrevious(); + } + return null; + } + + /** + * String representation of the exception + * + * @return string + */ + public function __toString() + { + if (version_compare(PHP_VERSION, '5.3.0', '<')) { + if (null !== ($e = $this->getPrevious())) { + return $e->__toString() + . "\n\nNext " + . parent::__toString(); + } + } + return parent::__toString(); + } + + /** + * Returns previous Exception + * + * @return Exception|null + */ + protected function _getPrevious() + { + return $this->_previous; + } +} diff --git a/lib/zend/Zend/Gdata.php b/lib/zend/Zend/Gdata.php index c9f73224dd3..0445c6a5f14 100644 --- a/lib/zend/Zend/Gdata.php +++ b/lib/zend/Zend/Gdata.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/App.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata extends Zend_Gdata_App diff --git a/lib/zend/Zend/Gdata/App.php b/lib/zend/Zend/Gdata/App.php index f2b69240277..d3230c5c203 100644 --- a/lib/zend/Zend/Gdata/App.php +++ b/lib/zend/Zend/Gdata/App.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -49,7 +49,7 @@ require_once 'Zend/Gdata/App/MediaSource.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App @@ -256,7 +256,7 @@ class Zend_Gdata_App ) ); $this->_httpClient = $client; - Zend_Gdata::setStaticHttpClient($client); + self::setStaticHttpClient($client); return $this; } @@ -634,9 +634,9 @@ class Zend_Gdata_App // Make sure the HTTP client object is 'clean' before making a request // In addition to standard headers to reset via resetParameters(), - // also reset the Slug header + // also reset the Slug and If-Match headers $this->_httpClient->resetParameters(); - $this->_httpClient->setHeaders('Slug', null); + $this->_httpClient->setHeaders(array('Slug', 'If-Match')); // Set the params for the new request to be performed $this->_httpClient->setHeaders($headers); @@ -757,7 +757,7 @@ class Zend_Gdata_App if (!$this->_useObjectMapping) { return $feedContent; } - + $protocolVersionStr = $response->getHeader('GData-Version'); $majorProtocolVersion = null; $minorProtocolVersion = null; diff --git a/lib/zend/Zend/Gdata/App/AuthException.php b/lib/zend/Zend/Gdata/App/AuthException.php index d852f2a4ced..f205a38f8d0 100644 --- a/lib/zend/Zend/Gdata/App/AuthException.php +++ b/lib/zend/Zend/Gdata/App/AuthException.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/App/Exception.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_AuthException extends Zend_Gdata_App_Exception diff --git a/lib/zend/Zend/Gdata/App/BadMethodCallException.php b/lib/zend/Zend/Gdata/App/BadMethodCallException.php index ca238c736d5..b9bf33c6f37 100644 --- a/lib/zend/Zend/Gdata/App/BadMethodCallException.php +++ b/lib/zend/Zend/Gdata/App/BadMethodCallException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Exception.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_BadMethodCallException extends Zend_Gdata_App_Exception diff --git a/lib/zend/Zend/Gdata/App/Base.php b/lib/zend/Zend/Gdata/App/Base.php index bc25f7abbd5..dbf1d7f22b0 100644 --- a/lib/zend/Zend/Gdata/App/Base.php +++ b/lib/zend/Zend/Gdata/App/Base.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Util.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Base diff --git a/lib/zend/Zend/Gdata/App/BaseMediaSource.php b/lib/zend/Zend/Gdata/App/BaseMediaSource.php index cbec12ed5c5..51b6f3a9adb 100644 --- a/lib/zend/Zend/Gdata/App/BaseMediaSource.php +++ b/lib/zend/Zend/Gdata/App/BaseMediaSource.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/MediaSource.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_BaseMediaSource implements Zend_Gdata_App_MediaSource diff --git a/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php b/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php index 85db881a19d..897f5bbad0d 100644 --- a/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php +++ b/lib/zend/Zend/Gdata/App/CaptchaRequiredException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/App/AuthException.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_CaptchaRequiredException extends Zend_Gdata_App_AuthException @@ -46,24 +46,24 @@ class Zend_Gdata_App_CaptchaRequiredException extends Zend_Gdata_App_AuthExcepti * The Google Accounts URL prefix. */ const ACCOUNTS_URL = 'https://www.google.com/accounts/'; - + /** * The token identifier from the server. - * + * * @var string */ private $captchaToken; - + /** * The URL of the CAPTCHA image. - * + * * @var string */ private $captchaUrl; - + /** * Constructs the exception to handle a CAPTCHA required response. - * + * * @param string $captchaToken The CAPTCHA token ID provided by the server. * @param string $captchaUrl The URL to the CAPTCHA challenge image. */ @@ -72,23 +72,23 @@ class Zend_Gdata_App_CaptchaRequiredException extends Zend_Gdata_App_AuthExcepti $this->captchaUrl = Zend_Gdata_App_CaptchaRequiredException::ACCOUNTS_URL . $captchaUrl; parent::__construct('CAPTCHA challenge issued by server'); } - + /** * Retrieves the token identifier as provided by the server. - * + * * @return string */ public function getCaptchaToken() { return $this->captchaToken; } - + /** * Retrieves the URL CAPTCHA image as provided by the server. - * + * * @return string */ public function getCaptchaUrl() { return $this->captchaUrl; } - + } diff --git a/lib/zend/Zend/Gdata/App/Entry.php b/lib/zend/Zend/Gdata/App/Entry.php index 4f15c3e3f23..a6fd3e76f45 100644 --- a/lib/zend/Zend/Gdata/App/Entry.php +++ b/lib/zend/Zend/Gdata/App/Entry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -62,7 +62,7 @@ require_once 'Zend/Gdata/App/Extension/Control.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Entry extends Zend_Gdata_App_FeedEntryParent diff --git a/lib/zend/Zend/Gdata/App/Exception.php b/lib/zend/Zend/Gdata/App/Exception.php index 44773c479ca..052cef4853d 100644 --- a/lib/zend/Zend/Gdata/App/Exception.php +++ b/lib/zend/Zend/Gdata/App/Exception.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Exception.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Exception extends Zend_Exception diff --git a/lib/zend/Zend/Gdata/App/Extension.php b/lib/zend/Zend/Gdata/App/Extension.php index 74a2eca2229..40de85bbc9d 100644 --- a/lib/zend/Zend/Gdata/App/Extension.php +++ b/lib/zend/Zend/Gdata/App/Extension.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Base.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension extends Zend_Gdata_App_Base diff --git a/lib/zend/Zend/Gdata/App/Extension/Author.php b/lib/zend/Zend/Gdata/App/Extension/Author.php index 020927b6255..83086005c26 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Author.php +++ b/lib/zend/Zend/Gdata/App/Extension/Author.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Person.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Author extends Zend_Gdata_App_Extension_Person diff --git a/lib/zend/Zend/Gdata/App/Extension/Category.php b/lib/zend/Zend/Gdata/App/Extension/Category.php index 4f9637510e7..012b5aa67d4 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Category.php +++ b/lib/zend/Zend/Gdata/App/Extension/Category.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Category extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Content.php b/lib/zend/Zend/Gdata/App/Extension/Content.php index 42a38f7a6c1..634767a975c 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Content.php +++ b/lib/zend/Zend/Gdata/App/Extension/Content.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Content extends Zend_Gdata_App_Extension_Text diff --git a/lib/zend/Zend/Gdata/App/Extension/Contributor.php b/lib/zend/Zend/Gdata/App/Extension/Contributor.php index b9509487e45..5224be04f5f 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Contributor.php +++ b/lib/zend/Zend/Gdata/App/Extension/Contributor.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Person.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Contributor extends Zend_Gdata_App_Extension_Person diff --git a/lib/zend/Zend/Gdata/App/Extension/Control.php b/lib/zend/Zend/Gdata/App/Extension/Control.php index 702c55b0ca5..517486874a3 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Control.php +++ b/lib/zend/Zend/Gdata/App/Extension/Control.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/App/Extension/Draft.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Control extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Draft.php b/lib/zend/Zend/Gdata/App/Extension/Draft.php index 46ff8bae85d..fa9746660bb 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Draft.php +++ b/lib/zend/Zend/Gdata/App/Extension/Draft.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Draft extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Edited.php b/lib/zend/Zend/Gdata/App/Extension/Edited.php index dce479e1c64..69913b40db3 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Edited.php +++ b/lib/zend/Zend/Gdata/App/Extension/Edited.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Edited extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Element.php b/lib/zend/Zend/Gdata/App/Extension/Element.php index e983ec5f89d..91b8c8cbe34 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Element.php +++ b/lib/zend/Zend/Gdata/App/Extension/Element.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Element extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Email.php b/lib/zend/Zend/Gdata/App/Extension/Email.php index 05b01c07258..2cf71f56395 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Email.php +++ b/lib/zend/Zend/Gdata/App/Extension/Email.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Email extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Generator.php b/lib/zend/Zend/Gdata/App/Extension/Generator.php index 576a46750a5..e438a2a1fa4 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Generator.php +++ b/lib/zend/Zend/Gdata/App/Extension/Generator.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Generator extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Icon.php b/lib/zend/Zend/Gdata/App/Extension/Icon.php index ef769d096ba..da4beaae332 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Icon.php +++ b/lib/zend/Zend/Gdata/App/Extension/Icon.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Icon extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Id.php b/lib/zend/Zend/Gdata/App/Extension/Id.php index cdfc8e79070..9101b0f9b71 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Id.php +++ b/lib/zend/Zend/Gdata/App/Extension/Id.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Id extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Link.php b/lib/zend/Zend/Gdata/App/Extension/Link.php index a50609832e1..d0a61149c68 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Link.php +++ b/lib/zend/Zend/Gdata/App/Extension/Link.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Link extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Logo.php b/lib/zend/Zend/Gdata/App/Extension/Logo.php index 23bcf85ea90..820cf4be415 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Logo.php +++ b/lib/zend/Zend/Gdata/App/Extension/Logo.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Logo extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Name.php b/lib/zend/Zend/Gdata/App/Extension/Name.php index f0a85b6707c..db347c23a54 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Name.php +++ b/lib/zend/Zend/Gdata/App/Extension/Name.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Name extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Person.php b/lib/zend/Zend/Gdata/App/Extension/Person.php index 7dd74788b14..8dbc59c4b7a 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Person.php +++ b/lib/zend/Zend/Gdata/App/Extension/Person.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -47,7 +47,7 @@ require_once 'Zend/Gdata/App/Extension/Uri.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension_Person extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Published.php b/lib/zend/Zend/Gdata/App/Extension/Published.php index 55c1105e804..a68a94a8141 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Published.php +++ b/lib/zend/Zend/Gdata/App/Extension/Published.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Published extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Rights.php b/lib/zend/Zend/Gdata/App/Extension/Rights.php index a0c34e8f126..59726ba8b4f 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Rights.php +++ b/lib/zend/Zend/Gdata/App/Extension/Rights.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Rights extends Zend_Gdata_App_Extension_Text diff --git a/lib/zend/Zend/Gdata/App/Extension/Source.php b/lib/zend/Zend/Gdata/App/Extension/Source.php index 9bc1d4966d4..55dd52f945b 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Source.php +++ b/lib/zend/Zend/Gdata/App/Extension/Source.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Gdata/App/FeedSourceParent.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Source extends Zend_Gdata_App_FeedSourceParent diff --git a/lib/zend/Zend/Gdata/App/Extension/Subtitle.php b/lib/zend/Zend/Gdata/App/Extension/Subtitle.php index dd1435509e6..148a2e8d8af 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Subtitle.php +++ b/lib/zend/Zend/Gdata/App/Extension/Subtitle.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Subtitle extends Zend_Gdata_App_Extension_Text diff --git a/lib/zend/Zend/Gdata/App/Extension/Summary.php b/lib/zend/Zend/Gdata/App/Extension/Summary.php index 8c840862624..b5f771280e7 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Summary.php +++ b/lib/zend/Zend/Gdata/App/Extension/Summary.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Summary extends Zend_Gdata_App_Extension_Text diff --git a/lib/zend/Zend/Gdata/App/Extension/Text.php b/lib/zend/Zend/Gdata/App/Extension/Text.php index 4dedfe81a35..25d86866622 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Text.php +++ b/lib/zend/Zend/Gdata/App/Extension/Text.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_Extension_Text extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Title.php b/lib/zend/Zend/Gdata/App/Extension/Title.php index 977e38be15a..57e339692ac 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Title.php +++ b/lib/zend/Zend/Gdata/App/Extension/Title.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Text.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Title extends Zend_Gdata_App_Extension_Text diff --git a/lib/zend/Zend/Gdata/App/Extension/Updated.php b/lib/zend/Zend/Gdata/App/Extension/Updated.php index f939319b1c0..cee6ed18abe 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Updated.php +++ b/lib/zend/Zend/Gdata/App/Extension/Updated.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Updated extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Extension/Uri.php b/lib/zend/Zend/Gdata/App/Extension/Uri.php index 0844a5d1e4d..efa1283ef2c 100644 --- a/lib/zend/Zend/Gdata/App/Extension/Uri.php +++ b/lib/zend/Zend/Gdata/App/Extension/Uri.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Extension_Uri extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/App/Feed.php b/lib/zend/Zend/Gdata/App/Feed.php index 780dc7f77a4..3df3705564c 100644 --- a/lib/zend/Zend/Gdata/App/Feed.php +++ b/lib/zend/Zend/Gdata/App/Feed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/App/FeedSourceParent.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Feed extends Zend_Gdata_App_FeedSourceParent diff --git a/lib/zend/Zend/Gdata/App/FeedEntryParent.php b/lib/zend/Zend/Gdata/App/FeedEntryParent.php index a8cf8c60182..ec0821f56d1 100644 --- a/lib/zend/Zend/Gdata/App/FeedEntryParent.php +++ b/lib/zend/Zend/Gdata/App/FeedEntryParent.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -77,7 +77,7 @@ require_once 'Zend/Version.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base @@ -137,7 +137,7 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base } } else { $this->transferFromDOM($element); - } + } } /** @@ -148,7 +148,7 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base * @deprecated Deprecated as of Zend Framework 1.7. Use * setService() instead. * @param Zend_Http_Client $httpClient - * @return Zend_Gdata_App_Feed Provides a fluent interface + * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface */ public function setHttpClient(Zend_Http_Client $httpClient) { @@ -534,7 +534,7 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base * an atom:title element in a feed or entry * * @param Zend_Gdata_App_Extension_Title $value - * @return Zend_Gdata_App_Feed_Entry_Parent Provides a fluent interface + * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface */ public function setTitle($value) { @@ -552,7 +552,7 @@ abstract class Zend_Gdata_App_FeedEntryParent extends Zend_Gdata_App_Base /** * @param Zend_Gdata_App_Extension_Updated $value - * @return Zend_Gdata_App_Feed_Entry_Parent Provides a fluent interface + * @return Zend_Gdata_App_FeedEntryParent Provides a fluent interface */ public function setUpdated($value) { diff --git a/lib/zend/Zend/Gdata/App/FeedSourceParent.php b/lib/zend/Zend/Gdata/App/FeedSourceParent.php index 9cdc6fafaeb..276d57166dd 100644 --- a/lib/zend/Zend/Gdata/App/FeedSourceParent.php +++ b/lib/zend/Zend/Gdata/App/FeedSourceParent.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -57,7 +57,7 @@ require_once 'Zend/Gdata/App/Extension/Subtitle.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryParent @@ -100,7 +100,7 @@ abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryP } return $this; } - + /** * Set the active service instance for this feed and all enclosed entries. * This will be used to perform network requests, such as when calling @@ -117,7 +117,7 @@ abstract class Zend_Gdata_App_FeedSourceParent extends Zend_Gdata_App_FeedEntryP } return $this; } - + /** * Make accessing some individual elements of the feed easier. * diff --git a/lib/zend/Zend/Gdata/App/HttpException.php b/lib/zend/Zend/Gdata/App/HttpException.php index 70c29566a61..cca9ec48ec6 100644 --- a/lib/zend/Zend/Gdata/App/HttpException.php +++ b/lib/zend/Zend/Gdata/App/HttpException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Http/Client/Exception.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_HttpException extends Zend_Gdata_App_Exception diff --git a/lib/zend/Zend/Gdata/App/IOException.php b/lib/zend/Zend/Gdata/App/IOException.php index e91f2da77b2..03e44bd3848 100644 --- a/lib/zend/Zend/Gdata/App/IOException.php +++ b/lib/zend/Zend/Gdata/App/IOException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Gdata/App/Exception.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_IOException extends Zend_Gdata_App_Exception diff --git a/lib/zend/Zend/Gdata/App/InvalidArgumentException.php b/lib/zend/Zend/Gdata/App/InvalidArgumentException.php index e76bd16b248..389c86433ca 100644 --- a/lib/zend/Zend/Gdata/App/InvalidArgumentException.php +++ b/lib/zend/Zend/Gdata/App/InvalidArgumentException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Exception.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_InvalidArgumentException extends Zend_Gdata_App_Exception diff --git a/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php b/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php index 53be75c326f..62c78bd2a31 100644 --- a/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php +++ b/lib/zend/Zend/Gdata/App/LoggingHttpClientAdapterSocket.php @@ -17,7 +17,7 @@ * @package Zend_Gdata * @subpackage App * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -27,7 +27,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php'; /** - * Overrides the traditional socket-based adapter class for Zend_Http_Client to + * Overrides the traditional socket-based adapter class for Zend_Http_Client to * enable logging of requests. All requests are logged to a location specified * in the config as $config['logfile']. Requests and responses are logged after * they are sent and received/processed, thus an error could prevent logging. @@ -35,7 +35,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_LoggingHttpClientAdapterSocket extends Zend_Http_Client_Adapter_Socket diff --git a/lib/zend/Zend/Gdata/App/MediaEntry.php b/lib/zend/Zend/Gdata/App/MediaEntry.php index d93269d8f55..cc64c1def83 100644 --- a/lib/zend/Zend/Gdata/App/MediaEntry.php +++ b/lib/zend/Zend/Gdata/App/MediaEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/MediaMimeStream.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_MediaEntry extends Zend_Gdata_App_Entry diff --git a/lib/zend/Zend/Gdata/App/MediaFileSource.php b/lib/zend/Zend/Gdata/App/MediaFileSource.php index f569d6f029c..74f167973c2 100644 --- a/lib/zend/Zend/Gdata/App/MediaFileSource.php +++ b/lib/zend/Zend/Gdata/App/MediaFileSource.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/BaseMediaSource.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource @@ -40,7 +40,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource /** * The filename which is represented * - * @var string + * @var string */ protected $_filename = null; @@ -50,7 +50,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource * @var string */ protected $_contentType = null; - + /** * Create a new Zend_Gdata_App_MediaFileSource object. * @@ -60,7 +60,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource { $this->setFilename($filename); } - + /** * Return the MIME multipart representation of this MediaEntry. * @@ -69,7 +69,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource */ public function encode() { - if ($this->getFilename() !== null && + if ($this->getFilename() !== null && is_readable($this->getFilename())) { // Retrieves the file, using the include path @@ -84,11 +84,11 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource return $result; } else { require_once 'Zend/Gdata/App/IOException.php'; - throw new Zend_Gdata_App_IOException("Error reading file - " . + throw new Zend_Gdata_App_IOException("Error reading file - " . $this->getFilename() . '. File is not readable.'); } } - + /** * Get the filename associated with this reader. * @@ -101,7 +101,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource /** * Set the filename which is to be read. - * + * * @param string $value The desired file handle. * @return Zend_Gdata_App_MediaFileSource Provides a fluent interface. */ @@ -110,8 +110,8 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource $this->_filename = $value; return $this; } - - /** + + /** * The content type for the file attached (example image/png) * * @return string The content type @@ -121,7 +121,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource return $this->_contentType; } - /** + /** * Set the content type for the file attached (example image/png) * * @param string $value The content type @@ -132,7 +132,7 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource $this->_contentType = $value; return $this; } - + /** * Alias for getFilename(). * @@ -142,5 +142,5 @@ class Zend_Gdata_App_MediaFileSource extends Zend_Gdata_App_BaseMediaSource { return $this->getFilename(); } - + } diff --git a/lib/zend/Zend/Gdata/App/MediaSource.php b/lib/zend/Zend/Gdata/App/MediaSource.php index 5cab24f9ad8..734263103d6 100644 --- a/lib/zend/Zend/Gdata/App/MediaSource.php +++ b/lib/zend/Zend/Gdata/App/MediaSource.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Gdata_App_MediaSource @@ -39,7 +39,7 @@ interface Zend_Gdata_App_MediaSource */ public function encode(); - /** + /** * Set the content type for the file attached (example image/png) * * @param string $value The content type @@ -47,7 +47,7 @@ interface Zend_Gdata_App_MediaSource */ public function setContentType($value); - /** + /** * The content type for the file attached (example image/png) * * @return string The content type @@ -55,7 +55,7 @@ interface Zend_Gdata_App_MediaSource public function getContentType(); /** - * Sets the Slug header value. Used by some services to determine the + * Sets the Slug header value. Used by some services to determine the * title for the uploaded file. A null value indicates no slug header. * * @var string The slug value @@ -64,7 +64,7 @@ interface Zend_Gdata_App_MediaSource public function setSlug($value); /** - * Returns the Slug header value. Used by some services to determine the + * Returns the Slug header value. Used by some services to determine the * title for the uploaded file. Returns null if no slug should be used. * * @return string The slug value diff --git a/lib/zend/Zend/Gdata/App/Util.php b/lib/zend/Zend/Gdata/App/Util.php index eb117522bff..34744a52838 100644 --- a/lib/zend/Zend/Gdata/App/Util.php +++ b/lib/zend/Zend/Gdata/App/Util.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_Util diff --git a/lib/zend/Zend/Gdata/App/VersionException.php b/lib/zend/Zend/Gdata/App/VersionException.php index a9e683d4d9b..e2c2248e541 100644 --- a/lib/zend/Zend/Gdata/App/VersionException.php +++ b/lib/zend/Zend/Gdata/App/VersionException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Exception.php'; * @category Zend * @package Zend_Gdata * @subpackage App - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_App_VersionException extends Zend_Gdata_App_Exception diff --git a/lib/zend/Zend/Gdata/AuthSub.php b/lib/zend/Zend/Gdata/AuthSub.php index ab8b820400d..d959747c785 100644 --- a/lib/zend/Zend/Gdata/AuthSub.php +++ b/lib/zend/Zend/Gdata/AuthSub.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -40,7 +40,7 @@ require_once 'Zend/Version.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_AuthSub @@ -57,26 +57,26 @@ class Zend_Gdata_AuthSub /** * Creates a URI to request a single-use AuthSub token. * - * @param string $next (required) URL identifying the service to be + * @param string $next (required) URL identifying the service to be * accessed. * The resulting token will enable access to the specified service only. * Some services may limit scope further, such as read-only access. - * @param string $scope (required) URL identifying the service to be - * accessed. The resulting token will enable + * @param string $scope (required) URL identifying the service to be + * accessed. The resulting token will enable * access to the specified service only. - * Some services may limit scope further, such + * Some services may limit scope further, such * as read-only access. - * @param int $secure (optional) Boolean flag indicating whether the - * authentication transaction should issue a secure + * @param int $secure (optional) Boolean flag indicating whether the + * authentication transaction should issue a secure * token (1) or a non-secure token (0). Secure tokens * are available to registered applications only. - * @param int $session (optional) Boolean flag indicating whether - * the one-time-use token may be exchanged for + * @param int $session (optional) Boolean flag indicating whether + * the one-time-use token may be exchanged for * a session token (1) or not (0). - * @param string $request_uri (optional) URI to which to direct the + * @param string $request_uri (optional) URI to which to direct the * authentication request. */ - public static function getAuthSubTokenUri($next, $scope, $secure=0, $session=0, + public static function getAuthSubTokenUri($next, $scope, $secure=0, $session=0, $request_uri = self::AUTHSUB_REQUEST_URI) { $querystring = '?next=' . urlencode($next) @@ -91,21 +91,21 @@ class Zend_Gdata_AuthSub * Upgrades a single use token to a session token * * @param string $token The single use token which is to be upgraded - * @param Zend_Http_Client $client (optional) HTTP client to use to + * @param Zend_Http_Client $client (optional) HTTP client to use to * make the request - * @param string $request_uri (optional) URI to which to direct + * @param string $request_uri (optional) URI to which to direct * the session token upgrade * @return string The upgraded token value * @throws Zend_Gdata_App_AuthException * @throws Zend_Gdata_App_HttpException */ public static function getAuthSubSessionToken( - $token, $client = null, + $token, $client = null, $request_uri = self::AUTHSUB_SESSION_TOKEN_URI) { $client = self::getHttpClient($token, $client); - - if ($client instanceof Zend_Gdata_HttpClient) { + + if ($client instanceof Zend_Gdata_HttpClient) { $filterResult = $client->filterHttpRequest('GET', $request_uri); $url = $filterResult['url']; $headers = $filterResult['headers']; @@ -153,7 +153,7 @@ class Zend_Gdata_AuthSub $request_uri = self::AUTHSUB_REVOKE_TOKEN_URI) { $client = self::getHttpClient($token, $client); - + if ($client instanceof Zend_Gdata_HttpClient) { $filterResult = $client->filterHttpRequest('GET', $request_uri); $url = $filterResult['url']; @@ -186,9 +186,9 @@ class Zend_Gdata_AuthSub * get token information * * @param string $token The token to retrieve information about - * @param Zend_Http_Client $client (optional) HTTP client to use to + * @param Zend_Http_Client $client (optional) HTTP client to use to * make the request - * @param string $request_uri (optional) URI to which to direct + * @param string $request_uri (optional) URI to which to direct * the information request */ public static function getAuthSubTokenInfo( diff --git a/lib/zend/Zend/Gdata/Books.php b/lib/zend/Zend/Gdata/Books.php index f23e31e8d25..b0d6179d1cd 100755 --- a/lib/zend/Zend/Gdata/Books.php +++ b/lib/zend/Zend/Gdata/Books.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -57,7 +57,7 @@ require_once 'Zend/Gdata/Books/VolumeFeed.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Books/CollectionEntry.php b/lib/zend/Zend/Gdata/Books/CollectionEntry.php index 615e309010c..f77cd57e838 100644 --- a/lib/zend/Zend/Gdata/Books/CollectionEntry.php +++ b/lib/zend/Zend/Gdata/Books/CollectionEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_CollectionEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Books/CollectionFeed.php b/lib/zend/Zend/Gdata/Books/CollectionFeed.php index dda6e971979..1b6de1a9a9a 100644 --- a/lib/zend/Zend/Gdata/Books/CollectionFeed.php +++ b/lib/zend/Zend/Gdata/Books/CollectionFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_CollectionFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php b/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php index 25820ad9c61..28333c9c612 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php +++ b/lib/zend/Zend/Gdata/Books/Extension/AnnotationLink.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_AnnotationLink extends diff --git a/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php b/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php index bca2eeb7638..74d624e41b2 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php +++ b/lib/zend/Zend/Gdata/Books/Extension/BooksCategory.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_BooksCategory extends diff --git a/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php b/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php index 6230a60115b..0f027a636ed 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php +++ b/lib/zend/Zend/Gdata/Books/Extension/BooksLink.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension/Link.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_BooksLink extends Zend_Gdata_App_Extension_Link diff --git a/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php b/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php index 71bbd1465fa..081a79bd854 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php +++ b/lib/zend/Zend/Gdata/Books/Extension/Embeddability.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Embeddability extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php b/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php index 6691f312809..6ed26329c48 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php +++ b/lib/zend/Zend/Gdata/Books/Extension/InfoLink.php @@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_InfoLink extends diff --git a/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php b/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php index 854c63c83d0..6a4ec3216ea 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php +++ b/lib/zend/Zend/Gdata/Books/Extension/PreviewLink.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_PreviewLink extends diff --git a/lib/zend/Zend/Gdata/Books/Extension/Review.php b/lib/zend/Zend/Gdata/Books/Extension/Review.php index 660cbeb7a4d..0340177be8f 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/Review.php +++ b/lib/zend/Zend/Gdata/Books/Extension/Review.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Review extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php b/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php index 21f36dc5bfe..96d605064dd 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php +++ b/lib/zend/Zend/Gdata/Books/Extension/ThumbnailLink.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Books/Extension/BooksLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_ThumbnailLink extends diff --git a/lib/zend/Zend/Gdata/Books/Extension/Viewability.php b/lib/zend/Zend/Gdata/Books/Extension/Viewability.php index df7a51e3a7d..d37e9a73b88 100644 --- a/lib/zend/Zend/Gdata/Books/Extension/Viewability.php +++ b/lib/zend/Zend/Gdata/Books/Extension/Viewability.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_Extension_Viewability extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Books/VolumeEntry.php b/lib/zend/Zend/Gdata/Books/VolumeEntry.php index 94811217409..3b911684be8 100644 --- a/lib/zend/Zend/Gdata/Books/VolumeEntry.php +++ b/lib/zend/Zend/Gdata/Books/VolumeEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -102,7 +102,7 @@ require_once 'Zend/Gdata/Books/Extension/Viewability.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Books/VolumeFeed.php b/lib/zend/Zend/Gdata/Books/VolumeFeed.php index 90858143e92..950f5ca4311 100644 --- a/lib/zend/Zend/Gdata/Books/VolumeFeed.php +++ b/lib/zend/Zend/Gdata/Books/VolumeFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Books/VolumeQuery.php b/lib/zend/Zend/Gdata/Books/VolumeQuery.php index 5e869d1d4e1..617bb7b1361 100755 --- a/lib/zend/Zend/Gdata/Books/VolumeQuery.php +++ b/lib/zend/Zend/Gdata/Books/VolumeQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Books - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Books_VolumeQuery extends Zend_Gdata_Query diff --git a/lib/zend/Zend/Gdata/Calendar.php b/lib/zend/Zend/Gdata/Calendar.php index fa491e4500b..740bb931764 100644 --- a/lib/zend/Zend/Gdata/Calendar.php +++ b/lib/zend/Zend/Gdata/Calendar.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -53,7 +53,7 @@ require_once 'Zend/Gdata/Calendar/ListEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Calendar/EventEntry.php b/lib/zend/Zend/Gdata/Calendar/EventEntry.php index 10701656e40..b76a4851680 100644 --- a/lib/zend/Zend/Gdata/Calendar/EventEntry.php +++ b/lib/zend/Zend/Gdata/Calendar/EventEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -57,7 +57,7 @@ require_once 'Zend/Gdata/Calendar/Extension/QuickAdd.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventEntry extends Zend_Gdata_Kind_EventEntry diff --git a/lib/zend/Zend/Gdata/Calendar/EventFeed.php b/lib/zend/Zend/Gdata/Calendar/EventFeed.php index ac202ea3f5c..f898fa9152d 100644 --- a/lib/zend/Zend/Gdata/Calendar/EventFeed.php +++ b/lib/zend/Zend/Gdata/Calendar/EventFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Calendar/EventQuery.php b/lib/zend/Zend/Gdata/Calendar/EventQuery.php index 7d66e8f221a..0ff18d56332 100644 --- a/lib/zend/Zend/Gdata/Calendar/EventQuery.php +++ b/lib/zend/Zend/Gdata/Calendar/EventQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query @@ -47,18 +47,58 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query const CALENDAR_FEED_URI = 'http://www.google.com/calendar/feeds'; + /** + * The default URI used for feeds. + */ protected $_defaultFeedUri = self::CALENDAR_FEED_URI; + + /** + * The comment ID to retrieve. If null, no specific comment will be + * retrieved unless already included in the query URI. The event ID + * ($_event) must be set, otherwise this property is ignored. + */ protected $_comments = null; - protected $_user = null; - protected $_visibility = null; - protected $_projection = null; + + /** + * The calendar address to be requested by queries. This may be an email + * address if requesting the primary calendar for a user. Defaults to + * "default" (the currently authenticated user). A null value should be + * used when the calendar address has already been set as part of the + * query URI. + */ + protected $_user = 'default'; + + /* + * The visibility to be requested by queries. Defaults to "public". A + * null value should be used when the calendar address has already been + * set as part of the query URI. + */ + protected $_visibility = 'public'; + + /** + * Projection to be requested by queries. Defaults to "full". A null value + * should be used when the calendar address has already been set as part + * of the query URI. + */ + protected $_projection = 'full'; + + /** + * The event ID to retrieve. If null, no specific event will be retrieved + * unless already included in the query URI. + */ protected $_event = null; /** * Create Gdata_Calendar_EventQuery object. If a URL is provided, * it becomes the base URL, and additional URL components may be - * appended. For instance, if $url is 'http://www.foo.com', the - * default URL constructed will be 'http://www.foo.com/default/public/full' + * appended. For instance, if $url is 'http://www.google.com/calendar', + * the default URL constructed will be + * 'http://www.google.com/calendar/default/public/full'. + * + * If the URL already contains a calendar ID, projection, visibility, + * event ID, or comment ID, you will need to set these fields to null + * to prevent them from being inserted. See this class's properties for + * more information. * * @param string $url The URL to use as the base path for requests */ @@ -68,6 +108,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_comments * @param string $value * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface */ @@ -78,6 +119,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_event * @param string $value * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface */ @@ -88,6 +130,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_projection * @param string $value * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface */ @@ -98,6 +141,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_user * @param string $value * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface */ @@ -108,6 +152,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_visibility * @param bool $value * @return Zend_Gdata_Calendar_EventQuery Provides a fluent interface */ @@ -118,6 +163,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_comments; * @return string comments */ public function getComments() @@ -126,6 +172,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_event; * @return string event */ public function getEvent() @@ -134,6 +181,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_projection * @return string projection */ public function getProjection() @@ -142,6 +190,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_user * @return string user */ public function getUser() @@ -150,6 +199,7 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } /** + * @see $_visibility * @return string visibility */ public function getVisibility() @@ -421,18 +471,12 @@ class Zend_Gdata_Calendar_EventQuery extends Zend_Gdata_Query } if ($this->getUser() != null) { $uri .= '/' . $this->getUser(); - } else { - $uri .= '/default'; } if ($this->getVisibility() != null) { $uri .= '/' . $this->getVisibility(); - } else { - $uri .= '/public'; } if ($this->getProjection() != null) { $uri .= '/' . $this->getProjection(); - } else { - $uri .= '/full'; } if ($this->getEvent() != null) { $uri .= '/' . $this->getEvent(); diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php b/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php index 784901813f4..0e636a2b991 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/AccessLevel.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_AccessLevel extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Color.php b/lib/zend/Zend/Gdata/Calendar/Extension/Color.php index a8e2f086c95..0c7bcefeefd 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/Color.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/Color.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Color extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php b/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php index feeb38fef73..ba6afb68888 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/Hidden.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Hidden extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Link.php b/lib/zend/Zend/Gdata/Calendar/Extension/Link.php index 399b2361317..e008c35b43d 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/Link.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/Link.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Calendar/Extension/WebContent.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Link extends Zend_Gdata_App_Extension_Link diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php b/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php index 4964f9d19b4..6c0c1d95db3 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/QuickAdd.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_QuickAdd extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php b/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php index 51496a97dcc..acdf4a1071e 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/Selected.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Selected extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php b/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php index bab5062e36c..cdd45624f6c 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/SendEventNotifications.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_SendEventNotifications extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php b/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php index eec973e0a51..6ba2714814a 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/Timezone.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_Timezone extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php b/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php index 27925cb7397..511841f7adb 100644 --- a/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php +++ b/lib/zend/Zend/Gdata/Calendar/Extension/WebContent.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_Extension_WebContent extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/Calendar/ListEntry.php b/lib/zend/Zend/Gdata/Calendar/ListEntry.php index 99750b13506..71f762f43de 100644 --- a/lib/zend/Zend/Gdata/Calendar/ListEntry.php +++ b/lib/zend/Zend/Gdata/Calendar/ListEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -69,7 +69,7 @@ require_once 'Zend/Gdata/Extension/Where.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_ListEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Calendar/ListFeed.php b/lib/zend/Zend/Gdata/Calendar/ListFeed.php index 8388b97ea9c..f31ffeebb28 100644 --- a/lib/zend/Zend/Gdata/Calendar/ListFeed.php +++ b/lib/zend/Zend/Gdata/Calendar/ListFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Calendar/Extension/Timezone.php'; * @category Zend * @package Zend_Gdata * @subpackage Calendar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Calendar_ListFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/ClientLogin.php b/lib/zend/Zend/Gdata/ClientLogin.php index d017519a0db..ef84cdec6e4 100644 --- a/lib/zend/Zend/Gdata/ClientLogin.php +++ b/lib/zend/Zend/Gdata/ClientLogin.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Version.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_ClientLogin @@ -71,7 +71,7 @@ class Zend_Gdata_ClientLogin * @param string $loginToken The token identifier as provided by the server. * @param string $loginCaptcha The user's response to the CAPTCHA challenge. * @param string $accountType An optional string to identify whether the - * account to be authenticated is a google or a hosted account. Defaults to + * account to be authenticated is a google or a hosted account. Defaults to * 'HOSTED_OR_GOOGLE'. See: http://code.google.com/apis/accounts/docs/AuthForInstalledApps.html#Request * @throws Zend_Gdata_App_AuthException * @throws Zend_Gdata_App_HttpException @@ -119,7 +119,7 @@ class Zend_Gdata_ClientLogin if ($loginToken || $loginCaptcha) { if($loginToken && $loginCaptcha) { $client->setParameterPost('logintoken', (string) $loginToken); - $client->setParameterPost('logincaptcha', + $client->setParameterPost('logincaptcha', (string) $loginCaptcha); } else { diff --git a/lib/zend/Zend/Gdata/Docs.php b/lib/zend/Zend/Gdata/Docs.php index fd0d234d8f2..35562d63f17 100755 --- a/lib/zend/Zend/Gdata/Docs.php +++ b/lib/zend/Zend/Gdata/Docs.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -36,6 +36,16 @@ require_once 'Zend/Gdata/Docs/DocumentListFeed.php'; */ require_once 'Zend/Gdata/Docs/DocumentListEntry.php'; +/** + * @see Zend_Gdata_App_Extension_Category + */ +require_once 'Zend/Gdata/App/Extension/Category.php'; + +/** + * @see Zend_Gdata_App_Extension_Title + */ +require_once 'Zend/Gdata/App/Extension/Title.php'; + /** * Service class for interacting with the Google Document List data API * @link http://code.google.com/apis/documents/ @@ -43,26 +53,36 @@ require_once 'Zend/Gdata/Docs/DocumentListEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs extends Zend_Gdata { const DOCUMENTS_LIST_FEED_URI = 'http://docs.google.com/feeds/documents/private/full'; + const DOCUMENTS_FOLDER_FEED_URI = 'http://docs.google.com/feeds/folders/private/full'; + const DOCUMENTS_CATEGORY_SCHEMA = 'http://schemas.google.com/g/2005#kind'; + const DOCUMENTS_CATEGORY_TERM = 'http://schemas.google.com/docs/2007#folder'; const AUTH_SERVICE_NAME = 'writely'; protected $_defaultPostUri = self::DOCUMENTS_LIST_FEED_URI; private static $SUPPORTED_FILETYPES = array( + 'TXT'=>'text/plain', 'CSV'=>'text/csv', + 'TSV'=>'text/tab-separated-values', + 'TAB'=>'text/tab-separated-values', + 'HTML'=>'text/html', + 'HTM'=>'text/html', 'DOC'=>'application/msword', 'ODS'=>'application/vnd.oasis.opendocument.spreadsheet', 'ODT'=>'application/vnd.oasis.opendocument.text', 'RTF'=>'application/rtf', 'SXW'=>'application/vnd.sun.xml.writer', - 'TXT'=>'text/plain', - 'XLS'=>'application/vnd.ms-excel'); + 'XLS'=>'application/vnd.ms-excel', + 'XLSX'=>'application/vnd.ms-excel', + 'PPT'=>'application/vnd.ms-powerpoint', + 'PPS'=>'application/vnd.ms-powerpoint'); /** * Create Gdata_Docs object @@ -80,11 +100,11 @@ class Zend_Gdata_Docs extends Zend_Gdata /** * Looks up the mime type based on the file name extension. For example, - * calling this method with 'csv' would return - * 'text/comma-separated-values'. The Mime type is sent as a header in + * calling this method with 'csv' would return + * 'text/comma-separated-values'. The Mime type is sent as a header in * the upload HTTP POST request. * - * @param string $fileExtension + * @param string $fileExtension * @return string The mime type to be sent to the server to tell it how the * multipart mime data should be interpreted. */ @@ -135,14 +155,14 @@ class Zend_Gdata_Docs extends Zend_Gdata * * This method builds the URL where this item is stored using the type * and the id of the document. - * @param string $docId The URL key for the document. Examples: + * @param string $docId The URL key for the document. Examples: * dcmg89gw_62hfjj8m, pKq0CzjiF3YmGd0AIlHKqeg * @param string $docType The type of the document as used in the Google * Document List URLs. Examples: document, spreadsheet, presentation * @return Zend_Gdata_Docs_DocumentListEntry */ public function getDoc($docId, $docType) { - $location = 'http://docs.google.com/feeds/documents/private/full/' . + $location = 'http://docs.google.com/feeds/documents/private/full/' . $docType . '%3A' . $docId; return $this->getDocumentListEntry($location); } @@ -150,27 +170,27 @@ class Zend_Gdata_Docs extends Zend_Gdata /** * Retreive entry object for the desired word processing document. * - * @param string $id The URL id for the document. Example: + * @param string $id The URL id for the document. Example: * dcmg89gw_62hfjj8m */ public function getDocument($id) { return $this->getDoc($id, 'document'); } - + /** * Retreive entry object for the desired spreadsheet. * - * @param string $id The URL id for the document. Example: + * @param string $id The URL id for the document. Example: * pKq0CzjiF3YmGd0AIlHKqeg */ public function getSpreadsheet($id) { return $this->getDoc($id, 'spreadsheet'); } - + /** * Retreive entry object for the desired presentation. * - * @param string $id The URL id for the document. Example: + * @param string $id The URL id for the document. Example: * dcmg89gw_21gtrjcn */ public function getPresentation($id) { @@ -178,35 +198,35 @@ class Zend_Gdata_Docs extends Zend_Gdata } /** - * Upload a local file to create a new Google Document entry. + * Upload a local file to create a new Google Document entry. * * @param string $fileLocation The full or relative path of the file to * be uploaded. - * @param string $title The name that this document should have on the + * @param string $title The name that this document should have on the * server. If set, the title is used as the slug header in the - * POST request. If no title is provided, the location of the - * file will be used as the slug header in the request. If no + * POST request. If no title is provided, the location of the + * file will be used as the slug header in the request. If no * mimeType is provided, this method attempts to determine the - * mime type based on the slugHeader by looking for .doc, + * mime type based on the slugHeader by looking for .doc, * .csv, .txt, etc. at the end of the file name. * Example value: 'test.doc'. * @param string $mimeType Describes the type of data which is being sent - * to the server. This must be one of the accepted mime types + * to the server. This must be one of the accepted mime types * which are enumerated in SUPPORTED_FILETYPES. - * @param string $uri (optional) The URL to which the upload should be + * @param string $uri (optional) The URL to which the upload should be * made. * Example: 'http://docs.google.com/feeds/documents/private/full'. - * @return Zend_Gdata_Docs_DocumentListEntry The entry for the newly + * @return Zend_Gdata_Docs_DocumentListEntry The entry for the newly * created Google Document. */ - public function uploadFile($fileLocation, $title=null, $mimeType=null, + public function uploadFile($fileLocation, $title=null, $mimeType=null, $uri=null) { // Set the URI to which the file will be uploaded. if ($uri === null) { $uri = $this->_defaultPostUri; } - + // Create the media source which describes the file. $fs = $this->newMediaFileSource($fileLocation); if ($title !== null) { @@ -214,9 +234,9 @@ class Zend_Gdata_Docs extends Zend_Gdata } else { $slugHeader = $fileLocation; } - - // Set the slug header to tell the Google Documents server what the - // title of the document should be and what the file extension was + + // Set the slug header to tell the Google Documents server what the + // title of the document should be and what the file extension was // for the original file. $fs->setSlug($slugHeader); @@ -226,28 +246,55 @@ class Zend_Gdata_Docs extends Zend_Gdata $fileExtension = end($filenameParts); $mimeType = self::lookupMimeType($fileExtension); } - + // Set the mime type for the upload request. $fs->setContentType($mimeType); - + // Send the data to the server. return $this->insertDocument($fs, $uri); } + /** + * Creates a new folder in Google Docs + * + * @param string $folderName The folder name to create + * @param string|null $folderResourceId The parent folder to create it in + * ("folder%3Amy_parent_folder") + * @return Zend_Gdata_Entry The folder entry created. + * @todo ZF-8732: This should return a *subclass* of Zend_Gdata_Entry, but + * the appropriate type doesn't exist yet. + */ + public function createFolder($folderName, $folderResourceId=null) { + $category = new Zend_Gdata_App_Extension_Category(self::DOCUMENTS_CATEGORY_TERM, + self::DOCUMENTS_CATEGORY_SCHEMA); + $title = new Zend_Gdata_App_Extension_Title($folderName); + $entry = new Zend_Gdata_Entry(); + + $entry->setCategory(array($category)); + $entry->setTitle($title); + + $uri = self::DOCUMENTS_LIST_FEED_URI; + if ($folderResourceId != null) { + $uri = self::DOCUMENTS_FOLDER_FEED_URI . '/' . $folderResourceId; + } + + return $this->insertEntry($entry, $uri); + } + /** * Inserts an entry to a given URI and returns the response as an Entry. * - * @param mixed $data The Zend_Gdata_Docs_DocumentListEntry or media + * @param mixed $data The Zend_Gdata_Docs_DocumentListEntry or media * source to post. If it is a DocumentListEntry, the mediaSource - * should already have been set. If $data is a mediaSource, it + * should already have been set. If $data is a mediaSource, it * should have the correct slug header and mime type. * @param string $uri POST URI - * @param string $className (optional) The class of entry to be returned. + * @param string $className (optional) The class of entry to be returned. * The default is a 'Zend_Gdata_Docs_DocumentListEntry'. - * @return Zend_Gdata_Docs_DocumentListEntry The entry returned by the + * @return Zend_Gdata_Docs_DocumentListEntry The entry returned by the * service after insertion. */ - public function insertDocument($data, $uri, + public function insertDocument($data, $uri, $className='Zend_Gdata_Docs_DocumentListEntry') { return $this->insertEntry($data, $uri, $className); diff --git a/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php b/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php index 9bd88d8ed22..a5d42b5192d 100755 --- a/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php +++ b/lib/zend/Zend/Gdata/Docs/DocumentListEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_DocumentListEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php b/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php index 2c45e797259..107a61ad967 100755 --- a/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php +++ b/lib/zend/Zend/Gdata/Docs/DocumentListFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_DocumentListFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Docs/Query.php b/lib/zend/Zend/Gdata/Docs/Query.php index 27f3adeec96..2cee9a1c232 100755 --- a/lib/zend/Zend/Gdata/Docs/Query.php +++ b/lib/zend/Zend/Gdata/Docs/Query.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Docs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query @@ -55,8 +55,8 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query protected $_defaultFeedUri = self::DOCUMENTS_LIST_FEED_URI; /** - * The visibility to be used when querying for the feed. A request for a - * feed with private visbility requires the user to be authenricated. + * The visibility to be used when querying for the feed. A request for a + * feed with private visbility requires the user to be authenricated. * Private is the only avilable visibility for the documents list. * * @var string @@ -81,7 +81,7 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query } /** - * Sets the projection for this query. Common values for projection + * Sets the projection for this query. Common values for projection * include 'full'. * * @param string $value @@ -127,7 +127,7 @@ class Zend_Gdata_Docs_Query extends Zend_Gdata_Query /** * Sets the title attribute for this query. The title parameter is used - * to restrict the results to documents whose titles either contain or + * to restrict the results to documents whose titles either contain or * completely match the title. * * @param string $value diff --git a/lib/zend/Zend/Gdata/DublinCore.php b/lib/zend/Zend/Gdata/DublinCore.php index eeec7d6bba0..2f702a8291a 100755 --- a/lib/zend/Zend/Gdata/DublinCore.php +++ b/lib/zend/Zend/Gdata/DublinCore.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php index 82185df6e25..89d29cbe842 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Creator.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Creator extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php index 30288f4bacc..e7c633ba57d 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Date.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Date extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php index bd517d337a4..6bbeb6c66ea 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Description.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Description extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php index ebe3c58a3bf..d14077c80f4 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Format.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Format extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php index ee2c18a8761..08ad41cac45 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Identifier.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Identifier extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php index 3b943e16894..f1da3be4a6f 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Language.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Language extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php index edb4b74d910..70086f6f1d5 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Publisher.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Publisher extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php index 8ec7e166dcc..ad5cf5fd4f2 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Rights.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Rights extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php index c91bac897d4..2ddcccad1ed 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Subject.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Subject extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php b/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php index 45946495cb3..f3a14397c46 100644 --- a/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php +++ b/lib/zend/Zend/Gdata/DublinCore/Extension/Title.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage DublinCore - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_DublinCore_Extension_Title extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Entry.php b/lib/zend/Zend/Gdata/Entry.php index 2409ea137fc..267c9e5a0ad 100644 --- a/lib/zend/Zend/Gdata/Entry.php +++ b/lib/zend/Zend/Gdata/Entry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/App/MediaEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Entry extends Zend_Gdata_App_MediaEntry diff --git a/lib/zend/Zend/Gdata/Exif.php b/lib/zend/Zend/Gdata/Exif.php index 1b23bdb890d..05f858a8c44 100755 --- a/lib/zend/Zend/Gdata/Exif.php +++ b/lib/zend/Zend/Gdata/Exif.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Exif/Entry.php b/lib/zend/Zend/Gdata/Exif/Entry.php index 56670f993b7..5e0ee40cfc7 100755 --- a/lib/zend/Zend/Gdata/Exif/Entry.php +++ b/lib/zend/Zend/Gdata/Exif/Entry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Exif/Extension/Tags.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Entry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Distance.php b/lib/zend/Zend/Gdata/Exif/Extension/Distance.php index 60cba0c66b8..11bbac19f30 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Distance.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Distance.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Distance extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php b/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php index 23927b17935..2f0db751838 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Exposure.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Exposure extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/FStop.php b/lib/zend/Zend/Gdata/Exif/Extension/FStop.php index 3a06e6ce20b..4064f7880c6 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/FStop.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/FStop.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_FStop extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Flash.php b/lib/zend/Zend/Gdata/Exif/Extension/Flash.php index ad238f1a626..c7e0a066e45 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Flash.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Flash.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Flash extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php b/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php index d0fa68313dc..ffbbc514e83 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/FocalLength.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_FocalLength extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php b/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php index b35511df8d8..6413d3b9fcf 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/ImageUniqueId.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_ImageUniqueId extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Iso.php b/lib/zend/Zend/Gdata/Exif/Extension/Iso.php index d93df1eef0b..0ee637d7344 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Iso.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Iso.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Iso extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Make.php b/lib/zend/Zend/Gdata/Exif/Extension/Make.php index c4d2a49ebe1..d621cc6d48e 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Make.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Make.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Make extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Model.php b/lib/zend/Zend/Gdata/Exif/Extension/Model.php index 7ee9e587a11..2cc19ae6fc2 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Model.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Model.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Model extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Tags.php b/lib/zend/Zend/Gdata/Exif/Extension/Tags.php index 42e1bce8abe..a5c0872e950 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Tags.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Tags.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -87,7 +87,7 @@ require_once 'Zend/Gdata/Exif/Extension/Time.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Tags extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Extension/Time.php b/lib/zend/Zend/Gdata/Exif/Extension/Time.php index cc71ccc6e69..228954eeda6 100755 --- a/lib/zend/Zend/Gdata/Exif/Extension/Time.php +++ b/lib/zend/Zend/Gdata/Exif/Extension/Time.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Exif.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Extension_Time extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Exif/Feed.php b/lib/zend/Zend/Gdata/Exif/Feed.php index 7b7233f6501..f793ee66e8b 100755 --- a/lib/zend/Zend/Gdata/Exif/Feed.php +++ b/lib/zend/Zend/Gdata/Exif/Feed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Exif/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Exif - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Exif_Feed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Extension.php b/lib/zend/Zend/Gdata/Extension.php index cb13b2e7c72..cba779e139c 100644 --- a/lib/zend/Zend/Gdata/Extension.php +++ b/lib/zend/Zend/Gdata/Extension.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php b/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php index b88898ede74..e8c1197c58b 100644 --- a/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php +++ b/lib/zend/Zend/Gdata/Extension/AttendeeStatus.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_AttendeeStatus extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/AttendeeType.php b/lib/zend/Zend/Gdata/Extension/AttendeeType.php index dedc91f91db..8c6f79aa0da 100644 --- a/lib/zend/Zend/Gdata/Extension/AttendeeType.php +++ b/lib/zend/Zend/Gdata/Extension/AttendeeType.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_AttendeeType extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/Comments.php b/lib/zend/Zend/Gdata/Extension/Comments.php index fdc6c8a07c3..7c1451043c4 100644 --- a/lib/zend/Zend/Gdata/Extension/Comments.php +++ b/lib/zend/Zend/Gdata/Extension/Comments.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension/FeedLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Comments extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/EntryLink.php b/lib/zend/Zend/Gdata/Extension/EntryLink.php index ec1098e679c..f2c89db1e36 100644 --- a/lib/zend/Zend/Gdata/Extension/EntryLink.php +++ b/lib/zend/Zend/Gdata/Extension/EntryLink.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_EntryLink extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/EventStatus.php b/lib/zend/Zend/Gdata/Extension/EventStatus.php index bf31db9398b..c28bca76d7a 100644 --- a/lib/zend/Zend/Gdata/Extension/EventStatus.php +++ b/lib/zend/Zend/Gdata/Extension/EventStatus.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_EventStatus extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php b/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php index 3a464aa4a42..72e441ce0be 100644 --- a/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php +++ b/lib/zend/Zend/Gdata/Extension/ExtendedProperty.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_ExtendedProperty extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/FeedLink.php b/lib/zend/Zend/Gdata/Extension/FeedLink.php index a590afe302e..84feac27bc3 100644 --- a/lib/zend/Zend/Gdata/Extension/FeedLink.php +++ b/lib/zend/Zend/Gdata/Extension/FeedLink.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_FeedLink extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php b/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php index 0fc86a5d50b..daf18d34efa 100644 --- a/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php +++ b/lib/zend/Zend/Gdata/Extension/OpenSearchItemsPerPage.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchItemsPerPage extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php b/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php index 9ebdd1d44f9..17290ce0d18 100644 --- a/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php +++ b/lib/zend/Zend/Gdata/Extension/OpenSearchStartIndex.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchStartIndex extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php b/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php index ef4d1eee508..178aa379184 100644 --- a/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php +++ b/lib/zend/Zend/Gdata/Extension/OpenSearchTotalResults.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OpenSearchTotalResults extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/OriginalEvent.php b/lib/zend/Zend/Gdata/Extension/OriginalEvent.php index 9579f9c1413..a7cf4cd041e 100644 --- a/lib/zend/Zend/Gdata/Extension/OriginalEvent.php +++ b/lib/zend/Zend/Gdata/Extension/OriginalEvent.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Extension/When.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_OriginalEvent extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/Rating.php b/lib/zend/Zend/Gdata/Extension/Rating.php index 5cd86d2c7c0..d17720aeda4 100644 --- a/lib/zend/Zend/Gdata/Extension/Rating.php +++ b/lib/zend/Zend/Gdata/Extension/Rating.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Rating extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/Recurrence.php b/lib/zend/Zend/Gdata/Extension/Recurrence.php index 81aecbbc6bc..c5f32b9df4d 100644 --- a/lib/zend/Zend/Gdata/Extension/Recurrence.php +++ b/lib/zend/Zend/Gdata/Extension/Recurrence.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Recurrence extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/RecurrenceException.php b/lib/zend/Zend/Gdata/Extension/RecurrenceException.php index 972c0a7fe6d..304e56a4605 100644 --- a/lib/zend/Zend/Gdata/Extension/RecurrenceException.php +++ b/lib/zend/Zend/Gdata/Extension/RecurrenceException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Extension/OriginalEvent.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_RecurrenceException extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/Reminder.php b/lib/zend/Zend/Gdata/Extension/Reminder.php index 722bc5135ba..409438a76d2 100644 --- a/lib/zend/Zend/Gdata/Extension/Reminder.php +++ b/lib/zend/Zend/Gdata/Extension/Reminder.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Reminder extends Zend_Gdata_Extension @@ -102,16 +102,16 @@ class Zend_Gdata_Extension_Reminder extends Zend_Gdata_Extension public function __toString() { - $s; - if ($absoluteTime) - $s = "at" . $absoluteTime; - else if ($days) - $s = "in" . $days . "days"; - else if ($hours) - $s = "in" . $hours . "hours"; - else if ($minutes) - $s = "in" . $minutes . "minutes"; - return $method . $s; + $s = ''; + if ($this->_absoluteTime) + $s = " at " . $this->_absoluteTime; + else if ($this->_days) + $s = " in " . $this->_days . " days"; + else if ($this->_hours) + $s = " in " . $this->_hours . " hours"; + else if ($this->_minutes) + $s = " in " . $this->_minutes . " minutes"; + return $this->_method . $s; } public function getAbsoluteTime() diff --git a/lib/zend/Zend/Gdata/Extension/Transparency.php b/lib/zend/Zend/Gdata/Extension/Transparency.php index f41281c860f..dedd375b8cf 100644 --- a/lib/zend/Zend/Gdata/Extension/Transparency.php +++ b/lib/zend/Zend/Gdata/Extension/Transparency.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Transparency extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/Visibility.php b/lib/zend/Zend/Gdata/Extension/Visibility.php index 39442f440ea..c78d7fa2837 100644 --- a/lib/zend/Zend/Gdata/Extension/Visibility.php +++ b/lib/zend/Zend/Gdata/Extension/Visibility.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Visibility extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/When.php b/lib/zend/Zend/Gdata/Extension/When.php index dd9eaa5fb62..b6412d5c04f 100644 --- a/lib/zend/Zend/Gdata/Extension/When.php +++ b/lib/zend/Zend/Gdata/Extension/When.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension/Reminder.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_When extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/Where.php b/lib/zend/Zend/Gdata/Extension/Where.php index 94967adc349..58d02248712 100644 --- a/lib/zend/Zend/Gdata/Extension/Where.php +++ b/lib/zend/Zend/Gdata/Extension/Where.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension/EntryLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Where extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Extension/Who.php b/lib/zend/Zend/Gdata/Extension/Who.php index 6fd66a42cf3..19c7a59b701 100644 --- a/lib/zend/Zend/Gdata/Extension/Who.php +++ b/lib/zend/Zend/Gdata/Extension/Who.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -47,7 +47,7 @@ require_once 'Zend/Gdata/Extension/EntryLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Extension_Who extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Feed.php b/lib/zend/Zend/Gdata/Feed.php index c86735c5e04..07cf83f1ca8 100644 --- a/lib/zend/Zend/Gdata/Feed.php +++ b/lib/zend/Zend/Gdata/Feed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -57,7 +57,7 @@ require_once 'Zend/Gdata/Extension/OpenSearchItemsPerPage.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Feed extends Zend_Gdata_App_Feed diff --git a/lib/zend/Zend/Gdata/Gapps.php b/lib/zend/Zend/Gdata/Gapps.php index cab092d23f3..6b75521b2b0 100644 --- a/lib/zend/Zend/Gdata/Gapps.php +++ b/lib/zend/Zend/Gdata/Gapps.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -61,7 +61,7 @@ require_once 'Zend/Gdata/Gapps/EmailListRecipientFeed.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php b/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php index b4b1708d8ea..8d301a14143 100644 --- a/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php +++ b/lib/zend/Zend/Gdata/Gapps/EmailListEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -53,7 +53,7 @@ require_once 'Zend/Gdata/Gapps/Extension/EmailList.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php b/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php index 38a14568068..e43a6a10a17 100644 --- a/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php +++ b/lib/zend/Zend/Gdata/Gapps/EmailListFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,22 +32,22 @@ require_once 'Zend/Gdata/Feed.php'; require_once 'Zend/Gdata/Gapps/EmailListEntry.php'; /** - * Data model for a collection of Google Apps email list entries, usually + * Data model for a collection of Google Apps email list entries, usually * provided by the Google Apps servers. - * - * For information on requesting this feed from a server, see the Google + * + * For information on requesting this feed from a server, see the Google * Apps service class, Zend_Gdata_Gapps. * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListFeed extends Zend_Gdata_Feed { - + protected $_entryClassName = 'Zend_Gdata_Gapps_EmailListEntry'; protected $_feedClassName = 'Zend_Gdata_Gapps_EmailListFeed'; - + } diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php b/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php index e2bfda02fa0..e47767fd884 100644 --- a/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php +++ b/lib/zend/Zend/Gdata/Gapps/EmailListQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,43 +27,43 @@ require_once('Zend/Gdata/Gapps/Query.php'); /** - * Assists in constructing queries for Google Apps email list entries. - * Instances of this class can be provided in many places where a URL is + * Assists in constructing queries for Google Apps email list entries. + * Instances of this class can be provided in many places where a URL is * required. - * + * * For information on submitting queries to a server, see the Google Apps * service class, Zend_Gdata_Gapps. - * + * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query { /** - * A string which, if not null, indicates which email list should + * A string which, if not null, indicates which email list should * be retrieved by this query. - * + * * @var string */ protected $_emailListName = null; /** * Create a new instance. - * - * @param string $domain (optional) The Google Apps-hosted domain to use + * + * @param string $domain (optional) The Google Apps-hosted domain to use * when constructing query URIs. - * @param string $emailListName (optional) Value for the emailListName + * @param string $emailListName (optional) Value for the emailListName * property. - * @param string $recipient (optional) Value for the recipient + * @param string $recipient (optional) Value for the recipient * property. - * @param string $startEmailListName (optional) Value for the + * @param string $startEmailListName (optional) Value for the * startEmailListName property. */ - public function __construct($domain = null, $emailListName = null, + public function __construct($domain = null, $emailListName = null, $recipient = null, $startEmailListName = null) { parent::__construct($domain); @@ -73,11 +73,11 @@ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query } /** - * Set the email list name to query for. When set, only lists with a name - * matching this value will be returned in search results. Set to + * Set the email list name to query for. When set, only lists with a name + * matching this value will be returned in search results. Set to * null to disable filtering by list name. - * - * @param string $value The email list name to filter search results by, + * + * @param string $value The email list name to filter search results by, * or null to disable. */ public function setEmailListName($value) @@ -86,9 +86,9 @@ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query } /** - * Get the email list name to query for. If no name is set, null will be + * Get the email list name to query for. If no name is set, null will be * returned. - * + * * @see setEmailListName * @return string The email list name to filter search results by, or null * if disabled. @@ -99,11 +99,11 @@ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query } /** - * Set the recipient to query for. When set, only subscribers with an - * email address matching this value will be returned in search results. + * Set the recipient to query for. When set, only subscribers with an + * email address matching this value will be returned in search results. * Set to null to disable filtering by username. - * - * @param string $value The recipient email address to filter search + * + * @param string $value The recipient email address to filter search * results by, or null to disable. */ public function setRecipient($value) @@ -117,11 +117,11 @@ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query } /** - * Get the recipient email address to query for. If no recipient is set, + * Get the recipient email address to query for. If no recipient is set, * null will be returned. - * + * * @see setRecipient - * @return string The recipient email address to filter search results by, + * @return string The recipient email address to filter search results by, * or null if disabled. */ public function getRecipient() @@ -134,10 +134,10 @@ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query } /** - * Set the first email list which should be displayed when retrieving + * Set the first email list which should be displayed when retrieving * a list of email lists. - * - * @param string $value The first email list to be returned, or null to + * + * @param string $value The first email list to be returned, or null to * disable. */ public function setStartEmailListName($value) @@ -150,10 +150,10 @@ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query } /** - * Get the first email list which should be displayed when retrieving + * Get the first email list which should be displayed when retrieving * a list of email lists. - * - * @return string The first email list to be returned, or null to + * + * @return string The first email list to be returned, or null to * disable. */ public function getStartEmailListName() @@ -166,15 +166,15 @@ class Zend_Gdata_Gapps_EmailListQuery extends Zend_Gdata_Gapps_Query } /** - * Returns the URL generated for this query, based on it's current + * Returns the URL generated for this query, based on it's current * parameters. - * + * * @return string A URL generated based on the state of this query. * @throws Zend_Gdata_App_InvalidArgumentException */ public function getQueryUrl() { - + $uri = $this->getBaseUrl(); $uri .= Zend_Gdata_Gapps::APPS_EMAIL_LIST_PATH; if ($this->_emailListName !== null) { diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php index 61341aa8b61..a447a2ae2be 100644 --- a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php +++ b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -49,7 +49,7 @@ require_once 'Zend/Gdata/Extension/Who.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php index e45029660aa..75ad5cb78af 100644 --- a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php +++ b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,22 +32,22 @@ require_once 'Zend/Gdata/Feed.php'; require_once 'Zend/Gdata/Gapps/EmailListRecipientEntry.php'; /** - * Data model for a collection of Google Apps email list recipient entries, + * Data model for a collection of Google Apps email list recipient entries, * usually provided by the Google Apps servers. - * - * For information on requesting this feed from a server, see the Google + * + * For information on requesting this feed from a server, see the Google * Apps service class, Zend_Gdata_Gapps. * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientFeed extends Zend_Gdata_Feed { - + protected $_entryClassName = 'Zend_Gdata_Gapps_EmailListRecipientEntry'; protected $_feedClassName = 'Zend_Gdata_Gapps_EmailListRecipientFeed'; - + } diff --git a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php index 670fa093fde..611593bfe8b 100644 --- a/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php +++ b/lib/zend/Zend/Gdata/Gapps/EmailListRecipientQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,38 +27,38 @@ require_once('Zend/Gdata/Gapps/Query.php'); /** - * Assists in constructing queries for Google Apps email list recipient - * entries. Instances of this class can be provided in many places where a + * Assists in constructing queries for Google Apps email list recipient + * entries. Instances of this class can be provided in many places where a * URL is required. - * + * * For information on submitting queries to a server, see the Google Apps * service class, Zend_Gdata_Gapps. - * + * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query { - + /** - * If not null, specifies the name of the email list which + * If not null, specifies the name of the email list which * should be requested by this query. - * + * * @var string */ protected $_emailListName = null; /** * Create a new instance. - * - * @param string $domain (optional) The Google Apps-hosted domain to use + * + * @param string $domain (optional) The Google Apps-hosted domain to use * when constructing query URIs. - * @param string $emailListName (optional) Value for the emailListName + * @param string $emailListName (optional) Value for the emailListName * property. - * @param string $startRecipient (optional) Value for the + * @param string $startRecipient (optional) Value for the * startRecipient property. */ public function __construct($domain = null, $emailListName = null, @@ -68,13 +68,13 @@ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query $this->setEmailListName($emailListName); $this->setStartRecipient($startRecipient); } - + /** - * Set the email list name to query for. When set, only lists with a name - * matching this value will be returned in search results. Set to + * Set the email list name to query for. When set, only lists with a name + * matching this value will be returned in search results. Set to * null to disable filtering by list name. - * - * @param string $value The email list name to filter search results by, + * + * @param string $value The email list name to filter search results by, * or null to disable. */ public function setEmailListName($value) @@ -83,10 +83,10 @@ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query } /** - * Get the email list name to query for. If no name is set, null will be + * Get the email list name to query for. If no name is set, null will be * returned. - * - * @param string $value The email list name to filter search results by, + * + * @param string $value The email list name to filter search results by, * or null if disabled. */ public function getEmailListName() @@ -95,10 +95,10 @@ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query } /** - * Set the first recipient which should be displayed when retrieving + * Set the first recipient which should be displayed when retrieving * a list of email list recipients. - * - * @param string $value The first recipient to be returned, or null to + * + * @param string $value The first recipient to be returned, or null to * disable. */ public function setStartRecipient($value) @@ -111,10 +111,10 @@ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query } /** - * Get the first recipient which should be displayed when retrieving + * Get the first recipient which should be displayed when retrieving * a list of email list recipients. - * - * @return string The first recipient to be returned, or null if + * + * @return string The first recipient to be returned, or null if * disabled. */ public function getStartRecipient() @@ -127,15 +127,15 @@ class Zend_Gdata_Gapps_EmailListRecipientQuery extends Zend_Gdata_Gapps_Query } /** - * Returns the URL generated for this query, based on it's current + * Returns the URL generated for this query, based on it's current * parameters. - * + * * @return string A URL generated based on the state of this query. * @throws Zend_Gdata_App_InvalidArgumentException */ public function getQueryUrl() { - + $uri = $this->getBaseUrl(); $uri .= Zend_Gdata_Gapps::APPS_EMAIL_LIST_PATH; if ($this->_emailListName !== null) { diff --git a/lib/zend/Zend/Gdata/Gapps/Error.php b/lib/zend/Zend/Gdata/Gapps/Error.php index 6a490aada45..db35f9ba9b7 100644 --- a/lib/zend/Zend/Gdata/Gapps/Error.php +++ b/lib/zend/Zend/Gdata/Gapps/Error.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,26 +28,26 @@ require_once 'Zend/Gdata/App/Base.php'; /** - * Gdata Gapps Error class. This class is used to represent errors returned - * within an AppsForYourDomainErrors message received from the Google Apps + * Gdata Gapps Error class. This class is used to represent errors returned + * within an AppsForYourDomainErrors message received from the Google Apps * servers. * - * Several different errors may be represented by this class, determined by - * the error code returned by the server. For a list of error codes + * Several different errors may be represented by this class, determined by + * the error code returned by the server. For a list of error codes * available at the time of this writing, see getErrorCode. * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base { - - // Error codes as defined at + + // Error codes as defined at // http://code.google.com/apis/apps/gdata_provisioning_api_v2.0_reference.html#appendix_d - + const UNKNOWN_ERROR = 1000; const USER_DELETED_RECENTLY = 1100; const USER_SUSPENDED = 1101; @@ -68,34 +68,34 @@ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base const INVALID_EMAIL_ADDRESS = 1406; const INVALID_QUERY_PARAMETER_VALUE = 1407; const TOO_MANY_RECIPIENTS_ON_EMAIL_LIST = 1500; - + protected $_errorCode = null; protected $_reason = null; protected $_invalidInput = null; - - public function __construct($errorCode = null, $reason = null, + + public function __construct($errorCode = null, $reason = null, $invalidInput = null) { parent::__construct("Google Apps error received: $errorCode ($reason)"); $this->_errorCode = $errorCode; $this->_reason = $reason; $this->_invalidInput = $invalidInput; } - + /** - * Set the error code for this exception. For more information about + * Set the error code for this exception. For more information about * error codes, see getErrorCode. - * + * * @see getErrorCode * @param integer $value The new value for the error code. */ public function setErrorCode($value) { $this->_errorCode = $value; } - - /** - * Get the error code for this exception. Currently valid values are + + /** + * Get the error code for this exception. Currently valid values are * available as constants within this class. These values are: - * + * * UNKNOWN_ERROR (1000) * USER_DELETED_RECENTLY (1100) * USER_SUSPENDED (1101) @@ -116,14 +116,14 @@ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base * INVALID_EMAIL_ADDRESS (1406) * INVALID_QUERY_PARAMETER_VALUE (1407) * TOO_MANY_RECIPIENTS_ON_EMAIL_LIST (1500) - * - * Numbers in parenthesis indicate the actual integer value of the - * constant. This list should not be treated as exhaustive, as additional + * + * Numbers in parenthesis indicate the actual integer value of the + * constant. This list should not be treated as exhaustive, as additional * error codes may be added at any time. - * - * For more information about these codes and their meaning, please + * + * For more information about these codes and their meaning, please * see Appendix D of the Google Apps Provisioning API Reference. - * + * * @link http://code.google.com/apis/apps/gdata_provisioning_api_v2.0_reference.html#appendix_d Google Apps Provisioning API Reference: Appendix D - Gdata Error Codes * @see setErrorCode * @return integer The error code returned by the Google Apps server. @@ -131,20 +131,20 @@ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base public function getErrorCode() { return $this->_errorCode; } - + /** * Set human-readable text describing the reason this exception occurred. - * + * * @see getReason * @param string $value The reason this exception occurred. */ public function setReason($value) { $this->_reason = $value; } - + /** * Get human-readable text describing the reason this exception occurred. - * + * * @see setReason * @return string The reason this exception occurred. */ @@ -154,24 +154,24 @@ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base /** * Set the invalid input which caused this exception. - * + * * @see getInvalidInput * @param string $value The invalid input that triggered this exception. */ public function setInvalidInput($value) { $this->_invalidInput = $value; } - + /** * Set the invalid input which caused this exception. - * + * * @see setInvalidInput * @return string The reason this exception occurred. */ public function getInvalidInput() { return $this->_invalidInput; } - + /** * Retrieves a DOMElement which corresponds to this element and all * child properties. This is used to build an entry back into a DOM @@ -195,7 +195,7 @@ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base } return $element; } - + /** * Given a DOMNode representing an attribute, tries to map the data into * instance members. If no mapping is defined, the name and value are @@ -219,10 +219,10 @@ class Zend_Gdata_Gapps_Error extends Zend_Gdata_App_Base parent::takeAttributeFromDOM($attribute); } } - + /** * Get a human readable version of this exception. - * + * * @return string */ public function __toString() { diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php b/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php index 2471cae68a7..c57c01df41a 100644 --- a/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php +++ b/lib/zend/Zend/Gdata/Gapps/Extension/EmailList.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Gapps.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_EmailList extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Login.php b/lib/zend/Zend/Gdata/Gapps/Extension/Login.php index 988f0869850..ca3843418fa 100644 --- a/lib/zend/Zend/Gdata/Gapps/Extension/Login.php +++ b/lib/zend/Zend/Gdata/Gapps/Extension/Login.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -40,7 +40,7 @@ require_once 'Zend/Gdata/Gapps.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Login extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Name.php b/lib/zend/Zend/Gdata/Gapps/Extension/Name.php index b2aa1710b72..8825e0f3566 100644 --- a/lib/zend/Zend/Gdata/Gapps/Extension/Name.php +++ b/lib/zend/Zend/Gdata/Gapps/Extension/Name.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Gapps.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Name extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php b/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php index 6d0e1fb30f3..54de7917ed3 100644 --- a/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php +++ b/lib/zend/Zend/Gdata/Gapps/Extension/Nickname.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Gapps.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Nickname extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php b/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php index a6412bf93bb..c64b1a39203 100644 --- a/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php +++ b/lib/zend/Zend/Gdata/Gapps/Extension/Quota.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -40,7 +40,7 @@ require_once 'Zend/Gdata/Gapps.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_Extension_Quota extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php b/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php index 6841177ba08..ce02ed4ac23 100644 --- a/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php +++ b/lib/zend/Zend/Gdata/Gapps/NicknameEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -53,7 +53,7 @@ require_once 'Zend/Gdata/Gapps/Extension/Nickname.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php b/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php index 42f4c0e3af4..a4fb13d0cbe 100644 --- a/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php +++ b/lib/zend/Zend/Gdata/Gapps/NicknameFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,22 +32,22 @@ require_once 'Zend/Gdata/Feed.php'; require_once 'Zend/Gdata/Gapps/NicknameEntry.php'; /** - * Data model for a collection of Google Apps nickname entries, usually + * Data model for a collection of Google Apps nickname entries, usually * provided by the Google Apps servers. - * - * For information on requesting this feed from a server, see the Google + * + * For information on requesting this feed from a server, see the Google * Apps service class, Zend_Gdata_Gapps. * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameFeed extends Zend_Gdata_Feed { - + protected $_entryClassName = 'Zend_Gdata_Gapps_NicknameEntry'; protected $_feedClassName = 'Zend_Gdata_Gapps_NicknameFeed'; - + } diff --git a/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php b/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php index ab52402eaad..1348775bcf8 100644 --- a/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php +++ b/lib/zend/Zend/Gdata/Gapps/NicknameQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,43 +27,43 @@ require_once('Zend/Gdata/Gapps/Query.php'); /** - * Assists in constructing queries for Google Apps nickname entries. - * Instances of this class can be provided in many places where a URL is + * Assists in constructing queries for Google Apps nickname entries. + * Instances of this class can be provided in many places where a URL is * required. - * + * * For information on submitting queries to a server, see the Google Apps * service class, Zend_Gdata_Gapps. - * + * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query { /** - * If not null, indicates the name of the nickname entry which + * If not null, indicates the name of the nickname entry which * should be returned by this query. - * + * * @var string */ protected $_nickname = null; /** * Create a new instance. - * - * @param string $domain (optional) The Google Apps-hosted domain to use + * + * @param string $domain (optional) The Google Apps-hosted domain to use * when constructing query URIs. - * @param string $nickname (optional) Value for the nickname + * @param string $nickname (optional) Value for the nickname * property. - * @param string $username (optional) Value for the username + * @param string $username (optional) Value for the username * property. - * @param string $startNickname (optional) Value for the + * @param string $startNickname (optional) Value for the * startNickname property. */ - public function __construct($domain = null, $nickname = null, + public function __construct($domain = null, $nickname = null, $username = null, $startNickname = null) { parent::__construct($domain); @@ -73,11 +73,11 @@ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query } /** - * Set the nickname to query for. When set, only users with a nickname - * matching this value will be returned in search results. Set to + * Set the nickname to query for. When set, only users with a nickname + * matching this value will be returned in search results. Set to * null to disable filtering by username. - * - * @param string $value The nickname to filter search results by, or null + * + * @param string $value The nickname to filter search results by, or null * to disable. */ public function setNickname($value) @@ -86,11 +86,11 @@ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query } /** - * Get the nickname to query for. If no nickname is set, null will be + * Get the nickname to query for. If no nickname is set, null will be * returned. - * + * * @see setNickname - * @return string The nickname to filter search results by, or null if + * @return string The nickname to filter search results by, or null if * disabled. */ public function getNickname() @@ -99,11 +99,11 @@ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query } /** - * Set the username to query for. When set, only users with a username - * matching this value will be returned in search results. Set to + * Set the username to query for. When set, only users with a username + * matching this value will be returned in search results. Set to * null to disable filtering by username. - * - * @param string $value The username to filter search results by, or null + * + * @param string $value The username to filter search results by, or null * to disable. */ public function setUsername($value) @@ -117,11 +117,11 @@ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query } /** - * Get the username to query for. If no username is set, null will be + * Get the username to query for. If no username is set, null will be * returned. - * + * * @see setUsername - * @return string The username to filter search results by, or null if + * @return string The username to filter search results by, or null if * disabled. */ public function getUsername() @@ -134,10 +134,10 @@ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query } /** - * Set the first nickname which should be displayed when retrieving + * Set the first nickname which should be displayed when retrieving * a list of nicknames. - * - * @param string $value The first nickname to be returned, or null to + * + * @param string $value The first nickname to be returned, or null to * disable. */ public function setStartNickname($value) @@ -150,10 +150,10 @@ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query } /** - * Get the first nickname which should be displayed when retrieving + * Get the first nickname which should be displayed when retrieving * a list of nicknames. - * - * @return string The first nickname to be returned, or null to + * + * @return string The first nickname to be returned, or null to * disable. */ public function getStartNickname() @@ -166,14 +166,14 @@ class Zend_Gdata_Gapps_NicknameQuery extends Zend_Gdata_Gapps_Query } /** - * Returns the URL generated for this query, based on it's current + * Returns the URL generated for this query, based on it's current * parameters. - * + * * @return string A URL generated based on the state of this query. */ public function getQueryUrl() { - + $uri = $this->getBaseUrl(); $uri .= Zend_Gdata_Gapps::APPS_NICKNAME_PATH; if ($this->_nickname !== null) { diff --git a/lib/zend/Zend/Gdata/Gapps/Query.php b/lib/zend/Zend/Gdata/Gapps/Query.php index e2785efa619..9b220938b75 100644 --- a/lib/zend/Zend/Gdata/Gapps/Query.php +++ b/lib/zend/Zend/Gdata/Gapps/Query.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,32 +32,32 @@ require_once('Zend/Gdata/Query.php'); require_once('Zend/Gdata/Gapps.php'); /** - * Assists in constructing queries for Google Apps entries. This class + * Assists in constructing queries for Google Apps entries. This class * provides common methods used by all other Google Apps query classes. * - * This class should never be instantiated directly. Instead, instantiate a + * This class should never be instantiated directly. Instead, instantiate a * class which inherits from this class. - * + * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query { - + /** * The domain which is being administered via the Provisioning API. * * @var string */ protected $_domain = null; - + /** * Create a new instance. - * - * @param string $domain (optional) The Google Apps-hosted domain to use + * + * @param string $domain (optional) The Google Apps-hosted domain to use * when constructing query URIs. */ public function __construct($domain = null) @@ -65,16 +65,16 @@ abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query parent::__construct(); $this->_domain = $domain; } - + /** - * Set domain for this service instance. This should be a fully qualified + * Set domain for this service instance. This should be a fully qualified * domain, such as 'foo.example.com'. * - * This value is used when calculating URLs for retrieving and posting - * entries. If no value is specified, a URL will have to be manually - * constructed prior to using any methods which interact with the Google + * This value is used when calculating URLs for retrieving and posting + * entries. If no value is specified, a URL will have to be manually + * constructed prior to using any methods which interact with the Google * Apps provisioning service. - * + * * @param string $value The domain to be used for this session. */ public function setDomain($value) @@ -83,26 +83,26 @@ abstract class Zend_Gdata_Gapps_Query extends Zend_Gdata_Query } /** - * Get domain for this service instance. This should be a fully qualified - * domain, such as 'foo.example.com'. If no domain is set, null will be + * Get domain for this service instance. This should be a fully qualified + * domain, such as 'foo.example.com'. If no domain is set, null will be * returned. - * + * * @see setDomain - * @return string The domain to be used for this session, or null if not + * @return string The domain to be used for this session, or null if not * set. */ public function getDomain() { return $this->_domain; } - + /** - * Returns the base URL used to access the Google Apps service, based - * on the current domain. The current domain can be temporarily + * Returns the base URL used to access the Google Apps service, based + * on the current domain. The current domain can be temporarily * overridden by providing a fully qualified domain as $domain. * * @see setDomain - * @param string $domain (optional) A fully-qualified domain to use + * @param string $domain (optional) A fully-qualified domain to use * instead of the default domain for this service instance. */ public function getBaseUrl($domain = null) diff --git a/lib/zend/Zend/Gdata/Gapps/ServiceException.php b/lib/zend/Zend/Gdata/Gapps/ServiceException.php index 7c34ae34880..bdd45c6e584 100644 --- a/lib/zend/Zend/Gdata/Gapps/ServiceException.php +++ b/lib/zend/Zend/Gdata/Gapps/ServiceException.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,35 +33,35 @@ require_once 'Zend/Exception.php'; require_once 'Zend/Gdata/Gapps/Error.php'; /** - * Gdata Gapps Exception class. This is thrown when an - * AppsForYourDomainErrors message is received from the Google Apps + * Gdata Gapps Exception class. This is thrown when an + * AppsForYourDomainErrors message is received from the Google Apps * servers. * - * Several different errors may be represented by this exception. For a list + * Several different errors may be represented by this exception. For a list * of error codes available, see getErrorCode. * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception { - + protected $_rootElement = "AppsForYourDomainErrors"; - - /** + + /** * Array of Zend_Gdata_Error objects indexed by error code. - * + * * @var array */ protected $_errors = array(); - + /** * Create a new ServiceException. * - * @return array An array containing a collection of + * @return array An array containing a collection of * Zend_Gdata_Gapps_Error objects. */ public function __construct($errors = null) { @@ -70,32 +70,32 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception $this->setErrors($errors); } } - + /** - * Add a single Error object to the list of errors received by the + * Add a single Error object to the list of errors received by the * server. - * - * @param Zend_Gdata_Gapps_Error $error An instance of an error returned + * + * @param Zend_Gdata_Gapps_Error $error An instance of an error returned * by the server. The error's errorCode must be set. * @throws Zend_Gdata_App_Exception */ public function addError($error) { - // Make sure that we don't try to index an error that doesn't + // Make sure that we don't try to index an error that doesn't // contain an index value. if ($error->getErrorCode() == null) { require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception("Error encountered without corresponding error code."); } - + $this->_errors[$error->getErrorCode()] = $error; } - + /** - * Set the list of errors as sent by the server inside of an + * Set the list of errors as sent by the server inside of an * AppsForYourDomainErrors tag. - * - * @param array $array An associative array containing a collection of - * Zend_Gdata_Gapps_Error objects. All errors must have their + * + * @param array $array An associative array containing a collection of + * Zend_Gdata_Gapps_Error objects. All errors must have their * errorCode value set. * @throws Zend_Gdata_App_Exception */ @@ -105,22 +105,22 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception $this->addError($error); } } - + /** - * Get the list of errors as sent by the server inside of an + * Get the list of errors as sent by the server inside of an * AppsForYourDomainErrors tag. - * - * @return array An associative array containing a collection of + * + * @return array An associative array containing a collection of * Zend_Gdata_Gapps_Error objects, indexed by error code. */ public function getErrors() { return $this->_errors; } - + /** * Return the Error object associated with a specific error code. * - * @return Zend_Gdata_Gapps_Error The Error object requested, or null + * @return Zend_Gdata_Gapps_Error The Error object requested, or null * if not found. */ public function getError($errorCode) { @@ -131,22 +131,22 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception return null; } } - + /** - * Check whether or not a particular error code was returned by the + * Check whether or not a particular error code was returned by the * server. * * @param integer $errorCode The error code to check against. - * @return boolean Whether or not the supplied error code was returned + * @return boolean Whether or not the supplied error code was returned * by the server. */ public function hasError($errorCode) { return array_key_exists($errorCode, $this->_errors); } - + /** * Import an AppsForYourDomain error from XML. - * + * * @param string $string The XML data to be imported * @return Zend_Gdata_Gapps_ServiceException Provides a fluent interface. * @throws Zend_Gdata_App_Exception @@ -155,21 +155,21 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception if ($string) { // Check to see if an AppsForYourDomainError exists // - // track_errors is temporarily enabled so that if an error - // occurs while parsing the XML we can append it to an + // track_errors is temporarily enabled so that if an error + // occurs while parsing the XML we can append it to an // exception by referencing $php_errormsg @ini_set('track_errors', 1); $doc = new DOMDocument(); $success = @$doc->loadXML($string); @ini_restore('track_errors'); - + if (!$success) { require_once 'Zend/Gdata/App/Exception.php'; - // $php_errormsg is automatically generated by PHP if + // $php_errormsg is automatically generated by PHP if // an error occurs while calling loadXML(), above. throw new Zend_Gdata_App_Exception("DOMDocument cannot parse XML: $php_errormsg"); } - + // Ensure that the outermost node is an AppsForYourDomain error. // If it isn't, something has gone horribly wrong. $rootElement = $doc->getElementsByTagName($this->_rootElement)->item(0); @@ -177,7 +177,7 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('No root <' . $this->_rootElement . '> element found, cannot parse feed.'); } - + foreach ($rootElement->childNodes as $errorNode) { if (!($errorNode instanceof DOMText)) { $error = new Zend_Gdata_Gapps_Error(); @@ -190,12 +190,12 @@ class Zend_Gdata_Gapps_ServiceException extends Zend_Exception require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('XML passed to transferFromXML cannot be null'); } - + } - + /** * Get a human readable version of this exception. - * + * * @return string */ public function __toString() { diff --git a/lib/zend/Zend/Gdata/Gapps/UserEntry.php b/lib/zend/Zend/Gdata/Gapps/UserEntry.php index 34da8da1d9c..e973a05511d 100644 --- a/lib/zend/Zend/Gdata/Gapps/UserEntry.php +++ b/lib/zend/Zend/Gdata/Gapps/UserEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -61,7 +61,7 @@ require_once 'Zend/Gdata/Gapps/Extension/Quota.php'; * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Gapps/UserFeed.php b/lib/zend/Zend/Gdata/Gapps/UserFeed.php index e673316a7c9..7ab8187c319 100644 --- a/lib/zend/Zend/Gdata/Gapps/UserFeed.php +++ b/lib/zend/Zend/Gdata/Gapps/UserFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,22 +32,22 @@ require_once 'Zend/Gdata/Feed.php'; require_once 'Zend/Gdata/Gapps/UserEntry.php'; /** - * Data model for a collection of Google Apps user entries, usually + * Data model for a collection of Google Apps user entries, usually * provided by the Google Apps servers. - * - * For information on requesting this feed from a server, see the Google + * + * For information on requesting this feed from a server, see the Google * Apps service class, Zend_Gdata_Gapps. * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserFeed extends Zend_Gdata_Feed { - + protected $_entryClassName = 'Zend_Gdata_Gapps_UserEntry'; protected $_feedClassName = 'Zend_Gdata_Gapps_UserFeed'; - + } diff --git a/lib/zend/Zend/Gdata/Gapps/UserQuery.php b/lib/zend/Zend/Gdata/Gapps/UserQuery.php index 674f75afee0..afedd1333f2 100644 --- a/lib/zend/Zend/Gdata/Gapps/UserQuery.php +++ b/lib/zend/Zend/Gdata/Gapps/UserQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,41 +27,41 @@ require_once('Zend/Gdata/Gapps/Query.php'); /** - * Assists in constructing queries for Google Apps user entries. - * Instances of this class can be provided in many places where a URL is + * Assists in constructing queries for Google Apps user entries. + * Instances of this class can be provided in many places where a URL is * required. - * + * * For information on submitting queries to a server, see the Google Apps * service class, Zend_Gdata_Gapps. - * + * * @category Zend * @package Zend_Gdata * @subpackage Gapps - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query { /** - * If not null, specifies the username of the user who should be + * If not null, specifies the username of the user who should be * retrieved by this query. - * + * * @var string */ protected $_username = null; /** * Create a new instance. - * - * @param string $domain (optional) The Google Apps-hosted domain to use + * + * @param string $domain (optional) The Google Apps-hosted domain to use * when constructing query URIs. - * @param string $username (optional) Value for the username + * @param string $username (optional) Value for the username * property. - * @param string $startUsername (optional) Value for the + * @param string $startUsername (optional) Value for the * startUsername property. */ - public function __construct($domain = null, $username = null, + public function __construct($domain = null, $username = null, $startUsername = null) { parent::__construct($domain); @@ -70,12 +70,12 @@ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query } /** - * Set the username to query for. When set, only users with a username - * matching this value will be returned in search results. Set to + * Set the username to query for. When set, only users with a username + * matching this value will be returned in search results. Set to * null to disable filtering by username. - * + * * @see getUsername - * @param string $value The username to filter search results by, or null to + * @param string $value The username to filter search results by, or null to * disable. */ public function setUsername($value) @@ -84,10 +84,10 @@ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query } /** - * Get the username to query for. If no username is set, null will be + * Get the username to query for. If no username is set, null will be * returned. - * - * @param string $value The username to filter search results by, or + * + * @param string $value The username to filter search results by, or * null if disabled. */ public function getUsername() @@ -96,10 +96,10 @@ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query } /** - * Set the first username which should be displayed when retrieving + * Set the first username which should be displayed when retrieving * a list of users. - * - * @param string $value The first username to be returned, or null to + * + * @param string $value The first username to be returned, or null to * disable. */ public function setStartUsername($value) @@ -112,11 +112,11 @@ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query } /** - * Get the first username which should be displayed when retrieving + * Get the first username which should be displayed when retrieving * a list of users. - * + * * @see setStartUsername - * @return string The first username to be returned, or null if + * @return string The first username to be returned, or null if * disabled. */ public function getStartUsername() @@ -130,7 +130,7 @@ class Zend_Gdata_Gapps_UserQuery extends Zend_Gdata_Gapps_Query /** * Returns the query URL generated by this query instance. - * + * * @return string The query URL for this instance. */ public function getQueryUrl() diff --git a/lib/zend/Zend/Gdata/Gbase.php b/lib/zend/Zend/Gdata/Gbase.php index 8f6c6eab1f9..4e0fb2f11a5 100644 --- a/lib/zend/Zend/Gdata/Gbase.php +++ b/lib/zend/Zend/Gdata/Gbase.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -54,7 +54,7 @@ require_once 'Zend/Gdata/Gbase/SnippetFeed.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Gbase/Entry.php b/lib/zend/Zend/Gdata/Gbase/Entry.php index 5506c3619ab..7a395f2dc23 100644 --- a/lib/zend/Zend/Gdata/Gbase/Entry.php +++ b/lib/zend/Zend/Gdata/Gbase/Entry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Gbase/Extension/BaseAttribute.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Entry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php b/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php index caaf0505be5..14e60b3940e 100644 --- a/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php +++ b/lib/zend/Zend/Gdata/Gbase/Extension/BaseAttribute.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Gdata/App/Extension/Element.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Extension_BaseAttribute extends Zend_Gdata_App_Extension_Element diff --git a/lib/zend/Zend/Gdata/Gbase/Feed.php b/lib/zend/Zend/Gdata/Gbase/Feed.php index 4cf5e3b054a..f5d10360977 100644 --- a/lib/zend/Zend/Gdata/Gbase/Feed.php +++ b/lib/zend/Zend/Gdata/Gbase/Feed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Feed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Gbase/ItemEntry.php b/lib/zend/Zend/Gdata/Gbase/ItemEntry.php index 0e39933ef63..ead0879289f 100644 --- a/lib/zend/Zend/Gdata/Gbase/ItemEntry.php +++ b/lib/zend/Zend/Gdata/Gbase/ItemEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Gbase/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry @@ -49,7 +49,7 @@ class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry /** * Set the value of the itme_type * - * @param Zend_Gdata_Gbase_Extension_ItemType $value The desired value for the item_type + * @param Zend_Gdata_Gbase_Extension_ItemType $value The desired value for the item_type * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface */ public function setItemType($value) @@ -60,7 +60,7 @@ class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry /** * Adds a custom attribute to the entry in the following format: - * <g:[$name] type='[$type]'>[$value]</g:[$name]> + * <g:[$name] type='[$type]'>[$value]</g:[$name]> * * @param string $name The name of the attribute * @param string $value The text value of the attribute @@ -76,7 +76,7 @@ class Zend_Gdata_Gbase_ItemEntry extends Zend_Gdata_Gbase_Entry /** * Removes a Base attribute from the current list of Base attributes - * + * * @param Zend_Gdata_Gbase_Extension_BaseAttribute $baseAttribute The attribute to be removed * @return Zend_Gdata_Gbase_ItemEntry Provides a fluent interface */ diff --git a/lib/zend/Zend/Gdata/Gbase/ItemFeed.php b/lib/zend/Zend/Gdata/Gbase/ItemFeed.php index e2269e30451..098e3c4d8fc 100644 --- a/lib/zend/Zend/Gdata/Gbase/ItemFeed.php +++ b/lib/zend/Zend/Gdata/Gbase/ItemFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Gbase/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Gbase/ItemQuery.php b/lib/zend/Zend/Gdata/Gbase/ItemQuery.php index 909be7ed706..29bb57d1f86 100644 --- a/lib/zend/Zend/Gdata/Gbase/ItemQuery.php +++ b/lib/zend/Zend/Gdata/Gbase/ItemQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -40,7 +40,7 @@ require_once('Zend/Gdata/Gbase/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query @@ -54,14 +54,14 @@ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query * The default URI for POST methods * * @var string - */ + */ protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI; /** * The id of an item * * @var string - */ + */ protected $_id = null; /** @@ -84,7 +84,7 @@ class Zend_Gdata_Gbase_ItemQuery extends Zend_Gdata_Gbase_Query /** * Returns the query URL generated by this query instance. - * + * * @return string The query URL for this instance. */ public function getQueryUrl() diff --git a/lib/zend/Zend/Gdata/Gbase/Query.php b/lib/zend/Zend/Gdata/Gbase/Query.php index ea25d48b9a0..77b3e460ca0 100644 --- a/lib/zend/Zend/Gdata/Gbase/Query.php +++ b/lib/zend/Zend/Gdata/Gbase/Query.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query @@ -54,7 +54,7 @@ class Zend_Gdata_Gbase_Query extends Zend_Gdata_Query * The default URI for POST methods * * @var string - */ + */ protected $_defaultFeedUri = self::GBASE_ITEM_FEED_URI; /** diff --git a/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php b/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php index 02c659c6c94..231ea6cd2d5 100644 --- a/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php +++ b/lib/zend/Zend/Gdata/Gbase/SnippetEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Gbase/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetEntry extends Zend_Gdata_Gbase_Entry diff --git a/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php b/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php index ed50d133438..5892c58ad5e 100644 --- a/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php +++ b/lib/zend/Zend/Gdata/Gbase/SnippetFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Gbase/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php b/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php index eed5f3498d0..3944b14a605 100644 --- a/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php +++ b/lib/zend/Zend/Gdata/Gbase/SnippetQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once('Zend/Gdata/Gbase/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Gbase - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query @@ -53,12 +53,12 @@ class Zend_Gdata_Gbase_SnippetQuery extends Zend_Gdata_Gbase_Query * The default URI for POST methods * * @var string - */ + */ protected $_defaultFeedUri = self::BASE_SNIPPET_FEED_URI; /** * Returns the query URL generated by this query instance. - * + * * @return string The query URL for this instance. */ public function getQueryUrl() diff --git a/lib/zend/Zend/Gdata/Geo.php b/lib/zend/Zend/Gdata/Geo.php index 4249ac54640..9a4bdfff6c7 100755 --- a/lib/zend/Zend/Gdata/Geo.php +++ b/lib/zend/Zend/Gdata/Geo.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -36,7 +36,7 @@ require_once 'Zend/Gdata.php'; * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Geo/Entry.php b/lib/zend/Zend/Gdata/Geo/Entry.php index e36abb9f083..f77eb5d3c85 100755 --- a/lib/zend/Zend/Gdata/Geo/Entry.php +++ b/lib/zend/Zend/Gdata/Geo/Entry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Geo/Extension/GeoRssWhere.php'; * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Entry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php b/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php index 503d6b8ae97..d8827dc3194 100755 --- a/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php +++ b/lib/zend/Zend/Gdata/Geo/Extension/GeoRssWhere.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -43,7 +43,7 @@ require_once 'Zend/Gdata/Geo/Extension/GmlPoint.php'; * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GeoRssWhere extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php b/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php index cd8572a5925..e4f55684bc3 100755 --- a/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php +++ b/lib/zend/Zend/Gdata/Geo/Extension/GmlPoint.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -43,7 +43,7 @@ require_once 'Zend/Gdata/Geo/Extension/GmlPos.php'; * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GmlPoint extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php b/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php index e3615e17a87..a2179ba30f7 100755 --- a/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php +++ b/lib/zend/Zend/Gdata/Geo/Extension/GmlPos.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Geo.php'; * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Extension_GmlPos extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Geo/Feed.php b/lib/zend/Zend/Gdata/Geo/Feed.php index f67d348b732..ad26ee256b4 100755 --- a/lib/zend/Zend/Gdata/Geo/Feed.php +++ b/lib/zend/Zend/Gdata/Geo/Feed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Geo/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Geo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Geo_Feed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Health.php b/lib/zend/Zend/Gdata/Health.php index f406a26cd7f..02d84d00869 100755 --- a/lib/zend/Zend/Gdata/Health.php +++ b/lib/zend/Zend/Gdata/Health.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -54,7 +54,7 @@ require_once 'Zend/Gdata/Health/ProfileEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health extends Zend_Gdata @@ -62,19 +62,19 @@ class Zend_Gdata_Health extends Zend_Gdata /** * URIs of the AuthSub/OAuth feeds. */ - const AUTHSUB_PROFILE_FEED_URI = + const AUTHSUB_PROFILE_FEED_URI = 'https://www.google.com/health/feeds/profile/default'; - const AUTHSUB_REGISTER_FEED_URI = + const AUTHSUB_REGISTER_FEED_URI = 'https://www.google.com/health/feeds/register/default'; /** * URIs of the ClientLogin feeds. */ - const CLIENTLOGIN_PROFILELIST_FEED_URI = + const CLIENTLOGIN_PROFILELIST_FEED_URI = 'https://www.google.com/health/feeds/profile/list'; - const CLIENTLOGIN_PROFILE_FEED_URI = + const CLIENTLOGIN_PROFILE_FEED_URI = 'https://www.google.com/health/feeds/profile/ui'; - const CLIENTLOGIN_REGISTER_FEED_URI = + const CLIENTLOGIN_REGISTER_FEED_URI = 'https://www.google.com/health/feeds/register/ui'; /** diff --git a/lib/zend/Zend/Gdata/Health/Extension/Ccr.php b/lib/zend/Zend/Gdata/Health/Extension/Ccr.php index 2683447cbda..6deeca19a6b 100755 --- a/lib/zend/Zend/Gdata/Health/Extension/Ccr.php +++ b/lib/zend/Zend/Gdata/Health/Extension/Ccr.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Gdata/App/Extension/Element.php'; * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_Extension_Ccr extends Zend_Gdata_App_Extension_Element @@ -92,12 +92,11 @@ class Zend_Gdata_Health_Extension_Ccr extends Zend_Gdata_App_Extension_Element * return extract the user's conditions. * * @param string $name Name of the function to call + * @param unknown $args * @return array. A list of the appropriate CCR data */ public function __call($name, $args) { - $matches = array(); - if (substr($name, 0, 3) === 'get') { $category = substr($name, 3); diff --git a/lib/zend/Zend/Gdata/Health/ProfileEntry.php b/lib/zend/Zend/Gdata/Health/ProfileEntry.php index ffeac5d172d..6246ee1a277 100755 --- a/lib/zend/Zend/Gdata/Health/ProfileEntry.php +++ b/lib/zend/Zend/Gdata/Health/ProfileEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Health/Extension/Ccr.php'; * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry @@ -57,7 +57,7 @@ class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry * @var Zend_Gdata_Health_Extension_Ccr */ protected $_ccrData = null; - + /** * Constructs a new Zend_Gdata_Health_ProfileEntry object. * @param DOMElement $element (optional) The DOMElement on which to base this object. @@ -85,7 +85,7 @@ class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry if ($this->_ccrData !== null) { $element->appendChild($this->_ccrData->getDOM($element->ownerDocument)); } - + return $element; } @@ -102,14 +102,14 @@ class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry if (strstr($absoluteNodeName, $this->lookupNamespace('ccr') . ':')) { $ccrElement = new Zend_Gdata_Health_Extension_Ccr(); $ccrElement->transferFromDOM($child); - $this->_ccrData = $ccrElement; + $this->_ccrData = $ccrElement; } else { parent::takeChildFromDOM($child); - + } } - - /** + + /** * Sets the profile entry's CCR data * @param string $ccrXMLStr The CCR as an xml string * @return Zend_Gdata_Health_Extension_Ccr @@ -125,7 +125,7 @@ class Zend_Gdata_Health_ProfileEntry extends Zend_Gdata_Entry } - /** + /** * Returns all the CCR data in a profile entry * @return Zend_Gdata_Health_Extension_Ccr */ diff --git a/lib/zend/Zend/Gdata/Health/ProfileFeed.php b/lib/zend/Zend/Gdata/Health/ProfileFeed.php index 59535895cfc..06e957732b5 100755 --- a/lib/zend/Zend/Gdata/Health/ProfileFeed.php +++ b/lib/zend/Zend/Gdata/Health/ProfileFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileFeed extends Zend_Gdata_Feed @@ -45,7 +45,7 @@ class Zend_Gdata_Health_ProfileFeed extends Zend_Gdata_Feed * @var string */ protected $_entryClassName = 'Zend_Gdata_Health_ProfileEntry'; - + /** * Creates a Health Profile feed, representing a user's Health profile * diff --git a/lib/zend/Zend/Gdata/Health/ProfileListEntry.php b/lib/zend/Zend/Gdata/Health/ProfileListEntry.php index 36554e08971..5b5e065b4d1 100755 --- a/lib/zend/Zend/Gdata/Health/ProfileListEntry.php +++ b/lib/zend/Zend/Gdata/Health/ProfileListEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileListEntry extends Zend_Gdata_Entry @@ -80,16 +80,16 @@ class Zend_Gdata_Health_ProfileListEntry extends Zend_Gdata_Entry { parent::takeChildFromDOM($child); } - - /** + + /** * Retrieves the profile ID for the entry, which is contained in * @return string The profile id */ public function getProfileID() { return $this->getContent()->text; } - - /** + + /** * Retrieves the profile's title, which is contained in * @return string The profile name */ diff --git a/lib/zend/Zend/Gdata/Health/ProfileListFeed.php b/lib/zend/Zend/Gdata/Health/ProfileListFeed.php index c0d6799c638..4cecec4b0db 100755 --- a/lib/zend/Zend/Gdata/Health/ProfileListFeed.php +++ b/lib/zend/Zend/Gdata/Health/ProfileListFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_ProfileListFeed extends Zend_Gdata_Feed @@ -45,7 +45,7 @@ class Zend_Gdata_Health_ProfileListFeed extends Zend_Gdata_Feed * @var string */ protected $_entryClassName = 'Zend_Gdata_Health_ProfileListEntry'; - + public function getEntries() { return $this->entry; diff --git a/lib/zend/Zend/Gdata/Health/Query.php b/lib/zend/Zend/Gdata/Health/Query.php index d1692e2d557..75196615586 100755 --- a/lib/zend/Zend/Gdata/Health/Query.php +++ b/lib/zend/Zend/Gdata/Health/Query.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Health_Query extends Zend_Gdata_Query @@ -101,7 +101,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query */ public function setCategory($item, $name = null) { - $this->_category = $item . + $this->_category = $item . ($name ? '/' . urlencode('{' . self::ITEM_CATEGORY_NS . '}' . $name) : null); return $this; } @@ -133,7 +133,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Returns the value set for the grouped parameter. * - * @return string grouped parameter. + * @return string grouped parameter. */ public function getGrouped() { @@ -143,11 +143,11 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query return null; } } - + /** * Setter for the max-results-group parameter. * - * @param int $value Specifies the maximum number of groups to be + * @param int $value Specifies the maximum number of groups to be * retrieved. Must be an integer value greater than zero. This parameter * is only valid if grouped=true. * @return Zend_Gdata_Health_Query Provides a fluent interface @@ -159,7 +159,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query require_once 'Zend/Gdata/App/InvalidArgumentException.php'; throw new Zend_Gdata_App_InvalidArgumentException( 'The max-results-group parameter must be set to a value - greater than 0 and can only be used if grouped=true'); + greater than 0 and can only be used if grouped=true'); } else { $this->_params['max-results-group'] = $value; } @@ -170,7 +170,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Returns the value set for max-results-group. * - * @return int Returns max-results-group parameter. + * @return int Returns max-results-group parameter. */ public function getMaxResultsGroup() { @@ -184,9 +184,9 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Setter for the max-results-group parameter. * - * @param int $value Specifies the maximum number of records to be - * retrieved from each group. The limits that you specify with this - * parameter apply to all groups. Must be an integer value greater than + * @param int $value Specifies the maximum number of records to be + * retrieved from each group. The limits that you specify with this + * parameter apply to all groups. Must be an integer value greater than * zero. This parameter is only valid if grouped=true. * @return Zend_Gdata_Health_Query Provides a fluent interface */ @@ -195,8 +195,8 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query if ($value !== null) { if ($value <= 0 || $this->getGrouped() !== 'true') { throw new Zend_Gdata_App_InvalidArgumentException( - 'The max-results-in-group parameter must be set to a value - greater than 0 and can only be used if grouped=true'); + 'The max-results-in-group parameter must be set to a value + greater than 0 and can only be used if grouped=true'); } else { $this->_params['max-results-in-group'] = $value; } @@ -207,7 +207,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Returns the value set for max-results-in-group. * - * @return int Returns max-results-in-group parameter. + * @return int Returns max-results-in-group parameter. */ public function getMaxResultsInGroup() { @@ -221,9 +221,9 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Setter for the start-index-group parameter. * - * @param int $value Retrieves only items whose group ranking is at + * @param int $value Retrieves only items whose group ranking is at * least start-index-group. This should be set to a 1-based index of the - * first group to be retrieved. The range is applied per category. + * first group to be retrieved. The range is applied per category. * This parameter is only valid if grouped=true. * @return Zend_Gdata_Health_Query Provides a fluent interface */ @@ -231,7 +231,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query { if ($value !== null && $this->getGrouped() !== 'true') { throw new Zend_Gdata_App_InvalidArgumentException( - 'The start-index-group can only be used if grouped=true'); + 'The start-index-group can only be used if grouped=true'); } else { $this->_params['start-index-group'] = $value; } @@ -241,7 +241,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Returns the value set for start-index-group. * - * @return int Returns start-index-group parameter. + * @return int Returns start-index-group parameter. */ public function getStartIndexGroup() { @@ -255,7 +255,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Setter for the start-index-in-group parameter. * - * @param int $value A 1-based index of the records to be retrieved from + * @param int $value A 1-based index of the records to be retrieved from * each group. This parameter is only valid if grouped=true. * @return Zend_Gdata_Health_Query Provides a fluent interface */ @@ -272,7 +272,7 @@ class Zend_Gdata_Health_Query extends Zend_Gdata_Query /** * Returns the value set for start-index-in-group. * - * @return int Returns start-index-in-group parameter. + * @return int Returns start-index-in-group parameter. */ public function getStartIndexInGroup() { diff --git a/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php b/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php index bf9cfd1f196..0435bdb2bb8 100644 --- a/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php +++ b/lib/zend/Zend/Gdata/HttpAdapterStreamingProxy.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Http/Client/Adapter/Proxy.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Proxy @@ -59,7 +59,7 @@ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Prox { // If no proxy is set, throw an error if (! $this->config['proxy_host']) { - require_once 'Zend/Http/Client/Adapter/Exception.php'; + require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('No proxy host set!'); } @@ -86,13 +86,13 @@ class Zend_Gdata_HttpAdapterStreamingProxy extends Zend_Http_Client_Adapter_Prox $this->config['proxy_user'], $this->config['proxy_pass'], $this->config['proxy_auth'] ); } - + // if we are proxying HTTPS, preform CONNECT handshake with the proxy if ($uri->getScheme() == 'https' && (! $this->negotiated)) { $this->connectHandshake($uri->getHost(), $uri->getPort(), $http_ver, $headers); $this->negotiated = true; } - + // Save request method for later $this->method = $method; diff --git a/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php b/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php index 49a506dcfce..28c8365a52f 100644 --- a/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php +++ b/lib/zend/Zend/Gdata/HttpAdapterStreamingSocket.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpAdapterStreamingSocket extends Zend_Http_Client_Adapter_Socket diff --git a/lib/zend/Zend/Gdata/HttpClient.php b/lib/zend/Zend/Gdata/HttpClient.php index 4a850e1021c..d4816a41af8 100644 --- a/lib/zend/Zend/Gdata/HttpClient.php +++ b/lib/zend/Zend/Gdata/HttpClient.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Http/Client.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_HttpClient extends Zend_Http_Client @@ -96,7 +96,12 @@ class Zend_Gdata_HttpClient extends Zend_Http_Client */ public function setAuthSubPrivateKeyFile($file, $passphrase = null, $useIncludePath = false) { - $fp = fopen($file, "r", $useIncludePath); + $fp = @fopen($file, "r", $useIncludePath); + if (!$fp) { + require_once 'Zend/Gdata/App/InvalidArgumentException.php'; + throw new Zend_Gdata_App_InvalidArgumentException('Failed to open private key file for AuthSub.'); + } + $key = ''; while (!feof($fp)) { $key .= fread($fp, 8192); @@ -253,7 +258,7 @@ class Zend_Gdata_HttpClient extends Zend_Http_Client */ public function getAdapter() { - return $this->adapter; + return $this->adapter; } /** @@ -267,7 +272,7 @@ class Zend_Gdata_HttpClient extends Zend_Http_Client if ($adapter == null) { $this->adapter = $adapter; } else { - parent::setAdapter($adapter); + parent::setAdapter($adapter); } } @@ -320,11 +325,11 @@ class Zend_Gdata_HttpClient extends Zend_Http_Client * * @return Zend_Http_Client */ - public function resetParameters() + public function resetParameters($clearAll = false) { $this->_streamingRequest = false; - return parent::resetParameters(); + return parent::resetParameters($clearAll); } /** diff --git a/lib/zend/Zend/Gdata/Kind/EventEntry.php b/lib/zend/Zend/Gdata/Kind/EventEntry.php index 4b134e22f8a..f475122c8aa 100644 --- a/lib/zend/Zend/Gdata/Kind/EventEntry.php +++ b/lib/zend/Zend/Gdata/Kind/EventEntry.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -92,7 +92,7 @@ require_once 'Zend/Gdata/Extension/EntryLink.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Kind_EventEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Media.php b/lib/zend/Zend/Gdata/Media.php index ba716be6305..b7f6da6343c 100755 --- a/lib/zend/Zend/Gdata/Media.php +++ b/lib/zend/Zend/Gdata/Media.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Gdata.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Media/Entry.php b/lib/zend/Zend/Gdata/Media/Entry.php index 5dddb78262d..5650c8a8309 100755 --- a/lib/zend/Zend/Gdata/Media/Entry.php +++ b/lib/zend/Zend/Gdata/Media/Entry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaGroup.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Entry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php b/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php index 829695728aa..7f7e39b4c98 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaCategory.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCategory extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php b/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php index c332dfeb0b3..30d69ba5f82 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaContent.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaContent extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php b/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php index 02da2bbe61d..84776bc279e 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaCopyright.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCopyright extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php b/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php index 3058dd6c742..446c5ccd224 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaCredit.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaCredit extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php b/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php index a3ba35a9f9e..2e1a8128fcd 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaDescription.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaDescription extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php b/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php index 1dda30d275a..89ba21e1eec 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaGroup.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -106,7 +106,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaTitle.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaGroup extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php b/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php index f41de8f7f96..abab09de904 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaHash.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaHash extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php b/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php index b481a58008f..34426bc549e 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaKeywords.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaKeywords extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php b/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php index b84013b312f..3b9bb33e02b 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaPlayer.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaPlayer extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php b/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php index 3e986a27717..cc5e87c0150 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaRating.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaRating extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php b/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php index 6756dc789ca..1434397bbf3 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaRestriction.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaRestriction extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaText.php b/lib/zend/Zend/Gdata/Media/Extension/MediaText.php index 4a5eb009fd7..2d67b8f7895 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaText.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaText.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaText extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php b/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php index a6081620493..71f726b133a 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaThumbnail.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaThumbnail extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php b/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php index ecd9b75e09a..d0d75c06e36 100755 --- a/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php +++ b/lib/zend/Zend/Gdata/Media/Extension/MediaTitle.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Extension_MediaTitle extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Media/Feed.php b/lib/zend/Zend/Gdata/Media/Feed.php index a554b6fe33e..5f235d62739 100755 --- a/lib/zend/Zend/Gdata/Media/Feed.php +++ b/lib/zend/Zend/Gdata/Media/Feed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Media/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Media_Feed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/MediaMimeStream.php b/lib/zend/Zend/Gdata/MediaMimeStream.php index 5d25d038408..7588bff41ba 100644 --- a/lib/zend/Zend/Gdata/MediaMimeStream.php +++ b/lib/zend/Zend/Gdata/MediaMimeStream.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/MimeBodyString.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MediaMimeStream diff --git a/lib/zend/Zend/Gdata/MimeBodyString.php b/lib/zend/Zend/Gdata/MimeBodyString.php index 373882356ce..c8230b17578 100644 --- a/lib/zend/Zend/Gdata/MimeBodyString.php +++ b/lib/zend/Zend/Gdata/MimeBodyString.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,9 +25,9 @@ * A wrapper for strings for buffered reading. * * @category Zend - * @package Zend_Gdata_MimeBodyString + * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MimeBodyString diff --git a/lib/zend/Zend/Gdata/MimeFile.php b/lib/zend/Zend/Gdata/MimeFile.php index 381faacc50f..f97ddc3e4f8 100644 --- a/lib/zend/Zend/Gdata/MimeFile.php +++ b/lib/zend/Zend/Gdata/MimeFile.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,9 +25,9 @@ * A wrapper for strings for buffered reading. * * @category Zend - * @package Zend_Gdata_MimeFile + * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_MimeFile diff --git a/lib/zend/Zend/Gdata/Photos.php b/lib/zend/Zend/Gdata/Photos.php index 6c5cbe552fd..eb040e82dd5 100755 --- a/lib/zend/Zend/Gdata/Photos.php +++ b/lib/zend/Zend/Gdata/Photos.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -52,7 +52,7 @@ require_once 'Zend/Gdata/Photos/PhotoFeed.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Photos/AlbumEntry.php b/lib/zend/Zend/Gdata/Photos/AlbumEntry.php index d72f9242154..63f4fa20e29 100755 --- a/lib/zend/Zend/Gdata/Photos/AlbumEntry.php +++ b/lib/zend/Zend/Gdata/Photos/AlbumEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -98,7 +98,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Photos/AlbumFeed.php b/lib/zend/Zend/Gdata/Photos/AlbumFeed.php index 13cd91ae461..3cb55736a4d 100755 --- a/lib/zend/Zend/Gdata/Photos/AlbumFeed.php +++ b/lib/zend/Zend/Gdata/Photos/AlbumFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -46,7 +46,7 @@ require_once 'Zend/Gdata/Photos/AlbumEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Photos/AlbumQuery.php b/lib/zend/Zend/Gdata/Photos/AlbumQuery.php index 27087a1eafd..eef5f2c9440 100755 --- a/lib/zend/Zend/Gdata/Photos/AlbumQuery.php +++ b/lib/zend/Zend/Gdata/Photos/AlbumQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once('Zend/Gdata/Photos/UserQuery.php'); * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery @@ -73,7 +73,7 @@ class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery { $this->_albumId = null; $this->_albumName = $value; - + return $this; } @@ -104,7 +104,7 @@ class Zend_Gdata_Photos_AlbumQuery extends Zend_Gdata_Photos_UserQuery { $this->_albumName = null; $this->_albumId = $value; - + return $this; } diff --git a/lib/zend/Zend/Gdata/Photos/CommentEntry.php b/lib/zend/Zend/Gdata/Photos/CommentEntry.php index 346a329cb91..68c008b77ee 100755 --- a/lib/zend/Zend/Gdata/Photos/CommentEntry.php +++ b/lib/zend/Zend/Gdata/Photos/CommentEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -58,7 +58,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_CommentEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Access.php b/lib/zend/Zend/Gdata/Photos/Extension/Access.php index eebc14e648a..5e91246fb70 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Access.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Access.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Access extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php b/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php index dffb3d5175b..2f348e9ab76 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/AlbumId.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_AlbumId extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php b/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php index 18f8a2e5734..62a937c963c 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/BytesUsed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_BytesUsed extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php b/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php index 1417157121a..61d91d8c8c4 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Checksum.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Checksum extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Client.php b/lib/zend/Zend/Gdata/Photos/Extension/Client.php index a827889d167..7518a1388af 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Client.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Client.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Client extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php b/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php index af4ebad0e50..1e9b2697118 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/CommentCount.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_CommentCount extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php b/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php index 4d1c1b482ab..72021c04a9e 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/CommentingEnabled.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_CommentingEnabled extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Height.php b/lib/zend/Zend/Gdata/Photos/Extension/Height.php index eb3bfb59ee3..211dfd20525 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Height.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Height.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Height extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Id.php b/lib/zend/Zend/Gdata/Photos/Extension/Id.php index 2a63b933526..07ee418b7aa 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Id.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Id.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Id extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Location.php b/lib/zend/Zend/Gdata/Photos/Extension/Location.php index 78295acd2e4..d151374180b 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Location.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Location.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Location extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php b/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php index a2cadd95cff..013c6d70c09 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/MaxPhotosPerAlbum.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_MaxPhotosPerAlbum extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Name.php b/lib/zend/Zend/Gdata/Photos/Extension/Name.php index 7b7fa9778e9..09e77faabc3 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Name.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Name.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Name extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php b/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php index b1b74974176..02a8ed8145e 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Nickname.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Nickname extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php index 25d27eb2ef2..5911e3aa4be 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotos.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_NumPhotos extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php index a82bb5b1047..bf0ac04e7a0 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/NumPhotosRemaining.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_NumPhotosRemaining extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php b/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php index c4611a831ce..88a0196e2a3 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/PhotoId.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_PhotoId extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Position.php b/lib/zend/Zend/Gdata/Photos/Extension/Position.php index 537010147b7..a3ff42afe68 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Position.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Position.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Position extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php b/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php index 7c02ca5e9d1..450a5e32e1e 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/QuotaCurrent.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_QuotaCurrent extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php b/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php index 41d7775f103..29e9f530c71 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/QuotaLimit.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_QuotaLimit extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php b/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php index 56e42e21029..15fac99e826 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Rotation.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Rotation extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Size.php b/lib/zend/Zend/Gdata/Photos/Extension/Size.php index 7043c85ac37..3bd302bf039 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Size.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Size.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Size extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php b/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php index b861a4a1a79..6b02ec2b46b 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Thumbnail.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Thumbnail extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php b/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php index ca018461f3f..baa509db03b 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Timestamp.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Timestamp extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/User.php b/lib/zend/Zend/Gdata/Photos/Extension/User.php index e8864335996..ef81da30ffe 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/User.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/User.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_User extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Version.php b/lib/zend/Zend/Gdata/Photos/Extension/Version.php index 763c123437c..30b8241a0e1 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Version.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Version.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Version extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Weight.php b/lib/zend/Zend/Gdata/Photos/Extension/Weight.php index c4f2ccab66c..fa4a0ac998e 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Weight.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Weight.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Weight extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/Extension/Width.php b/lib/zend/Zend/Gdata/Photos/Extension/Width.php index a545aed68ae..ff7fec0068b 100755 --- a/lib/zend/Zend/Gdata/Photos/Extension/Width.php +++ b/lib/zend/Zend/Gdata/Photos/Extension/Width.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/Photos.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_Extension_Width extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Photos/PhotoEntry.php b/lib/zend/Zend/Gdata/Photos/PhotoEntry.php index 0bea56c574d..00583af3750 100755 --- a/lib/zend/Zend/Gdata/Photos/PhotoEntry.php +++ b/lib/zend/Zend/Gdata/Photos/PhotoEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -113,7 +113,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoEntry extends Zend_Gdata_Media_Entry diff --git a/lib/zend/Zend/Gdata/Photos/PhotoFeed.php b/lib/zend/Zend/Gdata/Photos/PhotoFeed.php index 102eace76f1..0046d76ce11 100755 --- a/lib/zend/Zend/Gdata/Photos/PhotoFeed.php +++ b/lib/zend/Zend/Gdata/Photos/PhotoFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -46,7 +46,7 @@ require_once 'Zend/Gdata/Photos/PhotoEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Photos/PhotoQuery.php b/lib/zend/Zend/Gdata/Photos/PhotoQuery.php index bf37cd8aa81..a4cc3b00f7b 100755 --- a/lib/zend/Zend/Gdata/Photos/PhotoQuery.php +++ b/lib/zend/Zend/Gdata/Photos/PhotoQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once('Zend/Gdata/Photos/AlbumQuery.php'); * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_PhotoQuery extends Zend_Gdata_Photos_AlbumQuery diff --git a/lib/zend/Zend/Gdata/Photos/TagEntry.php b/lib/zend/Zend/Gdata/Photos/TagEntry.php index 5a48b737f46..47d9e6e62ac 100755 --- a/lib/zend/Zend/Gdata/Photos/TagEntry.php +++ b/lib/zend/Zend/Gdata/Photos/TagEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -48,7 +48,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_TagEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Photos/UserEntry.php b/lib/zend/Zend/Gdata/Photos/UserEntry.php index 8e125686cf6..805e70f3b34 100755 --- a/lib/zend/Zend/Gdata/Photos/UserEntry.php +++ b/lib/zend/Zend/Gdata/Photos/UserEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -78,7 +78,7 @@ require_once 'Zend/Gdata/App/Extension/Category.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Photos/UserFeed.php b/lib/zend/Zend/Gdata/Photos/UserFeed.php index 850a1375c8f..a851ae33d0f 100755 --- a/lib/zend/Zend/Gdata/Photos/UserFeed.php +++ b/lib/zend/Zend/Gdata/Photos/UserFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -66,7 +66,7 @@ require_once 'Zend/Gdata/Photos/CommentEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Photos/UserQuery.php b/lib/zend/Zend/Gdata/Photos/UserQuery.php index 605505a463a..ddf80630bb0 100755 --- a/lib/zend/Zend/Gdata/Photos/UserQuery.php +++ b/lib/zend/Zend/Gdata/Photos/UserQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once('Zend/Gdata/Gapps/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Photos - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query @@ -50,7 +50,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query * @var string */ protected $_projection = 'api'; - + /** * Indicates whether to request a feed or entry in queries. Default * value is 'feed'; @@ -58,7 +58,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query * @var string */ protected $_type = 'feed'; - + /** * A string which, if not null, indicates which user should * be retrieved by this query. If null, the default user will be used @@ -67,7 +67,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query * @var string */ protected $_user = Zend_Gdata_Photos::DEFAULT_USER; - + /** * Create a new Query object with default values. */ @@ -75,9 +75,9 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query { parent::__construct(); } - + /** - * Set's the format of data returned in Atom feeds. Can be either + * Set's the format of data returned in Atom feeds. Can be either * 'api' or 'base'. Normally, 'api' will be desired. Default is 'api'. * * @param string $value @@ -99,9 +99,9 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query { return $this->_projection; } - + /** - * Set's the type of data returned in queries. Can be either + * Set's the type of data returned in queries. Can be either * 'feed' or 'entry'. Normally, 'feed' will be desired. Default is 'feed'. * * @param string $value @@ -153,13 +153,13 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query } /** - * Set the visibility filter for entries returned. Only entries which - * match this value will be returned. If null or unset, the default + * Set the visibility filter for entries returned. Only entries which + * match this value will be returned. If null or unset, the default * value will be used instead. - * - * Valid values are 'all' (default), 'public', and 'private'. * - * @param string $value The visibility to filter by, or null to use the + * Valid values are 'all' (default), 'public', and 'private'. + * + * @param string $value The visibility to filter by, or null to use the * default value. */ public function setAccess($value) @@ -184,10 +184,10 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query } /** - * Set the tag for entries that are returned. Only entries which + * Set the tag for entries that are returned. Only entries which * match this value will be returned. If null or unset, this filter will * not be applied. - * + * * See http://code.google.com/apis/picasaweb/reference.html#Parameters * for a list of valid values. * @@ -214,12 +214,12 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query { return $this->_params['tag']; } - + /** - * Set the kind of entries that are returned. Only entries which + * Set the kind of entries that are returned. Only entries which * match this value will be returned. If null or unset, this filter will * not be applied. - * + * * See http://code.google.com/apis/picasaweb/reference.html#Parameters * for a list of valid values. * @@ -246,12 +246,12 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query { return $this->_params['kind']; } - + /** - * Set the maximum image size for entries returned. Only entries which + * Set the maximum image size for entries returned. Only entries which * match this value will be returned. If null or unset, this filter will * not be applied. - * + * * See http://code.google.com/apis/picasaweb/reference.html#Parameters * for a list of valid values. * @@ -278,12 +278,12 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query { return $this->_params['imgmax']; } - + /** - * Set the thumbnail size filter for entries returned. Only entries which + * Set the thumbnail size filter for entries returned. Only entries which * match this value will be returned. If null or unset, this filter will * not be applied. - * + * * See http://code.google.com/apis/picasaweb/reference.html#Parameters * for a list of valid values. * @@ -310,7 +310,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query { return $this->_params['thumbsize']; } - + /** * Returns the URL generated for this query, based on it's current * parameters. @@ -321,7 +321,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query public function getQueryUrl($incomingUri = null) { $uri = Zend_Gdata_Photos::PICASA_BASE_URI; - + if ($this->getType() !== null) { $uri .= '/' . $this->getType(); } else { @@ -329,7 +329,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query throw new Zend_Gdata_App_InvalidArgumentException( 'Type must be feed or entry, not null'); } - + if ($this->getProjection() !== null) { $uri .= '/' . $this->getProjection(); } else { @@ -337,7 +337,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query throw new Zend_Gdata_App_InvalidArgumentException( 'Projection must not be null'); } - + if ($this->getUser() !== null) { $uri .= '/user/' . $this->getUser(); } else { @@ -346,7 +346,7 @@ class Zend_Gdata_Photos_UserQuery extends Zend_Gdata_Query throw new Zend_Gdata_App_InvalidArgumentException( 'User must not be null'); } - + $uri .= $incomingUri; $uri .= $this->getQueryString(); return $uri; diff --git a/lib/zend/Zend/Gdata/Query.php b/lib/zend/Zend/Gdata/Query.php index 6235244cb0a..2b35357fa05 100644 --- a/lib/zend/Zend/Gdata/Query.php +++ b/lib/zend/Zend/Gdata/Query.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Gdata/App/Util.php'; * @category Zend * @package Zend_Gdata * @subpackage Gdata - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Query diff --git a/lib/zend/Zend/Gdata/Spreadsheets.php b/lib/zend/Zend/Gdata/Spreadsheets.php index db7a87a57a0..83346b126f7 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets.php +++ b/lib/zend/Zend/Gdata/Spreadsheets.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -89,7 +89,7 @@ require_once('Zend/Gdata/Spreadsheets/CellQuery.php'); * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets extends Zend_Gdata diff --git a/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php index e00dc437489..d2a9176d7d3 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/CellEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/Cell.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php index efc9f35164b..b46a930d1d3 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/CellFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -41,7 +41,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php b/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php index 0523db07a91..9663df15b85 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/CellQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_CellQuery extends Zend_Gdata_Query diff --git a/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php b/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php index 9965b11c724..c5a54ad46b1 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/DocumentQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query @@ -224,14 +224,14 @@ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for document queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for document queries.'); } @@ -250,7 +250,7 @@ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query if ($this->_documentType != null) { $uri .= '/'.$this->_documentType; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A document type must be provided for document queries.'); } @@ -263,7 +263,7 @@ class Zend_Gdata_Spreadsheets_DocumentQuery extends Zend_Gdata_Query if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for worksheet document queries.'); } $uri .= $this->appendVisibilityProjection(); diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php index 82860802971..748f7382d45 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Cell.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_Cell extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php index 8827bb27edc..741031b89e4 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/ColCount.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_ColCount extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php index 09d42a2a6ba..e1a356f3ebb 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/Custom.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_Custom extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php b/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php index 2408deb2c79..416d9d05834 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/Extension/RowCount.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_Extension_RowCount extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php index 2626e14645c..575fde96195 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/ListEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/Custom.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php index a67fcc2f458..292fc8b42e7 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/ListFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php b/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php index e8204f20c2a..b61455f1919 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/ListQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query @@ -260,28 +260,28 @@ class Zend_Gdata_Spreadsheets_ListQuery extends Zend_Gdata_Query if ($this->_spreadsheetKey != null) { $uri .= '/'.$this->_spreadsheetKey; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A spreadsheet key must be provided for list queries.'); } if ($this->_worksheetId != null) { $uri .= '/'.$this->_worksheetId; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A worksheet id must be provided for list queries.'); } if ($this->_visibility != null) { $uri .= '/'.$this->_visibility; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A visibility must be provided for list queries.'); } if ($this->_projection != null) { $uri .= '/'.$this->_projection; } else { - require_once 'Zend/Gdata/App/Exception.php'; + require_once 'Zend/Gdata/App/Exception.php'; throw new Zend_Gdata_App_Exception('A projection must be provided for list queries.'); } diff --git a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php index a7fc3eb99ce..595bcca80e3 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Entry.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_SpreadsheetEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php index db14177ad10..570ac69d6ac 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/SpreadsheetFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_SpreadsheetFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php index dba88804905..421fb31e30d 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/Spreadsheets/Extension/ColCount.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_WorksheetEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php index c950f8a40e0..960da8da0ce 100644 --- a/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php +++ b/lib/zend/Zend/Gdata/Spreadsheets/WorksheetFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Gdata/Feed.php'; * @category Zend * @package Zend_Gdata * @subpackage Spreadsheets - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_Spreadsheets_WorksheetFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/YouTube.php b/lib/zend/Zend/Gdata/YouTube.php index f7be0b73d9e..6383b12a081 100644 --- a/lib/zend/Zend/Gdata/YouTube.php +++ b/lib/zend/Zend/Gdata/YouTube.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -79,7 +79,7 @@ require_once 'Zend/Gdata/YouTube/InboxFeed.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube extends Zend_Gdata_Media diff --git a/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php b/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php index a67d6df5fb3..c4f0e09acad 100644 --- a/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/ActivityEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Health - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -49,7 +49,7 @@ require_once 'Zend/Gdata/Extension/Rating.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ActivityEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php b/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php index 16f918b349f..b4c99edfd82 100644 --- a/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/ActivityFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/YouTube/ActivityEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ActivityFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/CommentEntry.php b/lib/zend/Zend/Gdata/YouTube/CommentEntry.php index 3895e3c3a0a..3740d6bbab5 100644 --- a/lib/zend/Zend/Gdata/YouTube/CommentEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/CommentEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,12 +27,12 @@ require_once 'Zend/Gdata/Media/Feed.php'; /** - * The YouTube comments flavor of an Atom Entry + * The YouTube comments flavor of an Atom Entry * * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_CommentEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/YouTube/CommentFeed.php b/lib/zend/Zend/Gdata/YouTube/CommentFeed.php index 584794e54a0..ae3af46d58e 100644 --- a/lib/zend/Zend/Gdata/YouTube/CommentFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/CommentFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/CommentEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_CommentFeed extends Zend_Gdata_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/ContactEntry.php b/lib/zend/Zend/Gdata/YouTube/ContactEntry.php index e791cb40a80..1ee12776f60 100644 --- a/lib/zend/Zend/Gdata/YouTube/ContactEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/ContactEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Status.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ContactEntry extends Zend_Gdata_YouTube_UserProfileEntry diff --git a/lib/zend/Zend/Gdata/YouTube/ContactFeed.php b/lib/zend/Zend/Gdata/YouTube/ContactFeed.php index 6d0e09c3ff8..2b75b2c74bc 100644 --- a/lib/zend/Zend/Gdata/YouTube/ContactFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/ContactFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/ContactEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_ContactFeed extends Zend_Gdata_Media_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php b/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php index cc629ac7bbc..2dfcfae3117 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/AboutMe.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_AboutMe extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Age.php b/lib/zend/Zend/Gdata/YouTube/Extension/Age.php index 799dac83790..d45ddaadc91 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Age.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Age.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Age extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Books.php b/lib/zend/Zend/Gdata/YouTube/Extension/Books.php index 6444aac963d..d87de9bbb3b 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Books.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Books.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Books extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Company.php b/lib/zend/Zend/Gdata/YouTube/Extension/Company.php index ebf860e5663..f6fa367d4c7 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Company.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Company.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Company extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Control.php b/lib/zend/Zend/Gdata/YouTube/Extension/Control.php index d4eae13847e..b1f8266f634 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Control.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Control.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/Extension/State.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Control extends Zend_Gdata_App_Extension_Control diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php b/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php index 2118d6c454b..c80462e5bfa 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/CountHint.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_CountHint extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Description.php b/lib/zend/Zend/Gdata/YouTube/Extension/Description.php index 7f637d131e3..fd6bb2a4259 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Description.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Description.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Description extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php b/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php index 49c40095d68..9a52c9c8c6d 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Duration.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Duration extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php b/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php index b2df77f2ffb..09f5e9403eb 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/FirstName.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_FirstName extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php b/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php index caf4cd5b272..b94c4e0e8a9 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Gender.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Gender extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php b/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php index 81e8ddaa179..fe6c80e0e0d 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Hobbies.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Hobbies extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php b/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php index fff840960fb..bec3b84d659 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Hometown.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Hometown extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php b/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php index 1511853c99a..d6f3bce62ba 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/LastName.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_LastName extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Link.php b/lib/zend/Zend/Gdata/YouTube/Extension/Link.php index 95be72e105a..bf79e2132c9 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Link.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Link.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Token.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Link extends Zend_Gdata_App_Extension_Link diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Location.php b/lib/zend/Zend/Gdata/YouTube/Extension/Location.php index b53733c217f..7882e661e12 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Location.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Location.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Location extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php index b4722a7bb8c..3966314418a 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaContent.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaContent.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaContent extends Zend_Gdata_Media_Extension_MediaContent diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php index 51eea762908..2d1db859673 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaCredit.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/App/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaCredit extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php index c6ee5c7dbde..a2141bd7e1f 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaGroup.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -70,7 +70,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Uploaded.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaGroup extends Zend_Gdata_Media_Extension_MediaGroup diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php b/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php index a96ec4eafb1..6534e66d7a0 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/MediaRating.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage Media - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_MediaRating extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php b/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php index db999b20491..349ab8396c3 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Movies.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Movies extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Music.php b/lib/zend/Zend/Gdata/YouTube/Extension/Music.php index c781835681b..d1601a5237c 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Music.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Music.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Music extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php b/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php index c621be18a70..dfa3608260a 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/NoEmbed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_NoEmbed extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php b/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php index 59a81630fbb..289e920d8db 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Occupation.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Occupation extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php index c6ee4e2727d..98b0729d342 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistId.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_PlaylistId extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php index 8725097a26b..41228e246ad 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/PlaylistTitle.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_PlaylistTitle extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Position.php b/lib/zend/Zend/Gdata/YouTube/Extension/Position.php index f5871507e1f..401b3cda48b 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Position.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Position.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Position extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Private.php b/lib/zend/Zend/Gdata/YouTube/Extension/Private.php index 7bacd41b4b8..2ccfb5c3e53 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Private.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Private.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Private extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php b/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php index 07b9591bb86..fa959c9bc36 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/QueryString.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_QueryString extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php b/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php index 89a2f674194..198d1d51d6a 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Racy.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Racy extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php b/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php index 44194c3918d..414fb67e600 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Recorded.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Recorded extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php b/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php index ba75a819a7c..0fa3b599e38 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Relationship.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Relationship extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php b/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php index 577843bcddb..fa0fa98fbb3 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/ReleaseDate.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_ReleaseDate extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/School.php b/lib/zend/Zend/Gdata/YouTube/Extension/School.php index cc5276a2dad..ffcc7d58e51 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/School.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/School.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_School extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/State.php b/lib/zend/Zend/Gdata/YouTube/Extension/State.php index 1481e261d75..c4f632afc17 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/State.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/State.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_State extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php b/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php index ac62b0a5504..94f29ccf3ad 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Statistics.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension @@ -67,7 +67,7 @@ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension * who have subscribed to a particular user's YouTube channel. * The subscriberCount attribute is only specified when the * tag appears within a user profile entry. - * + * * @var integer */ protected $_subscriberCount = null; @@ -213,7 +213,7 @@ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension * Set the value for this element's videoWatchCount attribute. * * @param int $value The desired value for this attribute. - * @return Zend_Gdata_YouTube_Extension_Statistics The element being + * @return Zend_Gdata_YouTube_Extension_Statistics The element being * modified. */ public function setVideoWatchCount($value) @@ -236,7 +236,7 @@ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension * Set the value for this element's subscriberCount attribute. * * @param int $value The desired value for this attribute. - * @return Zend_Gdata_YouTube_Extension_Statistics The element being + * @return Zend_Gdata_YouTube_Extension_Statistics The element being * modified. */ public function setSubscriberCount($value) @@ -259,7 +259,7 @@ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension * Set the value for this element's lastWebAccess attribute. * * @param int $value The desired value for this attribute. - * @return Zend_Gdata_YouTube_Extension_Statistics The element being + * @return Zend_Gdata_YouTube_Extension_Statistics The element being * modified. */ public function setLastWebAccess($value) @@ -282,7 +282,7 @@ class Zend_Gdata_YouTube_Extension_Statistics extends Zend_Gdata_Extension * Set the value for this element's favoriteCount attribute. * * @param int $value The desired value for this attribute. - * @return Zend_Gdata_YouTube_Extension_Statistics The element being + * @return Zend_Gdata_YouTube_Extension_Statistics The element being * modified. */ public function setFavoriteCount($value) diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Status.php b/lib/zend/Zend/Gdata/YouTube/Extension/Status.php index ed9529d4fa8..33d28bf9c54 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Status.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Status.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Status extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Token.php b/lib/zend/Zend/Gdata/YouTube/Extension/Token.php index 16a4d56f1c7..d45ca1321f3 100755 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Token.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Token.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Token extends Zend_Gdata_App_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php b/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php index 8789d63a82a..b65def761b5 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Uploaded.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Uploaded extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/Username.php b/lib/zend/Zend/Gdata/YouTube/Extension/Username.php index 636fbffd11a..4f13a58b218 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/Username.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/Username.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_Username extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php b/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php index 18d9af18d10..ce366ed22bf 100644 --- a/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php +++ b/lib/zend/Zend/Gdata/YouTube/Extension/VideoId.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Gdata/Extension.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_Extension_VideoId extends Zend_Gdata_Extension diff --git a/lib/zend/Zend/Gdata/YouTube/InboxEntry.php b/lib/zend/Zend/Gdata/YouTube/InboxEntry.php index cff4d079bbd..38159cb00d9 100644 --- a/lib/zend/Zend/Gdata/YouTube/InboxEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/InboxEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -53,7 +53,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Description.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_InboxEntry extends Zend_Gdata_Media_Entry diff --git a/lib/zend/Zend/Gdata/YouTube/InboxFeed.php b/lib/zend/Zend/Gdata/YouTube/InboxFeed.php index 393a2b2d0af..22957bae397 100644 --- a/lib/zend/Zend/Gdata/YouTube/InboxFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/InboxFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/InboxEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_InboxFeed extends Zend_Gdata_Media_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/MediaEntry.php b/lib/zend/Zend/Gdata/YouTube/MediaEntry.php index 490e12201e0..955405bf423 100755 --- a/lib/zend/Zend/Gdata/YouTube/MediaEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/MediaEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -42,7 +42,7 @@ require_once 'Zend/Gdata/YouTube/Extension/MediaGroup.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_MediaEntry extends Zend_Gdata_Media_Entry diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php b/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php index 7f1902fa21a..af31a3ecaa1 100644 --- a/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/PlaylistListEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -57,7 +57,7 @@ require_once 'Zend/Gdata/YouTube/Extension/CountHint.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry @@ -86,7 +86,7 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry * @var Zend_Gdata_YouTube_Extension_PlaylistId */ protected $_playlistId = null; - + /** * CountHint for this playlist. * @@ -193,7 +193,7 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry /** * Returns the description relating to the video. * - * @return Zend_Gdata_YouTube_Extension_Description The description + * @return Zend_Gdata_YouTube_Extension_Description The description * relating to the video */ public function getDescription() @@ -209,7 +209,7 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry * Returns the countHint relating to the playlist. * * The countHint is the number of videos on a playlist. - * + * * @throws Zend_Gdata_App_VersionException * @return Zend_Gdata_YouTube_Extension_CountHint The count of videos on * a playlist. @@ -219,7 +219,7 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { require_once 'Zend/Gdata/App/VersionException.php'; - throw new Zend_Gdata_App_VersionException('The yt:countHint ' . + throw new Zend_Gdata_App_VersionException('The yt:countHint ' . 'element is not supported in versions earlier than 2.'); } else { return $this->_countHint; @@ -228,7 +228,7 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry /** * Returns the Id relating to the playlist. - * + * * @throws Zend_Gdata_App_VersionException * @return Zend_Gdata_YouTube_Extension_PlaylistId The id of this playlist. */ @@ -237,7 +237,7 @@ class Zend_Gdata_YouTube_PlaylistListEntry extends Zend_Gdata_Entry if (($this->getMajorProtocolVersion() == null) || ($this->getMajorProtocolVersion() == 1)) { require_once 'Zend/Gdata/App/VersionException.php'; - throw new Zend_Gdata_App_VersionException('The yt:playlistId ' . + throw new Zend_Gdata_App_VersionException('The yt:playlistId ' . 'element is not supported in versions earlier than 2.'); } else { return $this->_playlistId; diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php b/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php index ca3e9b026e7..53ba84a2510 100644 --- a/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/PlaylistListFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/PlaylistListEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistListFeed extends Zend_Gdata_Media_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php index b55de28825c..90af2fe788f 100644 --- a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Position.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistVideoEntry extends Zend_Gdata_YouTube_VideoEntry diff --git a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php index b6ff7f28624..b429ba9274b 100644 --- a/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/PlaylistVideoFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/PlaylistVideoEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_PlaylistVideoFeed extends Zend_Gdata_Media_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php b/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php index 8b38115cce4..294358bc910 100644 --- a/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/SubscriptionEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -72,7 +72,7 @@ require_once 'Zend/Gdata/YouTube/Extension/QueryString.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry @@ -86,35 +86,35 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry * @var array */ protected $_feedLink = array(); - + /** * The username of this entry. * * @var Zend_Gdata_YouTube_Extension_Username */ protected $_username = null; - + /** * The playlist title for this entry. - * + * * This element is only used on subscriptions to playlists. * * @var Zend_Gdata_YouTube_Extension_PlaylistTitle */ protected $_playlistTitle = null; - + /** * The playlist id for this entry. - * + * * This element is only used on subscriptions to playlists. * * @var Zend_Gdata_YouTube_Extension_PlaylistId */ protected $_playlistId = null; - + /** * The media:thumbnail element for this entry. - * + * * This element is only used on subscriptions to playlists. * * @var Zend_Gdata_Media_Extension_MediaThumbnail @@ -276,7 +276,7 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry return null; } } - + /** * Get the playlist title for a 'playlist' subscription. * @@ -299,7 +299,7 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry /** * Sets the yt:playlistId element for a new playlist subscription. * - * @param Zend_Gdata_YouTube_Extension_PlaylistId $id The id of + * @param Zend_Gdata_YouTube_Extension_PlaylistId $id The id of * the playlist to which to subscribe to. * @throws Zend_Gdata_App_VersionException * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface @@ -363,7 +363,7 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry /** * Sets the yt:playlistTitle element for a new playlist subscription. * - * @param Zend_Gdata_YouTube_Extension_PlaylistTitle $title The title of + * @param Zend_Gdata_YouTube_Extension_PlaylistTitle $title The title of * the playlist to which to subscribe to. * @throws Zend_Gdata_App_VersionException * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface @@ -419,7 +419,7 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry return $this->_mediaThumbnail; } } - + /** * Get the username for a channel subscription. * @@ -433,7 +433,7 @@ class Zend_Gdata_YouTube_SubscriptionEntry extends Zend_Gdata_Entry /** * Sets the username for a new channel subscription. * - * @param Zend_Gdata_YouTube_Extension_Username $username The username of + * @param Zend_Gdata_YouTube_Extension_Username $username The username of * the channel to which to subscribe to. * @return Zend_Gdata_YouTube_SubscriptionEntry Provides a fluent interface */ diff --git a/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php b/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php index 9242c44c326..a59828d11c6 100644 --- a/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/SubscriptionFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Gdata/YouTube/SubscriptionEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_SubscriptionFeed extends Zend_Gdata_Media_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php b/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php index a83d4dddf54..1d6846d029d 100644 --- a/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/UserProfileEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -132,7 +132,7 @@ require_once 'Zend/Gdata/Media/Extension/MediaThumbnail.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_UserProfileEntry extends Zend_Gdata_Entry diff --git a/lib/zend/Zend/Gdata/YouTube/VideoEntry.php b/lib/zend/Zend/Gdata/YouTube/VideoEntry.php index 0389df4c723..41d1cb9051d 100644 --- a/lib/zend/Zend/Gdata/YouTube/VideoEntry.php +++ b/lib/zend/Zend/Gdata/YouTube/VideoEntry.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -92,7 +92,7 @@ require_once 'Zend/Gdata/YouTube/Extension/Location.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoEntry extends Zend_Gdata_YouTube_MediaEntry diff --git a/lib/zend/Zend/Gdata/YouTube/VideoFeed.php b/lib/zend/Zend/Gdata/YouTube/VideoFeed.php index fb2c1ed144f..dd3ce7601b1 100644 --- a/lib/zend/Zend/Gdata/YouTube/VideoFeed.php +++ b/lib/zend/Zend/Gdata/YouTube/VideoFeed.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Gdata/YouTube/VideoEntry.php'; * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoFeed extends Zend_Gdata_Media_Feed diff --git a/lib/zend/Zend/Gdata/YouTube/VideoQuery.php b/lib/zend/Zend/Gdata/YouTube/VideoQuery.php index 03ca966a595..7105b79867b 100644 --- a/lib/zend/Zend/Gdata/YouTube/VideoQuery.php +++ b/lib/zend/Zend/Gdata/YouTube/VideoQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once('Zend/Gdata/Query.php'); * @category Zend * @package Zend_Gdata * @subpackage YouTube - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query @@ -140,7 +140,7 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query $temp = trim($param); // strip off the optional exclamation mark for numeric check if (substr($temp, -1) == '!') { - $temp = substr($temp, -1); + $temp = substr($temp, 0, -1); } if (!is_numeric($temp)) { require_once 'Zend/Gdata/App/InvalidArgumentException.php'; @@ -177,7 +177,7 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query public function setLocationRadius($value) { switch($value) { - case null: + case null: unset($this->_params['location-radius']); default: $this->_params['location-radius'] = $value; @@ -335,11 +335,11 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query */ public function setSafeSearch($value) { - switch ($value) { + switch ($value) { case 'none': $this->_params['safeSearch'] = 'none'; break; - case 'moderate': + case 'moderate': $this->_params['safeSearch'] = 'moderate'; break; case 'strict': @@ -352,7 +352,7 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query throw new Zend_Gdata_App_InvalidArgumentException( 'The safeSearch parameter only supports the values '. '\'none\', \'moderate\' or \'strict\'.'); - } + } } /** @@ -363,9 +363,9 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query */ public function getSafeSearch() { - if (array_key_exists('safeSearch', $this->_params)) { - return $this->_params['safeSearch']; - } + if (array_key_exists('safeSearch', $this->_params)) { + return $this->_params['safeSearch']; + } return $this; } @@ -470,7 +470,7 @@ class Zend_Gdata_YouTube_VideoQuery extends Zend_Gdata_Query } break; - case 'racy': + case 'racy': if ($majorProtocolVersion == 2) { require_once 'Zend/Gdata/App/VersionException.php'; throw new Zend_Gdata_App_VersionException("The $name " . diff --git a/lib/zend/Zend/Http/Client.php b/lib/zend/Zend/Http/Client.php index 8fbb4267054..b3f26bd7152 100644 --- a/lib/zend/Zend/Http/Client.php +++ b/lib/zend/Zend/Http/Client.php @@ -17,7 +17,7 @@ * @package Zend_Http * @subpackage Client * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -44,6 +44,11 @@ require_once 'Zend/Http/Client/Adapter/Interface.php'; */ require_once 'Zend/Http/Response.php'; +/** + * @see Zend_Http_Response_Stream + */ +require_once 'Zend/Http/Response/Stream.php'; + /** * Zend_Http_Client is an implemetation of an HTTP client in PHP. The client * supports basic features like sending different HTTP requests and handling @@ -55,7 +60,7 @@ require_once 'Zend/Http/Response.php'; * @package Zend_Http * @subpackage Client * @throws Zend_Http_Client_Exception - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client @@ -71,6 +76,7 @@ class Zend_Http_Client const TRACE = 'TRACE'; const OPTIONS = 'OPTIONS'; const CONNECT = 'CONNECT'; + const MERGE = 'MERGE'; /** * Supported HTTP Authentication methods @@ -110,7 +116,9 @@ class Zend_Http_Client 'httpversion' => self::HTTP_1, 'keepalive' => false, 'storeresponse' => true, - 'strict' => true + 'strict' => true, + 'output_stream' => false, + 'encodecookies' => true, ); /** @@ -125,7 +133,7 @@ class Zend_Http_Client * * @var Zend_Uri_Http */ - protected $uri; + protected $uri = null; /** * Associative array of request headers @@ -267,6 +275,11 @@ class Zend_Http_Client throw new Zend_Http_Client_Exception('Passed parameter is not a valid HTTP URI.'); } + // Set auth if username and password has been specified in the uri + if ($uri->getUsername() && $uri->getPassword()) { + $this->setAuth($uri->getUsername(), $uri->getPassword()); + } + // We have no ports, set the defaults if (! $uri->getPort()) { $uri->setPort(($uri->getScheme() == 'https' ? 443 : 80)); @@ -536,6 +549,11 @@ class Zend_Http_Client if ($user === false || $user === null) { $this->auth = null; + // Clear the auth information in the uri instance as well + if ($this->uri instanceof Zend_Uri_Http) { + $this->getUri()->setUsername(''); + $this->getUri()->setPassword(''); + } // Else, set up authentication } else { // Check we got a proper authentication type @@ -623,7 +641,7 @@ class Zend_Http_Client return $this; } - if ($value !== null) { + if ($value !== null && $this->config['encodecookies']) { $value = urlencode($value); } @@ -631,7 +649,9 @@ class Zend_Http_Client if ($cookie instanceof Zend_Http_Cookie) { $this->cookiejar->addCookie($cookie); } elseif (is_string($cookie) && $value !== null) { - $cookie = Zend_Http_Cookie::fromString("{$cookie}={$value}", $this->uri); + $cookie = Zend_Http_Cookie::fromString("{$cookie}={$value}", + $this->uri, + $this->config['encodecookies']); $this->cookiejar->addCookie($cookie); } } else { @@ -726,7 +746,9 @@ class Zend_Http_Client * 2. For backwards compatibilty: If someone uses the old post($data) method. * this method will be used to set the encoded data. * - * @param string $data + * $data can also be stream (such as file) from which the data will be read. + * + * @param string|resource $data * @param string $enctype * @return Zend_Http_Client */ @@ -734,7 +756,13 @@ class Zend_Http_Client { $this->raw_post_data = $data; $this->setEncType($enctype); - + if (is_resource($data)) { + // We've got stream data + $stat = @fstat($data); + if($stat) { + $this->setHeaders(self::CONTENT_LENGTH, $stat['size']); + } + } return $this; } @@ -744,9 +772,13 @@ class Zend_Http_Client * Should be used to reset the request parameters if the client is * used for several concurrent requests. * + * clearAll parameter controls if we clean just parameters or also + * headers and last_* + * + * @param bool $clearAll Should all data be cleared? * @return Zend_Http_Client */ - public function resetParameters() + public function resetParameters($clearAll = false) { // Reset parameter data $this->paramsGet = array(); @@ -754,12 +786,18 @@ class Zend_Http_Client $this->files = array(); $this->raw_post_data = null; - // Clear outdated headers - if (isset($this->headers[strtolower(self::CONTENT_TYPE)])) { - unset($this->headers[strtolower(self::CONTENT_TYPE)]); - } - if (isset($this->headers[strtolower(self::CONTENT_LENGTH)])) { - unset($this->headers[strtolower(self::CONTENT_LENGTH)]); + if($clearAll) { + $this->headers = array(); + $this->last_request = null; + $this->last_response = null; + } else { + // Clear outdated headers + if (isset($this->headers[strtolower(self::CONTENT_TYPE)])) { + unset($this->headers[strtolower(self::CONTENT_TYPE)]); + } + if (isset($this->headers[strtolower(self::CONTENT_LENGTH)])) { + unset($this->headers[strtolower(self::CONTENT_LENGTH)]); + } } return $this; @@ -808,7 +846,7 @@ class Zend_Http_Client } catch (Zend_Exception $e) { /** @see Zend_Http_Client_Exception */ require_once 'Zend/Http/Client/Exception.php'; - throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}"); + throw new Zend_Http_Client_Exception("Unable to load adapter '$adapter': {$e->getMessage()}", 0, $e); } } @@ -827,6 +865,62 @@ class Zend_Http_Client $this->adapter->setConfig($config); } + /** + * Load the connection adapter + * + * @return Zend_Http_Client_Adapter_Interface $adapter + */ + public function getAdapter() + { + return $this->adapter; + } + + /** + * Set streaming for received data + * + * @param string|boolean $streamfile Stream file, true for temp file, false/null for no streaming + * @return Zend_Http_Client + */ + public function setStream($streamfile = true) + { + $this->setConfig(array("output_stream" => $streamfile)); + return $this; + } + + /** + * Get status of streaming for received data + * @return boolean|string + */ + public function getStream() + { + return $this->config["output_stream"]; + } + + /** + * Create temporary stream + * + * @return resource + */ + protected function _openTempStream() + { + $this->_stream_name = $this->config['output_stream']; + if(!is_string($this->_stream_name)) { + // If name is not given, create temp name + $this->_stream_name = tempnam(isset($this->config['stream_tmp_dir'])?$this->config['stream_tmp_dir']:sys_get_temp_dir(), + 'Zend_Http_Client'); + } + + if (false === ($fp = @fopen($this->_stream_name, "w+b"))) { + if ($this->adapter instanceof Zend_Http_Client_Adapter_Interface) { + $this->adapter->close(); + } + require_once 'Zend/Http/Client/Exception.php'; + throw new Zend_Http_Client_Exception("Could not open temp file {$this->_stream_name}"); + } + + return $fp; + } + /** * Send the HTTP request and return an HTTP response object * @@ -870,10 +964,28 @@ class Zend_Http_Client $body = $this->_prepareBody(); $headers = $this->_prepareHeaders(); + // check that adapter supports streaming before using it + if(is_resource($body) && !($this->adapter instanceof Zend_Http_Client_Adapter_Stream)) { + /** @see Zend_Http_Client_Exception */ + require_once 'Zend/Http/Client/Exception.php'; + throw new Zend_Http_Client_Exception('Adapter does not support streaming'); + } + // Open the connection, send the request and read the response $this->adapter->connect($uri->getHost(), $uri->getPort(), ($uri->getScheme() == 'https' ? true : false)); + if($this->config['output_stream']) { + if($this->adapter instanceof Zend_Http_Client_Adapter_Stream) { + $stream = $this->_openTempStream(); + $this->adapter->setOutputStream($stream); + } else { + /** @see Zend_Http_Client_Exception */ + require_once 'Zend/Http/Client/Exception.php'; + throw new Zend_Http_Client_Exception('Adapter does not support streaming'); + } + } + $this->last_request = $this->adapter->write($this->method, $uri, $this->config['httpversion'], $headers, $body); @@ -884,7 +996,20 @@ class Zend_Http_Client throw new Zend_Http_Client_Exception('Unable to read response, or response is empty'); } - $response = Zend_Http_Response::fromString($response); + if($this->config['output_stream']) { + rewind($stream); + // cleanup the adapter + $this->adapter->setOutputStream(null); + $response = Zend_Http_Response_Stream::fromStream($response, $stream); + $response->setStreamName($this->_stream_name); + if(!is_string($this->config['output_stream'])) { + // we used temp name, will need to clean up + $response->setCleanup(true); + } + } else { + $response = Zend_Http_Response::fromString($response); + } + if ($this->config['storeresponse']) { $this->last_response = $response; } @@ -1039,6 +1164,9 @@ class Zend_Http_Client return ''; } + if (isset($this->raw_post_data) && is_resource($this->raw_post_data)) { + return $this->raw_post_data; + } // If mbstring overloads substr and strlen functions, we have to // override it's internal encoding if (function_exists('mb_internal_encoding') && diff --git a/lib/zend/Zend/Http/Client/Adapter/Curl.php b/lib/zend/Zend/Http/Client/Adapter/Curl.php index c8359d77530..7f5a632a8e6 100644 --- a/lib/zend/Zend/Http/Client/Adapter/Curl.php +++ b/lib/zend/Zend/Http/Client/Adapter/Curl.php @@ -17,15 +17,23 @@ * @package Zend_Http * @subpackage Client_Adapter * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -/** Zend_Uri_Http */ +/** + * @see Zend_Uri_Http + */ require_once 'Zend/Uri/Http.php'; -/** Zend_Http_Client_Adapter_Interface */ +/** + * @see Zend_Http_Client_Adapter_Interface + */ require_once 'Zend/Http/Client/Adapter/Interface.php'; +/** + * @see Zend_Http_Client_Adapter_Stream + */ +require_once 'Zend/Http/Client/Adapter/Stream.php'; /** * An adapter class for Zend_Http_Client based on the curl extension. @@ -34,10 +42,10 @@ require_once 'Zend/Http/Client/Adapter/Interface.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interface +class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream { /** * Parameters array @@ -65,23 +73,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac * * @var array */ - protected $_invalidOverwritableCurlOptions = array( - CURLOPT_HTTPGET, - CURLOPT_POST, - CURLOPT_PUT, - CURLOPT_CUSTOMREQUEST, - CURLOPT_HEADER, - CURLOPT_RETURNTRANSFER, - CURLOPT_HTTPHEADER, - CURLOPT_POSTFIELDS, - CURLOPT_INFILE, - CURLOPT_INFILESIZE, - CURLOPT_PORT, - CURLOPT_MAXREDIRS, - CURLOPT_TIMEOUT, - CURL_HTTP_VERSION_1_1, - CURL_HTTP_VERSION_1_0, - ); + protected $_invalidOverwritableCurlOptions; /** * Response gotten from server @@ -90,6 +82,13 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac */ protected $_response = null; + /** + * Stream for storing output + * + * @var resource + */ + protected $out_stream; + /** * Adapter constructor * @@ -104,6 +103,23 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('cURL extension has to be loaded to use this Zend_Http_Client adapter.'); } + $this->_invalidOverwritableCurlOptions = array( + CURLOPT_HTTPGET, + CURLOPT_POST, + CURLOPT_PUT, + CURLOPT_CUSTOMREQUEST, + CURLOPT_HEADER, + CURLOPT_RETURNTRANSFER, + CURLOPT_HTTPHEADER, + CURLOPT_POSTFIELDS, + CURLOPT_INFILE, + CURLOPT_INFILESIZE, + CURLOPT_PORT, + CURLOPT_MAXREDIRS, + CURLOPT_CONNECTTIMEOUT, + CURL_HTTP_VERSION_1_1, + CURL_HTTP_VERSION_1_0, + ); } /** @@ -148,6 +164,16 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac return $this; } + /** + * Retrieve the array of all configuration options + * + * @return array + */ + public function getConfig() + { + return $this->_config; + } + /** * Direct setter for cURL adapter related options. * @@ -196,7 +222,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac } // Set timeout - curl_setopt($this->_curl, CURLOPT_TIMEOUT, $this->_config['timeout']); + curl_setopt($this->_curl, CURLOPT_CONNECTTIMEOUT, $this->_config['timeout']); // Set Max redirects curl_setopt($this->_curl, CURLOPT_MAXREDIRS, $this->_config['maxredirects']); @@ -233,7 +259,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac * @return string $request * @throws Zend_Http_Client_Adapter_Exception If connection fails, connected to wrong host, no PUT file defined, unsupported method, or unsupported cURL option */ - public function write($method, $uri, $http_ver = '1.1', $headers = array(), $body = '') + public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $body = '') { // Make sure we're properly connected if (!$this->_curl) { @@ -263,18 +289,28 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac case Zend_Http_Client::PUT: // There are two different types of PUT request, either a Raw Data string has been set // or CURLOPT_INFILE and CURLOPT_INFILESIZE are used. + if(is_resource($body)) { + $this->_config['curloptions'][CURLOPT_INFILE] = $body; + } if (isset($this->_config['curloptions'][CURLOPT_INFILE])) { + // Now we will probably already have Content-Length set, so that we have to delete it + // from $headers at this point: + foreach ($headers AS $k => $header) { + if (preg_match('/Content-Length:\s*(\d+)/i', $header, $m)) { + if(is_resource($body)) { + $this->_config['curloptions'][CURLOPT_INFILESIZE] = (int)$m[1]; + } + unset($headers[$k]); + } + } + if (!isset($this->_config['curloptions'][CURLOPT_INFILESIZE])) { require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Cannot set a file-handle for cURL option CURLOPT_INFILE without also setting its size in CURLOPT_INFILESIZE."); } - // Now we will probably already have Content-Length set, so that we have to delete it - // from $headers at this point: - foreach ($headers AS $k => $header) { - if (stristr($header, "Content-Length:") !== false) { - unset($headers[$k]); - } + if(is_resource($body)) { + $body = ''; } $curlMethod = CURLOPT_PUT; @@ -298,6 +334,11 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac $curlMethod = CURLOPT_CUSTOMREQUEST; $curlValue = "TRACE"; break; + + case Zend_Http_Client::HEAD: + $curlMethod = CURLOPT_CUSTOMREQUEST; + $curlValue = "HEAD"; + break; default: // For now, through an exception for unsupported request methods @@ -305,18 +346,31 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac throw new Zend_Http_Client_Adapter_Exception("Method currently not supported"); } + if(is_resource($body) && $curlMethod != CURLOPT_PUT) { + require_once 'Zend/Http/Client/Adapter/Exception.php'; + throw new Zend_Http_Client_Adapter_Exception("Streaming requests are allowed only with PUT"); + } + // get http version to use - $curlHttp = ($http_ver = 1.1) ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0; + $curlHttp = ($httpVersion == 1.1) ? CURL_HTTP_VERSION_1_1 : CURL_HTTP_VERSION_1_0; // mark as HTTP request and set HTTP method curl_setopt($this->_curl, $curlHttp, true); curl_setopt($this->_curl, $curlMethod, $curlValue); - // ensure headers are also returned - curl_setopt($this->_curl, CURLOPT_HEADER, true); + if($this->out_stream) { + // headers will be read into the response + curl_setopt($this->_curl, CURLOPT_HEADER, false); + curl_setopt($this->_curl, CURLOPT_HEADERFUNCTION, array($this, "readHeader")); + // and data will be written into the file + curl_setopt($this->_curl, CURLOPT_FILE, $this->out_stream); + } else { + // ensure headers are also returned + curl_setopt($this->_curl, CURLOPT_HEADER, true); - // ensure actual response is returned - curl_setopt($this->_curl, CURLOPT_RETURNTRANSFER, true); + // ensure actual response is returned + curl_setopt($this->_curl, CURLOPT_RETURNTRANSFER, true); + } // set additional headers $headers['Accept'] = ''; @@ -354,7 +408,12 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac } // send the request - $this->_response = curl_exec($this->_curl); + $response = curl_exec($this->_curl); + + // if we used streaming, headers are already there + if(!is_resource($this->out_stream)) { + $this->_response = $response; + } $request = curl_getinfo($this->_curl, CURLINFO_HEADER_OUT); $request .= $body; @@ -420,4 +479,29 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac { return $this->_curl; } + + /** + * Set output stream for the response + * + * @param resource $stream + * @return Zend_Http_Client_Adapter_Socket + */ + public function setOutputStream($stream) + { + $this->out_stream = $stream; + return $this; + } + + /** + * Header reader function for CURL + * + * @param resource $curl + * @param string $header + * @return int + */ + public function readHeader($curl, $header) + { + $this->_response .= $header; + return strlen($header); + } } diff --git a/lib/zend/Zend/Http/Client/Adapter/Exception.php b/lib/zend/Zend/Http/Client/Adapter/Exception.php index ab666195421..e618dee5321 100644 --- a/lib/zend/Zend/Http/Client/Adapter/Exception.php +++ b/lib/zend/Zend/Http/Client/Adapter/Exception.php @@ -16,7 +16,7 @@ * @package Zend_Http * @subpackage Client_Adapter_Exception * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Http/Client/Exception.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Exception extends Zend_Http_Client_Exception diff --git a/lib/zend/Zend/Http/Client/Adapter/Interface.php b/lib/zend/Zend/Http/Client/Adapter/Interface.php index 0b2e8674a3d..561de3a244c 100644 --- a/lib/zend/Zend/Http/Client/Adapter/Interface.php +++ b/lib/zend/Zend/Http/Client/Adapter/Interface.php @@ -17,7 +17,7 @@ * @package Zend_Http * @subpackage Client_Adapter * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Http_Client_Adapter_Interface diff --git a/lib/zend/Zend/Http/Client/Adapter/Proxy.php b/lib/zend/Zend/Http/Client/Adapter/Proxy.php index 09eef7461bc..b3c39fb999e 100644 --- a/lib/zend/Zend/Http/Client/Adapter/Proxy.php +++ b/lib/zend/Zend/Http/Client/Adapter/Proxy.php @@ -17,7 +17,7 @@ * @package Zend_Http * @subpackage Client_Adapter * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,7 +46,7 @@ require_once 'Zend/Http/Client/Adapter/Socket.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket @@ -60,6 +60,7 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket 'ssltransport' => 'ssl', 'sslcert' => null, 'sslpassphrase' => null, + 'sslusecontext' => false, 'proxy_host' => '', 'proxy_port' => 8080, 'proxy_user' => '', @@ -91,6 +92,11 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket if (! $this->config['proxy_host']) { return parent::connect($host, $port, $secure); } + + /* Url might require stream context even if proxy connection doesn't */ + if ($secure) { + $this->config['sslusecontext'] = true; + } // Connect (a non-secure connection) to the proxy server return parent::connect( @@ -162,15 +168,26 @@ class Zend_Http_Client_Adapter_Proxy extends Zend_Http_Client_Adapter_Socket $request .= "$v\r\n"; } - // Add the request body - $request .= "\r\n" . $body; - + if(is_resource($body)) { + $request .= "\r\n"; + } else { + // Add the request body + $request .= "\r\n" . $body; + } + // Send the request if (! @fwrite($this->socket, $request)) { require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception("Error writing request to proxy server"); } - + + if(is_resource($body)) { + if(stream_copy_to_stream($body, $this->socket) == 0) { + require_once 'Zend/Http/Client/Adapter/Exception.php'; + throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); + } + } + return $request; } diff --git a/lib/zend/Zend/Http/Client/Adapter/Socket.php b/lib/zend/Zend/Http/Client/Adapter/Socket.php index c0a29e429b6..353cff4ca34 100644 --- a/lib/zend/Zend/Http/Client/Adapter/Socket.php +++ b/lib/zend/Zend/Http/Client/Adapter/Socket.php @@ -17,7 +17,7 @@ * @package Zend_Http * @subpackage Client_Adapter * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,6 +29,10 @@ require_once 'Zend/Uri/Http.php'; * @see Zend_Http_Client_Adapter_Interface */ require_once 'Zend/Http/Client/Adapter/Interface.php'; +/** + * @see Zend_Http_Client_Adapter_Stream + */ +require_once 'Zend/Http/Client/Adapter/Stream.php'; /** * A sockets based (stream_socket_client) adapter class for Zend_Http_Client. Can be used @@ -37,10 +41,10 @@ require_once 'Zend/Http/Client/Adapter/Interface.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interface +class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interface, Zend_Http_Client_Adapter_Stream { /** * The socket for server connection @@ -56,6 +60,13 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf */ protected $connected_to = array(null, null); + /** + * Stream for storing output + * + * @var resource + */ + protected $out_stream = null; + /** * Parameters array * @@ -65,7 +76,8 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf 'persistent' => false, 'ssltransport' => 'ssl', 'sslcert' => null, - 'sslpassphrase' => null + 'sslpassphrase' => null, + 'sslusecontext' => false ); /** @@ -112,7 +124,17 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf } } - /** + /** + * Retrieve the array of all configuration options + * + * @return array + */ + public function getConfig() + { + return $this->config; + } + + /** * Set the stream context for the TCP connection to the server * * Can accept either a pre-existing stream context resource, or an array @@ -180,7 +202,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf // Now, if we are not connected, connect if (! is_resource($this->socket) || ! $this->config['keepalive']) { $context = $this->getStreamContext(); - if ($secure) { + if ($secure || $this->config['sslusecontext']) { if ($this->config['sslcert'] !== null) { if (! stream_context_set_option($context, 'ssl', 'local_cert', $this->config['sslcert'])) { @@ -262,14 +284,25 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $request .= "$v\r\n"; } - // Add the request body - $request .= "\r\n" . $body; - + if(is_resource($body)) { + $request .= "\r\n"; + } else { + // Add the request body + $request .= "\r\n" . $body; + } + // Send the request if (! @fwrite($this->socket, $request)) { require_once 'Zend/Http/Client/Adapter/Exception.php'; throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); } + + if(is_resource($body)) { + if(stream_copy_to_stream($body, $this->socket) == 0) { + require_once 'Zend/Http/Client/Adapter/Exception.php'; + throw new Zend_Http_Client_Adapter_Exception('Error writing request to server'); + } + } return $request; } @@ -284,6 +317,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf // First, read headers only $response = ''; $gotStatus = false; + $stream = !empty($this->config['stream']); while (($line = @fgets($this->socket)) !== false) { $gotStatus = $gotStatus || (strpos($line, 'HTTP') !== false); @@ -292,7 +326,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf if (rtrim($line) === '') break; } } - + $this->_checkSocketReadTimeout(); $statusCode = Zend_Http_Response::extractCode($response); @@ -319,7 +353,7 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf // If we got a 'transfer-encoding: chunked' header if (isset($headers['transfer-encoding'])) { - + if (strtolower($headers['transfer-encoding']) == 'chunked') { do { @@ -347,45 +381,71 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf $current_pos = ftell($this->socket); if ($current_pos >= $read_to) break; - $line = @fread($this->socket, $read_to - $current_pos); - if ($line === false || strlen($line) === 0) { - $this->_checkSocketReadTimeout(); - break; + if($this->out_stream) { + if(stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) { + $this->_checkSocketReadTimeout(); + break; + } } else { - $chunk .= $line; + $line = @fread($this->socket, $read_to - $current_pos); + if ($line === false || strlen($line) === 0) { + $this->_checkSocketReadTimeout(); + break; + } + $chunk .= $line; } - } while (! feof($this->socket)); $chunk .= @fgets($this->socket); $this->_checkSocketReadTimeout(); - $response .= $chunk; + if(!$this->out_stream) { + $response .= $chunk; + } } while ($chunksize > 0); - } else { $this->close(); throw new Zend_Http_Client_Adapter_Exception('Cannot handle "' . $headers['transfer-encoding'] . '" transfer encoding'); } - + + // We automatically decode chunked-messages when writing to a stream + // this means we have to disallow the Zend_Http_Response to do it again + if ($this->out_stream) { + $response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $response); + } // Else, if we got the content-length header, read this number of bytes } elseif (isset($headers['content-length'])) { + // If we got more than one Content-Length header (see ZF-9404) use + // the last value sent + if (is_array($headers['content-length'])) { + $contentLength = $headers['content-length'][count($headers['content-length']) - 1]; + } else { + $contentLength = $headers['content-length']; + } + $current_pos = ftell($this->socket); $chunk = ''; - for ($read_to = $current_pos + $headers['content-length']; + for ($read_to = $current_pos + $contentLength; $read_to > $current_pos; $current_pos = ftell($this->socket)) { - $chunk = @fread($this->socket, $read_to - $current_pos); - if ($chunk === false || strlen($chunk) === 0) { - $this->_checkSocketReadTimeout(); - break; - } + if($this->out_stream) { + if(@stream_copy_to_stream($this->socket, $this->out_stream, $read_to - $current_pos) == 0) { + $this->_checkSocketReadTimeout(); + break; + } + } else { + $chunk = @fread($this->socket, $read_to - $current_pos); + if ($chunk === false || strlen($chunk) === 0) { + $this->_checkSocketReadTimeout(); + break; + } - $response .= $chunk; + $response .= $chunk; + } // Break if the connection ended prematurely if (feof($this->socket)) break; @@ -395,12 +455,19 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf } else { do { - $buff = @fread($this->socket, 8192); - if ($buff === false || strlen($buff) === 0) { - $this->_checkSocketReadTimeout(); - break; - } else { - $response .= $buff; + if($this->out_stream) { + if(@stream_copy_to_stream($this->socket, $this->out_stream) == 0) { + $this->_checkSocketReadTimeout(); + break; + } + } else { + $buff = @fread($this->socket, 8192); + if ($buff === false || strlen($buff) === 0) { + $this->_checkSocketReadTimeout(); + break; + } else { + $response .= $buff; + } } } while (feof($this->socket) === false); @@ -448,7 +515,19 @@ class Zend_Http_Client_Adapter_Socket implements Zend_Http_Client_Adapter_Interf } } } - + + /** + * Set output stream for the response + * + * @param resource $stream + * @return Zend_Http_Client_Adapter_Socket + */ + public function setOutputStream($stream) + { + $this->out_stream = $stream; + return $this; + } + /** * Destructor: make sure the socket is disconnected * diff --git a/lib/zend/Zend/Http/Client/Adapter/Test.php b/lib/zend/Zend/Http/Client/Adapter/Test.php index 10633d71e29..d79ad58fb8c 100644 --- a/lib/zend/Zend/Http/Client/Adapter/Test.php +++ b/lib/zend/Zend/Http/Client/Adapter/Test.php @@ -16,7 +16,7 @@ * @package Zend_Http * @subpackage Client_Adapter * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -44,7 +44,7 @@ require_once 'Zend/Http/Client/Adapter/Interface.php'; * @category Zend * @package Zend_Http * @subpackage Client_Adapter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interface @@ -71,6 +71,13 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac */ protected $responseIndex = 0; + /** + * Wether or not the next request will fail with an exception + * + * @var boolean + */ + protected $_nextRequestWillFail = false; + /** * Adapter constructor, currently empty. Config is set using setConfig() * @@ -78,6 +85,19 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac public function __construct() { } + /** + * Set the nextRequestWillFail flag + * + * @param boolean $flag + * @return Zend_Http_Client_Adapter_Test + */ + public function setNextRequestWillFail($flag) + { + $this->_nextRequestWillFail = (bool) $flag; + + return $this; + } + /** * Set the configuration array for the adapter * @@ -108,9 +128,16 @@ class Zend_Http_Client_Adapter_Test implements Zend_Http_Client_Adapter_Interfac * @param int $port * @param boolean $secure * @param int $timeout + * @throws Zend_Http_Client_Adapter_Exception */ public function connect($host, $port = 80, $secure = false) - { } + { + if ($this->_nextRequestWillFail) { + $this->_nextRequestWillFail = false; + require_once 'Zend/Http/Client/Adapter/Exception.php'; + throw new Zend_Http_Client_Adapter_Exception('Request failed'); + } + } /** * Send request to the remote server diff --git a/lib/zend/Zend/Http/Client/Exception.php b/lib/zend/Zend/Http/Client/Exception.php index e140fdd5872..a66e2ca9863 100644 --- a/lib/zend/Zend/Http/Client/Exception.php +++ b/lib/zend/Zend/Http/Client/Exception.php @@ -16,7 +16,7 @@ * @package Zend_Http * @subpackage Client_Exception * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Http/Exception.php'; * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Client_Exception extends Zend_Http_Exception diff --git a/lib/zend/Zend/Http/Cookie.php b/lib/zend/Zend/Http/Cookie.php index ff9bebfeb09..80c64c5a352 100644 --- a/lib/zend/Zend/Http/Cookie.php +++ b/lib/zend/Zend/Http/Cookie.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Http * @subpackage Cookie - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @version $Id$ * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ require_once 'Zend/Uri/Http.php'; * * @category Zend * @package Zend_Http - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Cookie @@ -88,6 +88,13 @@ class Zend_Http_Cookie */ protected $secure; + /** + * Whether the cookie value has been encoded/decoded + * + * @var boolean + */ + protected $encodeValue; + /** * Cookie object constructor * @@ -258,7 +265,10 @@ class Zend_Http_Cookie */ public function __toString() { - return $this->name . '=' . urlencode($this->value) . ';'; + if ($this->encodeValue) { + return $this->name . '=' . urlencode($this->value) . ';'; + } + return $this->name . '=' . $this->value . ';'; } /** @@ -266,14 +276,16 @@ class Zend_Http_Cookie * (for example the value of the Set-Cookie HTTP header) * * @param string $cookieStr - * @param Zend_Uri_Http|string $ref_uri Reference URI for default values (domain, path) + * @param Zend_Uri_Http|string $refUri Reference URI for default values (domain, path) + * @param boolean $encodeValue Weither or not the cookie's value should be + * passed through urlencode/urldecode * @return Zend_Http_Cookie A new Zend_Http_Cookie object or false on failure. */ - public static function fromString($cookieStr, $ref_uri = null) + public static function fromString($cookieStr, $refUri = null, $encodeValue = true) { // Set default values - if (is_string($ref_uri)) { - $ref_uri = Zend_Uri_Http::factory($ref_uri); + if (is_string($refUri)) { + $refUri = Zend_Uri_Http::factory($refUri); } $name = ''; @@ -290,12 +302,14 @@ class Zend_Http_Cookie // Get the name and value of the cookie list($name, $value) = explode('=', trim(array_shift($parts)), 2); $name = trim($name); - $value = urldecode(trim($value)); + if ($encodeValue) { + $value = urldecode(trim($value)); + } // Set default domain and path - if ($ref_uri instanceof Zend_Uri_Http) { - $domain = $ref_uri->getHost(); - $path = $ref_uri->getPath(); + if ($refUri instanceof Zend_Uri_Http) { + $domain = $refUri->getHost(); + $path = $refUri->getPath(); $path = substr($path, 0, strrpos($path, '/')); } @@ -342,7 +356,9 @@ class Zend_Http_Cookie } if ($name !== '') { - return new self($name, $value, $domain, $expires, $path, $secure); + $ret = new self($name, $value, $domain, $expires, $path, $secure); + $ret->encodeValue = ($encodeValue) ? true : false; + return $ret; } else { return false; } diff --git a/lib/zend/Zend/Http/CookieJar.php b/lib/zend/Zend/Http/CookieJar.php index 65e60f54919..1f7a425c777 100644 --- a/lib/zend/Zend/Http/CookieJar.php +++ b/lib/zend/Zend/Http/CookieJar.php @@ -16,7 +16,7 @@ * @package Zend_Http * @subpackage CookieJar * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -54,7 +54,7 @@ require_once "Zend/Http/Response.php"; * @category Zend * @package Zend_Http * @subpackage CookieJar - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_CookieJar implements Countable, IteratorAggregate diff --git a/lib/zend/Zend/Http/Exception.php b/lib/zend/Zend/Http/Exception.php index 32c18e9b5e2..6e1dd98207d 100644 --- a/lib/zend/Zend/Http/Exception.php +++ b/lib/zend/Zend/Http/Exception.php @@ -16,7 +16,7 @@ * @package Zend_Http * @subpackage Exception * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; * @category Zend * @package Zend_Http * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Exception extends Zend_Exception diff --git a/lib/zend/Zend/Http/Response.php b/lib/zend/Zend/Http/Response.php index ebf36db2310..74e0be8ee0f 100644 --- a/lib/zend/Zend/Http/Response.php +++ b/lib/zend/Zend/Http/Response.php @@ -17,7 +17,7 @@ * @package Zend_Http * @subpackage Response * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ * * @package Zend_Http * @subpackage Response - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Http_Response diff --git a/lib/zend/Zend/Loader.php b/lib/zend/Zend/Loader.php index 9532aa44189..d69af1235c3 100644 --- a/lib/zend/Zend/Loader.php +++ b/lib/zend/Zend/Loader.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader @@ -60,8 +60,20 @@ class Zend_Loader throw new Zend_Exception('Directory argument must be a string or an array'); } - // autodiscover the path from the class name - $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php'; + // Autodiscover the path from the class name + // Implementation is PHP namespace-aware, and based on + // Framework Interop Group reference implementation: + // http://groups.google.com/group/php-standards/web/psr-0-final-proposal + $className = ltrim($class, '\\'); + $file = ''; + $namespace = ''; + if ($lastNsPos = strripos($className, '\\')) { + $namespace = substr($className, 0, $lastNsPos); + $className = substr($className, $lastNsPos + 1); + $file = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR; + } + $file .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php'; + if (!empty($dirs)) { // use the autodiscovered path $dirPath = dirname($file); @@ -79,8 +91,7 @@ class Zend_Loader $file = basename($file); self::loadFile($file, $dirs, true); } else { - self::_securityCheck($file); - include $file; + self::loadFile($file, null, true); } if (!class_exists($class, false) && !interface_exists($class, false)) { @@ -162,11 +173,59 @@ class Zend_Loader */ public static function isReadable($filename) { - if (!$fh = @fopen($filename, 'r', true)) { + if (is_readable($filename)) { + // Return early if the filename is readable without needing the + // include_path + return true; + } + + if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' + && preg_match('/^[a-z]:/i', $filename) + ) { + // If on windows, and path provided is clearly an absolute path, + // return false immediately return false; } - @fclose($fh); - return true; + + foreach (self::explodeIncludePath() as $path) { + if ($path == '.') { + if (is_readable($filename)) { + return true; + } + continue; + } + $file = $path . '/' . $filename; + if (is_readable($file)) { + return true; + } + } + return false; + } + + /** + * Explode an include path into an array + * + * If no path provided, uses current include_path. Works around issues that + * occur when the path includes stream schemas. + * + * @param string|null $path + * @return array + */ + public static function explodeIncludePath($path = null) + { + if (null === $path) { + $path = get_include_path(); + } + + if (PATH_SEPARATOR == ':') { + // On *nix systems, include_paths which include paths with a stream + // schema cannot be safely explode'd, so we have to be a bit more + // intelligent in the approach. + $paths = preg_split('#:(?!//)#', $path); + } else { + $paths = explode(PATH_SEPARATOR, $path); + } + return $paths; } /** diff --git a/lib/zend/Zend/Loader/Exception.php b/lib/zend/Zend/Loader/Exception.php index f1e01e3b744..10416a8fb55 100644 --- a/lib/zend/Zend/Loader/Exception.php +++ b/lib/zend/Zend/Loader/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Loader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,8 +28,8 @@ require_once 'Zend/Exception.php'; * @category Zend * @package Zend_Loader * @uses Zend_Exception - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Loader_Exception extends Zend_Exception +class Zend_Loader_Exception extends Zend_Exception {} \ No newline at end of file diff --git a/lib/zend/Zend/Loader/PluginLoader.php b/lib/zend/Zend/Loader/PluginLoader.php index 43aa6e3486e..b78f9ba8ec7 100644 --- a/lib/zend/Zend/Loader/PluginLoader.php +++ b/lib/zend/Zend/Loader/PluginLoader.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Loader.php'; * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface @@ -123,9 +123,15 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface */ protected function _formatPrefix($prefix) { - if($prefix == "") { - return $prefix; - } + if($prefix == "") { + return $prefix; + } + + $last = strlen($prefix) - 1; + if ($prefix{$last} == '\\') { + return $prefix; + } + return rtrim($prefix, '_') . '_'; } @@ -298,7 +304,7 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface public function getClassName($name) { $name = $this->_formatName($name); - if ($this->_useStaticRegistry + if ($this->_useStaticRegistry && isset(self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name]) ) { return self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name]; @@ -311,14 +317,14 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface /** * Get path to plugin class - * - * @param mixed $name + * + * @param mixed $name * @return string|false False if not found */ public function getClassPath($name) { $name = $this->_formatName($name); - if ($this->_useStaticRegistry + if ($this->_useStaticRegistry && !empty(self::$_staticLoadedPluginPaths[$this->_useStaticRegistry][$name]) ) { return self::$_staticLoadedPluginPaths[$this->_useStaticRegistry][$name]; @@ -345,9 +351,9 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface * Load a plugin via the name provided * * @param string $name - * @param bool $throwExceptions Whether or not to throw exceptions if the + * @param bool $throwExceptions Whether or not to throw exceptions if the * class is not resolved - * @return string|false Class name of loaded class; false if $throwExceptions + * @return string|false Class name of loaded class; false if $throwExceptions * if false and no class found * @throws Zend_Loader_Exception if class not found */ @@ -408,10 +414,8 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface if ($this->_useStaticRegistry) { self::$_staticLoadedPlugins[$this->_useStaticRegistry][$name] = $className; - self::$_staticLoadedPluginPaths[$this->_useStaticRegistry][$name] = (isset($loadFile) ? $loadFile : ''); } else { $this->_loadedPlugins[$name] = $className; - $this->_loadedPluginPaths[$name] = (isset($loadFile) ? $loadFile : ''); } return $className; } @@ -419,10 +423,10 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface /** * Set path to class file cache * - * Specify a path to a file that will add include_once statements for each + * Specify a path to a file that will add include_once statements for each * plugin class loaded. This is an opt-in feature for performance purposes. - * - * @param string $file + * + * @param string $file * @return void * @throws Zend_Loader_PluginLoader_Exception if file is not writeable or path does not exist */ @@ -451,7 +455,7 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface /** * Retrieve class file cache path - * + * * @return string|null */ public static function getIncludeFileCache() @@ -461,8 +465,8 @@ class Zend_Loader_PluginLoader implements Zend_Loader_PluginLoader_Interface /** * Append an include_once statement to the class file cache - * - * @param string $incFile + * + * @param string $incFile * @return void */ protected static function _appendIncFile($incFile) diff --git a/lib/zend/Zend/Loader/PluginLoader/Exception.php b/lib/zend/Zend/Loader/PluginLoader/Exception.php index 4c68cbcc395..4597acb5ef9 100644 --- a/lib/zend/Zend/Loader/PluginLoader/Exception.php +++ b/lib/zend/Zend/Loader/PluginLoader/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Loader/Exception.php'; * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Loader_PluginLoader_Exception extends Zend_Loader_Exception diff --git a/lib/zend/Zend/Loader/PluginLoader/Interface.php b/lib/zend/Zend/Loader/PluginLoader/Interface.php index 55d5a21b559..431700d5746 100644 --- a/lib/zend/Zend/Loader/PluginLoader/Interface.php +++ b/lib/zend/Zend/Loader/PluginLoader/Interface.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Loader * @subpackage PluginLoader - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ interface Zend_Loader_PluginLoader_Interface @@ -39,7 +39,7 @@ interface Zend_Loader_PluginLoader_Interface * @return Zend_Loader_PluginLoader */ public function addPrefixPath($prefix, $path); - + /** * Remove a prefix (or prefixed-path) from the registry * @@ -48,7 +48,7 @@ interface Zend_Loader_PluginLoader_Interface * @return Zend_Loader_PluginLoader */ public function removePrefixPath($prefix, $path = null); - + /** * Whether or not a Helper by a specific name * @@ -64,7 +64,7 @@ interface Zend_Loader_PluginLoader_Interface * @return string */ public function getClassName($name); - + /** * Load a helper via the name provided * diff --git a/lib/zend/Zend/Mime.php b/lib/zend/Zend/Mime.php index 9072f9d0c52..68224b114c3 100644 --- a/lib/zend/Zend/Mime.php +++ b/lib/zend/Zend/Mime.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,7 +25,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime diff --git a/lib/zend/Zend/Mime/Decode.php b/lib/zend/Zend/Mime/Decode.php index e9cbac40424..af413a90a80 100644 --- a/lib/zend/Zend/Mime/Decode.php +++ b/lib/zend/Zend/Mime/Decode.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ require_once 'Zend/Mime.php'; /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Decode diff --git a/lib/zend/Zend/Mime/Exception.php b/lib/zend/Zend/Mime/Exception.php index 275bd100daa..5c875ed5b4b 100644 --- a/lib/zend/Zend/Mime/Exception.php +++ b/lib/zend/Zend/Mime/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Exception extends Zend_Exception diff --git a/lib/zend/Zend/Mime/Message.php b/lib/zend/Zend/Mime/Message.php index b34b4fc839c..6ca1f17a76c 100644 --- a/lib/zend/Zend/Mime/Message.php +++ b/lib/zend/Zend/Mime/Message.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Mime/Part.php'; /** * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Message diff --git a/lib/zend/Zend/Mime/Part.php b/lib/zend/Zend/Mime/Part.php index 051bf1511f8..f88b1312591 100644 --- a/lib/zend/Zend/Mime/Part.php +++ b/lib/zend/Zend/Mime/Part.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Mime.php'; * * @category Zend * @package Zend_Mime - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Mime_Part { diff --git a/lib/zend/Zend/Registry.php b/lib/zend/Zend/Registry.php index 3c3cf496523..786a94dca58 100644 --- a/lib/zend/Zend/Registry.php +++ b/lib/zend/Zend/Registry.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Registry - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Registry - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Registry extends ArrayObject diff --git a/lib/zend/Zend/Rest/Client.php b/lib/zend/Zend/Rest/Client.php index 7e7373dc186..db6be42d516 100644 --- a/lib/zend/Zend/Rest/Client.php +++ b/lib/zend/Zend/Rest/Client.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/Uri.php'; * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client extends Zend_Service_Abstract diff --git a/lib/zend/Zend/Rest/Client/Exception.php b/lib/zend/Zend/Rest/Client/Exception.php index aaff9b8ec1c..a4f73cd7692 100644 --- a/lib/zend/Zend/Rest/Client/Exception.php +++ b/lib/zend/Zend/Rest/Client/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Rest/Exception.php'; * * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Exception extends Zend_Rest_Exception diff --git a/lib/zend/Zend/Rest/Client/Result.php b/lib/zend/Zend/Rest/Client/Result.php index 7860309bf4f..b126f7e416a 100644 --- a/lib/zend/Zend/Rest/Client/Result.php +++ b/lib/zend/Zend/Rest/Client/Result.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Result implements IteratorAggregate { @@ -33,6 +33,12 @@ class Zend_Rest_Client_Result implements IteratorAggregate { */ protected $_sxml; + /** + * error information + * @var string + */ + protected $_errstr; + /** * Constructor * @@ -43,10 +49,16 @@ class Zend_Rest_Client_Result implements IteratorAggregate { { set_error_handler(array($this, 'handleXmlErrors')); $this->_sxml = simplexml_load_string($data); + restore_error_handler(); if($this->_sxml === false) { - $this->handleXmlErrors(0, "An error occured while parsing the REST response with simplexml."); - } else { - restore_error_handler(); + if ($this->_errstr === null) { + $message = "An error occured while parsing the REST response with simplexml."; + } else { + $message = "REST Response Error: " . $this->_errstr; + $this->_errstr = null; + } + require_once "Zend/Rest/Client/Result/Exception.php"; + throw new Zend_Rest_Client_Result_Exception($message); } } @@ -58,13 +70,12 @@ class Zend_Rest_Client_Result implements IteratorAggregate { * @param string $errfile * @param string $errline * @param array $errcontext - * @throws Zend_Result_Client_Result_Exception + * @return true */ public function handleXmlErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null) { - restore_error_handler(); - require_once "Zend/Rest/Client/Result/Exception.php"; - throw new Zend_Rest_Client_Result_Exception("REST Response Error: ".$errstr); + $this->_errstr = $errstr; + return true; } /** diff --git a/lib/zend/Zend/Rest/Client/Result/Exception.php b/lib/zend/Zend/Rest/Client/Result/Exception.php index 98060436e1a..486c0926a34 100644 --- a/lib/zend/Zend/Rest/Client/Result/Exception.php +++ b/lib/zend/Zend/Rest/Client/Result/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -30,7 +30,7 @@ require_once "Zend/Rest/Client/Exception.php"; * * @package Zend_Rest * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Client_Result_Exception extends Zend_Rest_Client_Exception{} diff --git a/lib/zend/Zend/Rest/Controller.php b/lib/zend/Zend/Rest/Controller.php index d6ba180a2e7..803deaad295 100644 --- a/lib/zend/Zend/Rest/Controller.php +++ b/lib/zend/Zend/Rest/Controller.php @@ -12,8 +12,9 @@ * 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_Rest - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,45 +25,46 @@ require_once 'Zend/Controller/Action.php'; /** * An abstract class to guide implementation of action controllers for use with * Zend_Rest_Route. - * + * + * @category Zend * @package Zend_Rest * @see Zend_Rest_Route - * @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com) - * @license http://framework.zend.com/license/new-bsd New BSD License + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Rest_Controller extends Zend_Controller_Action { /** * The index action handles index/list requests; it should respond with a * list of the requested resources. - */ + */ abstract public function indexAction(); /** - * The get action handles GET requests and receives an 'id' parameter; it + * The get action handles GET requests and receives an 'id' parameter; it * should respond with the server resource state of the resource identified * by the 'id' value. - */ + */ abstract public function getAction(); - + /** * The post action handles POST requests; it should accept and digest a * POSTed resource representation and persist the resource state. - */ + */ abstract public function postAction(); - + /** - * The put action handles PUT requests and receives an 'id' parameter; it - * should update the server resource state of the resource identified by + * The put action handles PUT requests and receives an 'id' parameter; it + * should update the server resource state of the resource identified by * the 'id' value. - */ + */ abstract public function putAction(); - + /** - * The delete action handles DELETE requests and receives an 'id' + * The delete action handles DELETE requests and receives an 'id' * parameter; it should update the server resource state of the resource * identified by the 'id' value. - */ + */ abstract public function deleteAction(); - + } \ No newline at end of file diff --git a/lib/zend/Zend/Rest/Exception.php b/lib/zend/Zend/Rest/Exception.php index 1a7305aceaf..938b0ee83da 100644 --- a/lib/zend/Zend/Rest/Exception.php +++ b/lib/zend/Zend/Rest/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Exception extends Zend_Exception diff --git a/lib/zend/Zend/Rest/Route.php b/lib/zend/Zend/Rest/Route.php index edf62180051..639eeabf80f 100644 --- a/lib/zend/Zend/Rest/Route.php +++ b/lib/zend/Zend/Rest/Route.php @@ -12,28 +12,29 @@ * 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_Rest - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Controller_Router_Route_Interface +/** + * @see Zend_Controller_Router_Route_Interface */ require_once 'Zend/Controller/Router/Route/Interface.php'; -/** +/** * @see Zend_Controller_Router_Route_Module */ require_once 'Zend/Controller/Router/Route/Module.php'; -/** +/** * @see Zend_Controller_Dispatcher_Interface */ require_once 'Zend/Controller/Dispatcher/Interface.php'; -/** +/** * @see Zend_Controller_Request_Abstract */ require_once 'Zend/Controller/Request/Abstract.php'; @@ -43,8 +44,9 @@ require_once 'Zend/Controller/Request/Abstract.php'; * * Request-aware route for RESTful modular routing * + * @category Zend * @package Zend_Rest - * @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module @@ -52,15 +54,15 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module /** * Specific Modules to receive RESTful routes * @var array - */ - protected $_restfulModules = null; - + */ + protected $_restfulModules = null; + /** * Specific Modules=>Controllers to receive RESTful routes * @var array - */ - protected $_restfulControllers = null; - + */ + protected $_restfulControllers = null; + /** * @var Zend_Controller_Front */ @@ -87,6 +89,27 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module $this->_dispatcher = $front->getDispatcher(); } + /** + * Instantiates route based on passed Zend_Config structure + */ + public static function getInstance(Zend_Config $config) + { + $frontController = Zend_Controller_Front::getInstance(); + $defaultsArray = array(); + $restfulConfigArray = array(); + foreach ($config as $key => $values) { + if ($key == 'type') { + // do nothing + } elseif ($key == 'defaults') { + $defaultsArray = $values->toArray(); + } else { + $restfulConfigArray[$key] = explode(',', $values); + } + } + $instance = new self($frontController, $defaultsArray, $restfulConfigArray); + return $instance; + } + /** * Matches a user submitted request. Assigns and returns an array of variables * on a successful match. @@ -98,7 +121,7 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module * @param Zend_Controller_Request_Http $request Request used to match against this routing ruleset * @return array An array of assigned values or a false on a mismatch */ - public function match($request) + public function match($request, $partial = false) { if (!$request instanceof Zend_Controller_Request_Http) { $request = $this->_front->getRequest(); @@ -107,14 +130,13 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module $this->_setRequestKeys(); $path = $request->getPathInfo(); + $params = $request->getParams(); $values = array(); - $params = array(); $path = trim($path, self::URI_DELIMITER); if ($path != '') { $path = explode(self::URI_DELIMITER, $path); - // Determine Module $moduleName = $this->_defaults[$this->_moduleKey]; $dispatcher = $this->_front->getDispatcher(); @@ -138,21 +160,26 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module // Controller, return false to fall back to other routes return false; } + } elseif ($this->_checkRestfulController($moduleName, $controllerName)) { + $values[$this->_controllerKey] = $controllerName; + $values[$this->_actionKey] = 'get'; + } else { + return false; } //Store path count for method mapping $pathElementCount = count($path); - - // Check for leading "special get" URI's + + // Check for "special get" URI's $specialGetTarget = false; - if ($pathElementCount && array_search($path[0], array('index', 'new')) > -1) { + if ($pathElementCount && array_search($path[0], array('index', 'new')) > -1) { $specialGetTarget = array_shift($path); } elseif ($pathElementCount && $path[$pathElementCount-1] == 'edit') { $specialGetTarget = 'edit'; $params['id'] = $path[$pathElementCount-2]; } elseif ($pathElementCount == 1) { - $params['id'] = array_shift($path); - } elseif ($pathElementCount == 0 || $pathElementCount > 1) { + $params['id'] = urldecode(array_shift($path)); + } elseif ($pathElementCount == 0 && !isset($params['id'])) { $specialGetTarget = 'index'; } @@ -190,17 +217,22 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module $values[$this->_actionKey] = 'put'; break; } - - } elseif ($specialGetTarget) { - $values[$this->_actionKey] = $specialGetTarget; - } - - } + + } elseif ($specialGetTarget) { + $values[$this->_actionKey] = $specialGetTarget; + } + + } $this->_values = $values + $params; - - return $this->_values + $this->_defaults; - } - + + $result = $this->_values + $this->_defaults; + + if ($partial && $result) + $this->setMatchedPath($request->getPathInfo()); + + return $result; + } + /** * Assembles user submitted parameters forming a URL path defined by this route * @@ -243,37 +275,38 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module unset($params[$this->_controllerKey]); unset($params[$this->_actionKey]); - + if (isset($params['index']) && $params['index']) { unset($params['index']); $url .= '/index'; foreach ($params as $key => $value) { + if ($encode) $value = urlencode($value); $url .= '/' . $key . '/' . $value; } } elseif (isset($params['id'])) { $url .= '/' . $params['id']; } - - if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) { - $url = '/' . $controller . $url; - } - - if (isset($module)) { - $url = '/' . $module . $url; - } - - return ltrim($url, self::URI_DELIMITER); - } - + + if (!empty($url) || $controller !== $this->_defaults[$this->_controllerKey]) { + $url = '/' . $controller . $url; + } + + if (isset($module)) { + $url = '/' . $module . $url; + } + + return ltrim($url, self::URI_DELIMITER); + } + /** * Tells Rewrite Router which version this Route is * * @return int Route "version" - */ - public function getVersion() - { - return 2; - } + */ + public function getVersion() + { + return 2; + } /** * Parses the responders array sent to constructor to know @@ -281,7 +314,7 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module * * @param array $responders */ - private function _parseResponders($responders) + protected function _parseResponders($responders) { $modulesOnly = true; foreach ($responders as $responder) { @@ -303,7 +336,7 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module * @param string $moduleName * @return bool */ - private function _checkRestfulModule($moduleName) + protected function _checkRestfulModule($moduleName) { if ($this->_allRestful()) { return true; @@ -325,7 +358,7 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module * @param string $controllerName * @return bool */ - private function _checkRestfulController($moduleName, $controllerName) + protected function _checkRestfulController($moduleName, $controllerName) { if ($this->_allRestful()) { return true; @@ -333,7 +366,7 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module if ($this->_fullRestfulModule($moduleName)) { return true; } - if ($this->_checkRestfulModule($moduleName) + if ($this->_checkRestfulModule($moduleName) && $this->_restfulControllers && (false !== array_search($controllerName, $this->_restfulControllers[$moduleName])) ) { @@ -347,10 +380,10 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module * * @return bool */ - private function _allRestful() - { - return (!$this->_restfulModules && !$this->_restfulControllers); - } + protected function _allRestful() + { + return (!$this->_restfulModules && !$this->_restfulControllers); + } /** * Determines if RESTful routing applies to an entire module @@ -358,10 +391,10 @@ class Zend_Rest_Route extends Zend_Controller_Router_Route_Module * @param string $moduleName * @return bool */ - private function _fullRestfulModule($moduleName) + protected function _fullRestfulModule($moduleName) { return ( - $this->_restfulModules + $this->_restfulModules && (false !==array_search($moduleName, $this->_restfulModules)) ); } diff --git a/lib/zend/Zend/Rest/Server.php b/lib/zend/Zend/Rest/Server.php index 421c23e10e0..f2666afd827 100644 --- a/lib/zend/Zend/Rest/Server.php +++ b/lib/zend/Zend/Rest/Server.php @@ -15,23 +15,23 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * Zend_Server_Interface + * @see Zend_Server_Interface */ require_once 'Zend/Server/Interface.php'; /** - * Zend_Server_Reflection + * @see Zend_Server_Reflection */ require_once 'Zend/Server/Reflection.php'; /** - * Zend_Server_Abstract + * @see Zend_Server_Abstract */ require_once 'Zend/Server/Abstract.php'; @@ -39,7 +39,7 @@ require_once 'Zend/Server/Abstract.php'; * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Server implements Zend_Server_Interface @@ -190,11 +190,14 @@ class Zend_Rest_Server implements Zend_Server_Interface $func_args = $this->_functions[$this->_method]->getParameters(); $calling_args = array(); + $missing_args = array(); foreach ($func_args as $arg) { if (isset($request[strtolower($arg->getName())])) { $calling_args[] = $request[strtolower($arg->getName())]; } elseif ($arg->isOptional()) { $calling_args[] = $arg->getDefaultValue(); + } else { + $missing_args[] = $arg->getName(); } } @@ -202,6 +205,9 @@ class Zend_Rest_Server implements Zend_Server_Interface if (substr($key, 0, 3) == 'arg') { $key = str_replace('arg', '', $key); $calling_args[$key] = $value; + if (($index = array_search($key, $missing_args)) !== false) { + unset($missing_args[$index]); + } } } @@ -211,7 +217,7 @@ class Zend_Rest_Server implements Zend_Server_Interface $result = false; if (count($calling_args) < count($func_args)) { require_once 'Zend/Rest/Server/Exception.php'; - $result = $this->fault(new Zend_Rest_Server_Exception('Invalid Method Call to ' . $this->_method . '. Requires ' . count($func_args) . ', ' . count($calling_args) . ' given.'), 400); + $result = $this->fault(new Zend_Rest_Server_Exception('Invalid Method Call to ' . $this->_method . '. Missing argument(s): ' . implode(', ', $missing_args) . '.'), 400); } if (!$result && $this->_functions[$this->_method] instanceof Zend_Server_Reflection_Method) { @@ -592,9 +598,11 @@ class Zend_Rest_Server implements Zend_Server_Interface $object = $this->_functions[$this->_method]->getDeclaringClass()->newInstance(); } } catch (Exception $e) { - echo $e->getMessage(); require_once 'Zend/Rest/Server/Exception.php'; - throw new Zend_Rest_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $this->_functions[$this->_method]->getName(), 500); + throw new Zend_Rest_Server_Exception('Error instantiating class ' . $class . + ' to invoke method ' . $this->_functions[$this->_method]->getName() . + ' (' . $e->getMessage() . ') ', + 500, $e); } try { diff --git a/lib/zend/Zend/Rest/Server/Exception.php b/lib/zend/Zend/Rest/Server/Exception.php index beadb3b84ea..6d635f743d6 100644 --- a/lib/zend/Zend/Rest/Server/Exception.php +++ b/lib/zend/Zend/Rest/Server/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Rest/Exception.php'; * * @package Zend_Rest * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Rest_Server_Exception extends Zend_Rest_Exception diff --git a/lib/zend/Zend/Server/Abstract.php b/lib/zend/Zend/Server/Abstract.php index e0cd508488a..d1f0871af85 100644 --- a/lib/zend/Zend/Server/Abstract.php +++ b/lib/zend/Zend/Server/Abstract.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -51,7 +51,7 @@ require_once 'Zend/Server/Method/Parameter.php'; * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -90,7 +90,7 @@ abstract class Zend_Server_Abstract implements Zend_Server_Interface * Constructor * * Setup server description - * + * * @return void */ public function __construct() @@ -115,7 +115,7 @@ abstract class Zend_Server_Abstract implements Zend_Server_Interface * Lowercase a string * * Lowercase's a string by reference - * + * * @deprecated * @param string $string value * @param string $key @@ -129,8 +129,8 @@ abstract class Zend_Server_Abstract implements Zend_Server_Interface /** * Build callback for method signature - * - * @param Zend_Server_Reflection_Function_Abstract $reflection + * + * @param Zend_Server_Reflection_Function_Abstract $reflection * @return Zend_Server_Method_Callback */ protected function _buildCallback(Zend_Server_Reflection_Function_Abstract $reflection) @@ -149,8 +149,8 @@ abstract class Zend_Server_Abstract implements Zend_Server_Interface /** * Build a method signature - * - * @param Zend_Server_Reflection_Function_Abstract $reflection + * + * @param Zend_Server_Reflection_Function_Abstract $reflection * @param null|string|object $class * @return Zend_Server_Method_Definition * @throws Zend_Server_Exception on duplicate entry @@ -197,9 +197,9 @@ abstract class Zend_Server_Abstract implements Zend_Server_Interface /** * Dispatch method - * - * @param Zend_Server_Method_Definition $invocable - * @param array $params + * + * @param Zend_Server_Method_Definition $invocable + * @param array $params * @return mixed */ protected function _dispatch(Zend_Server_Method_Definition $invocable, array $params) @@ -234,8 +234,8 @@ abstract class Zend_Server_Abstract implements Zend_Server_Interface /** * Map PHP type to protocol type - * - * @param string $type + * + * @param string $type * @return string */ abstract protected function _fixType($type); diff --git a/lib/zend/Zend/Server/Cache.php b/lib/zend/Zend/Server/Cache.php index 78c68739bfa..4d008d2a026 100644 --- a/lib/zend/Zend/Server/Cache.php +++ b/lib/zend/Zend/Server/Cache.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Cache @@ -78,10 +78,10 @@ class Zend_Server_Cache /** * Load server definition from a file * - * Unserializes a stored server definition from $filename. Returns false if + * Unserializes a stored server definition from $filename. Returns false if * it fails in any way, true on success. * - * Useful to prevent needing to build the server definition on each + * Useful to prevent needing to build the server definition on each * request. Sample usage: * * diff --git a/lib/zend/Zend/Server/Definition.php b/lib/zend/Zend/Server/Definition.php index 384b2946468..7ec4735d4fc 100644 --- a/lib/zend/Zend/Server/Definition.php +++ b/lib/zend/Zend/Server/Definition.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,7 +25,7 @@ * @todo Implement iterator * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Definition implements Countable, Iterator @@ -42,8 +42,8 @@ class Zend_Server_Definition implements Countable, Iterator /** * Constructor - * - * @param null|array $methods + * + * @param null|array $methods * @return void */ public function __construct($methods = null) @@ -55,8 +55,8 @@ class Zend_Server_Definition implements Countable, Iterator /** * Set flag indicating whether or not overwriting existing methods is allowed - * - * @param mixed $flag + * + * @param mixed $flag * @return void */ public function setOverwriteExistingMethods($flag) @@ -67,9 +67,9 @@ class Zend_Server_Definition implements Countable, Iterator /** * Add method to definition - * - * @param array|Zend_Server_Method_Definition $method - * @param null|string $name + * + * @param array|Zend_Server_Method_Definition $method + * @param null|string $name * @return Zend_Server_Definition * @throws Zend_Server_Exception if duplicate or invalid method provided */ @@ -106,7 +106,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Add multiple methods - * + * * @param array $methods Array of Zend_Server_Method_Definition objects or arrays * @return Zend_Server_Definition */ @@ -120,7 +120,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Set all methods at once (overwrite) - * + * * @param array $methods Array of Zend_Server_Method_Definition objects or arrays * @return Zend_Server_Definition */ @@ -133,8 +133,8 @@ class Zend_Server_Definition implements Countable, Iterator /** * Does the definition have the given method? - * - * @param string $method + * + * @param string $method * @return bool */ public function hasMethod($method) @@ -144,8 +144,8 @@ class Zend_Server_Definition implements Countable, Iterator /** * Get a given method definition - * - * @param string $method + * + * @param string $method * @return null|Zend_Server_Method_Definition */ public function getMethod($method) @@ -158,7 +158,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Get all method definitions - * + * * @return array Array of Zend_Server_Method_Definition objects */ public function getMethods() @@ -168,8 +168,8 @@ class Zend_Server_Definition implements Countable, Iterator /** * Remove a method definition - * - * @param string $method + * + * @param string $method * @return Zend_Server_Definition */ public function removeMethod($method) @@ -182,7 +182,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Clear all method definitions - * + * * @return Zend_Server_Definition */ public function clearMethods() @@ -193,7 +193,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Cast definition to an array - * + * * @return array */ public function toArray() @@ -207,7 +207,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Countable: count of methods - * + * * @return int */ public function count() @@ -217,7 +217,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Iterator: current item - * + * * @return mixed */ public function current() @@ -227,7 +227,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Iterator: current item key - * + * * @return int|string */ public function key() @@ -237,7 +237,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Iterator: advance to next method - * + * * @return void */ public function next() @@ -247,7 +247,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Iterator: return to first method - * + * * @return void */ public function rewind() @@ -257,7 +257,7 @@ class Zend_Server_Definition implements Countable, Iterator /** * Iterator: is the current index valid? - * + * * @return bool */ public function valid() diff --git a/lib/zend/Zend/Server/Exception.php b/lib/zend/Zend/Server/Exception.php index b7ccc693c34..34ada8961e1 100644 --- a/lib/zend/Zend/Server/Exception.php +++ b/lib/zend/Zend/Server/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ diff --git a/lib/zend/Zend/Server/Interface.php b/lib/zend/Zend/Server/Interface.php index b926ccc328e..fc9469b4af9 100644 --- a/lib/zend/Zend/Server/Interface.php +++ b/lib/zend/Zend/Server/Interface.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -23,7 +23,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Method/Callback.php b/lib/zend/Zend/Server/Method/Callback.php index 6f83fa9351c..535310db7c6 100644 --- a/lib/zend/Zend/Server/Method/Callback.php +++ b/lib/zend/Zend/Server/Method/Callback.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Callback @@ -58,8 +58,8 @@ class Zend_Server_Method_Callback /** * Constructor - * - * @param null|array $options + * + * @param null|array $options * @return void */ public function __construct($options = null) @@ -71,8 +71,8 @@ class Zend_Server_Method_Callback /** * Set object state from array of options - * - * @param array $options + * + * @param array $options * @return Zend_Server_Method_Callback */ public function setOptions(array $options) @@ -88,8 +88,8 @@ class Zend_Server_Method_Callback /** * Set callback class - * - * @param string $class + * + * @param string $class * @return Zend_Server_Method_Callback */ public function setClass($class) @@ -103,7 +103,7 @@ class Zend_Server_Method_Callback /** * Get callback class - * + * * @return string|null */ public function getClass() @@ -113,8 +113,8 @@ class Zend_Server_Method_Callback /** * Set callback function - * - * @param string $function + * + * @param string $function * @return Zend_Server_Method_Callback */ public function setFunction($function) @@ -126,7 +126,7 @@ class Zend_Server_Method_Callback /** * Get callback function - * + * * @return null|string */ public function getFunction() @@ -136,8 +136,8 @@ class Zend_Server_Method_Callback /** * Set callback class method - * - * @param string $method + * + * @param string $method * @return Zend_Server_Method_Callback */ public function setMethod($method) @@ -148,7 +148,7 @@ class Zend_Server_Method_Callback /** * Get callback class method - * + * * @return null|string */ public function getMethod() @@ -158,8 +158,8 @@ class Zend_Server_Method_Callback /** * Set callback type - * - * @param string $type + * + * @param string $type * @return Zend_Server_Method_Callback * @throws Zend_Server_Exception */ @@ -175,7 +175,7 @@ class Zend_Server_Method_Callback /** * Get callback type - * + * * @return string */ public function getType() @@ -185,7 +185,7 @@ class Zend_Server_Method_Callback /** * Cast callback to array - * + * * @return array */ public function toArray() diff --git a/lib/zend/Zend/Server/Method/Definition.php b/lib/zend/Zend/Server/Method/Definition.php index 7a1d2a17f42..bb2f0577197 100644 --- a/lib/zend/Zend/Server/Method/Definition.php +++ b/lib/zend/Zend/Server/Method/Definition.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Definition @@ -63,8 +63,8 @@ class Zend_Server_Method_Definition /** * Constructor - * - * @param null|array $options + * + * @param null|array $options * @return void */ public function __construct($options = null) @@ -76,8 +76,8 @@ class Zend_Server_Method_Definition /** * Set object state from options - * - * @param array $options + * + * @param array $options * @return Zend_Server_Method_Definition */ public function setOptions(array $options) @@ -93,8 +93,8 @@ class Zend_Server_Method_Definition /** * Set method name - * - * @param string $name + * + * @param string $name * @return Zend_Server_Method_Definition */ public function setName($name) @@ -105,7 +105,7 @@ class Zend_Server_Method_Definition /** * Get method name - * + * * @return string */ public function getName() @@ -115,8 +115,8 @@ class Zend_Server_Method_Definition /** * Set method callback - * - * @param array|Zend_Server_Method_Callback $callback + * + * @param array|Zend_Server_Method_Callback $callback * @return Zend_Server_Method_Definition */ public function setCallback($callback) @@ -134,7 +134,7 @@ class Zend_Server_Method_Definition /** * Get method callback - * + * * @return Zend_Server_Method_Callback */ public function getCallback() @@ -144,8 +144,8 @@ class Zend_Server_Method_Definition /** * Add prototype to method definition - * - * @param array|Zend_Server_Method_Prototype $prototype + * + * @param array|Zend_Server_Method_Prototype $prototype * @return Zend_Server_Method_Definition */ public function addPrototype($prototype) @@ -163,7 +163,7 @@ class Zend_Server_Method_Definition /** * Add multiple prototypes at once - * + * * @param array $prototypes Array of Zend_Server_Method_Prototype objects or arrays * @return Zend_Server_Method_Definition */ @@ -177,7 +177,7 @@ class Zend_Server_Method_Definition /** * Set all prototypes at once (overwrites) - * + * * @param array $prototypes Array of Zend_Server_Method_Prototype objects or arrays * @return Zend_Server_Method_Definition */ @@ -190,7 +190,7 @@ class Zend_Server_Method_Definition /** * Get all prototypes - * + * * @return array $prototypes Array of Zend_Server_Method_Prototype objects or arrays */ public function getPrototypes() @@ -200,8 +200,8 @@ class Zend_Server_Method_Definition /** * Set method help - * - * @param string $methodHelp + * + * @param string $methodHelp * @return Zend_Server_Method_Definition */ public function setMethodHelp($methodHelp) @@ -212,7 +212,7 @@ class Zend_Server_Method_Definition /** * Get method help - * + * * @return string */ public function getMethodHelp() @@ -222,8 +222,8 @@ class Zend_Server_Method_Definition /** * Set object to use with method calls - * - * @param object $object + * + * @param object $object * @return Zend_Server_Method_Definition */ public function setObject($object) @@ -238,7 +238,7 @@ class Zend_Server_Method_Definition /** * Get object to use with method calls - * + * * @return null|object */ public function getObject() @@ -270,7 +270,7 @@ class Zend_Server_Method_Definition /** * Serialize to array - * + * * @return array */ public function toArray() diff --git a/lib/zend/Zend/Server/Method/Parameter.php b/lib/zend/Zend/Server/Method/Parameter.php index d56208447d7..fc29b302a7a 100644 --- a/lib/zend/Zend/Server/Method/Parameter.php +++ b/lib/zend/Zend/Server/Method/Parameter.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Parameter @@ -58,8 +58,8 @@ class Zend_Server_Method_Parameter /** * Constructor - * - * @param null|array $options + * + * @param null|array $options * @return void */ public function __construct($options = null) @@ -71,8 +71,8 @@ class Zend_Server_Method_Parameter /** * Set object state from array of options - * - * @param array $options + * + * @param array $options * @return Zend_Server_Method_Parameter */ public function setOptions(array $options) @@ -154,8 +154,8 @@ class Zend_Server_Method_Parameter /** * Set optional flag - * - * @param bool $flag + * + * @param bool $flag * @return Zend_Server_Method_Parameter */ public function setOptional($flag) @@ -166,7 +166,7 @@ class Zend_Server_Method_Parameter /** * Is the parameter optional? - * + * * @return bool */ public function isOptional() @@ -176,8 +176,8 @@ class Zend_Server_Method_Parameter /** * Set parameter type - * - * @param string $type + * + * @param string $type * @return Zend_Server_Method_Parameter */ public function setType($type) @@ -188,7 +188,7 @@ class Zend_Server_Method_Parameter /** * Retrieve parameter type - * + * * @return string */ public function getType() @@ -198,7 +198,7 @@ class Zend_Server_Method_Parameter /** * Cast to array - * + * * @return array */ public function toArray() diff --git a/lib/zend/Zend/Server/Method/Prototype.php b/lib/zend/Zend/Server/Method/Prototype.php index 0deb71c25f7..553320d2fe2 100644 --- a/lib/zend/Zend/Server/Method/Prototype.php +++ b/lib/zend/Zend/Server/Method/Prototype.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Method - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Method_Prototype @@ -47,9 +47,9 @@ class Zend_Server_Method_Prototype protected $_parameters = array(); /** - * Constructor - * - * @param null|array $options + * Constructor + * + * @param null|array $options * @return void */ public function __construct($options = null) @@ -83,8 +83,8 @@ class Zend_Server_Method_Prototype /** * Add a parameter - * - * @param string $parameter + * + * @param string $parameter * @return Zend_Server_Method_Prototype */ public function addParameter($parameter) @@ -106,8 +106,8 @@ class Zend_Server_Method_Prototype /** * Add parameters - * - * @param array $parameter + * + * @param array $parameter * @return Zend_Server_Method_Prototype */ public function addParameters(array $parameters) @@ -148,7 +148,7 @@ class Zend_Server_Method_Prototype /** * Get parameter objects - * + * * @return array */ public function getParameterObjects() @@ -158,8 +158,8 @@ class Zend_Server_Method_Prototype /** * Retrieve a single parameter by name or index - * - * @param string|int $index + * + * @param string|int $index * @return null|Zend_Server_Method_Parameter */ public function getParameter($index) @@ -178,8 +178,8 @@ class Zend_Server_Method_Prototype /** * Set object state from array - * - * @param array $options + * + * @param array $options * @return Zend_Server_Method_Prototype */ public function setOptions(array $options) @@ -195,7 +195,7 @@ class Zend_Server_Method_Prototype /** * Serialize to array - * + * * @return array */ public function toArray() diff --git a/lib/zend/Zend/Server/Reflection.php b/lib/zend/Zend/Server/Reflection.php index 5e4f94028e0..0559633354a 100644 --- a/lib/zend/Zend/Server/Reflection.php +++ b/lib/zend/Zend/Server/Reflection.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ require_once 'Zend/Server/Reflection/Class.php'; * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Reflection/Class.php b/lib/zend/Zend/Server/Reflection/Class.php index 36f9ac3cc8b..6e03191392c 100644 --- a/lib/zend/Zend/Server/Reflection/Class.php +++ b/lib/zend/Zend/Server/Reflection/Class.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,7 +32,7 @@ require_once 'Zend/Server/Reflection/Method.php'; * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Reflection/Exception.php b/lib/zend/Zend/Server/Reflection/Exception.php index b9ea91e13f6..4aff7efe88c 100644 --- a/lib/zend/Zend/Server/Reflection/Exception.php +++ b/lib/zend/Zend/Server/Reflection/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/Server/Exception.php'; * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Reflection/Function.php b/lib/zend/Zend/Server/Reflection/Function.php index ff44f37cbd5..b9faa4337bb 100644 --- a/lib/zend/Zend/Server/Reflection/Function.php +++ b/lib/zend/Zend/Server/Reflection/Function.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Server/Reflection/Function/Abstract.php'; * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Reflection/Function/Abstract.php b/lib/zend/Zend/Server/Reflection/Function/Abstract.php index e9422e6a576..5d6e95f5729 100644 --- a/lib/zend/Zend/Server/Reflection/Function/Abstract.php +++ b/lib/zend/Zend/Server/Reflection/Function/Abstract.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -46,7 +46,7 @@ require_once 'Zend/Server/Reflection/Prototype.php'; * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -237,7 +237,7 @@ abstract class Zend_Server_Reflection_Function_Abstract $return = new Zend_Server_Reflection_ReturnValue(array_shift($signature), $this->_returnDesc); $tmp = array(); foreach ($signature as $key => $type) { - $param = new Zend_Server_Reflection_Parameter($params[$key], $type, $this->_paramDesc[$key]); + $param = new Zend_Server_Reflection_Parameter($params[$key], $type, (isset($this->_paramDesc[$key]) ? $this->_paramDesc[$key] : null)); $param->setPosition($key); $tmp[] = $param; } @@ -339,8 +339,7 @@ abstract class Zend_Server_Reflection_Function_Abstract require_once 'Zend/Server/Reflection/Exception.php'; throw new Zend_Server_Reflection_Exception( 'Variable number of arguments is not supported for services (except optional parameters). ' - . 'Number of function arguments must correspond to actual number of arguments described in a docblock ' - . '(function was ' . $function->getName() . ')'); + . 'Number of function arguments must correspond to actual number of arguments described in a docblock.'); } $paramTypes = array(); diff --git a/lib/zend/Zend/Server/Reflection/Method.php b/lib/zend/Zend/Server/Reflection/Method.php index 6500dd1f130..d75da71646c 100644 --- a/lib/zend/Zend/Server/Reflection/Method.php +++ b/lib/zend/Zend/Server/Reflection/Method.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -30,7 +30,7 @@ require_once 'Zend/Server/Reflection/Function/Abstract.php'; * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Reflection/Node.php b/lib/zend/Zend/Server/Reflection/Node.php index de0d0e1c514..2de3cd825ed 100644 --- a/lib/zend/Zend/Server/Reflection/Node.php +++ b/lib/zend/Zend/Server/Reflection/Node.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * @package Zend_Server * @subpackage Reflection * @version $Id$ - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Server_Reflection_Node diff --git a/lib/zend/Zend/Server/Reflection/Parameter.php b/lib/zend/Zend/Server/Reflection/Parameter.php index b0dee542943..687c7de7d27 100644 --- a/lib/zend/Zend/Server/Reflection/Parameter.php +++ b/lib/zend/Zend/Server/Reflection/Parameter.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Reflection/Prototype.php b/lib/zend/Zend/Server/Reflection/Prototype.php index 806a17f841b..43536735c23 100644 --- a/lib/zend/Zend/Server/Reflection/Prototype.php +++ b/lib/zend/Zend/Server/Reflection/Prototype.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -36,7 +36,7 @@ require_once 'Zend/Server/Reflection/Parameter.php'; * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Server/Reflection/ReturnValue.php b/lib/zend/Zend/Server/Reflection/ReturnValue.php index 9a173794ae0..a1d7a9ebd3f 100644 --- a/lib/zend/Zend/Server/Reflection/ReturnValue.php +++ b/lib/zend/Zend/Server/Reflection/ReturnValue.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Server * @subpackage Reflection - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Service/Abstract.php b/lib/zend/Zend/Service/Abstract.php index 49828cbd3fe..46375c397aa 100644 --- a/lib/zend/Zend/Service/Abstract.php +++ b/lib/zend/Zend/Service/Abstract.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Http/Client.php'; /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Abstract diff --git a/lib/zend/Zend/Service/Akismet.php b/lib/zend/Zend/Service/Akismet.php index 6025b03c11a..008c9341d26 100644 --- a/lib/zend/Zend/Service/Akismet.php +++ b/lib/zend/Zend/Service/Akismet.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Akismet - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ */ require_once 'Zend/Version.php'; -/** +/** * @see Zend_Service_Abstract */ require_once 'Zend/Service/Abstract.php'; @@ -39,7 +39,7 @@ require_once 'Zend/Service/Abstract.php'; * @category Zend * @package Zend_Service * @subpackage Akismet - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Akismet extends Zend_Service_Abstract diff --git a/lib/zend/Zend/Service/Amazon.php b/lib/zend/Zend/Service/Amazon.php index 025b4cc2a27..e58b383d630 100644 --- a/lib/zend/Zend/Service/Amazon.php +++ b/lib/zend/Zend/Service/Amazon.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Rest/Client.php'; * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon @@ -44,7 +44,7 @@ class Zend_Service_Amazon /** * @var string - */ + */ protected $_secretKey = null; /** diff --git a/lib/zend/Zend/Service/Amazon/Abstract.php b/lib/zend/Zend/Service/Amazon/Abstract.php index 263f548471c..f4c7fa551b6 100644 --- a/lib/zend/Zend/Service/Amazon/Abstract.php +++ b/lib/zend/Zend/Service/Amazon/Abstract.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Abstract + */ require_once 'Zend/Service/Abstract.php'; /** @@ -29,7 +32,7 @@ require_once 'Zend/Service/Abstract.php'; * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract @@ -44,11 +47,6 @@ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract */ protected static $_defaultSecretKey = null; - /** - * @var string Amazon Region - */ - protected static $_defaultRegion = null; - /** * @var string Amazon Secret Key */ @@ -59,17 +57,6 @@ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract */ protected $_accessKey; - /** - * @var string Amazon Region - */ - protected $_region; - - /** - * An array that contains all the valid Amazon Ec2 Regions. - * - * @var array - */ - protected static $_validEc2Regions = array('eu-west-1', 'us-east-1'); /** * Set the keys to use when accessing SQS. @@ -85,30 +72,13 @@ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract } /** - * Set which region you are working in. It will append the - * end point automaticly - * - * @param string $region - */ - public static function setRegion($region) - { - if(in_array(strtolower($region), self::$_validEc2Regions, true)) { - self::$_defaultRegion = $region; - } else { - require_once 'Zend/Service/Amazon/Exception.php'; - throw new Zend_Service_Amazon_Exception('Invalid Amazon Ec2 Region'); - } - } - - /** - * Create Amazon Sqs client. + * Create Amazon client. * * @param string $access_key Override the default Access Key * @param string $secret_key Override the default Secret Key - * @param string $region Sets the AWS Region * @return void */ - public function __construct($accessKey=null, $secretKey=null, $region=null) + public function __construct($accessKey=null, $secretKey=null) { if(!$accessKey) { $accessKey = self::$_defaultAccessKey; @@ -116,15 +86,6 @@ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract if(!$secretKey) { $secretKey = self::$_defaultSecretKey; } - if(!$region) { - $region = self::$_defaultRegion; - } else { - // make rue the region is valid - if(!empty($region) && !in_array(strtolower($region), self::$_validEc2Regions, true)) { - require_once 'Zend/Service/Amazon/Exception.php'; - throw new Zend_Service_Amazon_Exception('Invalid Amazon Ec2 Region'); - } - } if(!$accessKey || !$secretKey) { require_once 'Zend/Service/Amazon/Exception.php'; @@ -132,18 +93,9 @@ abstract class Zend_Service_Amazon_Abstract extends Zend_Service_Abstract } $this->_accessKey = $accessKey; $this->_secretKey = $secretKey; - $this->_region = $region; } - /** - * Method to fetch the AWS Region - * - * @return string - */ - protected function _getRegion() - { - return (!empty($this->_region)) ? $this->_region . '.' : ''; - } + /** * Method to fetch the Access Key diff --git a/lib/zend/Zend/Service/Amazon/Accessories.php b/lib/zend/Zend/Service/Amazon/Accessories.php index c5f0df5b706..d6b415b0787 100644 --- a/lib/zend/Zend/Service/Amazon/Accessories.php +++ b/lib/zend/Zend/Service/Amazon/Accessories.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Accessories diff --git a/lib/zend/Zend/Service/Amazon/CustomerReview.php b/lib/zend/Zend/Service/Amazon/CustomerReview.php index 930f8da6b74..259c0696da1 100644 --- a/lib/zend/Zend/Service/Amazon/CustomerReview.php +++ b/lib/zend/Zend/Service/Amazon/CustomerReview.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_CustomerReview diff --git a/lib/zend/Zend/Service/Amazon/Ec2.php b/lib/zend/Zend/Service/Amazon/Ec2.php index e809e3fea20..a6567fc7ba8 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2.php +++ b/lib/zend/Zend/Service/Amazon/Ec2.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2 diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php b/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php index ef9936619c4..ae9dd360126 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Abstract.php @@ -15,15 +15,24 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Abstract + */ require_once 'Zend/Service/Amazon/Abstract.php'; +/** + * @see Zend_Service_Amazon_Ec2_Response + */ require_once 'Zend/Service/Amazon/Ec2/Response.php'; +/** + * @see Zend_Service_Amazon_Ec2_Exception + */ require_once 'Zend/Service/Amazon/Ec2/Exception.php'; /** @@ -32,7 +41,7 @@ require_once 'Zend/Service/Amazon/Ec2/Exception.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abstract @@ -62,6 +71,74 @@ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abst */ protected $_httpTimeout = 10; + /** + * @var string Amazon Region + */ + protected static $_defaultRegion = null; + + /** + * @var string Amazon Region + */ + protected $_region; + + /** + * An array that contains all the valid Amazon Ec2 Regions. + * + * @var array + */ + protected static $_validEc2Regions = array('eu-west-1', 'us-east-1'); + + /** + * Create Amazon client. + * + * @param string $access_key Override the default Access Key + * @param string $secret_key Override the default Secret Key + * @param string $region Sets the AWS Region + * @return void + */ + public function __construct($accessKey=null, $secretKey=null, $region=null) + { + if(!$region) { + $region = self::$_defaultRegion; + } else { + // make rue the region is valid + if(!empty($region) && !in_array(strtolower($region), self::$_validEc2Regions, true)) { + require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Invalid Amazon Ec2 Region'); + } + } + + $this->_region = $region; + + parent::__construct($accessKey, $secretKey); + } + + /** + * Set which region you are working in. It will append the + * end point automaticly + * + * @param string $region + */ + public static function setRegion($region) + { + if(in_array(strtolower($region), self::$_validEc2Regions, true)) { + self::$_defaultRegion = $region; + } else { + require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Invalid Amazon Ec2 Region'); + } + } + + /** + * Method to fetch the AWS Region + * + * @return string + */ + protected function _getRegion() + { + return (!empty($this->_region)) ? $this->_region . '.' : ''; + } + /** * Sends a HTTP request to the queue service using Zend_Http_Client * @@ -93,7 +170,7 @@ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abst } catch (Zend_Http_Client_Exception $zhce) { $message = 'Error in request to AWS service: ' . $zhce->getMessage(); - throw new Zend_Service_Amazon_Ec2_Exception($message, $zhce->getCode()); + throw new Zend_Service_Amazon_Ec2_Exception($message, $zhce->getCode(), $zhce); } $response = new Zend_Service_Amazon_Ec2_Response($httpResponse); $this->checkForErrors($response); @@ -163,7 +240,7 @@ abstract class Zend_Service_Amazon_Ec2_Abstract extends Zend_Service_Amazon_Abst $arrData = array(); foreach($paramaters as $key => $value) { - $arrData[] = $key . '=' . str_replace("%7E", "~", urlencode($value)); + $arrData[] = $key . '=' . str_replace("%7E", "~", rawurlencode($value)); } $data .= implode('&', $arrData); diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php b/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php index 8c737c46e56..c47edf2a83f 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Availabilityzones.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -28,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Availabilityzones extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php b/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php index 49479defcd2..6f69e7fefa9 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/CloudWatch.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -29,7 +32,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstract @@ -274,8 +277,12 @@ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstrac $x = 1; foreach($options['Dimensions'] as $dimKey=>$dimVal) { if(!in_array($dimKey, $this->_validDimensionsKeys, true)) continue; - $options[$dimKey . '.member.' . $x++] = $dimVal; + $options['Dimensions.member.' . $x . '.Name'] = $dimKey; + $options['Dimensions.member.' . $x . '.Value'] = $dimVal; + $x++; } + + unset($options['Dimensions']); } $params = array_merge($params, $options); @@ -310,8 +317,8 @@ class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_Abstrac * Return the Metrics that are aviable for your current monitored instances * * @param string $nextToken The NextToken parameter is an optional parameter - * that allows you to retrieve the next set of results - * for your ListMetrics query. + * that allows you to retrieve the next set of results + * for your ListMetrics query. * @return array */ public function listMetrics($nextToken = null) diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php b/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php index 5b15e8281f2..92687c18519 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Ebs.php @@ -15,14 +15,16 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; - /** * An Amazon EC2 interface to create, describe, attach, detach and delete Elastic Block * Storage Volumes and Snaphsots. @@ -30,7 +32,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Ebs extends Zend_Service_Amazon_Ec2_Abstract @@ -240,7 +242,7 @@ class Zend_Service_Amazon_Ec2_Ebs extends Zend_Service_Amazon_Ec2_Abstract { $params = array(); $params['Action'] = 'DeleteVolume'; - $params['volumeId'] = $volumeId; + $params['VolumeId'] = $volumeId; $response = $this->sendRequest($params); $xpath = $response->getXPath(); diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php b/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php index af6c114989e..edacfaeec22 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Elasticip.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -29,7 +32,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Elasticip extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Exception.php b/lib/zend/Zend/Service/Amazon/Ec2/Exception.php index 10dd77d9173..5f958a58f84 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Exception.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Exception.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Exception + */ require_once 'Zend/Service/Amazon/Exception.php'; /** @@ -28,7 +31,7 @@ require_once 'Zend/Service/Amazon/Exception.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Exception extends Zend_Service_Amazon_Exception diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Image.php b/lib/zend/Zend/Service/Amazon/Ec2/Image.php index dd4a8e89384..a2bf20ca1f7 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Image.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Image.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -28,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Image extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Instance.php b/lib/zend/Zend/Service/Amazon/Ec2/Instance.php index 4c4f0bea45f..77d2f8d2a64 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Instance.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Instance.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -29,7 +32,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_Abstract @@ -279,9 +282,9 @@ class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_Abstract $item['amiLaunchIndex'] = $xpath->evaluate('string(ec2:amiLaunchIndex/text())', $is_node); $item['monitoringState'] = $xpath->evaluate('string(ec2:monitoring/ec2:state/text())', $is_node); + $return['instances'][] = $item; unset($is_node); } - $return['instances'][] = $item; unset($item); unset($is); } diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php index d2a85a09e57..ae68e83fc37 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Reserved.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -28,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance_Reserved extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php index 1447f746065..b268ecf688a 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Instance/Windows.php @@ -15,20 +15,23 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** - * Zend_Crypt_Hmac + * @see Zend_Crypt_Hmac */ require_once 'Zend/Crypt/Hmac.php'; /** - * Zend_Json + * @see Zend_Json */ require_once 'Zend/Json.php'; @@ -39,7 +42,7 @@ require_once 'Zend/Json.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Instance_Windows extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php b/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php index 5dbd4d54ab6..e78df50d4d7 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Keypair.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -28,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Keypair extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Region.php b/lib/zend/Zend/Service/Amazon/Ec2/Region.php index f4fc67cc373..03fb49ba60b 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Region.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Region.php @@ -15,19 +15,23 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; + /** * An Amazon EC2 interface to query which Regions your account has access to. * * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Region extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Response.php b/lib/zend/Zend/Service/Amazon/Ec2/Response.php index 7bbde82b744..fcdf1b43101 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Response.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Response.php @@ -15,18 +15,21 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Http_Response + */ require_once 'Zend/Http/Response.php'; /** * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Response { diff --git a/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php b/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php index cbbcfa9293f..63f2ad87662 100644 --- a/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php +++ b/lib/zend/Zend/Service/Amazon/Ec2/Securitygroups.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Service_Amazon_Ec2_Abstract + */ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; /** @@ -28,7 +31,7 @@ require_once 'Zend/Service/Amazon/Ec2/Abstract.php'; * @category Zend * @package Zend_Service_Amazon * @subpackage Ec2 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Ec2_Securitygroups extends Zend_Service_Amazon_Ec2_Abstract diff --git a/lib/zend/Zend/Service/Amazon/EditorialReview.php b/lib/zend/Zend/Service/Amazon/EditorialReview.php index 043fcc62ead..94c93869376 100644 --- a/lib/zend/Zend/Service/Amazon/EditorialReview.php +++ b/lib/zend/Zend/Service/Amazon/EditorialReview.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_EditorialReview diff --git a/lib/zend/Zend/Service/Amazon/Exception.php b/lib/zend/Zend/Service/Amazon/Exception.php index 24801e62d09..62ccf3e6246 100755 --- a/lib/zend/Zend/Service/Amazon/Exception.php +++ b/lib/zend/Zend/Service/Amazon/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,7 +28,7 @@ require_once 'Zend/Service/Exception.php'; /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Exception extends Zend_Service_Exception diff --git a/lib/zend/Zend/Service/Amazon/Image.php b/lib/zend/Zend/Service/Amazon/Image.php index 4f215825abb..673a776fd3c 100644 --- a/lib/zend/Zend/Service/Amazon/Image.php +++ b/lib/zend/Zend/Service/Amazon/Image.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Image diff --git a/lib/zend/Zend/Service/Amazon/Item.php b/lib/zend/Zend/Service/Amazon/Item.php index a0e8f49db83..4ea008fd6bd 100644 --- a/lib/zend/Zend/Service/Amazon/Item.php +++ b/lib/zend/Zend/Service/Amazon/Item.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Item @@ -112,11 +112,22 @@ class Zend_Service_Amazon_Item /** * Parse the given element * - * @param DOMElement $dom + * @param null|DOMElement $dom * @return void + * @throws Zend_Service_Amazon_Exception + * + * @group ZF-9547 */ - public function __construct(DOMElement $dom) + public function __construct($dom) { + if (null === $dom) { + require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Item element is empty'); + } + if (!$dom instanceof DOMElement) { + require_once 'Zend/Service/Amazon/Exception.php'; + throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element'); + } $xpath = new DOMXPath($dom->ownerDocument); $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); $this->ASIN = $xpath->query('./az:ASIN/text()', $dom)->item(0)->data; diff --git a/lib/zend/Zend/Service/Amazon/ListmaniaList.php b/lib/zend/Zend/Service/Amazon/ListmaniaList.php index 6f638dd7ee0..0c57fbeeae6 100644 --- a/lib/zend/Zend/Service/Amazon/ListmaniaList.php +++ b/lib/zend/Zend/Service/Amazon/ListmaniaList.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_ListmaniaList diff --git a/lib/zend/Zend/Service/Amazon/Offer.php b/lib/zend/Zend/Service/Amazon/Offer.php index 3b3e0f9c953..b53dee3717c 100644 --- a/lib/zend/Zend/Service/Amazon/Offer.php +++ b/lib/zend/Zend/Service/Amazon/Offer.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Offer @@ -36,6 +36,11 @@ class Zend_Service_Amazon_Offer */ public $MerchantId; + /** + * @var string + */ + public $MerchantName; + /** * @var string */ @@ -82,11 +87,18 @@ class Zend_Service_Amazon_Offer $xpath = new DOMXPath($dom->ownerDocument); $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05'); $this->MerchantId = (string) $xpath->query('./az:Merchant/az:MerchantId/text()', $dom)->item(0)->data; + $name = $xpath->query('./az:Merchant/az:Name/text()', $dom); + if ($name->length == 1) { + $this->MerchantName = (string) $name->item(0)->data; + } $this->GlancePage = (string) $xpath->query('./az:Merchant/az:GlancePage/text()', $dom)->item(0)->data; $this->Condition = (string) $xpath->query('./az:OfferAttributes/az:Condition/text()', $dom)->item(0)->data; $this->OfferListingId = (string) $xpath->query('./az:OfferListing/az:OfferListingId/text()', $dom)->item(0)->data; - $this->Price = (int) $xpath->query('./az:OfferListing/az:Price/az:Amount/text()', $dom)->item(0)->data; - $this->CurrencyCode = (string) $xpath->query('./az:OfferListing/az:Price/az:CurrencyCode/text()', $dom)->item(0)->data; + $Price = $xpath->query('./az:OfferListing/az:Price/az:Amount', $dom); + if ($Price->length == 1) { + $this->Price = (int) $xpath->query('./az:OfferListing/az:Price/az:Amount/text()', $dom)->item(0)->data; + $this->CurrencyCode = (string) $xpath->query('./az:OfferListing/az:Price/az:CurrencyCode/text()', $dom)->item(0)->data; + } $availability = $xpath->query('./az:OfferListing/az:Availability/text()', $dom)->item(0); if($availability instanceof DOMText) { $this->Availability = (string) $availability->data; @@ -96,4 +108,4 @@ class Zend_Service_Amazon_Offer $this->IsEligibleForSuperSaverShipping = (bool) $result->item(0)->data; } } -} +} \ No newline at end of file diff --git a/lib/zend/Zend/Service/Amazon/OfferSet.php b/lib/zend/Zend/Service/Amazon/OfferSet.php index 24dc389ac79..daf6f0e8723 100644 --- a/lib/zend/Zend/Service/Amazon/OfferSet.php +++ b/lib/zend/Zend/Service/Amazon/OfferSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_OfferSet @@ -89,12 +89,12 @@ class Zend_Service_Amazon_OfferSet $offer = $xpath->query('./az:OfferSummary', $dom); if ($offer->length == 1) { - $lowestNewPrice = $xpath->query('./az:OfferSummary/az:LowestNewPrice', $dom); + $lowestNewPrice = $xpath->query('./az:OfferSummary/az:LowestNewPrice/az:Amount', $dom); if ($lowestNewPrice->length == 1) { $this->LowestNewPrice = (int) $xpath->query('./az:OfferSummary/az:LowestNewPrice/az:Amount/text()', $dom)->item(0)->data; $this->LowestNewPriceCurrency = (string) $xpath->query('./az:OfferSummary/az:LowestNewPrice/az:CurrencyCode/text()', $dom)->item(0)->data; } - $lowestUsedPrice = $xpath->query('./az:OfferSummary/az:LowestUsedPrice', $dom); + $lowestUsedPrice = $xpath->query('./az:OfferSummary/az:LowestUsedPrice/az:Amount', $dom); if ($lowestUsedPrice->length == 1) { $this->LowestUsedPrice = (int) $xpath->query('./az:OfferSummary/az:LowestUsedPrice/az:Amount/text()', $dom)->item(0)->data; $this->LowestUsedPriceCurrency = (string) $xpath->query('./az:OfferSummary/az:LowestUsedPrice/az:CurrencyCode/text()', $dom)->item(0)->data; diff --git a/lib/zend/Zend/Service/Amazon/Query.php b/lib/zend/Zend/Service/Amazon/Query.php index 0e749a42f5e..1391298a0d6 100644 --- a/lib/zend/Zend/Service/Amazon/Query.php +++ b/lib/zend/Zend/Service/Amazon/Query.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Amazon.php'; * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Query extends Zend_Service_Amazon diff --git a/lib/zend/Zend/Service/Amazon/ResultSet.php b/lib/zend/Zend/Service/Amazon/ResultSet.php index c26342f8341..84e25f47ae3 100644 --- a/lib/zend/Zend/Service/Amazon/ResultSet.php +++ b/lib/zend/Zend/Service/Amazon/ResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Amazon/Item.php'; * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_ResultSet implements SeekableIterator diff --git a/lib/zend/Zend/Service/Amazon/S3.php b/lib/zend/Zend/Service/Amazon/S3.php index 0fb33ec9e78..80fed83fd09 100755 --- a/lib/zend/Zend/Service/Amazon/S3.php +++ b/lib/zend/Zend/Service/Amazon/S3.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -36,7 +36,7 @@ require_once 'Zend/Crypt/Hmac.php'; * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://docs.amazonwebservices.com/AmazonS3/2006-03-01/ */ @@ -281,14 +281,19 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract /** * List the objects in a bucket. * - * Provides the list of object keys that are contained in the bucket. + * Provides the list of object keys that are contained in the bucket. Valid params include the following. + * prefix - Limits the response to keys which begin with the indicated prefix. You can use prefixes to separate a bucket into different sets of keys in a way similar to how a file system uses folders. + * marker - Indicates where in the bucket to begin listing. The list will only include keys that occur lexicographically after marker. This is convenient for pagination: To get the next page of results use the last key of the current page as the marker. + * max-keys - The maximum number of keys you'd like to see in the response body. The server might return fewer than this many keys, but will not return more. + * delimiter - Causes keys that contain the same string between the prefix and the first occurrence of the delimiter to be rolled up into a single result element in the CommonPrefixes collection. These rolled-up keys are not returned elsewhere in the response. * * @param string $bucket + * @param array $params S3 GET Bucket Paramater * @return array|false */ - public function getObjectsByBucket($bucket) + public function getObjectsByBucket($bucket, $params = array()) { - $response = $this->_makeRequest('GET', $bucket); + $response = $this->_makeRequest('GET', $bucket, $params); if ($response->getStatus() != 200) { return false; @@ -352,11 +357,40 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract return $response->getBody(); } + /** + * Get an object using streaming + * + * Can use either provided filename for storage or create a temp file if none provided. + * + * @param string $object Object path + * @param string $streamfile File to write the stream to + * @param bool $paidobject This is "requestor pays" object + * @return Zend_Http_Response_Stream|false + */ + public function getObjectStream($object, $streamfile = null, $paidobject=false) + { + $object = $this->_fixupObjectName($object); + self::getHttpClient()->setStream($streamfile?$streamfile:true); + if ($paidobject) { + $response = $this->_makeRequest('GET', $object, null, array(self::S3_REQUESTPAY_HEADER => 'requester')); + } + else { + $response = $this->_makeRequest('GET', $object); + } + self::getHttpClient()->setStream(null); + + if ($response->getStatus() != 200 || !($response instanceof Zend_Http_Response_Stream)) { + return false; + } + + return $response; + } + /** * Upload an object by a PHP string * * @param string $object Object name - * @param string $data Object data + * @param string|resource $data Object data (can be string or stream) * @param array $meta Metadata * @return boolean */ @@ -365,7 +399,9 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract $object = $this->_fixupObjectName($object); $headers = (is_array($meta)) ? $meta : array(); - $headers['Content-MD5'] = base64_encode(md5($data, true)); + if(!is_resource($data)) { + $headers['Content-MD5'] = base64_encode(md5($data, true)); + } $headers['Expect'] = '100-continue'; if (!isset($headers[self::S3_CONTENT_TYPE_HEADER])) { @@ -379,7 +415,7 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract // It is escaped by double quotes for some reason $etag = str_replace('"', '', $response->getHeader('Etag')); - if ($etag == md5($data)) { + if (is_resource($data) || $etag == md5($data)) { return true; } } @@ -417,6 +453,40 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract return $this->putObject($object, $data, $meta); } + /** + * Put file to S3 as object, using streaming + * + * @param string $path File name + * @param string $object Object name + * @param array $meta Metadata + * @return boolean + */ + public function putFileStream($path, $object, $meta=null) + { + $data = @fopen($path, "rb"); + if ($data === false) { + /** + * @see Zend_Service_Amazon_S3_Exception + */ + require_once 'Zend/Service/Amazon/S3/Exception.php'; + throw new Zend_Service_Amazon_S3_Exception("Cannot open file $path"); + } + + if (!is_array($meta)) { + $meta = array(); + } + + if (!isset($meta[self::S3_CONTENT_TYPE_HEADER])) { + $meta[self::S3_CONTENT_TYPE_HEADER] = self::getMimeType($path); + } + + if(!isset($meta['Content-MD5'])) { + $headers['Content-MD5'] = base64_encode(md5_file($path, true)); + } + + return $this->putObject($object, $data, $meta); + } + /** * Remove a given object * @@ -435,11 +505,11 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract /** * Make a request to Amazon S3 * - * @param string $method - * @param string $path - * @param array $params - * @param array $headers - * @param string $data + * @param string $method Request method + * @param string $path Path to requested object + * @param array $params Request parameters + * @param array $headers HTTP headers + * @param string|resource $data Request data * @return Zend_Http_Response */ public function _makeRequest($method, $path='', $params=null, $headers=array(), $data=null) @@ -452,6 +522,14 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract $headers['Date'] = gmdate(DATE_RFC1123, time()); + if(is_resource($data) && $method != 'PUT') { + /** + * @see Zend_Service_Amazon_S3_Exception + */ + require_once 'Zend/Service/Amazon/S3/Exception.php'; + throw new Zend_Service_Amazon_S3_Exception("Only PUT request supports stream data"); + } + // build the end point out $parts = explode('/', $path, 2); $endpoint = clone($this->_endpoint); @@ -474,6 +552,7 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract $client = self::getHttpClient(); $client->resetParameters(); + $client->setUri($endpoint); $client->setAuth(false); // Work around buglet in HTTP client - it doesn't clean headers // Remove when ZHC is fixed @@ -482,7 +561,6 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract 'Range' => null, 'x-amz-acl' => null)); - $client->setUri($endpoint); $client->setHeaders($headers); if (is_array($params)) { @@ -597,8 +675,6 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract /** * Attempt to get the content-type of a file based on the extension * - * TODO: move this to Zend_Mime - * * @param string $path * @return string */ @@ -611,7 +687,7 @@ class Zend_Service_Amazon_S3 extends Zend_Service_Amazon_Abstract return 'binary/octet-stream'; } - switch ($ext) { + switch (strtolower($ext)) { case 'xls': $content_type = 'application/excel'; break; diff --git a/lib/zend/Zend/Service/Amazon/S3/Exception.php b/lib/zend/Zend/Service/Amazon/S3/Exception.php index df5b1b71e79..6cba569b2a8 100755 --- a/lib/zend/Zend/Service/Amazon/S3/Exception.php +++ b/lib/zend/Zend/Service/Amazon/S3/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Service/Amazon/Exception.php'; /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_S3_Exception extends Zend_Service_Amazon_Exception diff --git a/lib/zend/Zend/Service/Amazon/S3/Stream.php b/lib/zend/Zend/Service/Amazon/S3/Stream.php index 1d86eeac82b..e5a7bf164f2 100755 --- a/lib/zend/Zend/Service/Amazon/S3/Stream.php +++ b/lib/zend/Zend/Service/Amazon/S3/Stream.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/S3.php'; * @category Zend * @package Zend_Service * @subpackage Amazon_S3 - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_S3_Stream @@ -331,13 +331,13 @@ class Zend_Service_Amazon_S3_Stream $stat['blksize'] = 0; $stat['blocks'] = 0; - if(($slash = strchr($this->_objectName, '/')) === false || $slash == strlen($this->_objectName)-1) { - /* bucket */ - $stat['mode'] |= 040000; - } else { - $stat['mode'] |= 0100000; - } - $info = $this->_s3->getInfo($this->_objectName); + if(($slash = strchr($this->_objectName, '/')) === false || $slash == strlen($this->_objectName)-1) { + /* bucket */ + $stat['mode'] |= 040000; + } else { + $stat['mode'] |= 0100000; + } + $info = $this->_s3->getInfo($this->_objectName); if (!empty($info)) { $stat['size'] = $info['size']; $stat['atime'] = time(); @@ -410,8 +410,8 @@ class Zend_Service_Amazon_S3_Stream $this->_bucketList = $this->_getS3Client($path)->getBuckets(); } else { - $url = parse_url($path); - $this->_bucketList = $this->_getS3Client($path)->getObjectsByBucket($url["host"]); + $host = parse_url($path, PHP_URL_HOST); + $this->_bucketList = $this->_getS3Client($path)->getObjectsByBucket($host); } return ($this->_bucketList !== false); @@ -441,14 +441,14 @@ class Zend_Service_Amazon_S3_Stream $stat['blksize'] = 0; $stat['blocks'] = 0; - $name = $this->_getNamePart($path); - if(($slash = strchr($name, '/')) === false || $slash == strlen($name)-1) { - /* bucket */ - $stat['mode'] |= 040000; - } else { - $stat['mode'] |= 0100000; - } - $info = $this->_getS3Client($path)->getInfo($name); + $name = $this->_getNamePart($path); + if(($slash = strchr($name, '/')) === false || $slash == strlen($name)-1) { + /* bucket */ + $stat['mode'] |= 040000; + } else { + $stat['mode'] |= 0100000; + } + $info = $this->_getS3Client($path)->getInfo($name); if (!empty($info)) { $stat['size'] = $info['size']; diff --git a/lib/zend/Zend/Service/Amazon/SimilarProduct.php b/lib/zend/Zend/Service/Amazon/SimilarProduct.php index 156ff96fc99..01ab07b13cc 100644 --- a/lib/zend/Zend/Service/Amazon/SimilarProduct.php +++ b/lib/zend/Zend/Service/Amazon/SimilarProduct.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_SimilarProduct diff --git a/lib/zend/Zend/Service/Amazon/Sqs.php b/lib/zend/Zend/Service/Amazon/Sqs.php index 3883a5d6772..410fddddfd7 100644 --- a/lib/zend/Zend/Service/Amazon/Sqs.php +++ b/lib/zend/Zend/Service/Amazon/Sqs.php @@ -13,9 +13,9 @@ * to license@zend.com so we can send you a copy immediately. * * @category Zend - * @package Service + * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,9 +34,9 @@ require_once 'Zend/Crypt/Hmac.php'; * Class for connecting to the Amazon Simple Queue Service (SQS) * * @category Zend - * @package Service + * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @see http://aws.amazon.com/sqs/ Amazon Simple Queue Service */ @@ -298,8 +298,16 @@ class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_Abstract require_once 'Zend/Service/Amazon/Sqs/Exception.php'; throw new Zend_Service_Amazon_Sqs_Exception($result->Error->Code); } - - return (string) $result->GetQueueAttributesResult->Attribute->Value; + + if(count($result->GetQueueAttributesResult->Attribute) > 1) { + $attr_result = array(); + foreach($result->GetQueueAttributesResult->Attribute as $attribute) { + $attr_result[(string)$attribute->Name] = (string)$attribute->Value; + } + return $attr_result; + } else { + return (string) $result->GetQueueAttributesResult->Attribute->Value; + } } /** diff --git a/lib/zend/Zend/Service/Amazon/Sqs/Exception.php b/lib/zend/Zend/Service/Amazon/Sqs/Exception.php index 6d808e39337..b40e8601fa5 100644 --- a/lib/zend/Zend/Service/Amazon/Sqs/Exception.php +++ b/lib/zend/Zend/Service/Amazon/Sqs/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Service/Amazon/Exception.php'; * @category Zend * @package Zend_Service * @subpackage Amazon_Sqs - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Amazon_Sqs_Exception extends Zend_Service_Amazon_Exception diff --git a/lib/zend/Zend/Service/Audioscrobbler.php b/lib/zend/Zend/Service/Audioscrobbler.php index f9ded932807..d95444bc888 100644 --- a/lib/zend/Zend/Service/Audioscrobbler.php +++ b/lib/zend/Zend/Service/Audioscrobbler.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Audioscrobbler - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Http/Client.php'; * @category Zend * @package Zend_Service * @subpackage Audioscrobbler - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Audioscrobbler @@ -76,7 +76,7 @@ class Zend_Service_Audioscrobbler /** * Set Http Client - * + * * @param Zend_Http_Client $client */ public function setHttpClient(Zend_Http_Client $client) @@ -86,7 +86,7 @@ class Zend_Service_Audioscrobbler /** * Get current http client. - * + * * @return Zend_Http_Client */ public function getHttpClient() @@ -201,7 +201,7 @@ class Zend_Service_Audioscrobbler /** * Utility function to get Audioscrobbler profile information (eg: Name, Gender) - * + * * @return array containing information */ public function userGetProfileInformation() @@ -212,7 +212,7 @@ class Zend_Service_Audioscrobbler /** * Utility function get this user's 50 most played artists - * + * * @return array containing info */ public function userGetTopArtists() @@ -244,7 +244,7 @@ class Zend_Service_Audioscrobbler /** * Utility function to get this user's 50 most used tags - * + * * @return SimpleXMLElement object containing result set */ public function userGetTopTags() @@ -301,7 +301,7 @@ class Zend_Service_Audioscrobbler /** * Utility function that returns a list of people with similar listening preferences to this user - * + * * @return SimpleXMLElement object containing result set */ public function userGetNeighbours() @@ -445,7 +445,7 @@ class Zend_Service_Audioscrobbler /** * Utility function that returns a list of this artist's top-rated tracks - * + * * @return SimpleXMLElement object containing result set */ public function artistGetTopTracks() @@ -456,7 +456,7 @@ class Zend_Service_Audioscrobbler /** * Utility function that returns a list of this artist's top-rated albums - * + * * @return SimpleXMLElement object containing result set */ public function artistGetTopAlbums() @@ -467,7 +467,7 @@ class Zend_Service_Audioscrobbler /** * Utility function that returns a list of this artist's top-rated tags - * + * * @return SimpleXMLElement object containing result set */ public function artistGetTopTags() @@ -490,7 +490,7 @@ class Zend_Service_Audioscrobbler /** * Get top fans of the current track. - * + * * @return SimpleXMLElement */ public function trackGetTopFans() @@ -534,7 +534,7 @@ class Zend_Service_Audioscrobbler /** * Get top artists by current tag. - * + * * @return SimpleXMLElement */ public function tagGetTopArtists() @@ -611,7 +611,7 @@ class Zend_Service_Audioscrobbler /** * Retrieve Weekly album charts. - * + * * @param int $from * @param int $to * @return SimpleXMLElement diff --git a/lib/zend/Zend/Service/Delicious.php b/lib/zend/Zend/Service/Delicious.php index 03fd3e7bfd7..5a967593069 100644 --- a/lib/zend/Zend/Service/Delicious.php +++ b/lib/zend/Zend/Service/Delicious.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -54,7 +54,7 @@ require_once 'Zend/Service/Delicious/PostList.php'; * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious @@ -426,10 +426,10 @@ class Zend_Service_Delicious $path = sprintf(self::JSON_FANS, $user); return $this->makeRequest($path, array(), 'json'); } - + /** * Get details on a particular bookmarked URL - * + * * Returned array contains four elements: * - hash - md5 hash of URL * - top_tags - array of tags and their respective usage counts @@ -439,14 +439,14 @@ class Zend_Service_Delicious * If URL hasen't been bookmarked null is returned. * * @param string $url URL for which to get details - * @return array + * @return array */ - public function getUrlDetails($url) + public function getUrlDetails($url) { $parms = array('hash' => md5($url)); - + $res = $this->makeRequest(self::JSON_URL, $parms, 'json'); - + if(isset($res[0])) { return $res[0]; } else { diff --git a/lib/zend/Zend/Service/Delicious/Exception.php b/lib/zend/Zend/Service/Delicious/Exception.php index cd95446ce58..8424afe8574 100644 --- a/lib/zend/Zend/Service/Delicious/Exception.php +++ b/lib/zend/Zend/Service/Delicious/Exception.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Exception.php'; * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_Exception extends Zend_Service_Exception diff --git a/lib/zend/Zend/Service/Delicious/Post.php b/lib/zend/Zend/Service/Delicious/Post.php index d4dc34a7ae0..0491d51dcdb 100644 --- a/lib/zend/Zend/Service/Delicious/Post.php +++ b/lib/zend/Zend/Service/Delicious/Post.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -39,7 +39,7 @@ require_once 'Zend/Service/Delicious/SimplePost.php'; * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_Post extends Zend_Service_Delicious_SimplePost diff --git a/lib/zend/Zend/Service/Delicious/PostList.php b/lib/zend/Zend/Service/Delicious/PostList.php index a3a5341d1cd..e9493c493a1 100644 --- a/lib/zend/Zend/Service/Delicious/PostList.php +++ b/lib/zend/Zend/Service/Delicious/PostList.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_PostList implements Countable, Iterator, ArrayAccess diff --git a/lib/zend/Zend/Service/Delicious/SimplePost.php b/lib/zend/Zend/Service/Delicious/SimplePost.php index f7764801c43..80ae08d6096 100644 --- a/lib/zend/Zend/Service/Delicious/SimplePost.php +++ b/lib/zend/Zend/Service/Delicious/SimplePost.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage Delicious - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Delicious_SimplePost diff --git a/lib/zend/Zend/Service/Exception.php b/lib/zend/Zend/Service/Exception.php index c77ed0271a5..6421b7b78f0 100644 --- a/lib/zend/Zend/Service/Exception.php +++ b/lib/zend/Zend/Service/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_Service - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Exception extends Zend_Exception diff --git a/lib/zend/Zend/Service/Flickr.php b/lib/zend/Zend/Service/Flickr.php index 0bb9caccb76..af185f0ad18 100644 --- a/lib/zend/Zend/Service/Flickr.php +++ b/lib/zend/Zend/Service/Flickr.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr @@ -192,7 +192,7 @@ class Zend_Service_Flickr require_once 'Zend/Service/Flickr/ResultSet.php'; return new Zend_Service_Flickr_ResultSet($dom, $this); } - + /** * Finds photos in a group's pool. * @@ -410,7 +410,7 @@ class Zend_Service_Flickr protected function _validateUserSearch(array $options) { $validOptions = array('api_key', 'method', 'user_id', 'per_page', 'page', 'extras', 'min_upload_date', - 'min_taken_date', 'max_upload_date', 'max_taken_date'); + 'min_taken_date', 'max_upload_date', 'max_taken_date', 'safe_search'); $this->_compareOptions($options, $validOptions); @@ -465,7 +465,9 @@ class Zend_Service_Flickr { $validOptions = array('method', 'api_key', 'user_id', 'tags', 'tag_mode', 'text', 'min_upload_date', 'max_upload_date', 'min_taken_date', 'max_taken_date', 'license', 'sort', - 'privacy_filter', 'bbox', 'accuracy', 'machine_tags', 'machine_tag_mode', 'group_id', + 'privacy_filter', 'bbox', 'accuracy', 'safe_search', 'content_type', 'machine_tags', + 'machine_tag_mode', 'group_id', 'contacts', 'woe_id', 'place_id', 'media', 'has_geo', + 'geo_context', 'lat', 'lon', 'radius', 'radius_units', 'is_commons', 'is_gallery', 'extras', 'per_page', 'page'); $this->_compareOptions($options, $validOptions); @@ -509,8 +511,8 @@ class Zend_Service_Flickr } } - - + + /** * Validate Group Search Options * @@ -542,7 +544,7 @@ class Zend_Service_Flickr */ require_once 'Zend/Validate/Int.php'; $int = new Zend_Validate_Int(); - + if (!$int->isValid($options['page'])) { /** * @see Zend_Service_Exception diff --git a/lib/zend/Zend/Service/Flickr/Image.php b/lib/zend/Zend/Service/Flickr/Image.php index ffbe854ea08..fcf3063f8fc 100644 --- a/lib/zend/Zend/Service/Flickr/Image.php +++ b/lib/zend/Zend/Service/Flickr/Image.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_Image diff --git a/lib/zend/Zend/Service/Flickr/Result.php b/lib/zend/Zend/Service/Flickr/Result.php index a7e20018f7c..8fcea0812d4 100644 --- a/lib/zend/Zend/Service/Flickr/Result.php +++ b/lib/zend/Zend/Service/Flickr/Result.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_Result diff --git a/lib/zend/Zend/Service/Flickr/ResultSet.php b/lib/zend/Zend/Service/Flickr/ResultSet.php index 450cb051031..2368627552e 100644 --- a/lib/zend/Zend/Service/Flickr/ResultSet.php +++ b/lib/zend/Zend/Service/Flickr/ResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Flickr/Result.php'; * @category Zend * @package Zend_Service * @subpackage Flickr - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Flickr_ResultSet implements SeekableIterator @@ -99,7 +99,7 @@ class Zend_Service_Flickr_ResultSet implements SeekableIterator $perPage = $photos->getAttribute('perpage'); $total = $photos->getAttribute('total'); - $this->totalResultsReturned = ($page == $pages) ? ($total - ($page - 1) * $perPage) : (int) $perPage; + $this->totalResultsReturned = ($page == $pages || $pages == 0) ? ($total - ($page - 1) * $perPage) : (int) $perPage; $this->firstResultPosition = ($page - 1) * $perPage + 1; $this->totalResultsAvailable = (int) $total; diff --git a/lib/zend/Zend/Service/Nirvanix.php b/lib/zend/Zend/Service/Nirvanix.php index 50e1ce95d5a..a63075d6999 100644 --- a/lib/zend/Zend/Service/Nirvanix.php +++ b/lib/zend/Zend/Service/Nirvanix.php @@ -15,11 +15,11 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ - + /** * @see Zend_Http_Client */ @@ -33,7 +33,7 @@ require_once 'Zend/Http/Client.php'; * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix @@ -45,7 +45,7 @@ class Zend_Service_Nirvanix protected $_options; /** - * Class constructor. Authenticates with Nirvanix to receive a + * Class constructor. Authenticates with Nirvanix to receive a * sessionToken, which is then passed to each future request. * * @param array $authParams Authentication POST parameters. This @@ -64,7 +64,7 @@ class Zend_Service_Nirvanix // login and save sessionToken to default POST params $resp = $this->getService('Authentication')->login($authParams); $this->_options['defaults']['sessionToken'] = (string)$resp->SessionToken; - } + } /** * Nirvanix divides its service into namespaces, with each namespace @@ -93,7 +93,7 @@ class Zend_Service_Nirvanix } return new $class($options); } - + /** * Get the configured options. * diff --git a/lib/zend/Zend/Service/Nirvanix/Exception.php b/lib/zend/Zend/Service/Nirvanix/Exception.php index e99de179e6e..d81d4d13ba4 100644 --- a/lib/zend/Zend/Service/Nirvanix/Exception.php +++ b/lib/zend/Zend/Service/Nirvanix/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Service/Exception.php'; * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Exception extends Zend_Service_Exception diff --git a/lib/zend/Zend/Service/Nirvanix/Namespace/Base.php b/lib/zend/Zend/Service/Nirvanix/Namespace/Base.php index b12d91e4fa9..a7bc1d0f98f 100644 --- a/lib/zend/Zend/Service/Nirvanix/Namespace/Base.php +++ b/lib/zend/Zend/Service/Nirvanix/Namespace/Base.php @@ -15,11 +15,11 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ - + /** * @see Zend_Http_Client */ @@ -34,11 +34,11 @@ require_once 'Zend/Service/Nirvanix/Response.php'; * The Nirvanix web services are split into namespaces. This is a proxy class * representing one namespace. It allows calls to the namespace to be made by * PHP object calls rather than by having to construct HTTP client requests. - * + * * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Namespace_Base @@ -49,7 +49,7 @@ class Zend_Service_Nirvanix_Namespace_Base * @var Zend_Http_Client */ protected $_httpClient; - + /** * Host to use for calls to this Nirvanix namespace. It is possible * that the user will wish to use different hosts for different namespaces. @@ -67,19 +67,19 @@ class Zend_Service_Nirvanix_Namespace_Base * Defaults for POST parameters. When a request to the service is to be * made, the POST parameters are merged into these. This is a convenience * feature so parameters that are repeatedly required like sessionToken - * do not need to be supplied again and again by the user. + * do not need to be supplied again and again by the user. * * @param array */ - protected $_defaults = array(); + protected $_defaults = array(); /** - * Class constructor. + * Class constructor. * * @param $options array Options and dependency injection */ public function __construct($options = array()) - { + { if (isset($options['baseUrl'])) { $this->_host = $options['baseUrl']; } @@ -97,19 +97,19 @@ class Zend_Service_Nirvanix_Namespace_Base } $this->_httpClient = $options['httpClient']; } - + /** * When a method call is made against this proxy, convert it to - * an HTTP request to make against the Nirvanix REST service. + * an HTTP request to make against the Nirvanix REST service. * * $imfs->DeleteFiles(array('filePath' => 'foo')); * - * Assuming this object was proxying the IMFS namespace, the + * Assuming this object was proxying the IMFS namespace, the * method call above would call the DeleteFiles command. The - * POST parameters would be filePath, merged with the + * POST parameters would be filePath, merged with the * $this->_defaults (containing the sessionToken). * - * @param string $methodName Name of the command to call + * @param string $methodName Name of the command to call * on this namespace. * @param array $args Only the first is used and it must be * an array. It contains the POST params. @@ -121,7 +121,7 @@ class Zend_Service_Nirvanix_Namespace_Base $uri = $this->_makeUri($methodName); $this->_httpClient->setUri($uri); - if (!isset($args[0]) || !is_array($args[0])) { + if (!isset($args[0]) || !is_array($args[0])) { $args[0] = array(); } @@ -148,19 +148,19 @@ class Zend_Service_Nirvanix_Namespace_Base /** * Make a complete URI from an RPC method name. All Nirvanix REST * service URIs use the same format. - * + * * @param string $methodName RPC method name - * @return string + * @return string */ protected function _makeUri($methodName) { $methodName = ucfirst($methodName); return "{$this->_host}/ws/{$this->_namespace}/{$methodName}.ashx"; } - + /** * All Nirvanix REST service calls return an XML payload. This method - * makes a Zend_Service_Nirvanix_Response from that XML payload. + * makes a Zend_Service_Nirvanix_Response from that XML payload. * * @param Zend_Http_Response $httpResponse Raw response from Nirvanix * @return Zend_Service_Nirvanix_Response Wrapped response diff --git a/lib/zend/Zend/Service/Nirvanix/Namespace/Imfs.php b/lib/zend/Zend/Service/Nirvanix/Namespace/Imfs.php index 7415f2567ee..86907ad323f 100644 --- a/lib/zend/Zend/Service/Nirvanix/Namespace/Imfs.php +++ b/lib/zend/Zend/Service/Nirvanix/Namespace/Imfs.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -23,15 +23,15 @@ /** * @see Zend_Service_Nirvanix_Namespace_Base */ -require_once 'Zend/Service/Nirvanix/Namespace/Base.php'; - +require_once 'Zend/Service/Nirvanix/Namespace/Base.php'; + /** * Namespace proxy with additional convenience methods for the IMFS namespace. - * + * * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespace_Base @@ -43,7 +43,7 @@ class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespa * @param string $filePath Remote path and filename * @param integer $expiration Number of seconds that Nirvanix * make the file available for download. - * @return string Contents of file + * @return string Contents of file */ public function getContents($filePath, $expiration = 3600) { @@ -88,7 +88,7 @@ class Zend_Service_Nirvanix_Namespace_Imfs extends Zend_Service_Nirvanix_Namespa return new Zend_Service_Nirvanix_Response($response->getBody()); } - + /** * Convenience function to remove a file from the Nirvanix IMFS. * Analog to PHP's unlink(). diff --git a/lib/zend/Zend/Service/Nirvanix/Response.php b/lib/zend/Zend/Service/Nirvanix/Response.php index f59e6bc27db..b1de6422f7a 100644 --- a/lib/zend/Zend/Service/Nirvanix/Response.php +++ b/lib/zend/Zend/Service/Nirvanix/Response.php @@ -15,31 +15,31 @@ * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** * This class decorates a SimpleXMLElement parsed from a Nirvanix web service - * response. It is primarily exists to provide a convenience feature that + * response. It is primarily exists to provide a convenience feature that * throws an exception when contains an error. * * @category Zend * @package Zend_Service * @subpackage Nirvanix - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Nirvanix_Response { /** * SimpleXMLElement parsed from Nirvanix web service response. - * + * * @var SimpleXMLElement */ protected $_sxml; - + /** * Class constructor. Parse the XML response from a Nirvanix method * call into a decorated SimpleXMLElement element. @@ -59,7 +59,7 @@ class Zend_Service_Nirvanix_Response if ($name != 'Response') { $this->_throwException("Expected XML element Response, got $name"); } - + $code = (int)$this->_sxml->ResponseCode; if ($code != 0) { $msg = (string)$this->_sxml->ErrorMessage; @@ -84,7 +84,7 @@ class Zend_Service_Nirvanix_Response * @param string $offset Undefined property name * @return mixed */ - public function __get($offset) + public function __get($offset) { return $this->_sxml->$offset; } @@ -104,7 +104,7 @@ class Zend_Service_Nirvanix_Response /** * Throw an exception. This method exists to only contain the * lazy-require() of the exception class. - * + * * @param string $message Error message * @param integer $code Error code * @throws Zend_Service_Nirvanix_Exception @@ -115,7 +115,7 @@ class Zend_Service_Nirvanix_Response /** * @see Zend_Service_Nirvanix_Exception */ - require_once 'Zend/Service/Nirvanix/Exception.php'; + require_once 'Zend/Service/Nirvanix/Exception.php'; throw new Zend_Service_Nirvanix_Exception($message, $code); } diff --git a/lib/zend/Zend/Service/ReCaptcha.php b/lib/zend/Zend/Service/ReCaptcha.php index 1a95db867fd..2421d9dc898 100644 --- a/lib/zend/Zend/Service/ReCaptcha.php +++ b/lib/zend/Zend/Service/ReCaptcha.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -34,7 +34,7 @@ require_once 'Zend/Service/ReCaptcha/Response.php'; * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Service/ReCaptcha/Exception.php b/lib/zend/Zend/Service/ReCaptcha/Exception.php index 18666e329da..4edf24e3a5e 100644 --- a/lib/zend/Zend/Service/ReCaptcha/Exception.php +++ b/lib/zend/Zend/Service/ReCaptcha/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ require_once 'Zend/Service/Exception.php'; * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Service/ReCaptcha/MailHide.php b/lib/zend/Zend/Service/ReCaptcha/MailHide.php index b439eda84be..0528af5395a 100644 --- a/lib/zend/Zend/Service/ReCaptcha/MailHide.php +++ b/lib/zend/Zend/Service/ReCaptcha/MailHide.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -28,7 +28,7 @@ require_once 'Zend/Service/ReCaptcha.php'; * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -57,6 +57,11 @@ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha */ protected $_email = null; + /** + * @var Zend_Validate_Interface + */ + protected $_emailValidator; + /** * Binary representation of the private key * @@ -110,6 +115,34 @@ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha } } + + /** + * Get emailValidator + * + * @return Zend_Validate_Interface + */ + public function getEmailValidator() + { + if (null === $this->_emailValidator) { + require_once 'Zend/Validate/EmailAddress.php'; + $this->setEmailValidator(new Zend_Validate_EmailAddress()); + } + return $this->_emailValidator; + } + + /** + * Set email validator + * + * @param Zend_Validate_Interface $validator + * @return Zend_Service_ReCaptcha_MailHide + */ + public function setEmailValidator(Zend_Validate_Interface $validator) + { + $this->_emailValidator = $validator; + return $this; + } + + /** * See if the mcrypt extension is available * @@ -153,6 +186,7 @@ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha public function getDefaultOptions() { return array( + 'encoding' => 'UTF-8', 'linkTitle' => 'Reveal this e-mail address', 'linkHiddenText' => '...', 'popupWidth' => 500, @@ -190,6 +224,12 @@ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha { $this->_email = $email; + $validator = $this->getEmailValidator(); + if (!$validator->isValid($email)) { + require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php'; + throw new Zend_Service_ReCaptcha_MailHide_Exception('Invalid email address provided'); + } + $emailParts = explode('@', $email, 2); /* Decide on how much of the local part we want to reveal */ @@ -248,32 +288,43 @@ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha { if ($email !== null) { $this->setEmail($email); - } else if ($this->_email === null) { + } elseif (null === ($email = $this->getEmail())) { /** @see Zend_Service_ReCaptcha_MailHide_Exception */ require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php'; - throw new Zend_Service_ReCaptcha_MailHide_Exception('Missing email address'); } if ($this->_publicKey === null) { /** @see Zend_Service_ReCaptcha_MailHide_Exception */ require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php'; - throw new Zend_Service_ReCaptcha_MailHide_Exception('Missing public key'); } if ($this->_privateKey === null) { /** @see Zend_Service_ReCaptcha_MailHide_Exception */ require_once 'Zend/Service/ReCaptcha/MailHide/Exception.php'; - throw new Zend_Service_ReCaptcha_MailHide_Exception('Missing private key'); } /* Generate the url */ $url = $this->_getUrl(); + $enc = $this->getOption('encoding'); + /* Genrate the HTML used to represent the email address */ - $html = htmlentities($this->_emailLocalPart) . '' . $this->_options['linkHiddenText'] . '@' . htmlentities($this->_emailDomainPart); + $html = htmlentities($this->getEmailLocalPart(), ENT_COMPAT, $enc) + . '' . $this->_options['linkHiddenText'] . '@' + . htmlentities($this->getEmailDomainPart(), ENT_COMPAT, $enc); return $html; } @@ -297,4 +348,4 @@ class Zend_Service_ReCaptcha_MailHide extends Zend_Service_ReCaptcha /* Return the url */ return self::MAILHIDE_SERVER . '?k=' . $this->_publicKey . '&c=' . strtr(base64_encode($emailEncrypted), '+/', '-_'); } -} \ No newline at end of file +} diff --git a/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php b/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php index 19532062ef8..105e8823927 100644 --- a/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php +++ b/lib/zend/Zend/Service/ReCaptcha/MailHide/Exception.php @@ -15,12 +15,12 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -/** @see Zend_Exception */ -require_once 'Zend/Exception.php'; +/** @see Zend_Service_ReCaptcha_Exception */ +require_once 'Zend/Service/ReCaptcha/Exception.php'; /** * Zend_Service_ReCaptcha_MailHide_Exception @@ -28,9 +28,9 @@ require_once 'Zend/Exception.php'; * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -class Zend_Service_ReCaptcha_MailHide_Exception extends Zend_Exception +class Zend_Service_ReCaptcha_MailHide_Exception extends Zend_Service_ReCaptcha_Exception {} \ No newline at end of file diff --git a/lib/zend/Zend/Service/ReCaptcha/Response.php b/lib/zend/Zend/Service/ReCaptcha/Response.php index c783f73a342..d9fad2caba6 100644 --- a/lib/zend/Zend/Service/ReCaptcha/Response.php +++ b/lib/zend/Zend/Service/ReCaptcha/Response.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -25,7 +25,7 @@ * @category Zend * @package Zend_Service * @subpackage ReCaptcha - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Service/Simpy.php b/lib/zend/Zend/Service/Simpy.php index 1e49fdcd5ad..26a9be6501a 100644 --- a/lib/zend/Zend/Service/Simpy.php +++ b/lib/zend/Zend/Service/Simpy.php @@ -16,19 +16,21 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ - +/** + * @see Zend_Http_Client + */ require_once 'Zend/Http/Client.php'; /** * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @link http://www.simpy.com/doc/api/rest/ */ @@ -42,9 +44,9 @@ class Zend_Service_Simpy protected $_baseUri = 'http://simpy.com/simpy/api/rest/'; /** - * HTTP client for use in making web service calls + * HTTP client for use in making web service calls * - * @var Zend_Http_Client + * @var Zend_Http_Client */ protected $_http; @@ -57,16 +59,12 @@ class Zend_Service_Simpy */ public function __construct($username, $password) { - /** - * @see Zend_Service_Rest - */ - require_once 'Zend/Rest/Client.php'; $this->_http = new Zend_Http_Client; $this->_http->setAuth($username, $password); } /** - * Returns the HTTP client currently in use by this class for REST API + * Returns the HTTP client currently in use by this class for REST API * calls, intended mainly for testing. * * @return Zend_Http_Client diff --git a/lib/zend/Zend/Service/Simpy/Link.php b/lib/zend/Zend/Service/Simpy/Link.php index 7b36cc9bf23..0a7c5381eb9 100644 --- a/lib/zend/Zend/Service/Simpy/Link.php +++ b/lib/zend/Zend/Service/Simpy/Link.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Link diff --git a/lib/zend/Zend/Service/Simpy/LinkQuery.php b/lib/zend/Zend/Service/Simpy/LinkQuery.php index 0faa2eba3f2..68502f2a06e 100644 --- a/lib/zend/Zend/Service/Simpy/LinkQuery.php +++ b/lib/zend/Zend/Service/Simpy/LinkQuery.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_LinkQuery diff --git a/lib/zend/Zend/Service/Simpy/LinkSet.php b/lib/zend/Zend/Service/Simpy/LinkSet.php index c4584acd4ad..8fa5ad89c3a 100644 --- a/lib/zend/Zend/Service/Simpy/LinkSet.php +++ b/lib/zend/Zend/Service/Simpy/LinkSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Simpy/Link.php'; * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_LinkSet implements IteratorAggregate diff --git a/lib/zend/Zend/Service/Simpy/Note.php b/lib/zend/Zend/Service/Simpy/Note.php index ea32d828807..75d65d9ab64 100644 --- a/lib/zend/Zend/Service/Simpy/Note.php +++ b/lib/zend/Zend/Service/Simpy/Note.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Note diff --git a/lib/zend/Zend/Service/Simpy/NoteSet.php b/lib/zend/Zend/Service/Simpy/NoteSet.php index 30308364288..38fa6fd99b5 100644 --- a/lib/zend/Zend/Service/Simpy/NoteSet.php +++ b/lib/zend/Zend/Service/Simpy/NoteSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Simpy/Note.php'; * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_NoteSet implements IteratorAggregate diff --git a/lib/zend/Zend/Service/Simpy/Tag.php b/lib/zend/Zend/Service/Simpy/Tag.php index 218d931934a..694c4ad7054 100644 --- a/lib/zend/Zend/Service/Simpy/Tag.php +++ b/lib/zend/Zend/Service/Simpy/Tag.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Tag diff --git a/lib/zend/Zend/Service/Simpy/TagSet.php b/lib/zend/Zend/Service/Simpy/TagSet.php index ae21411b898..904922cde76 100644 --- a/lib/zend/Zend/Service/Simpy/TagSet.php +++ b/lib/zend/Zend/Service/Simpy/TagSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Simpy/Tag.php'; * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_TagSet implements IteratorAggregate diff --git a/lib/zend/Zend/Service/Simpy/Watchlist.php b/lib/zend/Zend/Service/Simpy/Watchlist.php index e7a76b95b6c..2eb531c4a0a 100644 --- a/lib/zend/Zend/Service/Simpy/Watchlist.php +++ b/lib/zend/Zend/Service/Simpy/Watchlist.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Simpy/WatchlistFilterSet.php'; * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_Watchlist diff --git a/lib/zend/Zend/Service/Simpy/WatchlistFilter.php b/lib/zend/Zend/Service/Simpy/WatchlistFilter.php index 143e31f2237..210fddc317e 100644 --- a/lib/zend/Zend/Service/Simpy/WatchlistFilter.php +++ b/lib/zend/Zend/Service/Simpy/WatchlistFilter.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_WatchlistFilter diff --git a/lib/zend/Zend/Service/Simpy/WatchlistFilterSet.php b/lib/zend/Zend/Service/Simpy/WatchlistFilterSet.php index ae24598ae5c..3e1a2f7d7a2 100644 --- a/lib/zend/Zend/Service/Simpy/WatchlistFilterSet.php +++ b/lib/zend/Zend/Service/Simpy/WatchlistFilterSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Simpy/WatchlistFilter.php'; * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_WatchlistFilterSet implements IteratorAggregate diff --git a/lib/zend/Zend/Service/Simpy/WatchlistSet.php b/lib/zend/Zend/Service/Simpy/WatchlistSet.php index 13ae9d29c1b..93a5e4a3b97 100644 --- a/lib/zend/Zend/Service/Simpy/WatchlistSet.php +++ b/lib/zend/Zend/Service/Simpy/WatchlistSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Simpy/Watchlist.php'; * @category Zend * @package Zend_Service * @subpackage Simpy - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Simpy_WatchlistSet implements IteratorAggregate diff --git a/lib/zend/Zend/Service/SlideShare.php b/lib/zend/Zend/Service/SlideShare.php index e98a4095aaa..7fcdc2510f8 100644 --- a/lib/zend/Zend/Service/SlideShare.php +++ b/lib/zend/Zend/Service/SlideShare.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -44,7 +44,7 @@ require_once 'Zend/Service/SlideShare/SlideShow.php'; * @package Zend_Service * @subpackage SlideShare * @throws Zend_Service_SlideShare_Exception - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare @@ -354,7 +354,7 @@ class Zend_Service_SlideShare $response = $client->request('POST'); } catch(Zend_Http_Client_Exception $e) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}"); + throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e); } $sxe = simplexml_load_string($response->getBody()); @@ -406,7 +406,7 @@ class Zend_Service_SlideShare $response = $client->request('POST'); } catch(Zend_Http_Client_Exception $e) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}"); + throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e); } $sxe = simplexml_load_string($response->getBody()); @@ -544,7 +544,7 @@ class Zend_Service_SlideShare $response = $client->request('POST'); } catch(Zend_Http_Client_Exception $e) { require_once 'Zend/Service/SlideShare/Exception.php'; - throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}"); + throw new Zend_Service_SlideShare_Exception("Service Request Failed: {$e->getMessage()}", 0, $e); } $sxe = simplexml_load_string($response->getBody()); diff --git a/lib/zend/Zend/Service/SlideShare/Exception.php b/lib/zend/Zend/Service/SlideShare/Exception.php index b1a8e135368..a8939d30c80 100644 --- a/lib/zend/Zend/Service/SlideShare/Exception.php +++ b/lib/zend/Zend/Service/SlideShare/Exception.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -30,7 +30,7 @@ require_once 'Zend/Service/Exception.php'; * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare_Exception extends Zend_Service_Exception diff --git a/lib/zend/Zend/Service/SlideShare/SlideShow.php b/lib/zend/Zend/Service/SlideShare/SlideShow.php index 09dbe116387..7699e0238ea 100644 --- a/lib/zend/Zend/Service/SlideShare/SlideShow.php +++ b/lib/zend/Zend/Service/SlideShare/SlideShow.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -28,7 +28,7 @@ * @category Zend * @package Zend_Service * @subpackage SlideShare - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_SlideShare_SlideShow diff --git a/lib/zend/Zend/Service/StrikeIron.php b/lib/zend/Zend/Service/StrikeIron.php index c1781e97061..2501a56ae4f 100644 --- a/lib/zend/Zend/Service/StrikeIron.php +++ b/lib/zend/Zend/Service/StrikeIron.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron @@ -81,7 +81,7 @@ class Zend_Service_StrikeIron * @see Zend_Service_StrikeIron_Exception */ require_once 'Zend/Service/StrikeIron/Exception.php'; - throw new Zend_Service_StrikeIron_Exception($msg, $e->getCode()); + throw new Zend_Service_StrikeIron_Exception($msg, $e->getCode(), $e); } // instantiate and return the service diff --git a/lib/zend/Zend/Service/StrikeIron/Base.php b/lib/zend/Zend/Service/StrikeIron/Base.php index 476a3dfec3b..9b55b519638 100644 --- a/lib/zend/Zend/Service/StrikeIron/Base.php +++ b/lib/zend/Zend/Service/StrikeIron/Base.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Service/StrikeIron/Decorator.php'; * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Base @@ -103,7 +103,7 @@ class Zend_Service_StrikeIron_Base * @see Zend_Service_StrikeIron_Exception */ require_once 'Zend/Service/StrikeIron/Exception.php'; - throw new Zend_Service_StrikeIron_Exception($message, $e->getCode()); + throw new Zend_Service_StrikeIron_Exception($message, $e->getCode(), $e); } // transform/decorate the result and return it diff --git a/lib/zend/Zend/Service/StrikeIron/Decorator.php b/lib/zend/Zend/Service/StrikeIron/Decorator.php index 042231df479..280204147c6 100644 --- a/lib/zend/Zend/Service/StrikeIron/Decorator.php +++ b/lib/zend/Zend/Service/StrikeIron/Decorator.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Decorator diff --git a/lib/zend/Zend/Service/StrikeIron/Exception.php b/lib/zend/Zend/Service/StrikeIron/Exception.php index ae9acbf9cee..f9172aed9c0 100644 --- a/lib/zend/Zend/Service/StrikeIron/Exception.php +++ b/lib/zend/Zend/Service/StrikeIron/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Service/Exception.php'; * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_Exception extends Zend_Service_Exception diff --git a/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php b/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php index 597123241e5..b70d46f86dc 100644 --- a/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php +++ b/lib/zend/Zend/Service/StrikeIron/SalesUseTaxBasic.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ require_once 'Zend/Service/StrikeIron/Base.php'; * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_SalesUseTaxBasic extends Zend_Service_StrikeIron_Base diff --git a/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php b/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php index 179383231b6..93ba95cbece 100644 --- a/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php +++ b/lib/zend/Zend/Service/StrikeIron/USAddressVerification.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ require_once 'Zend/Service/StrikeIron/Base.php'; * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_USAddressVerification extends Zend_Service_StrikeIron_Base diff --git a/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php b/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php index 795c6039607..8e917924fb7 100644 --- a/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php +++ b/lib/zend/Zend/Service/StrikeIron/ZipCodeInfo.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ require_once 'Zend/Service/StrikeIron/Base.php'; * @category Zend * @package Zend_Service * @subpackage StrikeIron - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_StrikeIron_ZipCodeInfo extends Zend_Service_StrikeIron_Base diff --git a/lib/zend/Zend/Service/Technorati.php b/lib/zend/Zend/Service/Technorati.php index 9d4bebea220..3658f43e068 100644 --- a/lib/zend/Zend/Service/Technorati.php +++ b/lib/zend/Zend/Service/Technorati.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati @@ -80,7 +80,7 @@ class Zend_Service_Technorati * Constructs a new Zend_Service_Technorati instance * and setup character encoding. * - * @param string $apiKey Your Technorati API key + * @param string $apiKey Your Technorati API key */ public function __construct($apiKey) { diff --git a/lib/zend/Zend/Service/Technorati/Author.php b/lib/zend/Zend/Service/Technorati/Author.php index 4bb833ed2f7..7cffc24244c 100644 --- a/lib/zend/Zend/Service/Technorati/Author.php +++ b/lib/zend/Zend/Service/Technorati/Author.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,11 +29,11 @@ require_once 'Zend/Service/Technorati/Utils.php'; /** * Represents a weblog Author object. It usually belongs to a Technorati account. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Author @@ -53,7 +53,7 @@ class Zend_Service_Technorati_Author * @access protected */ protected $_lastName; - + /** * Technorati account username * @@ -61,7 +61,7 @@ class Zend_Service_Technorati_Author * @access protected */ protected $_username; - + /** * Technorati account description * @@ -98,27 +98,27 @@ class Zend_Service_Technorati_Author $result = $xpath->query('./firstname/text()', $dom); if ($result->length == 1) $this->setFirstName($result->item(0)->data); - + $result = $xpath->query('./lastname/text()', $dom); if ($result->length == 1) $this->setLastName($result->item(0)->data); - + $result = $xpath->query('./username/text()', $dom); if ($result->length == 1) $this->setUsername($result->item(0)->data); - + $result = $xpath->query('./description/text()', $dom); if ($result->length == 1) $this->setDescription($result->item(0)->data); - + $result = $xpath->query('./bio/text()', $dom); if ($result->length == 1) $this->setBio($result->item(0)->data); $result = $xpath->query('./thumbnailpicture/text()', $dom); if ($result->length == 1) $this->setThumbnailPicture($result->item(0)->data); } - + /** * Returns Author first name. - * + * * @return string Author first name */ public function getFirstName() { @@ -127,7 +127,7 @@ class Zend_Service_Technorati_Author /** * Returns Author last name. - * + * * @return string Author last name */ public function getLastName() { @@ -136,7 +136,7 @@ class Zend_Service_Technorati_Author /** * Returns Technorati account username. - * + * * @return string Technorati account username */ public function getUsername() { @@ -145,7 +145,7 @@ class Zend_Service_Technorati_Author /** * Returns Technorati account description. - * + * * @return string Technorati account description */ public function getDescription() { @@ -154,7 +154,7 @@ class Zend_Service_Technorati_Author /** * Returns Technorati account biography. - * + * * @return string Technorati account biography */ public function getBio() { @@ -163,7 +163,7 @@ class Zend_Service_Technorati_Author /** * Returns Technorati account thumbnail picture. - * + * * @return null|Zend_Uri_Http Technorati account thumbnail picture */ public function getThumbnailPicture() { @@ -173,8 +173,8 @@ class Zend_Service_Technorati_Author /** * Sets author first name. - * - * @param string $input first Name input value + * + * @param string $input first Name input value * @return Zend_Service_Technorati_Author $this instance */ public function setFirstName($input) { @@ -184,8 +184,8 @@ class Zend_Service_Technorati_Author /** * Sets author last name. - * - * @param string $input last Name input value + * + * @param string $input last Name input value * @return Zend_Service_Technorati_Author $this instance */ public function setLastName($input) { @@ -195,8 +195,8 @@ class Zend_Service_Technorati_Author /** * Sets Technorati account username. - * - * @param string $input username input value + * + * @param string $input username input value * @return Zend_Service_Technorati_Author $this instance */ public function setUsername($input) { @@ -206,7 +206,7 @@ class Zend_Service_Technorati_Author /** * Sets Technorati account biography. - * + * * @param string $input biography input value * @return Zend_Service_Technorati_Author $this instance */ @@ -217,7 +217,7 @@ class Zend_Service_Technorati_Author /** * Sets Technorati account description. - * + * * @param string $input description input value * @return Zend_Service_Technorati_Author $this instance */ @@ -228,7 +228,7 @@ class Zend_Service_Technorati_Author /** * Sets Technorati account thumbnail picture. - * + * * @param string|Zend_Uri_Http $input thumbnail picture URI * @return Zend_Service_Technorati_Author $this instance * @throws Zend_Service_Technorati_Exception if $input is an invalid URI diff --git a/lib/zend/Zend/Service/Technorati/BlogInfoResult.php b/lib/zend/Zend/Service/Technorati/BlogInfoResult.php index f9d0718cffd..a288693d6d3 100644 --- a/lib/zend/Zend/Service/Technorati/BlogInfoResult.php +++ b/lib/zend/Zend/Service/Technorati/BlogInfoResult.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,11 +29,11 @@ require_once 'Zend/Service/Technorati/Utils.php'; /** * Represents a single Technorati BlogInfo query result object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_BlogInfoResult @@ -69,7 +69,7 @@ class Zend_Service_Technorati_BlogInfoResult * @access protected */ protected $_inboundLinks; - + /** * Constructs a new object object from DOM Document. @@ -88,7 +88,7 @@ class Zend_Service_Technorati_BlogInfoResult if ($result->length == 1) { $this->_weblog = new Zend_Service_Technorati_Weblog($result->item(0)); } else { - // follow the same behavior of blogPostTags + // follow the same behavior of blogPostTags // and raise an Exception if the URL is not a valid weblog /** * @see Zend_Service_Technorati_Exception @@ -97,11 +97,11 @@ class Zend_Service_Technorati_BlogInfoResult throw new Zend_Service_Technorati_Exception( "Your URL is not a recognized Technorati weblog"); } - + $result = $xpath->query('//result/url/text()'); if ($result->length == 1) { try { - // fetched URL often doens't include schema + // fetched URL often doens't include schema // and this issue causes the following line to fail $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data); } catch(Zend_Service_Technorati_Exception $e) { @@ -110,52 +110,52 @@ class Zend_Service_Technorati_BlogInfoResult } } } - + $result = $xpath->query('//result/inboundblogs/text()'); if ($result->length == 1) $this->_inboundBlogs = (int) $result->item(0)->data; - + $result = $xpath->query('//result/inboundlinks/text()'); if ($result->length == 1) $this->_inboundLinks = (int) $result->item(0)->data; - + } /** * Returns the weblog URL. - * + * * @return Zend_Uri_Http */ public function getUrl() { return $this->_url; } - + /** * Returns the weblog. - * + * * @return Zend_Service_Technorati_Weblog */ public function getWeblog() { return $this->_weblog; } - + /** * Returns number of unique blogs linking this blog. - * + * * @return integer the number of inbound blogs */ - public function getInboundBlogs() + public function getInboundBlogs() { return (int) $this->_inboundBlogs; } - + /** * Returns number of incoming links to this blog. - * + * * @return integer the number of inbound links */ - public function getInboundLinks() + public function getInboundLinks() { return (int) $this->_inboundLinks; } - + } diff --git a/lib/zend/Zend/Service/Technorati/CosmosResult.php b/lib/zend/Zend/Service/Technorati/CosmosResult.php index c3767178c37..8a930a5dbda 100644 --- a/lib/zend/Zend/Service/Technorati/CosmosResult.php +++ b/lib/zend/Zend/Service/Technorati/CosmosResult.php @@ -15,34 +15,34 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_Result +/** + * @see Zend_Service_Technorati_Result */ require_once 'Zend/Service/Technorati/Result.php'; /** - * Represents a single Technorati Cosmos query result object. - * It is never returned as a standalone object, + * Represents a single Technorati Cosmos query result object. + * It is never returned as a standalone object, * but it always belongs to a valid Zend_Service_Technorati_CosmosResultSet object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Result { /** * Technorati weblog object that links queried URL. - * + * * @var Zend_Service_Technorati_Weblog * @access protected */ @@ -50,7 +50,7 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul /** * The nearest permalink tracked for queried URL. - * + * * @var Zend_Uri_Http * @access protected */ @@ -58,7 +58,7 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul /** * The excerpt of the blog/page linking queried URL. - * + * * @var string * @access protected */ @@ -66,7 +66,7 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul /** * The the datetime the link was created. - * + * * @var Zend_Date * @access protected */ @@ -74,7 +74,7 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul /** * The URL of the specific link target page - * + * * @var Zend_Uri_Http * @access protected */ @@ -96,7 +96,7 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul // weblog object field $this->_parseWeblog(); - + // filter fields $this->_nearestPermalink = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_nearestPermalink); $this->_linkUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($this->_linkUrl); @@ -105,7 +105,7 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul /** * Returns the weblog object that links queried URL. - * + * * @return Zend_Service_Technorati_Weblog */ public function getWeblog() { @@ -114,7 +114,7 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul /** * Returns the nearest permalink tracked for queried URL. - * + * * @return Zend_Uri_Http */ public function getNearestPermalink() { @@ -123,30 +123,30 @@ class Zend_Service_Technorati_CosmosResult extends Zend_Service_Technorati_Resul /** * Returns the excerpt of the blog/page linking queried URL. - * + * * @return string */ public function getExcerpt() { return $this->_excerpt; } - + /** * Returns the datetime the link was created. - * + * * @return Zend_Date */ public function getLinkCreated() { return $this->_linkCreated; } - + /** * If queried URL is a valid blog, * returns the URL of the specific link target page. - * + * * @return Zend_Uri_Http */ public function getLinkUrl() { return $this->_linkUrl; } - + } diff --git a/lib/zend/Zend/Service/Technorati/CosmosResultSet.php b/lib/zend/Zend/Service/Technorati/CosmosResultSet.php index 09f75ab5e1b..03d7363762e 100644 --- a/lib/zend/Zend/Service/Technorati/CosmosResultSet.php +++ b/lib/zend/Zend/Service/Technorati/CosmosResultSet.php @@ -15,25 +15,25 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_ResultSet +/** + * @see Zend_Service_Technorati_ResultSet */ require_once 'Zend/Service/Technorati/ResultSet.php'; /** * Represents a Technorati Cosmos query result set. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_ResultSet @@ -98,7 +98,7 @@ class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_Re $result = $this->_xpath->query('/tapi/document/result/url/text()'); if ($result->length == 1) { try { - // fetched URL often doens't include schema + // fetched URL often doens't include schema // and this issue causes the following line to fail $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($result->item(0)->data); } catch(Zend_Service_Technorati_Exception $e) { @@ -124,7 +124,7 @@ class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_Re /** * Returns the weblog URL. - * + * * @return Zend_Uri_Http */ public function getUrl() { @@ -133,7 +133,7 @@ class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_Re /** * Returns the weblog. - * + * * @return Zend_Service_Technorati_Weblog */ public function getWeblog() { @@ -142,20 +142,20 @@ class Zend_Service_Technorati_CosmosResultSet extends Zend_Service_Technorati_Re /** * Returns number of unique blogs linking this blog. - * + * * @return integer the number of inbound blogs */ - public function getInboundBlogs() + public function getInboundBlogs() { return $this->_inboundBlogs; } /** * Returns number of incoming links to this blog. - * + * * @return integer the number of inbound links */ - public function getInboundLinks() + public function getInboundLinks() { return $this->_inboundLinks; } diff --git a/lib/zend/Zend/Service/Technorati/DailyCountsResult.php b/lib/zend/Zend/Service/Technorati/DailyCountsResult.php index 2d6790fb8e4..c1e6a804deb 100644 --- a/lib/zend/Zend/Service/Technorati/DailyCountsResult.php +++ b/lib/zend/Zend/Service/Technorati/DailyCountsResult.php @@ -15,47 +15,47 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_Result +/** + * @see Zend_Service_Technorati_Result */ require_once 'Zend/Service/Technorati/Result.php'; /** - * Represents a single Technorati DailyCounts query result object. - * It is never returned as a standalone object, + * Represents a single Technorati DailyCounts query result object. + * It is never returned as a standalone object, * but it always belongs to a valid Zend_Service_Technorati_DailyCountsResultSet object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_DailyCountsResult extends Zend_Service_Technorati_Result { /** * Date of count. - * + * * @var Zend_Date * @access protected */ protected $_date; - + /** * Number of posts containing query on given date. - * + * * @var int * @access protected */ protected $_count; - + /** * Constructs a new object object from DOM Document. @@ -67,7 +67,7 @@ class Zend_Service_Technorati_DailyCountsResult extends Zend_Service_Technorati_ $this->_fields = array( '_date' => 'date', '_count' => 'count'); parent::__construct($dom); - + // filter fields $this->_date = new Zend_Date(strtotime($this->_date)); $this->_count = (int) $this->_count; @@ -75,16 +75,16 @@ class Zend_Service_Technorati_DailyCountsResult extends Zend_Service_Technorati_ /** * Returns the date of count. - * + * * @return Zend_Date */ public function getDate() { return $this->_date; } - + /** * Returns the number of posts containing query on given date. - * + * * @return int */ public function getCount() { diff --git a/lib/zend/Zend/Service/Technorati/DailyCountsResultSet.php b/lib/zend/Zend/Service/Technorati/DailyCountsResultSet.php index c5b6585be3b..e28c63361ca 100644 --- a/lib/zend/Zend/Service/Technorati/DailyCountsResultSet.php +++ b/lib/zend/Zend/Service/Technorati/DailyCountsResultSet.php @@ -15,19 +15,19 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** +/** * @see Zend_Date */ require_once 'Zend/Date.php'; -/** - * @see Zend_Service_Technorati_ResultSet +/** + * @see Zend_Service_Technorati_ResultSet */ require_once 'Zend/Service/Technorati/ResultSet.php'; @@ -39,11 +39,11 @@ require_once 'Zend/Service/Technorati/Utils.php'; /** * Represents a Technorati Tag query result set. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technorati_ResultSet @@ -58,7 +58,7 @@ class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technora /** * Number of days for which counts provided. - * + * * @var Zend_Service_Technorati_Weblog * @access protected */ @@ -73,7 +73,7 @@ class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technora public function __construct(DomDocument $dom, $options = array()) { parent::__construct($dom, $options); - + // default locale prevent Zend_Date to fail // when script is executed via shell // Zend_Locale::setDefault('en'); @@ -93,7 +93,7 @@ class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technora /** * Returns the search URL for given query. - * + * * @return Zend_Uri_Http */ public function getSearchUrl() { @@ -102,7 +102,7 @@ class Zend_Service_Technorati_DailyCountsResultSet extends Zend_Service_Technora /** * Returns the number of days for which counts provided. - * + * * @return int */ public function getDays() { diff --git a/lib/zend/Zend/Service/Technorati/Exception.php b/lib/zend/Zend/Service/Technorati/Exception.php index e29c07fe754..88a34cd4db7 100644 --- a/lib/zend/Zend/Service/Technorati/Exception.php +++ b/lib/zend/Zend/Service/Technorati/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,9 +31,9 @@ require_once 'Zend/Service/Exception.php'; * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Exception extends Zend_Service_Exception -{} - +{ +} diff --git a/lib/zend/Zend/Service/Technorati/GetInfoResult.php b/lib/zend/Zend/Service/Technorati/GetInfoResult.php index 9ab206f57c0..1cfdd9bf644 100644 --- a/lib/zend/Zend/Service/Technorati/GetInfoResult.php +++ b/lib/zend/Zend/Service/Technorati/GetInfoResult.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -23,11 +23,11 @@ /** * Represents a single Technorati GetInfo query result object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_GetInfoResult @@ -84,7 +84,7 @@ class Zend_Service_Technorati_GetInfoResult /** * Returns the author associated with queried username. - * + * * @return Zend_Service_Technorati_Author */ public function getAuthor() { @@ -93,7 +93,7 @@ class Zend_Service_Technorati_GetInfoResult /** * Returns the collection of weblogs authored by queried username. - * + * * @return array of Zend_Service_Technorati_Weblog */ public function getWeblogs() { diff --git a/lib/zend/Zend/Service/Technorati/KeyInfoResult.php b/lib/zend/Zend/Service/Technorati/KeyInfoResult.php index f469b71a211..e98666913db 100644 --- a/lib/zend/Zend/Service/Technorati/KeyInfoResult.php +++ b/lib/zend/Zend/Service/Technorati/KeyInfoResult.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,11 +24,11 @@ /** * Represents a single Technorati KeyInfo query result object. * It provides information about your Technorati API Key daily usage. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_KeyInfoResult @@ -56,7 +56,7 @@ class Zend_Service_Technorati_KeyInfoResult * @access protected */ protected $_maxQueries; - + /** * Constructs a new object from DOM Element. @@ -75,39 +75,39 @@ class Zend_Service_Technorati_KeyInfoResult $this->_maxQueries = (int) $xpath->query('/tapi/document/result/maxqueries/text()')->item(0)->data; $this->setApiKey($apiKey); } - - + + /** * Returns API Key string. - * + * * @return string API Key string */ public function getApiKey() { return $this->_apiKey; } - + /** * Returns the number of queries sent today. - * + * * @return int number of queries sent today */ public function getApiQueries() { return $this->_apiQueries; } - + /** * Returns Key's daily query limit. - * + * * @return int maximum number of available queries per day */ public function getMaxQueries() { return $this->_maxQueries; } - - + + /** * Sets API Key string. - * + * * @param string $apiKey the API Key * @return Zend_Service_Technorati_KeyInfoResult $this instance */ diff --git a/lib/zend/Zend/Service/Technorati/Result.php b/lib/zend/Zend/Service/Technorati/Result.php index d8f42f53c2f..518e06f69a5 100644 --- a/lib/zend/Zend/Service/Technorati/Result.php +++ b/lib/zend/Zend/Service/Technorati/Result.php @@ -15,23 +15,23 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ /** - * Represents a single Technorati Search query result object. - * It is never returned as a standalone object, + * Represents a single Technorati Search query result object. + * It is never returned as a standalone object, * but it always belongs to a valid Zend_Service_Technorati_SearchResultSet object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @abstract + * @abstract */ abstract class Zend_Service_Technorati_Result { @@ -71,7 +71,7 @@ abstract class Zend_Service_Technorati_Result { $this->_xpath = new DOMXPath($dom->ownerDocument); $this->_dom = $dom; - + // default fields for all search results $fields = array(); @@ -87,10 +87,10 @@ abstract class Zend_Service_Technorati_Result } } } - + /** * Parses weblog node and sets weblog object. - * + * * @return void */ protected function _parseWeblog() diff --git a/lib/zend/Zend/Service/Technorati/ResultSet.php b/lib/zend/Zend/Service/Technorati/ResultSet.php index 1e53d7d6d16..43008210f0b 100644 --- a/lib/zend/Zend/Service/Technorati/ResultSet.php +++ b/lib/zend/Zend/Service/Technorati/ResultSet.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Service/Technorati/Result.php'; * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @abstract */ @@ -64,9 +64,8 @@ abstract class Zend_Service_Technorati_ResultSet implements SeekableIterator * The offset in the total result set of this search set * * @var int - * @todo */ - // public $firstResultPosition; + //TODO public $firstResultPosition; /** @@ -148,8 +147,8 @@ abstract class Zend_Service_Technorati_ResultSet implements SeekableIterator * This method is called once each time a new instance is created * or a serialized object is unserialized. * - * @param DomDocument $dom the ReST fragment for this object - * @param array $options query options as associative array + * @param DomDocument $dom the ReST fragment for this object + * @param array $options query options as associative array * * @return void */ protected function _init(DomDocument $dom, $options = array()) diff --git a/lib/zend/Zend/Service/Technorati/SearchResult.php b/lib/zend/Zend/Service/Technorati/SearchResult.php index 23510f854b0..76828439f4f 100644 --- a/lib/zend/Zend/Service/Technorati/SearchResult.php +++ b/lib/zend/Zend/Service/Technorati/SearchResult.php @@ -15,34 +15,34 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_Result +/** + * @see Zend_Service_Technorati_Result */ require_once 'Zend/Service/Technorati/Result.php'; /** - * Represents a single Technorati Search query result object. - * It is never returned as a standalone object, + * Represents a single Technorati Search query result object. + * It is never returned as a standalone object, * but it always belongs to a valid Zend_Service_Technorati_SearchResultSet object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Result { /** * Technorati weblog object corresponding to queried keyword. - * + * * @var Zend_Service_Technorati_Weblog * @access protected */ @@ -50,15 +50,15 @@ class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Resul /** * The title of the entry. - * + * * @var string * @access protected */ protected $_title; - + /** * The blurb from entry with search term highlighted. - * + * * @var string * @access protected */ @@ -66,7 +66,7 @@ class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Resul /** * The datetime the entry was created. - * + * * @var Zend_Date * @access protected */ @@ -74,12 +74,12 @@ class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Resul /** * The permalink of the blog entry. - * + * * @var Zend_Uri_Http * @access protected */ protected $_permalink; - + /** * Constructs a new object object from DOM Element. @@ -104,47 +104,47 @@ class Zend_Service_Technorati_SearchResult extends Zend_Service_Technorati_Resul /** * Returns the weblog object that links queried URL. - * + * * @return Zend_Service_Technorati_Weblog */ public function getWeblog() { return $this->_weblog; } - + /** * Returns the title of the entry. - * + * * @return string */ public function getTitle() { return $this->_title; } - + /** * Returns the blurb from entry with search term highlighted. - * + * * @return string */ public function getExcerpt() { return $this->_excerpt; } - + /** * Returns the datetime the entry was created. - * + * * @return Zend_Date */ public function getCreated() { return $this->_created; } - + /** * Returns the permalink of the blog entry. - * + * * @return Zend_Uri_Http */ public function getPermalink() { return $this->_permalink; } - + } diff --git a/lib/zend/Zend/Service/Technorati/SearchResultSet.php b/lib/zend/Zend/Service/Technorati/SearchResultSet.php index b3c97b8e26c..c6718ee0727 100644 --- a/lib/zend/Zend/Service/Technorati/SearchResultSet.php +++ b/lib/zend/Zend/Service/Technorati/SearchResultSet.php @@ -15,25 +15,25 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_ResultSet +/** + * @see Zend_Service_Technorati_ResultSet */ require_once 'Zend/Service/Technorati/ResultSet.php'; /** * Represents a Technorati Search query result set. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_SearchResultSet extends Zend_Service_Technorati_ResultSet @@ -58,7 +58,7 @@ class Zend_Service_Technorati_SearchResultSet extends Zend_Service_Technorati_Re $result = $this->_xpath->query('/tapi/document/result/querycount/text()'); if ($result->length == 1) $this->_queryCount = (int) $result->item(0)->data; - + $this->_totalResultsReturned = (int) $this->_xpath->evaluate("count(/tapi/document/item)"); $this->_totalResultsAvailable = (int) $this->_queryCount; } diff --git a/lib/zend/Zend/Service/Technorati/TagResult.php b/lib/zend/Zend/Service/Technorati/TagResult.php index 35c7236a463..e371b9abc7a 100644 --- a/lib/zend/Zend/Service/Technorati/TagResult.php +++ b/lib/zend/Zend/Service/Technorati/TagResult.php @@ -15,34 +15,34 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_Result +/** + * @see Zend_Service_Technorati_Result */ require_once 'Zend/Service/Technorati/Result.php'; /** - * Represents a single Technorati Tag query result object. - * It is never returned as a standalone object, + * Represents a single Technorati Tag query result object. + * It is never returned as a standalone object, * but it always belongs to a valid Zend_Service_Technorati_TagResultSet object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result { /** * Technorati weblog object corresponding to queried keyword. - * + * * @var Zend_Service_Technorati_Weblog * @access protected */ @@ -50,15 +50,15 @@ class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result /** * The title of the entry. - * + * * @var string * @access protected */ protected $_title; - + /** * The blurb from entry with search term highlighted. - * + * * @var string * @access protected */ @@ -66,30 +66,30 @@ class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result /** * The datetime the entry was created. - * + * * @var Zend_Date * @access protected */ protected $_created; - + /** * The datetime the entry was updated. * Called 'postupdate' in original XML response, * it has been renamed to provide more coherence. - * + * * @var Zend_Date * @access protected */ protected $_updated; - + /** * The permalink of the blog entry. - * + * * @var Zend_Uri_Http * @access protected */ protected $_permalink; - + /** * Constructs a new object object from DOM Element. @@ -116,56 +116,56 @@ class Zend_Service_Technorati_TagResult extends Zend_Service_Technorati_Result /** * Returns the weblog object that links queried URL. - * + * * @return Zend_Service_Technorati_Weblog */ public function getWeblog() { return $this->_weblog; } - + /** * Returns the title of the entry. - * + * * @return string */ public function getTitle() { return $this->_title; } - + /** * Returns the blurb from entry with search term highlighted. - * + * * @return string */ public function getExcerpt() { return $this->_excerpt; } - + /** * Returns the datetime the entry was created. - * + * * @return Zend_Date */ public function getCreated() { return $this->_created; } - + /** * Returns the datetime the entry was updated. - * + * * @return Zend_Date */ public function getUpdated() { return $this->_updated; } - + /** * Returns the permalink of the blog entry. - * + * * @return Zend_Uri_Http */ public function getPermalink() { return $this->_permalink; } - + } diff --git a/lib/zend/Zend/Service/Technorati/TagResultSet.php b/lib/zend/Zend/Service/Technorati/TagResultSet.php index 797d7f0f254..62068bba62d 100644 --- a/lib/zend/Zend/Service/Technorati/TagResultSet.php +++ b/lib/zend/Zend/Service/Technorati/TagResultSet.php @@ -15,25 +15,25 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_ResultSet +/** + * @see Zend_Service_Technorati_ResultSet */ require_once 'Zend/Service/Technorati/ResultSet.php'; /** * Represents a Technorati Tag query result set. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagResultSet extends Zend_Service_Technorati_ResultSet @@ -78,7 +78,7 @@ class Zend_Service_Technorati_TagResultSet extends Zend_Service_Technorati_Resul /** * Returns the number of posts that match the tag. - * + * * @return int */ public function getPostsMatched() { @@ -87,7 +87,7 @@ class Zend_Service_Technorati_TagResultSet extends Zend_Service_Technorati_Resul /** * Returns the number of blogs that match the tag. - * + * * @return int */ public function getBlogsMatched() { diff --git a/lib/zend/Zend/Service/Technorati/TagsResult.php b/lib/zend/Zend/Service/Technorati/TagsResult.php index 82860bad21d..b97980154be 100644 --- a/lib/zend/Zend/Service/Technorati/TagsResult.php +++ b/lib/zend/Zend/Service/Technorati/TagsResult.php @@ -15,47 +15,47 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_Result +/** + * @see Zend_Service_Technorati_Result */ require_once 'Zend/Service/Technorati/Result.php'; /** - * Represents a single Technorati TopTags or BlogPostTags query result object. - * It is never returned as a standalone object, + * Represents a single Technorati TopTags or BlogPostTags query result object. + * It is never returned as a standalone object, * but it always belongs to a valid Zend_Service_Technorati_TagsResultSet object. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagsResult extends Zend_Service_Technorati_Result { /** * Name of the tag. - * + * * @var string * @access protected */ protected $_tag; - + /** * Number of posts containing this tag. - * + * * @var int * @access protected */ protected $_posts; - + /** * Constructs a new object object from DOM Document. @@ -67,7 +67,7 @@ class Zend_Service_Technorati_TagsResult extends Zend_Service_Technorati_Result $this->_fields = array( '_tag' => 'tag', '_posts' => 'posts'); parent::__construct($dom); - + // filter fields $this->_tag = (string) $this->_tag; $this->_posts = (int) $this->_posts; @@ -75,16 +75,16 @@ class Zend_Service_Technorati_TagsResult extends Zend_Service_Technorati_Result /** * Returns the tag name. - * + * * @return string */ public function getTag() { return $this->_tag; } - + /** * Returns the number of posts. - * + * * @return int */ public function getPosts() { diff --git a/lib/zend/Zend/Service/Technorati/TagsResultSet.php b/lib/zend/Zend/Service/Technorati/TagsResultSet.php index 62c0a7e9949..c804ecd21e6 100644 --- a/lib/zend/Zend/Service/Technorati/TagsResultSet.php +++ b/lib/zend/Zend/Service/Technorati/TagsResultSet.php @@ -15,25 +15,25 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** - * @see Zend_Service_Technorati_ResultSet +/** + * @see Zend_Service_Technorati_ResultSet */ require_once 'Zend/Service/Technorati/ResultSet.php'; /** * Represents a Technorati TopTags or BlogPostTags queries result set. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_TagsResultSet extends Zend_Service_Technorati_ResultSet diff --git a/lib/zend/Zend/Service/Technorati/Utils.php b/lib/zend/Zend/Service/Technorati/Utils.php index a71a28a5180..36448d75749 100644 --- a/lib/zend/Zend/Service/Technorati/Utils.php +++ b/lib/zend/Zend/Service/Technorati/Utils.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Utils @@ -64,7 +64,7 @@ class Zend_Service_Technorati_Utils * @see Zend_Service_Technorati_Exception */ require_once 'Zend/Service/Technorati/Exception.php'; - throw new Zend_Service_Technorati_Exception($e->getMessage()); + throw new Zend_Service_Technorati_Exception($e->getMessage(), 0, $e); } } @@ -73,20 +73,20 @@ class Zend_Service_Technorati_Utils /** * @see Zend_Service_Technorati_Exception */ - require_once 'Zend/Service/Technorati/Exception.php'; + require_once 'Zend/Service/Technorati/Exception.php'; throw new Zend_Service_Technorati_Exception( "Invalid URL $uri, only HTTP(S) protocols can be used"); } - + return $uri; } /** * Parses, validates and returns a valid Zend_Date object * from given $input. - * + * * $input can be either a string, an integer or a Zend_Date object. * If $input is string or int, it will be provided to Zend_Date as it is. - * If $input is a Zend_Date object, the object instance will be returned. + * If $input is a Zend_Date object, the object instance will be returned. * * @param mixed|Zend_Date $input * @return null|Zend_Date @@ -103,12 +103,12 @@ class Zend_Service_Technorati_Utils * @see Zend_Locale */ require_once 'Zend/Locale.php'; - + // allow null as value and return valid Zend_Date objects if (($input === null) || ($input instanceof Zend_Date)) { return $input; } - + // due to a BC break as of ZF 1.5 it's not safe to use Zend_Date::isDate() here // see ZF-2524, ZF-2334 if (@strtotime($input) !== FALSE) { @@ -121,7 +121,7 @@ class Zend_Service_Technorati_Utils throw new Zend_Service_Technorati_Exception("'$input' is not a valid Date/Time"); } } - + /** * @todo public static function xpathQueryAndSet() {} */ diff --git a/lib/zend/Zend/Service/Technorati/Weblog.php b/lib/zend/Zend/Service/Technorati/Weblog.php index ddace449573..c7044d84ac6 100644 --- a/lib/zend/Zend/Service/Technorati/Weblog.php +++ b/lib/zend/Zend/Service/Technorati/Weblog.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,11 +34,11 @@ require_once 'Zend/Service/Technorati/Utils.php'; /** * Represents a Weblog object successful recognized by Technorati. - * + * * @category Zend * @package Zend_Service * @subpackage Technorati - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Technorati_Weblog @@ -101,17 +101,17 @@ class Zend_Service_Technorati_Weblog /** * Technorati rank value for this weblog. - * + * * Note. This property has no official documentation. * * @var integer * @access protected */ protected $_rank; - + /** * Blog latitude coordinate. - * + * * Note. This property has no official documentation. * * @var float @@ -121,7 +121,7 @@ class Zend_Service_Technorati_Weblog /** * Blog longitude coordinate. - * + * * Note. This property has no official documentation. * * @var float @@ -131,7 +131,7 @@ class Zend_Service_Technorati_Weblog /** * Whether the author who claimed this weblog has a photo. - * + * * Note. This property has no official documentation. * * @var bool @@ -152,7 +152,7 @@ class Zend_Service_Technorati_Weblog /** * Constructs a new object from DOM Element. * - * @param DomElement $dom the ReST fragment for this object + * @param DomElement $dom the ReST fragment for this object */ public function __construct(DomElement $dom) { @@ -163,13 +163,13 @@ class Zend_Service_Technorati_Weblog $result = $xpath->query('./url/text()', $dom); if ($result->length == 1) $this->setUrl($result->item(0)->data); - + $result = $xpath->query('./inboundblogs/text()', $dom); if ($result->length == 1) $this->setInboundBlogs($result->item(0)->data); - + $result = $xpath->query('./inboundlinks/text()', $dom); if ($result->length == 1) $this->setInboundLinks($result->item(0)->data); - + $result = $xpath->query('./lastupdate/text()', $dom); if ($result->length == 1) $this->setLastUpdate($result->item(0)->data); @@ -177,10 +177,10 @@ class Zend_Service_Technorati_Weblog $result = $xpath->query('./rssurl/text()', $dom); if ($result->length == 1) $this->setRssUrl($result->item(0)->data); - + $result = $xpath->query('./atomurl/text()', $dom); if ($result->length == 1) $this->setAtomUrl($result->item(0)->data); - + $result = $xpath->query('./author', $dom); if ($result->length >= 1) { foreach ($result as $author) { @@ -190,11 +190,11 @@ class Zend_Service_Technorati_Weblog /** * The following are optional elements - * + * * I can't find any official documentation about the following properties * however they are included in response DTD and/or test responses. */ - + $result = $xpath->query('./rank/text()', $dom); if ($result->length == 1) $this->setRank($result->item(0)->data); @@ -207,134 +207,134 @@ class Zend_Service_Technorati_Weblog $result = $xpath->query('./hasphoto/text()', $dom); if ($result->length == 1) $this->setHasPhoto($result->item(0)->data); } - - + + /** * Returns weblog name. - * + * * @return string Weblog name */ - public function getName() + public function getName() { return $this->_name; } - + /** * Returns weblog URL. - * + * * @return null|Zend_Uri_Http object representing weblog base URL */ - public function getUrl() + public function getUrl() { return $this->_url; } - + /** * Returns number of unique blogs linking this blog. - * + * * @return integer the number of inbound blogs */ - public function getInboundBlogs() + public function getInboundBlogs() { return $this->_inboundBlogs; } - + /** * Returns number of incoming links to this blog. - * + * * @return integer the number of inbound links */ - public function getInboundLinks() + public function getInboundLinks() { return $this->_inboundLinks; } - + /** * Returns weblog Rss URL. - * + * * @return null|Zend_Uri_Http object representing the URL * of the RSS feed for given blog */ - public function getRssUrl() + public function getRssUrl() { return $this->_rssUrl; } - + /** * Returns weblog Atom URL. - * + * * @return null|Zend_Uri_Http object representing the URL * of the Atom feed for given blog */ - public function getAtomUrl() + public function getAtomUrl() { return $this->_atomUrl; } - + /** * Returns UNIX timestamp of the last weblog update. - * + * * @return integer UNIX timestamp of the last weblog update */ - public function getLastUpdate() + public function getLastUpdate() { return $this->_lastUpdate; } - + /** * Returns weblog rank value. - * + * * Note. This property is not documented. - * + * * @return integer weblog rank value */ - public function getRank() + public function getRank() { return $this->_rank; } - + /** * Returns weblog latitude coordinate. - * + * * Note. This property is not documented. - * + * * @return float weblog latitude coordinate */ public function getLat() { return $this->_lat; } - + /** * Returns weblog longitude coordinate. - * + * * Note. This property is not documented. - * + * * @return float weblog longitude coordinate */ - public function getLon() + public function getLon() { return $this->_lon; } - + /** * Returns whether the author who claimed this weblog has a photo. - * + * * Note. This property is not documented. - * + * * @return bool TRUE if the author who claimed this weblog has a photo, * FALSE otherwise. */ - public function hasPhoto() + public function hasPhoto() { return (bool) $this->_hasPhoto; } /** * Returns the array of weblog authors. - * + * * @return array of Zend_Service_Technorati_Author authors */ - public function getAuthors() + public function getAuthors() { return (array) $this->_authors; } @@ -342,11 +342,11 @@ class Zend_Service_Technorati_Weblog /** * Sets weblog name. - * + * * @param string $name * @return Zend_Service_Technorati_Weblog $this instance */ - public function setName($name) + public function setName($name) { $this->_name = (string) $name; return $this; @@ -354,37 +354,37 @@ class Zend_Service_Technorati_Weblog /** * Sets weblog URL. - * + * * @param string|Zend_Uri_Http $url * @return void * @throws Zend_Service_Technorati_Exception if $input is an invalid URI * (via Zend_Service_Technorati_Utils::normalizeUriHttp) */ - public function setUrl($url) + public function setUrl($url) { $this->_url = Zend_Service_Technorati_Utils::normalizeUriHttp($url); return $this; } - + /** * Sets number of inbound blogs. - * + * * @param integer $number * @return Zend_Service_Technorati_Weblog $this instance */ - public function setInboundBlogs($number) + public function setInboundBlogs($number) { $this->_inboundBlogs = (int) $number; return $this; } - + /** * Sets number of Iinbound links. - * + * * @param integer $number * @return Zend_Service_Technorati_Weblog $this instance */ - public function setInboundLinks($number) + public function setInboundLinks($number) { $this->_inboundLinks = (int) $number; return $this; @@ -392,13 +392,13 @@ class Zend_Service_Technorati_Weblog /** * Sets weblog Rss URL. - * + * * @param string|Zend_Uri_Http $url * @return Zend_Service_Technorati_Weblog $this instance * @throws Zend_Service_Technorati_Exception if $input is an invalid URI * (via Zend_Service_Technorati_Utils::normalizeUriHttp) */ - public function setRssUrl($url) + public function setRssUrl($url) { $this->_rssUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($url); return $this; @@ -406,81 +406,81 @@ class Zend_Service_Technorati_Weblog /** * Sets weblog Atom URL. - * + * * @param string|Zend_Uri_Http $url * @return Zend_Service_Technorati_Weblog $this instance * @throws Zend_Service_Technorati_Exception if $input is an invalid URI * (via Zend_Service_Technorati_Utils::normalizeUriHttp) */ - public function setAtomUrl($url) + public function setAtomUrl($url) { $this->_atomUrl = Zend_Service_Technorati_Utils::normalizeUriHttp($url); return $this; } - + /** * Sets weblog Last Update timestamp. - * - * $datetime can be any value supported by + * + * $datetime can be any value supported by * Zend_Service_Technorati_Utils::normalizeDate(). - * + * * @param mixed $datetime A string representing the last update date time * in a valid date time format * @return Zend_Service_Technorati_Weblog $this instance * @throws Zend_Service_Technorati_Exception */ - public function setLastUpdate($datetime) + public function setLastUpdate($datetime) { $this->_lastUpdate = Zend_Service_Technorati_Utils::normalizeDate($datetime); return $this; } - + /** * Sets weblog Rank. - * + * * @param integer $rank * @return Zend_Service_Technorati_Weblog $this instance */ - public function setRank($rank) + public function setRank($rank) { $this->_rank = (int) $rank; return $this; } - + /** * Sets weblog latitude coordinate. - * + * * @param float $coordinate * @return Zend_Service_Technorati_Weblog $this instance */ - public function setLat($coordinate) + public function setLat($coordinate) { $this->_lat = (float) $coordinate; return $this; } - + /** * Sets weblog longitude coordinate. - * + * * @param float $coordinate * @return Zend_Service_Technorati_Weblog $this instance */ - public function setLon($coordinate) + public function setLon($coordinate) { $this->_lon = (float) $coordinate; return $this; } - + /** * Sets hasPhoto property. - * + * * @param bool $hasPhoto * @return Zend_Service_Technorati_Weblog $this instance */ - public function setHasPhoto($hasPhoto) + public function setHasPhoto($hasPhoto) { $this->_hasPhoto = (bool) $hasPhoto; return $this; } - + } diff --git a/lib/zend/Zend/Service/Twitter.php b/lib/zend/Zend/Service/Twitter.php index 46c4792fb1d..d75bb8be958 100755 --- a/lib/zend/Zend/Service/Twitter.php +++ b/lib/zend/Zend/Service/Twitter.php @@ -15,28 +15,36 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ + /** * @see Zend_Rest_Client */ require_once 'Zend/Rest/Client.php'; + /** * @see Zend_Rest_Client_Result */ require_once 'Zend/Rest/Client/Result.php'; + +/** + * @see Zend_Oauth_Consumer + */ +require_once 'Zend/Oauth/Consumer.php'; + /** * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Twitter extends Zend_Rest_Client { - + /** * 246 is the current limit for a status message, 140 characters are displayed * initially, with the remainder linked from the web UI or client. The limit is @@ -48,42 +56,68 @@ class Zend_Service_Twitter extends Zend_Rest_Client const STATUS_MAX_CHARACTERS = 246; /** - * Whether or not authorization has been initialized for the current user. - * @var bool + * OAuth Endpoint */ - protected $_authInitialized = false; + const OAUTH_BASE_URI = 'http://twitter.com/oauth'; + /** * @var Zend_Http_CookieJar */ protected $_cookieJar; + /** * Date format for 'since' strings + * * @var string */ protected $_dateFormat = 'D, d M Y H:i:s T'; + /** * Username + * * @var string */ protected $_username; - /** - * Password - * @var string - */ - protected $_password; + /** * Current method type (for method proxying) + * * @var string */ protected $_methodType; - /** - * Types of API methods - * @var array - */ - protected $_methodTypes = array('status', 'user', 'directMessage', 'friendship', 'account', 'favorite', 'block'); + /** + * Zend_Oauth Consumer + * + * @var Zend_Oauth_Consumer + */ + protected $_oauthConsumer = null; + + /** + * Types of API methods + * + * @var array + */ + protected $_methodTypes = array( + 'status', + 'user', + 'directMessage', + 'friendship', + 'account', + 'favorite', + 'block' + ); + + /** + * Options passed to constructor + * + * @var array + */ + protected $_options = array(); + /** * Local HTTP Client cloned from statically set client + * * @var Zend_Http_Client */ protected $_localHttpClient = null; @@ -91,27 +125,32 @@ class Zend_Service_Twitter extends Zend_Rest_Client /** * Constructor * - * @param string $username - * @param string $password + * @param array $options Optional options array * @return void */ - public function __construct($username, $password = null) + public function __construct(array $options = null, Zend_Oauth_Consumer $consumer = null) { - $this->setLocalHttpClient(clone self::getHttpClient()); - if (is_array($username) && is_null($password)) { - if (isset($username['username']) && isset($username['password'])) { - $this->setUsername($username['username']); - $this->setPassword($username['password']); - } elseif (isset($username[0]) && isset($username[1])) { - $this->setUsername($username[0]); - $this->setPassword($username[1]); + $this->setUri('http://api.twitter.com'); + if (!is_array($options)) $options = array(); + $options['siteUrl'] = self::OAUTH_BASE_URI; + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } + $this->_options = $options; + if (isset($options['username'])) { + $this->setUsername($options['username']); + } + if (isset($options['accessToken']) + && $options['accessToken'] instanceof Zend_Oauth_Token_Access) { + $this->setLocalHttpClient($options['accessToken']->getHttpClient($options)); + } else { + $this->setLocalHttpClient(clone self::getHttpClient()); + if (is_null($consumer)) { + $this->_oauthConsumer = new Zend_Oauth_Consumer($options); + } else { + $this->_oauthConsumer = $consumer; } - } else { - $this->setUsername($username); - $this->setPassword($password); } - $this->setUri('http://twitter.com'); - $this->_localHttpClient->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8'); } /** @@ -124,13 +163,33 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function setLocalHttpClient(Zend_Http_Client $client) { $this->_localHttpClient = $client; + $this->_localHttpClient->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8'); return $this; } - + + /** + * Get the local HTTP client as distinct from the static HTTP client + * inherited from Zend_Rest_Client + * + * @return Zend_Http_Client + */ public function getLocalHttpClient() { return $this->_localHttpClient; } + + /** + * Checks for an authorised state + * + * @return bool + */ + public function isAuthorised() + { + if ($this->getLocalHttpClient() instanceof Zend_Oauth_Client) { + return true; + } + return false; + } /** * Retrieve username @@ -151,30 +210,6 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function setUsername($value) { $this->_username = $value; - $this->_authInitialized = false; - return $this; - } - - /** - * Retrieve password - * - * @return string - */ - public function getPassword() - { - return $this->_password; - } - - /** - * Set password - * - * @param string $value - * @return Zend_Service_Twitter - */ - public function setPassword($value) - { - $this->_password = $value; - $this->_authInitialized = false; return $this; } @@ -183,13 +218,15 @@ class Zend_Service_Twitter extends Zend_Rest_Client * * @param string $type * @return Zend_Service_Twitter - * @throws Zend_Service_Twitter_Exception if method is not in method types list + * @throws Zend_Service_Twitter_Exception If method not in method types list */ public function __get($type) { if (!in_array($type, $this->_methodTypes)) { include_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception('Invalid method type "' . $type . '"'); + throw new Zend_Service_Twitter_Exception( + 'Invalid method type "' . $type . '"' + ); } $this->_methodType = $type; return $this; @@ -205,16 +242,27 @@ class Zend_Service_Twitter extends Zend_Rest_Client */ public function __call($method, $params) { + if (method_exists($this->_oauthConsumer, $method)) { + $return = call_user_func_array(array($this->_oauthConsumer, $method), $params); + if ($return instanceof Zend_Oauth_Token_Access) { + $this->setLocalHttpClient($return->getHttpClient($this->_options)); + } + return $return; + } if (empty($this->_methodType)) { include_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception('Invalid method "' . $method . '"'); + throw new Zend_Service_Twitter_Exception( + 'Invalid method "' . $method . '"' + ); } $test = $this->_methodType . ucfirst($method); if (!method_exists($this, $test)) { include_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception('Invalid method "' . $test . '"'); + throw new Zend_Service_Twitter_Exception( + 'Invalid method "' . $test . '"' + ); } - + return call_user_func_array(array($this, $test), $params); } @@ -225,6 +273,15 @@ class Zend_Service_Twitter extends Zend_Rest_Client */ protected function _init() { + if (!$this->isAuthorised() && $this->getUsername() !== null) { + require_once 'Zend/Service/Twitter/Exception.php'; + throw new Zend_Service_Twitter_Exception( + 'Twitter session is unauthorised. You need to initialize ' + . 'Zend_Service_Twitter with an OAuth Access Token or use ' + . 'its OAuth functionality to obtain an Access Token before ' + . 'attempting any API actions that require authorisation' + ); + } $client = $this->_localHttpClient; $client->resetParameters(); if (null == $this->_cookieJar) { @@ -233,10 +290,6 @@ class Zend_Service_Twitter extends Zend_Rest_Client } else { $client->setCookieJar($this->_cookieJar); } - if (!$this->_authInitialized) { - $client->setAuth($this->getUsername(), $this->getPassword()); - $this->_authInitialized = true; - } } /** @@ -265,7 +318,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function statusPublicTimeline() { $this->_init(); - $path = '/statuses/public_timeline.xml'; + $path = '/1/statuses/public_timeline.xml'; $response = $this->_get($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -286,7 +339,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function statusFriendsTimeline(array $params = array()) { $this->_init(); - $path = '/statuses/friends_timeline'; + $path = '/1/statuses/friends_timeline'; $_params = array(); foreach ($params as $key => $value) { switch (strtolower($key)) { @@ -332,7 +385,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function statusUserTimeline(array $params = array()) { $this->_init(); - $path = '/statuses/user_timeline'; + $path = '/1/statuses/user_timeline'; $_params = array(); foreach ($params as $key => $value) { switch (strtolower($key)) { @@ -382,7 +435,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function statusShow($id) { $this->_init(); - $path = '/statuses/show/' . $this->_validInteger($id) . '.xml'; + $path = '/1/statuses/show/' . $this->_validInteger($id) . '.xml'; $response = $this->_get($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -396,23 +449,28 @@ class Zend_Service_Twitter extends Zend_Rest_Client * @throws Zend_Http_Client_Exception if HTTP request fails or times out * @throws Zend_Service_Twitter_Exception if message is too short or too long */ - public function statusUpdate($status, $in_reply_to_status_id = null) + public function statusUpdate($status, $inReplyToStatusId = null) { $this->_init(); - $path = '/statuses/update.xml'; + $path = '/1/statuses/update.xml'; $len = iconv_strlen(htmlspecialchars($status, ENT_QUOTES, 'UTF-8'), 'UTF-8'); if ($len > self::STATUS_MAX_CHARACTERS) { include_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception('Status must be no more than ' . self::STATUS_MAX_CHARACTERS . ' characters in length'); + throw new Zend_Service_Twitter_Exception( + 'Status must be no more than ' + . self::STATUS_MAX_CHARACTERS + . ' characters in length' + ); } elseif (0 == $len) { include_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception('Status must contain at least one character'); + throw new Zend_Service_Twitter_Exception( + 'Status must contain at least one character' + ); } $data = array('status' => $status); - if (is_numeric($in_reply_to_status_id) && !empty($in_reply_to_status_id)) { - $data['in_reply_to_status_id'] = $in_reply_to_status_id; + if (is_numeric($inReplyToStatusId) && !empty($inReplyToStatusId)) { + $data['in_reply_to_status_id'] = $inReplyToStatusId; } - //$this->status = $status; $response = $this->_post($path, $data); return new Zend_Rest_Client_Result($response->getBody()); } @@ -430,7 +488,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function statusReplies(array $params = array()) { $this->_init(); - $path = '/statuses/replies.xml'; + $path = '/1/statuses/mentions.xml'; $_params = array(); foreach ($params as $key => $value) { switch (strtolower($key)) { @@ -458,7 +516,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function statusDestroy($id) { $this->_init(); - $path = '/statuses/destroy/' . $this->_validInteger($id) . '.xml'; + $path = '/1/statuses/destroy/' . $this->_validInteger($id) . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -473,9 +531,9 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function userFriends(array $params = array()) { $this->_init(); - $path = '/statuses/friends'; + $path = '/1/statuses/friends'; $_params = array(); - + foreach ($params as $key => $value) { switch (strtolower($key)) { case 'id': @@ -489,7 +547,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client } } $path .= '.xml'; - + $response = $this->_get($path, $_params); return new Zend_Rest_Client_Result($response->getBody()); } @@ -504,7 +562,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function userFollowers($lite = false) { $this->_init(); - $path = '/statuses/followers.xml'; + $path = '/1/statuses/followers.xml'; if ($lite) { $this->lite = 'true'; } @@ -512,20 +570,6 @@ class Zend_Service_Twitter extends Zend_Rest_Client return new Zend_Rest_Client_Result($response->getBody()); } - /** - * Get featured users - * - * @throws Zend_Http_Client_Exception if HTTP request fails or times out - * @return Zend_Rest_Client_Result - */ - public function userFeatured() - { - $this->_init(); - $path = '/statuses/featured.xml'; - $response = $this->_get($path); - return new Zend_Rest_Client_Result($response->getBody()); - } - /** * Show extended information on a user * @@ -536,8 +580,8 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function userShow($id) { $this->_init(); - $path = '/users/show/' . $id . '.xml'; - $response = $this->_get($path); + $path = '/1/users/show.xml'; + $response = $this->_get($path, array('id'=>$id)); return new Zend_Rest_Client_Result($response->getBody()); } @@ -555,7 +599,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function directMessageMessages(array $params = array()) { $this->_init(); - $path = '/direct_messages.xml'; + $path = '/1/direct_messages.xml'; $_params = array(); foreach ($params as $key => $value) { switch (strtolower($key)) { @@ -587,7 +631,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function directMessageSent(array $params = array()) { $this->_init(); - $path = '/direct_messages/sent.xml'; + $path = '/1/direct_messages/sent.xml'; $_params = array(); foreach ($params as $key => $value) { switch (strtolower($key)) { @@ -617,12 +661,16 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function directMessageNew($user, $text) { $this->_init(); - $path = '/direct_messages/new.xml'; + $path = '/1/direct_messages/new.xml'; $len = iconv_strlen($text, 'UTF-8'); if (0 == $len) { - throw new Zend_Service_Twitter_Exception('Direct message must contain at least one character'); + throw new Zend_Service_Twitter_Exception( + 'Direct message must contain at least one character' + ); } elseif (140 < $len) { - throw new Zend_Service_Twitter_Exception('Direct message must contain no more than 140 characters'); + throw new Zend_Service_Twitter_Exception( + 'Direct message must contain no more than 140 characters' + ); } $data = array('user' => $user, 'text' => $text); $response = $this->_post($path, $data); @@ -639,7 +687,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function directMessageDestroy($id) { $this->_init(); - $path = '/direct_messages/destroy/' . $this->_validInteger($id) . '.xml'; + $path = '/1/direct_messages/destroy/' . $this->_validInteger($id) . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -654,7 +702,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function friendshipCreate($id) { $this->_init(); - $path = '/friendships/create/' . $id . '.xml'; + $path = '/1/friendships/create/' . $id . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -669,7 +717,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function friendshipDestroy($id) { $this->_init(); - $path = '/friendships/destroy/' . $id . '.xml'; + $path = '/1/friendships/destroy/' . $id . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -684,7 +732,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function friendshipExists($id) { $this->_init(); - $path = '/friendships/exists.xml'; + $path = '/1/friendships/exists.xml'; $data = array('user_a' => $this->getUsername(), 'user_b' => $id); $response = $this->_get($path, $data); return new Zend_Rest_Client_Result($response->getBody()); @@ -699,7 +747,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function accountVerifyCredentials() { $this->_init(); - $response = $this->_get('/account/verify_credentials.xml'); + $response = $this->_get('/1/account/verify_credentials.xml'); return new Zend_Rest_Client_Result($response->getBody()); } @@ -712,7 +760,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function accountEndSession() { $this->_init(); - $this->_get('/account/end_session'); + $this->_get('/1/account/end_session'); return true; } @@ -725,7 +773,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function accountRateLimitStatus() { $this->_init(); - $response = $this->_get('/account/rate_limit_status.xml'); + $response = $this->_get('/1/account/rate_limit_status.xml'); return new Zend_Rest_Client_Result($response->getBody()); } @@ -743,7 +791,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function favoriteFavorites(array $params = array()) { $this->_init(); - $path = '/favorites'; + $path = '/1/favorites'; $_params = array(); foreach ($params as $key => $value) { switch (strtolower($key)) { @@ -772,7 +820,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function favoriteCreate($id) { $this->_init(); - $path = '/favorites/create/' . $this->_validInteger($id) . '.xml'; + $path = '/1/favorites/create/' . $this->_validInteger($id) . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -787,7 +835,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client public function favoriteDestroy($id) { $this->_init(); - $path = '/favorites/destroy/' . $this->_validInteger($id) . '.xml'; + $path = '/1/favorites/destroy/' . $this->_validInteger($id) . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } @@ -795,68 +843,68 @@ class Zend_Service_Twitter extends Zend_Rest_Client /** * Blocks the user specified in the ID parameter as the authenticating user. * Destroys a friendship to the blocked user if it exists. - * - * @param integer|string $id The ID or screen name of a user to block. + * + * @param integer|string $id The ID or screen name of a user to block. * @return Zend_Rest_Client_Result */ public function blockCreate($id) { $this->_init(); - $path = '/blocks/create/' . $id . '.xml'; + $path = '/1/blocks/create/' . $id . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } /** * Un-blocks the user specified in the ID parameter for the authenticating user - * - * @param integer|string $id The ID or screen_name of the user to un-block. + * + * @param integer|string $id The ID or screen_name of the user to un-block. * @return Zend_Rest_Client_Result */ public function blockDestroy($id) { $this->_init(); - $path = '/blocks/destroy/' . $id . '.xml'; + $path = '/1/blocks/destroy/' . $id . '.xml'; $response = $this->_post($path); return new Zend_Rest_Client_Result($response->getBody()); } /** - * Returns if the authenticating user is blocking a target user. - * - * @param string|integer $id The ID or screen_name of the potentially blocked user. + * Returns if the authenticating user is blocking a target user. + * + * @param string|integer $id The ID or screen_name of the potentially blocked user. * @param boolean $returnResult Instead of returning a boolean return the rest response from twitter * @return Boolean|Zend_Rest_Client_Result */ public function blockExists($id, $returnResult = false) { $this->_init(); - $path = '/blocks/exists/' . $id . '.xml'; + $path = '/1/blocks/exists/' . $id . '.xml'; $response = $this->_get($path); - + $cr = new Zend_Rest_Client_Result($response->getBody()); - + if ($returnResult === true) return $cr; - + if (!empty($cr->request)) { return false; } - + return true; } /** * Returns an array of user objects that the authenticating user is blocking - * - * @param integer $page Optional. Specifies the page number of the results beginning at 1. A single page contains 20 ids. + * + * @param integer $page Optional. Specifies the page number of the results beginning at 1. A single page contains 20 ids. * @param boolean $returnUserIds Optional. Returns only the userid's instead of the whole user object * @return Zend_Rest_Client_Result */ public function blockBlocking($page = 1, $returnUserIds = false) { $this->_init(); - $path = '/blocks/blocking'; + $path = '/1/blocks/blocking'; if ($returnUserIds === true) { $path .= '/ids'; } @@ -890,7 +938,10 @@ class Zend_Service_Twitter extends Zend_Rest_Client { if (!preg_match('/^[a-zA-Z0-9_]{0,20}$/', $name)) { require_once 'Zend/Service/Twitter/Exception.php'; - throw new Zend_Service_Twitter_Exception('Screen name, "' . $name . '" should only contain alphanumeric characters and' . ' underscores, and not exceed 15 characters.'); + throw new Zend_Service_Twitter_Exception( + 'Screen name, "' . $name + . '" should only contain alphanumeric characters and' + . ' underscores, and not exceed 15 characters.'); } return $name; } @@ -907,22 +958,25 @@ class Zend_Service_Twitter extends Zend_Rest_Client // Get the URI object and configure it if (!$this->_uri instanceof Zend_Uri_Http) { require_once 'Zend/Rest/Client/Exception.php'; - throw new Zend_Rest_Client_Exception('URI object must be set before performing call'); + throw new Zend_Rest_Client_Exception( + 'URI object must be set before performing call' + ); } - + $uri = $this->_uri->getUri(); - + if ($path[0] != '/' && $uri[strlen($uri) - 1] != '/') { $path = '/' . $path; } - + $this->_uri->setPath($path); - + /** - * Get the HTTP client and configure it for the endpoint URI. Do this each time - * because the Zend_Http_Client instance is shared among all Zend_Service_Abstract subclasses. + * Get the HTTP client and configure it for the endpoint URI. + * Do this each time because the Zend_Http_Client instance is shared + * among all Zend_Service_Abstract subclasses. */ - $this->_localHttpClient->resetParameters()->setUri($this->_uri); + $this->_localHttpClient->resetParameters()->setUri((string) $this->_uri); } /** @@ -937,7 +991,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client { $this->_prepare($path); $this->_localHttpClient->setParameterGet($query); - return $this->_localHttpClient->request('GET'); + return $this->_localHttpClient->request(Zend_Http_Client::GET); } /** @@ -951,7 +1005,7 @@ class Zend_Service_Twitter extends Zend_Rest_Client protected function _post($path, $data = null) { $this->_prepare($path); - return $this->_performPost('POST', $data); + return $this->_performPost(Zend_Http_Client::POST, $data); } /** diff --git a/lib/zend/Zend/Service/Twitter/Exception.php b/lib/zend/Zend/Service/Twitter/Exception.php index 5f0faa698fe..06fc25ef2df 100755 --- a/lib/zend/Zend/Service/Twitter/Exception.php +++ b/lib/zend/Zend/Service/Twitter/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Service/Exception.php'; * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Twitter_Exception extends Zend_Service_Exception diff --git a/lib/zend/Zend/Service/Twitter/Search.php b/lib/zend/Zend/Service/Twitter/Search.php index e152d561e1e..f20961e94a2 100644 --- a/lib/zend/Zend/Service/Twitter/Search.php +++ b/lib/zend/Zend/Service/Twitter/Search.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -23,12 +23,7 @@ /** * @see Zend_Http_Client */ -require_once 'Zend/Http/Client.php'; - -/** - * @see Zend_Uri_Http - */ -require_once 'Zend/Uri/Http.php'; +require_once 'Zend/Rest/Client.php'; /** * @see Zend_Json @@ -44,11 +39,11 @@ require_once 'Zend/Feed.php'; * @category Zend * @package Zend_Service * @subpackage Twitter - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ -class Zend_Service_Twitter_Search extends Zend_Http_Client +class Zend_Service_Twitter_Search extends Zend_Rest_Client { /** * Return Type @@ -81,7 +76,7 @@ class Zend_Service_Twitter_Search extends Zend_Http_Client public function __construct($responseType = 'json') { $this->setResponseType($responseType); - $this->_uri = Zend_Uri_Http::fromString("http://search.twitter.com"); + $this->setUri("http://search.twitter.com"); $this->setHeaders('Accept-Charset', 'ISO-8859-1,utf-8'); } @@ -121,9 +116,7 @@ class Zend_Service_Twitter_Search extends Zend_Http_Client */ public function trends() { - $this->_uri->setPath('/trends.json'); - $this->setUri($this->_uri); - $response = $this->request(); + $response = $this->restGet('/trends.json'); return Zend_Json::decode($response->getBody()); } @@ -136,9 +129,6 @@ class Zend_Service_Twitter_Search extends Zend_Http_Client public function search($query, array $params = array()) { - $this->_uri->setPath('/search.' . $this->_responseType); - $this->_uri->setQuery(null); - $_query = array(); $_query['q'] = $query; @@ -147,7 +137,7 @@ class Zend_Service_Twitter_Search extends Zend_Http_Client switch($key) { case 'geocode': case 'lang': - case 'since_id': + case 'since_id': $_query[$key] = $param; break; case 'rpp': @@ -161,10 +151,7 @@ class Zend_Service_Twitter_Search extends Zend_Http_Client } } - $this->_uri->setQuery($_query); - - $this->setUri($this->_uri); - $response = $this->request(); + $response = $this->restGet('/search.' . $this->_responseType, $_query); switch($this->_responseType) { case 'json': diff --git a/lib/zend/Zend/Service/Yahoo.php b/lib/zend/Zend/Service/Yahoo.php index 54f690b538a..925232ccc4c 100644 --- a/lib/zend/Zend/Service/Yahoo.php +++ b/lib/zend/Zend/Service/Yahoo.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo @@ -411,7 +411,6 @@ class Zend_Service_Yahoo { static $defaultOptions = array('type' => 'all', 'start' => 1, - 'license' => 'any', 'results' => 10, 'format' => 'any'); @@ -837,11 +836,14 @@ class Zend_Service_Yahoo $this->_validateInArray('type', $options['type'], array('all', 'any', 'phrase')); $this->_validateInArray('format', $options['format'], array('any', 'html', 'msword', 'pdf', 'ppt', 'rss', 'txt', 'xls')); - $this->_validateInArray('license', $options['license'], array('any', 'cc_any', 'cc_commercial', + if (isset($options['license'])) { + $this->_validateInArray('license', $options['license'], array('any', 'cc_any', 'cc_commercial', 'cc_modifiable')); + } + if (isset($options['region'])){ $this->_validateInArray('region', $options['region'], array('ar', 'au', 'at', 'br', 'ca', 'ct', 'dk', 'fi', - 'fr', 'de', 'in', 'id', 'it', 'my', 'mx', + 'fr', 'de', 'in', 'id', 'it', 'my', 'mx', 'nl', 'no', 'ph', 'ru', 'sg', 'es', 'se', 'ch', 'th', 'uk', 'us')); } diff --git a/lib/zend/Zend/Service/Yahoo/Image.php b/lib/zend/Zend/Service/Yahoo/Image.php index 60dd78d4c89..30f3757a5db 100644 --- a/lib/zend/Zend/Service/Yahoo/Image.php +++ b/lib/zend/Zend/Service/Yahoo/Image.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_Image diff --git a/lib/zend/Zend/Service/Yahoo/ImageResult.php b/lib/zend/Zend/Service/Yahoo/ImageResult.php index 75def06a075..5c2909efeda 100644 --- a/lib/zend/Zend/Service/Yahoo/ImageResult.php +++ b/lib/zend/Zend/Service/Yahoo/ImageResult.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ImageResult extends Zend_Service_Yahoo_Result diff --git a/lib/zend/Zend/Service/Yahoo/ImageResultSet.php b/lib/zend/Zend/Service/Yahoo/ImageResultSet.php index 65e23f34c4d..38d7f01f910 100644 --- a/lib/zend/Zend/Service/Yahoo/ImageResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/ImageResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/ImageResult.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ImageResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php b/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php index 59a3706b8a0..1ac6d1c24f6 100644 --- a/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php +++ b/lib/zend/Zend/Service/Yahoo/InlinkDataResult.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Service/Yahoo/Result.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_InlinkDataResult extends Zend_Service_Yahoo_Result diff --git a/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php b/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php index 259d31b442b..d03bc7b91c8 100644 --- a/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/InlinkDataResultSet.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Service/Yahoo/InlinkDataResult.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_InlinkDataResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/lib/zend/Zend/Service/Yahoo/LocalResult.php b/lib/zend/Zend/Service/Yahoo/LocalResult.php index 82ecfcad5d2..bd7d9142632 100644 --- a/lib/zend/Zend/Service/Yahoo/LocalResult.php +++ b/lib/zend/Zend/Service/Yahoo/LocalResult.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_LocalResult extends Zend_Service_Yahoo_Result diff --git a/lib/zend/Zend/Service/Yahoo/LocalResultSet.php b/lib/zend/Zend/Service/Yahoo/LocalResultSet.php index 21700dea3df..50ddf35bf84 100644 --- a/lib/zend/Zend/Service/Yahoo/LocalResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/LocalResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/LocalResult.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_LocalResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/lib/zend/Zend/Service/Yahoo/NewsResult.php b/lib/zend/Zend/Service/Yahoo/NewsResult.php index 3c30b83c751..cb0e4327257 100644 --- a/lib/zend/Zend/Service/Yahoo/NewsResult.php +++ b/lib/zend/Zend/Service/Yahoo/NewsResult.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_NewsResult extends Zend_Service_Yahoo_Result diff --git a/lib/zend/Zend/Service/Yahoo/NewsResultSet.php b/lib/zend/Zend/Service/Yahoo/NewsResultSet.php index 5deafd3e641..695fad984aa 100644 --- a/lib/zend/Zend/Service/Yahoo/NewsResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/NewsResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/NewsResult.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_NewsResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/lib/zend/Zend/Service/Yahoo/PageDataResult.php b/lib/zend/Zend/Service/Yahoo/PageDataResult.php index 1412383bb2f..34aa988223f 100644 --- a/lib/zend/Zend/Service/Yahoo/PageDataResult.php +++ b/lib/zend/Zend/Service/Yahoo/PageDataResult.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/Service/Yahoo/Result.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_PageDataResult extends Zend_Service_Yahoo_Result diff --git a/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php b/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php index d03523c33dc..f7e0c9d3a7a 100644 --- a/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/PageDataResultSet.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -37,7 +37,7 @@ require_once 'Zend/Service/Yahoo/PageDataResult.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_PageDataResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/lib/zend/Zend/Service/Yahoo/Result.php b/lib/zend/Zend/Service/Yahoo/Result.php index 5aa0e35c4a3..23b5fa1bf11 100644 --- a/lib/zend/Zend/Service/Yahoo/Result.php +++ b/lib/zend/Zend/Service/Yahoo/Result.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_Result diff --git a/lib/zend/Zend/Service/Yahoo/ResultSet.php b/lib/zend/Zend/Service/Yahoo/ResultSet.php index cd710402c25..57951d7179a 100644 --- a/lib/zend/Zend/Service/Yahoo/ResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/ResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_ResultSet implements SeekableIterator diff --git a/lib/zend/Zend/Service/Yahoo/VideoResult.php b/lib/zend/Zend/Service/Yahoo/VideoResult.php index 7e08df3d02a..c3f53578773 100644 --- a/lib/zend/Zend/Service/Yahoo/VideoResult.php +++ b/lib/zend/Zend/Service/Yahoo/VideoResult.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_VideoResult extends Zend_Service_Yahoo_Result @@ -87,7 +87,7 @@ class Zend_Service_Yahoo_VideoResult extends Zend_Service_Yahoo_Result public $Duration; /** - * The number of audio channels in the video + * The number of audio channels in the video * * @var string */ diff --git a/lib/zend/Zend/Service/Yahoo/VideoResultSet.php b/lib/zend/Zend/Service/Yahoo/VideoResultSet.php index 15363f821bc..fe884cd7ee5 100644 --- a/lib/zend/Zend/Service/Yahoo/VideoResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/VideoResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/VideoResult.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_VideoResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/lib/zend/Zend/Service/Yahoo/WebResult.php b/lib/zend/Zend/Service/Yahoo/WebResult.php index e58d9349168..ffffb99c263 100644 --- a/lib/zend/Zend/Service/Yahoo/WebResult.php +++ b/lib/zend/Zend/Service/Yahoo/WebResult.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Service/Yahoo/Result.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_WebResult extends Zend_Service_Yahoo_Result @@ -93,17 +93,17 @@ class Zend_Service_Yahoo_WebResult extends Zend_Service_Yahoo_Result $this->_xpath = new DOMXPath($result->ownerDocument); $this->_xpath->registerNamespace('yh', $this->_namespace); - + // check if the cache section exists $cacheUrl = $this->_xpath->query('./yh:Cache/yh:Url/text()', $result)->item(0); if ($cacheUrl instanceof DOMNode) { - $this->CacheUrl = $cacheUrl->data; + $this->CacheUrl = $cacheUrl->data; } $cacheSize = $this->_xpath->query('./yh:Cache/yh:Size/text()', $result)->item(0); if ($cacheSize instanceof DOMNode) { - $this->CacheSize = (int) $cacheSize->data; + $this->CacheSize = (int) $cacheSize->data; } } } diff --git a/lib/zend/Zend/Service/Yahoo/WebResultSet.php b/lib/zend/Zend/Service/Yahoo/WebResultSet.php index 0ca5117c441..e704a86fe1b 100644 --- a/lib/zend/Zend/Service/Yahoo/WebResultSet.php +++ b/lib/zend/Zend/Service/Yahoo/WebResultSet.php @@ -16,7 +16,7 @@ * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Service/Yahoo/WebResult.php'; * @category Zend * @package Zend_Service * @subpackage Yahoo - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Service_Yahoo_WebResultSet extends Zend_Service_Yahoo_ResultSet diff --git a/lib/zend/Zend/Soap/AutoDiscover.php b/lib/zend/Zend/Soap/AutoDiscover.php index d0b6072b2c6..1440e5ab667 100644 --- a/lib/zend/Zend/Soap/AutoDiscover.php +++ b/lib/zend/Zend/Soap/AutoDiscover.php @@ -15,15 +15,30 @@ * @category Zend * @package Zend_Soap * @subpackage AutoDiscover - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Server_Interface + */ require_once 'Zend/Server/Interface.php'; +/** + * @see Zend_Soap_Wsdl + */ require_once 'Zend/Soap/Wsdl.php'; +/** + * @see Zend_Server_Reflection + */ require_once 'Zend/Server/Reflection.php'; +/** + * @see Zend_Server_Abstract + */ require_once 'Zend/Server/Abstract.php'; +/** + * @see Zend_Uri + */ require_once 'Zend/Uri.php'; /** @@ -33,7 +48,8 @@ require_once 'Zend/Uri.php'; * @package Zend_Soap * @subpackage AutoDiscover */ -class Zend_Soap_AutoDiscover implements Zend_Server_Interface { +class Zend_Soap_AutoDiscover implements Zend_Server_Interface +{ /** * @var Zend_Soap_Wsdl */ diff --git a/lib/zend/Zend/Soap/AutoDiscover/Exception.php b/lib/zend/Zend/Soap/AutoDiscover/Exception.php index 010c4a3ec5d..dd1b75a981d 100644 --- a/lib/zend/Zend/Soap/AutoDiscover/Exception.php +++ b/lib/zend/Zend/Soap/AutoDiscover/Exception.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Soap * @subpackage AutoDiscover - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Exception + */ require_once "Zend/Exception.php"; /** diff --git a/lib/zend/Zend/Soap/Client.php b/lib/zend/Zend/Soap/Client.php index c717d8f8574..3fc620a385d 100644 --- a/lib/zend/Zend/Soap/Client.php +++ b/lib/zend/Zend/Soap/Client.php @@ -15,18 +15,24 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ -/** Zend_Soap_Server */ +/** + * @see Zend_Soap_Server + */ require_once 'Zend/Soap/Server.php'; -/** Zend_Soap_Client_Local */ +/** + * @see Zend_Soap_Client_Local + */ require_once 'Zend/Soap/Client/Local.php'; -/** Zend_Soap_Client_Common */ +/** + * @see Zend_Soap_Client_Common + */ require_once 'Zend/Soap/Client/Common.php'; /** @@ -35,7 +41,7 @@ require_once 'Zend/Soap/Client/Common.php'; * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Soap_Client @@ -82,6 +88,7 @@ class Zend_Soap_Client protected $_stream_context = null; protected $_features = null; protected $_cache_wsdl = null; + protected $_user_agent = null; /** * WSDL used to access server @@ -256,6 +263,11 @@ class Zend_Soap_Client case 'cache_wsdl': $this->setWsdlCache($value); break; + case 'useragent': + case 'userAgent': + case 'user_agent': + $this->setUserAgent($value); + break; // Not used now // case 'connection_timeout': @@ -302,10 +314,21 @@ class Zend_Soap_Client $options['stream_context'] = $this->getStreamContext(); $options['cache_wsdl'] = $this->getWsdlCache(); $options['features'] = $this->getSoapFeatures(); + $options['user_agent'] = $this->getUserAgent(); foreach ($options as $key => $value) { - if ($value == null) { - unset($options[$key]); + /* + * ugly hack as I don't know if checking for '=== null' + * breaks some other option + */ + if ($key == 'user_agent') { + if ($value === null) { + unset($options[$key]); + } + } else { + if ($value == null) { + unset($options[$key]); + } } } @@ -415,13 +438,14 @@ class Zend_Soap_Client */ public function validateUrn($urn) { - $segs = parse_url($urn); - if (isset($segs['scheme'])) { - return true; + $scheme = parse_url($urn, PHP_URL_SCHEME); + if ($scheme === false || $scheme === null) { + require_once 'Zend/Soap/Client/Exception.php'; + throw new Zend_Soap_Client_Exception('Invalid URN'); } - require_once 'Zend/Soap/Client/Exception.php'; - throw new Zend_Soap_Client_Exception('Invalid URN'); + return true; + } /** @@ -850,6 +874,32 @@ class Zend_Soap_Client return $this->_cache_wsdl; } + /** + * Set the string to use in User-Agent header + * + * @param string|null $userAgent + * @return Zend_Soap_Client + */ + public function setUserAgent($userAgent) + { + if ($userAgent === null) { + $this->_user_agent = null; + } else { + $this->_user_agent = (string)$userAgent; + } + return $this; + } + + /** + * Get current string to use in User-Agent header + * + * @return string|null + */ + public function getUserAgent() + { + return $this->_user_agent; + } + /** * Retrieve request XML * @@ -1010,13 +1060,13 @@ class Zend_Soap_Client */ public function addSoapInputHeader(SoapHeader $header, $permanent = false) { - if ($permanent) { - $this->_permanentSoapInputHeaders[] = $header; - } else { - $this->_soapInputHeaders[] = $header; - } + if ($permanent) { + $this->_permanentSoapInputHeaders[] = $header; + } else { + $this->_soapInputHeaders[] = $header; + } - return $this; + return $this; } /** @@ -1039,7 +1089,7 @@ class Zend_Soap_Client */ public function getLastSoapOutputHeaderObjects() { - return $this->_soapOutputHeaders; + return $this->_soapOutputHeaders; } /** diff --git a/lib/zend/Zend/Soap/Client/Common.php b/lib/zend/Zend/Soap/Client/Common.php index b4eb28e8341..d3eb8e21155 100644 --- a/lib/zend/Zend/Soap/Client/Common.php +++ b/lib/zend/Zend/Soap/Client/Common.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Soap/Client/DotNet.php b/lib/zend/Zend/Soap/Client/DotNet.php index bd646d234b5..8a630f08bff 100644 --- a/lib/zend/Zend/Soap/Client/DotNet.php +++ b/lib/zend/Zend/Soap/Client/DotNet.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -65,12 +65,12 @@ class Zend_Soap_Client_DotNet extends Zend_Soap_Client */ protected function _preProcessArguments($arguments) { - if (count($arguments) > 1 || - (count($arguments) == 1 && !is_array(reset($arguments))) - ) { - require_once 'Zend/Soap/Client/Exception.php'; - throw new Zend_Soap_Client_Exception('.Net webservice arguments have to be grouped into array: array(\'a\' => $a, \'b\' => $b, ...).'); - } + if (count($arguments) > 1 || + (count($arguments) == 1 && !is_array(reset($arguments))) + ) { + require_once 'Zend/Soap/Client/Exception.php'; + throw new Zend_Soap_Client_Exception('.Net webservice arguments have to be grouped into array: array(\'a\' => $a, \'b\' => $b, ...).'); + } // Do nothing return $arguments; diff --git a/lib/zend/Zend/Soap/Client/Exception.php b/lib/zend/Zend/Soap/Client/Exception.php index f29a4f53d79..fc278a2c44f 100644 --- a/lib/zend/Zend/Soap/Client/Exception.php +++ b/lib/zend/Zend/Soap/Client/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -26,7 +26,7 @@ require_once 'Zend/Exception.php'; * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Soap/Client/Local.php b/lib/zend/Zend/Soap/Client/Local.php index 685c92ea075..09b43d3613b 100644 --- a/lib/zend/Zend/Soap/Client/Local.php +++ b/lib/zend/Zend/Soap/Client/Local.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Soap/Server.php b/lib/zend/Zend/Soap/Server.php index 9a1f2abd853..469192c38cf 100644 --- a/lib/zend/Zend/Soap/Server.php +++ b/lib/zend/Zend/Soap/Server.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -31,7 +31,7 @@ require_once 'Zend/Server/Interface.php'; * @package Zend_Soap * @subpackage Server * @uses Zend_Server_Interface - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -82,7 +82,7 @@ class Zend_Soap_Server implements Zend_Server_Interface /** * WSDL Caching Options of SOAP Server * - * @var + * @var mixed */ protected $_wsdlCache; @@ -327,13 +327,13 @@ class Zend_Soap_Server implements Zend_Server_Interface */ public function validateUrn($urn) { - $segs = parse_url($urn); - if (isset($segs['scheme'])) { - return true; + $scheme = parse_url($urn, PHP_URL_SCHEME); + if ($scheme === false || $scheme === null) { + require_once 'Zend/Soap/Server/Exception.php'; + throw new Zend_Soap_Server_Exception('Invalid URN'); } - require_once 'Zend/Soap/Server/Exception.php'; - throw new Zend_Soap_Server_Exception('Invalid URN'); + return true; } /** @@ -463,7 +463,7 @@ class Zend_Soap_Server implements Zend_Server_Interface /** * Return current SOAP Features options - * + * * @return int */ public function getSoapFeatures() @@ -539,16 +539,14 @@ class Zend_Soap_Server implements Zend_Server_Interface * Accepts a class name to use when handling requests. Any additional * arguments will be passed to that class' constructor when instantiated. * - * @param mixed $class Class name or object instance to examine and attach - * to the server. - * @param mixed $arg1 Optional argument to pass to class constructor - * @param mixed $arg2 Optional second argument to pass to class constructor - * dispatch. + * See {@link setObject()} to set preconfigured object instances as request handlers. + * + * @param string $class Class Name which executes SOAP Requests at endpoint. * @return Zend_Soap_Server * @throws Zend_Soap_Server_Exception if called more than once, or if class * does not exist */ - public function setClass($class, $arg1 = null, $arg2 = null) + public function setClass($class, $namespace = '', $argv = null) { if (isset($this->_class)) { require_once 'Zend/Soap/Server/Exception.php'; @@ -675,7 +673,7 @@ class Zend_Soap_Server implements Zend_Server_Interface * @param DOMDocument|DOMNode|SimpleXMLElement|stdClass|string $request * @return Zend_Soap_Server */ - private function _setRequest($request) + protected function _setRequest($request) { if ($request instanceof DOMDocument) { $xml = $request->saveXML(); diff --git a/lib/zend/Zend/Soap/Server/Exception.php b/lib/zend/Zend/Soap/Server/Exception.php index 86bffddd449..de19a674272 100644 --- a/lib/zend/Zend/Soap/Server/Exception.php +++ b/lib/zend/Zend/Soap/Server/Exception.php @@ -15,9 +15,9 @@ * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - */ + */ /** Zend_Exception */ @@ -28,7 +28,7 @@ require_once 'Zend/Exception.php'; * @category Zend * @package Zend_Soap * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/Soap/Wsdl.php b/lib/zend/Zend/Soap/Wsdl.php index 014c04704b1..5c9ceb40cac 100644 --- a/lib/zend/Zend/Soap/Wsdl.php +++ b/lib/zend/Zend/Soap/Wsdl.php @@ -14,12 +14,19 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Soap_Wsdl_Strategy_Interface + */ require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; + +/** + * @see Zend_Soap_Wsdl_Strategy_Abstract + */ require_once "Zend/Soap/Wsdl/Strategy/Abstract.php"; /** @@ -595,10 +602,10 @@ class Zend_Soap_Wsdl // delegates the detection of a complex type to the current strategy return $strategy->addComplexType($type); } - + /** * Parse an xsd:element represented as an array into a DOMElement. - * + * * @param array $element an xsd:element represented as an array * @return DOMElement parsed element */ @@ -608,7 +615,7 @@ class Zend_Soap_Wsdl require_once "Zend/Soap/Wsdl/Exception.php"; throw new Zend_Soap_Wsdl_Exception("The 'element' parameter needs to be an associative array."); } - + $elementXml = $this->_dom->createElement('xsd:element'); foreach ($element as $key => $value) { if (in_array($key, array('sequence', 'all', 'choice'))) { @@ -630,10 +637,10 @@ class Zend_Soap_Wsdl } return $elementXml; } - + /** * Add an xsd:element represented as an array to the schema. - * + * * Array keys represent attribute names and values their respective value. * The 'sequence', 'all' and 'choice' keys must have an array of elements as their value, * to add them to a nested complexType. @@ -645,7 +652,7 @@ class Zend_Soap_Wsdl * * * - * + * * @param array $element an xsd:element represented as an array * @return string xsd:element for the given element array */ diff --git a/lib/zend/Zend/Soap/Wsdl/Exception.php b/lib/zend/Zend/Soap/Wsdl/Exception.php index 804dd5b51b3..fc6e43dbe9d 100644 --- a/lib/zend/Zend/Soap/Wsdl/Exception.php +++ b/lib/zend/Zend/Soap/Wsdl/Exception.php @@ -15,11 +15,23 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Exception + */ require_once "Zend/Exception.php"; +/** + * Zend_Soap_Wsdl_Exception + * + * @category Zend + * @package Zend_Soap + * @subpackage Wsdl + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ class Zend_Soap_Wsdl_Exception extends Zend_Exception { } \ No newline at end of file diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php b/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php index d2e05feb582..220807e2e03 100644 --- a/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php +++ b/lib/zend/Zend/Soap/Wsdl/Strategy/Abstract.php @@ -15,11 +15,14 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Soap_Wsdl_Strategy_Interface + */ require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; /** @@ -28,7 +31,7 @@ require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Soap_Wsdl_Strategy_Abstract implements Zend_Soap_Wsdl_Strategy_Interface diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php b/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php index 3c89dab7a32..813c995545b 100644 --- a/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php +++ b/lib/zend/Zend/Soap/Wsdl/Strategy/AnyType.php @@ -15,13 +15,25 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Soap_Wsdl_Strategy_Interface + */ require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; +/** + * Zend_Soap_Wsdl_Strategy_AnyType + * + * @category Zend + * @package Zend_Soap + * @subpackage Wsdl + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ class Zend_Soap_Wsdl_Strategy_AnyType implements Zend_Soap_Wsdl_Strategy_Interface { /** @@ -31,7 +43,7 @@ class Zend_Soap_Wsdl_Strategy_AnyType implements Zend_Soap_Wsdl_Strategy_Interfa */ public function setContext(Zend_Soap_Wsdl $context) { - + } /** diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php index 3253fe91854..1ea69b5da67 100644 --- a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php +++ b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeComplex.php @@ -15,13 +15,25 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Soap_Wsdl_Strategy_DefaultComplexType + */ require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; +/** + * Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex + * + * @category Zend + * @package Zend_Soap + * @subpackage Wsdl + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy_DefaultComplexType { protected $_inProcess = array(); @@ -36,7 +48,7 @@ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy { if(in_array($type, $this->_inProcess)) { require_once "Zend/Soap/Wsdl/Exception.php"; - throw new Zend_Soap_Wsdl_Exception("Infinite recursion, cannot nest '".$type."' into itsself."); + throw new Zend_Soap_Wsdl_Exception("Infinite recursion, cannot nest '".$type."' into itself."); } $this->_inProcess[$type] = $type; @@ -111,7 +123,7 @@ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeComplex extends Zend_Soap_Wsdl_Strategy } /** - * From a nested defintion with type[], get the singular PHP Type + * From a nested definition with type[], get the singular PHP Type * * @param string $type * @return string diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php index 4cf581d6315..bbbd4740e15 100644 --- a/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php +++ b/lib/zend/Zend/Soap/Wsdl/Strategy/ArrayOfTypeSequence.php @@ -14,13 +14,25 @@ * * @category Zend * @package Zend_Soap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Soap_Wsdl_Strategy_DefaultComplexType + */ require_once "Zend/Soap/Wsdl/Strategy/DefaultComplexType.php"; +/** + * Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence + * + * @category Zend + * @package Zend_Soap + * @subpackage Wsdl + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ class Zend_Soap_Wsdl_Strategy_ArrayOfTypeSequence extends Zend_Soap_Wsdl_Strategy_DefaultComplexType { /** diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php b/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php index 6e3f9a3b80b..39fd70a0cd6 100644 --- a/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php +++ b/lib/zend/Zend/Soap/Wsdl/Strategy/Composite.php @@ -15,13 +15,25 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Soap_Wsdl_Strategy_Interface + */ require_once "Zend/Soap/Wsdl/Strategy/Interface.php"; +/** + * Zend_Soap_Wsdl_Strategy_Composite + * + * @category Zend + * @package Zend_Soap + * @subpackage Wsdl + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ class Zend_Soap_Wsdl_Strategy_Composite implements Zend_Soap_Wsdl_Strategy_Interface { /** diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php b/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php index b7c9196b21a..ba7d1a16a1d 100644 --- a/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php +++ b/lib/zend/Zend/Soap/Wsdl/Strategy/DefaultComplexType.php @@ -15,13 +15,25 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ +/** + * @see Zend_Soap_Wsdl_Strategy_Abstract + */ require_once "Zend/Soap/Wsdl/Strategy/Abstract.php"; +/** + * Zend_Soap_Wsdl_Strategy_DefaultComplexType + * + * @category Zend + * @package Zend_Soap + * @subpackage Wsdl + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ class Zend_Soap_Wsdl_Strategy_DefaultComplexType extends Zend_Soap_Wsdl_Strategy_Abstract { /** diff --git a/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php b/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php index 7175f1697d6..456bc6ea318 100644 --- a/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php +++ b/lib/zend/Zend/Soap/Wsdl/Strategy/Interface.php @@ -15,17 +15,25 @@ * @category Zend * @package Zend_Soap * @subpackage Wsdl - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ - +/** + * Interface for Zend_Soap_Wsdl_Strategy. + * + * @category Zend + * @package Zend_Soap + * @subpackage Wsdl + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) + * @license http://framework.zend.com/license/new-bsd New BSD License + */ interface Zend_Soap_Wsdl_Strategy_Interface { /** * Method accepts the current WSDL context file. - * + * * @param $context */ public function setContext(Zend_Soap_Wsdl $context); diff --git a/lib/zend/Zend/Uri.php b/lib/zend/Zend/Uri.php index ede117cabd2..9db6375073d 100644 --- a/lib/zend/Zend/Uri.php +++ b/lib/zend/Zend/Uri.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Uri @@ -44,7 +44,7 @@ abstract class Zend_Uri static protected $_config = array( 'allow_unwise' => false ); - + /** * Return a string representation of this URI. * @@ -79,14 +79,16 @@ abstract class Zend_Uri * Create a new Zend_Uri object for a URI. If building a new URI, then $uri should contain * only the scheme (http, ftp, etc). Otherwise, supply $uri with the complete URI. * - * @param string $uri The URI form which a Zend_Uri instance is created + * @param string $uri The URI form which a Zend_Uri instance is created + * @param string $className The name of the class to use in order to manipulate URI * @throws Zend_Uri_Exception When an empty string was supplied for the scheme * @throws Zend_Uri_Exception When an illegal scheme is supplied * @throws Zend_Uri_Exception When the scheme is not supported + * @throws Zend_Uri_Exception When $className doesn't exist or doesn't implements Zend_Uri * @return Zend_Uri * @link http://www.faqs.org/rfcs/rfc2396.html */ - public static function factory($uri = 'http') + public static function factory($uri = 'http', $className = null) { // Separate the scheme from the scheme-specific parts $uri = explode(':', $uri, 2); @@ -104,31 +106,44 @@ abstract class Zend_Uri throw new Zend_Uri_Exception('Illegal scheme supplied, only alphanumeric characters are permitted'); } - /** - * Create a new Zend_Uri object for the $uri. If a subclass of Zend_Uri exists for the - * scheme, return an instance of that class. Otherwise, a Zend_Uri_Exception is thrown. - */ - switch ($scheme) { - case 'http': - // Break intentionally omitted - case 'https': - $className = 'Zend_Uri_Http'; - break; + if ($className === null) { + /** + * Create a new Zend_Uri object for the $uri. If a subclass of Zend_Uri exists for the + * scheme, return an instance of that class. Otherwise, a Zend_Uri_Exception is thrown. + */ + switch ($scheme) { + case 'http': + // Break intentionally omitted + case 'https': + $className = 'Zend_Uri_Http'; + break; - case 'mailto': - // TODO - default: - require_once 'Zend/Uri/Exception.php'; - throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported"); - break; + case 'mailto': + // TODO + default: + require_once 'Zend/Uri/Exception.php'; + throw new Zend_Uri_Exception("Scheme \"$scheme\" is not supported"); + break; + } } if (!class_exists($className)) { require_once 'Zend/Loader.php'; - Zend_Loader::loadClass($className); + try { + Zend_Loader::loadClass($className); + } catch (Exception $e) { + require_once 'Zend/Uri/Exception.php'; + throw new Zend_Uri_Exception("\"$className\" not found"); + } } + $schemeHandler = new $className($scheme, $schemeSpecific); + if (! $schemeHandler instanceof Zend_Uri) { + require_once 'Zend/Uri/Exception.php'; + throw new Zend_Uri_Exception("\"$className\" is not an instance of Zend_Uri"); + } + return $schemeHandler; } @@ -149,15 +164,21 @@ abstract class Zend_Uri /** * Set global configuration options * - * @param array $config + * @param Zend_Config|array $config */ - static public function setConfig(array $config) + static public function setConfig($config) { + if ($config instanceof Zend_Config) { + $config = $config->toArray(); + } elseif (!is_array($config)) { + throw new Zend_Uri_Exception("Config must be an array or an instance of Zend_Config."); + } + foreach ($config as $k => $v) { self::$_config[$k] = $v; } } - + /** * Zend_Uri and its subclasses cannot be instantiated directly. * Use Zend_Uri::factory() to return a new Zend_Uri object. diff --git a/lib/zend/Zend/Uri/Exception.php b/lib/zend/Zend/Uri/Exception.php index d2fefec15cc..80b7e7d8b7b 100644 --- a/lib/zend/Zend/Uri/Exception.php +++ b/lib/zend/Zend/Uri/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Uri_Exception extends Zend_Exception diff --git a/lib/zend/Zend/Uri/Http.php b/lib/zend/Zend/Uri/Http.php index 389e96a7ed3..9ac428569c0 100644 --- a/lib/zend/Zend/Uri/Http.php +++ b/lib/zend/Zend/Uri/Http.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Uri - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -35,7 +35,7 @@ require_once 'Zend/Validate/Hostname.php'; * @category Zend * @package Zend_Uri * @uses Zend_Uri - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Uri_Http extends Zend_Uri @@ -591,6 +591,23 @@ class Zend_Uri_Http extends Zend_Uri return strlen($this->_query) > 0 ? $this->_query : false; } + /** + * Returns the query portion of the URL (after ?) as a + * key-value-array. If the query is empty an empty array + * is returned + * + * @return array + */ + public function getQueryAsArray() + { + $query = $this->getQuery(); + $querryArray = array(); + if ($query !== false) { + parse_str($query, $querryArray); + } + return $querryArray; + } + /** * Returns true if and only if the query string passes validation. If no query is passed, * then the query string contained in the instance variable is used. @@ -622,6 +639,32 @@ class Zend_Uri_Http extends Zend_Uri return $status == 1; } + /** + * Add or replace params in the query string for the current URI, and + * return the old query. + * + * @param array $queryParams + * @return string Old query string + */ + public function addReplaceQueryParameters(array $queryParams) + { + $queryParams = array_merge($this->getQueryAsArray(), $queryParams); + return $this->setQuery($queryParams); + } + + /** + * Remove params in the query string for the current URI, and + * return the old query. + * + * @param array $queryParamKeys + * @return string Old query string + */ + public function removeQueryParameters(array $queryParamKeys) + { + $queryParams = array_diff_key($this->getQueryAsArray(), array_fill_keys($queryParamKeys, 0)); + return $this->setQuery($queryParams); + } + /** * Set the query string for the current URI, and return the old query * string This method accepts both strings and arrays. diff --git a/lib/zend/Zend/Validate/Abstract.php b/lib/zend/Zend/Validate/Abstract.php index fb9ac45b87f..7f978ee4f04 100644 --- a/lib/zend/Zend/Validate/Abstract.php +++ b/lib/zend/Zend/Validate/Abstract.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ require_once 'Zend/Validate/Interface.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface @@ -216,10 +216,10 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface $message = $this->_messageTemplates[$messageKey]; if (null !== ($translator = $this->getTranslator())) { - if ($translator->isTranslated($message)) { - $message = $translator->translate($message); - } elseif ($translator->isTranslated($messageKey)) { + if ($translator->isTranslated($messageKey)) { $message = $translator->translate($messageKey); + } else { + $message = $translator->translate($message); } } @@ -352,6 +352,16 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface return $this->_translator; } + /** + * Does this validator have its own specific translator? + * + * @return bool + */ + public function hasTranslator() + { + return (bool)$this->_translator; + } + /** * Set default translation object for all validate objects * @@ -392,6 +402,16 @@ abstract class Zend_Validate_Abstract implements Zend_Validate_Interface return self::$_defaultTranslator; } + /** + * Is there a default translation object set? + * + * @return boolean + */ + public static function hasDefaultTranslator() + { + return (bool)self::$_defaultTranslator; + } + /** * Indicate whether or not translation should be disabled * diff --git a/lib/zend/Zend/Validate/Alnum.php b/lib/zend/Zend/Validate/Alnum.php index 7a6bfde5798..1585e5f115f 100644 --- a/lib/zend/Zend/Validate/Alnum.php +++ b/lib/zend/Zend/Validate/Alnum.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,20 +27,20 @@ require_once 'Zend/Validate/Abstract.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Alnum extends Zend_Validate_Abstract { const INVALID = 'alnumInvalid'; const NOT_ALNUM = 'notAlnum'; - const STRING_EMPTY = 'stringEmpty'; + const STRING_EMPTY = 'alnumStringEmpty'; /** * Whether to allow white space characters; off by default * * @var boolean - * @depreciated + * @deprecated */ public $allowWhiteSpace; @@ -58,18 +58,30 @@ class Zend_Validate_Alnum extends Zend_Validate_Abstract */ protected $_messageTemplates = array( self::INVALID => "Invalid type given, value should be float, string, or integer", - self::NOT_ALNUM => "'%value%' has not only alphabetic and digit characters", - self::STRING_EMPTY => "'%value%' is an empty string" + self::NOT_ALNUM => "'%value%' contains characters which are non alphabetic and no digits", + self::STRING_EMPTY => "'%value%' is an empty string", ); /** * Sets default option values for this instance * - * @param boolean $allowWhiteSpace + * @param boolean|Zend_Config $allowWhiteSpace * @return void */ public function __construct($allowWhiteSpace = false) { + if ($allowWhiteSpace instanceof Zend_Config) { + $allowWhiteSpace = $allowWhiteSpace->toArray(); + } + + if (is_array($allowWhiteSpace)) { + if (array_key_exists('allowWhiteSpace', $allowWhiteSpace)) { + $allowWhiteSpace = $allowWhiteSpace['allowWhiteSpace']; + } else { + $allowWhiteSpace = false; + } + } + $this->allowWhiteSpace = (boolean) $allowWhiteSpace; } diff --git a/lib/zend/Zend/Validate/Alpha.php b/lib/zend/Zend/Validate/Alpha.php index 2857526f00b..894ed877443 100644 --- a/lib/zend/Zend/Validate/Alpha.php +++ b/lib/zend/Zend/Validate/Alpha.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,20 +27,20 @@ require_once 'Zend/Validate/Abstract.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Alpha extends Zend_Validate_Abstract { const INVALID = 'alphaInvalid'; const NOT_ALPHA = 'notAlpha'; - const STRING_EMPTY = 'stringEmpty'; + const STRING_EMPTY = 'alphaStringEmpty'; /** * Whether to allow white space characters; off by default * * @var boolean - * @depreciated + * @deprecated */ public $allowWhiteSpace; @@ -58,18 +58,30 @@ class Zend_Validate_Alpha extends Zend_Validate_Abstract */ protected $_messageTemplates = array( self::INVALID => "Invalid type given, value should be a string", - self::NOT_ALPHA => "'%value%' has not only alphabetic characters", + self::NOT_ALPHA => "'%value%' contains non alphabetic characters", self::STRING_EMPTY => "'%value%' is an empty string" ); /** * Sets default option values for this instance * - * @param boolean $allowWhiteSpace + * @param boolean|Zend_Config $allowWhiteSpace * @return void */ public function __construct($allowWhiteSpace = false) { + if ($allowWhiteSpace instanceof Zend_Config) { + $allowWhiteSpace = $allowWhiteSpace->toArray(); + } + + if (is_array($allowWhiteSpace)) { + if (array_key_exists('allowWhiteSpace', $allowWhiteSpace)) { + $allowWhiteSpace = $allowWhiteSpace['allowWhiteSpace']; + } else { + $allowWhiteSpace = false; + } + } + $this->allowWhiteSpace = (boolean) $allowWhiteSpace; } diff --git a/lib/zend/Zend/Validate/Barcode.php b/lib/zend/Zend/Validate/Barcode.php index 5736ea544b9..31b70f6ce63 100644 --- a/lib/zend/Zend/Validate/Barcode.php +++ b/lib/zend/Zend/Validate/Barcode.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,60 +24,154 @@ */ require_once 'Zend/Validate/Abstract.php'; +/** + * @see Zend_Loader + */ +require_once 'Zend/Loader.php'; + /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Barcode extends Zend_Validate_Abstract { + const INVALID = 'barcodeInvalid'; + const FAILED = 'barcodeFailed'; + const INVALID_CHARS = 'barcodeInvalidChars'; + const INVALID_LENGTH = 'barcodeInvalidLength'; + + protected $_messageTemplates = array( + self::FAILED => "'%value%' failed checksum validation", + self::INVALID_CHARS => "'%value%' contains invalid characters", + self::INVALID_LENGTH => "'%value%' should have a length of %length% characters", + self::INVALID => "Invalid type given, value should be string", + ); + /** - * Barcode validator + * Additional variables available for validation failure messages * - * @var Zend_Validate_Abstract + * @var array */ - protected $_barcodeValidator; + protected $_messageVariables = array( + 'length' => '_length' + ); + + /** + * Length for the set subtype + * + * @var integer + */ + protected $_length; + + /** + * Barcode adapter + * + * @var Zend_Validate_Barcode_BarcodeAdapter + */ + protected $_adapter; /** * Generates the standard validator object * - * @param string $barcodeType - Barcode validator to use + * @param string|Zend_Config| + * Zend_Validate_Barcode_BarcodeAdapter $adapter Barcode adapter to use * @return void * @throws Zend_Validate_Exception */ - public function __construct($barcodeType) + public function __construct($adapter) { - $this->setType($barcodeType); + if ($adapter instanceof Zend_Config) { + $adapter = $adapter->toArray(); + } + + $options = null; + $checksum = null; + if (is_array($adapter)) { + if (array_key_exists('options', $adapter)) { + $options = $adapter['options']; + } + + if (array_key_exists('checksum', $adapter)) { + $checksum = $adapter['checksum']; + } + + if (array_key_exists('adapter', $adapter)) { + $adapter = $adapter['adapter']; + } else { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception("Missing option 'adapter'"); + } + } + + $this->setAdapter($adapter, $options); + if ($checksum !== null) { + $this->setChecksum($checksum); + } } /** - * Sets a new barcode validator + * Returns the set adapter * - * @param string $barcodeType - Barcode validator to use + * @return Zend_Validate_Barcode_BarcodeAdapter + */ + public function getAdapter() + { + return $this->_adapter; + } + + /** + * Sets a new barcode adapter + * + * @param string|Zend_Validate_Barcode $adapter Barcode adapter to use + * @param array $options Options for this adapter * @return void * @throws Zend_Validate_Exception */ - public function setType($barcodeType) + public function setAdapter($adapter, $options = null) { - switch (strtolower($barcodeType)) { - case 'upc': - case 'upc-a': - require_once 'Zend/Validate/Barcode/UpcA.php'; - $class = 'Zend_Validate_Barcode_UpcA'; - break; - case 'ean13': - case 'ean-13': - require_once 'Zend/Validate/Barcode/Ean13.php'; - $class = 'Zend_Validate_Barcode_Ean13'; - break; - default: - require_once 'Zend/Validate/Exception.php'; - throw new Zend_Validate_Exception("Barcode type '$barcodeType' is not supported'"); - break; + $adapter = ucfirst(strtolower($adapter)); + require_once 'Zend/Loader.php'; + if (Zend_Loader::isReadable('Zend/Validate/Barcode/' . $adapter. '.php')) { + $adapter = 'Zend_Validate_Barcode_' . $adapter; } - $this->_barcodeValidator = new $class; + if (!class_exists($adapter)) { + Zend_Loader::loadClass($adapter); + } + + $this->_adapter = new $adapter($options); + if (!$this->_adapter instanceof Zend_Validate_Barcode_AdapterInterface) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception( + "Adapter " . $adapter . " does not implement Zend_Validate_Barcode_AdapterInterface" + ); + } + + return $this; + } + + /** + * Returns the checksum option + * + * @return boolean + */ + public function getChecksum() + { + return $this->getAdapter()->getCheck(); + } + + /** + * Sets the checksum option + * + * @param boolean $checksum + * @return Zend_Validate_Barcode + */ + public function setChecksum($checksum) + { + $this->getAdapter()->setCheck($checksum); + return $this; } /** @@ -90,6 +184,34 @@ class Zend_Validate_Barcode extends Zend_Validate_Abstract */ public function isValid($value) { - return call_user_func(array($this->_barcodeValidator, 'isValid'), $value); + if (!is_string($value)) { + $this->_error(self::INVALID); + return false; + } + + $this->_setValue($value); + $adapter = $this->getAdapter(); + $this->_length = $adapter->getLength(); + $result = $adapter->checkLength($value); + if (!$result) { + $this->_error(self::INVALID_LENGTH); + return false; + } + + $result = $adapter->checkChars($value); + if (!$result) { + $this->_error(self::INVALID_CHARS); + return false; + } + + if ($this->getChecksum()) { + $result = $adapter->checksum($value); + if (!$result) { + $this->_error(self::FAILED); + return false; + } + } + + return true; } -} +} \ No newline at end of file diff --git a/lib/zend/Zend/Validate/Barcode/Ean13.php b/lib/zend/Zend/Validate/Barcode/Ean13.php index fda96e923f7..b8e83dc79d6 100644 --- a/lib/zend/Zend/Validate/Barcode/Ean13.php +++ b/lib/zend/Zend/Validate/Barcode/Ean13.php @@ -1,5 +1,4 @@ "'%value%' is an invalid EAN-13 barcode", - self::INVALID_LENGTH => "'%value%' should be 13 characters", - self::NOT_NUMERIC => "'%value%' should contain only numeric characters", - ); - - /** - * Defined by Zend_Validate_Interface - * - * Returns true if and only if $value contains a valid barcode - * - * @param string $value - * @return boolean - */ - public function isValid($value) - { - if (!is_string($value) || !ctype_digit($value)) { - $this->_error(self::NOT_NUMERIC); - return false; - } - - $this->_setValue($value); - if (strlen($value) !== 13) { - $this->_error(self::INVALID_LENGTH); - return false; - } - - $barcode = strrev(substr($value, 0, -1)); - $oddSum = 0; - $evenSum = 0; - - for ($i = 0; $i < 12; $i++) { - if ($i % 2 === 0) { - $oddSum += $barcode[$i] * 3; - } elseif ($i % 2 === 1) { - $evenSum += $barcode[$i]; - } - } - - $calculation = ($oddSum + $evenSum) % 10; - $checksum = ($calculation === 0) ? 0 : 10 - $calculation; - - if ($value[12] != $checksum) { - $this->_error(self::INVALID); - return false; - } - - return true; - } + protected $_checksum = '_gtin'; } diff --git a/lib/zend/Zend/Validate/Barcode/UpcA.php b/lib/zend/Zend/Validate/Barcode/UpcA.php index dfb4fcd75ab..41655288e7f 100644 --- a/lib/zend/Zend/Validate/Barcode/UpcA.php +++ b/lib/zend/Zend/Validate/Barcode/UpcA.php @@ -1,5 +1,4 @@ "'%value%' is an invalid UPC-A barcode", - self::INVALID_LENGTH => "'%value%' should be 12 characters", - ); - - /** - * Defined by Zend_Validate_Interface - * - * Returns true if and only if $value contains a valid barcode - * - * @param string $value - * @return boolean - */ - public function isValid($value) - { - if (!is_string($value)) { - $this->_error(self::INVALID); - return false; - } - - $this->_setValue($value); - if (strlen($value) !== 12) { - $this->_error(self::INVALID_LENGTH); - return false; - } - - $barcode = substr($value, 0, -1); - $oddSum = 0; - $evenSum = 0; - - for ($i = 0; $i < 11; $i++) { - if ($i % 2 === 0) { - $oddSum += $barcode[$i] * 3; - } elseif ($i % 2 === 1) { - $evenSum += $barcode[$i]; - } - } - - $calculation = ($oddSum + $evenSum) % 10; - $checksum = ($calculation === 0) ? 0 : 10 - $calculation; - - if ($value[11] != $checksum) { - $this->_error(self::INVALID); - return false; - } - - return true; - } + protected $_checksum = '_gtin'; } diff --git a/lib/zend/Zend/Validate/Between.php b/lib/zend/Zend/Validate/Between.php index 75f6d09959a..bf4d793ecad 100644 --- a/lib/zend/Zend/Validate/Between.php +++ b/lib/zend/Zend/Validate/Between.php @@ -1,5 +1,4 @@ scalar, minimum border + * 'max' => scalar, maximum border + * 'inclusive' => boolean, inclusive border values * - * @param mixed $min - * @param mixed $max - * @param boolean $inclusive + * @param array|Zend_Config $options * @return void */ - public function __construct($min, $max, $inclusive = true) + public function __construct($options) { - $this->setMin($min) - ->setMax($max) - ->setInclusive($inclusive); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp['min'] = array_shift($options); + if (!empty($options)) { + $temp['max'] = array_shift($options); + } + + if (!empty($options)) { + $temp['inclusive'] = array_shift($options); + } + + $options = $temp; + } + + if (!array_key_exists('min', $options) || !array_key_exists('max', $options)) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception("Missing option. 'min' and 'max' has to be given"); + } + + if (!array_key_exists('inclusive', $options)) { + $options['inclusive'] = true; + } + + $this->setMin($options['min']) + ->setMax($options['max']) + ->setInclusive($options['inclusive']); } /** diff --git a/lib/zend/Zend/Validate/Ccnum.php b/lib/zend/Zend/Validate/Ccnum.php index ffad2a9c264..605e6a33bed 100644 --- a/lib/zend/Zend/Validate/Ccnum.php +++ b/lib/zend/Zend/Validate/Ccnum.php @@ -1,5 +1,4 @@ "Luhn algorithm (mod-10 checksum) failed on '%value%'" ); + public function __construct() + { + trigger_error('Using the Ccnum validator is deprecated in favor of the CreditCard validator'); + } + /** * Defined by Zend_Validate_Interface * @@ -107,5 +109,4 @@ class Zend_Validate_Ccnum extends Zend_Validate_Abstract return true; } - } diff --git a/lib/zend/Zend/Validate/Date.php b/lib/zend/Zend/Validate/Date.php index eb0a24b0207..7e473a85f7e 100644 --- a/lib/zend/Zend/Validate/Date.php +++ b/lib/zend/Zend/Validate/Date.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,14 +27,13 @@ require_once 'Zend/Validate/Abstract.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Date extends Zend_Validate_Abstract { const INVALID = 'dateInvalid'; - const NOT_YYYY_MM_DD = 'dateNotYYYY-MM-DD'; - const INVALID_DATE = 'dateInvalidDate'; + const INVALID_DATE = 'dateInvalidDate'; const FALSEFORMAT = 'dateFalseFormat'; /** @@ -44,9 +43,15 @@ class Zend_Validate_Date extends Zend_Validate_Abstract */ protected $_messageTemplates = array( self::INVALID => "Invalid type given, value should be string, integer, array or Zend_Date", - self::NOT_YYYY_MM_DD => "'%value%' is not of the format YYYY-MM-DD", self::INVALID_DATE => "'%value%' does not appear to be a valid date", - self::FALSEFORMAT => "'%value%' does not fit given date format" + self::FALSEFORMAT => "'%value%' does not fit the date format '%format%'", + ); + + /** + * @var array + */ + protected $_messageVariables = array( + 'format' => '_format' ); /** @@ -66,22 +71,36 @@ class Zend_Validate_Date extends Zend_Validate_Abstract /** * Sets validator options * - * @param string $format OPTIONAL - * @param string|Zend_Locale $locale OPTIONAL + * @param string|Zend_Config $options OPTIONAL * @return void */ - public function __construct($format = null, $locale = null) + public function __construct($options = array()) { - $this->setFormat($format); - if ($locale === null) { + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp['format'] = array_shift($options); + if (!empty($options)) { + $temp['locale'] = array_shift($options); + } + + $options = $temp; + } + + if (array_key_exists('format', $options)) { + $this->setFormat($options['format']); + } + + if (!array_key_exists('locale', $options)) { require_once 'Zend/Registry.php'; if (Zend_Registry::isRegistered('Zend_Locale')) { - $locale = Zend_Registry::get('Zend_Locale'); + $options['locale'] = Zend_Registry::get('Zend_Locale'); } } - if ($locale !== null) { - $this->setLocale($locale); + if (array_key_exists('locale', $options)) { + $this->setLocale($options['locale']); } } @@ -163,7 +182,9 @@ class Zend_Validate_Date extends Zend_Validate_Abstract } } else { if (!preg_match('/^\d{4}-\d{2}-\d{2}$/', $value)) { - $this->_error(self::NOT_YYYY_MM_DD); + $this->_format = 'yyyy-MM-dd'; + $this->_error(self::FALSEFORMAT); + $this->_format = null; return false; } diff --git a/lib/zend/Zend/Validate/Db/Abstract.php b/lib/zend/Zend/Validate/Db/Abstract.php index 9c601b921ba..ddda9179f31 100644 --- a/lib/zend/Zend/Validate/Db/Abstract.php +++ b/lib/zend/Zend/Validate/Db/Abstract.php @@ -1,5 +1,4 @@ - 'No record matching %value% was found', - self::ERROR_RECORD_FOUND => 'A record matching %value% was found'); + */ + protected $_messageTemplates = array( + self::ERROR_NO_RECORD_FOUND => 'No record matching %value% was found', + self::ERROR_RECORD_FOUND => 'A record matching %value% was found', + ); /** * @var string - */ + */ protected $_schema = null; - + /** * @var string - */ - protected $_table = ''; - + */ + protected $_table = ''; + /** * @var string - */ - protected $_field = ''; - + */ + protected $_field = ''; + /** * @var mixed - */ - protected $_exclude = null; - + */ + protected $_exclude = null; + /** * Database adapter to use. If null isValid() will use Zend_Db::getInstance instead * * @var unknown_type - */ - protected $_adapter = null; - + */ + protected $_adapter = null; + /** - * Provides basic configuration for use with Zend_Validate_Db Validators + * Provides basic configuration for use with Zend_Validate_Db Validators * Setting $exclude allows a single record to be excluded from matching. * Exclude can either be a String containing a where clause, or an array with `field` and `value` keys - * to define the where clause added to the sql. - * A database adapter may optionally be supplied to avoid using the registered default adapter. - * - * @param string||array $table The database table to validate against, or array with table and schema keys - * @param string $field The field to check for a match - * @param string||array $exclude An optional where clause or field/value pair to exclude from the query - * @param Zend_Db_Adapter_Abstract $adapter An optional database adapter to use. - */ - public function __construct($table, $field, $exclude = null, Zend_Db_Adapter_Abstract $adapter = null) - { - if ($adapter !== null) { - $this->_adapter = $adapter; - } - $this->_exclude = $exclude; - $this->_field = (string) $field; - - if (is_array($table)) { - $this->_table = (isset($table['table'])) ? $table['table'] : ''; - $this->_schema = (isset($table['schema'])) ? $table['schema'] : null; - } else { - $this->_table = (string) $table; + * to define the where clause added to the sql. + * A database adapter may optionally be supplied to avoid using the registered default adapter. + * + * The following option keys are supported: + * 'table' => The database table to validate against + * 'schema' => The schema keys + * 'field' => The field to check for a match + * 'exclude' => An optional where clause or field/value pair to exclude from the query + * 'adapter' => An optional database adapter to use + * + * @param array|Zend_Config $options Options to use for this validator + */ + public function __construct($options) + { + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (func_num_args() > 1) { + $options = func_get_args(); + $temp['table'] = array_shift($options); + $temp['field'] = array_shift($options); + if (!empty($options)) { + $temp['exclude'] = array_shift($options); + } + + if (!empty($options)) { + $temp['adapter'] = array_shift($options); + } + + $options = $temp; } - } - + if (!array_key_exists('table', $options) && !array_key_exists('schema', $options)) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Table or Schema option missing!'); + } + + if (!array_key_exists('field', $options)) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Field option missing!'); + } + + if (array_key_exists('adapter', $options)) { + $this->setAdapter($options['adapter']); + } + + if (array_key_exists('exclude', $options)) { + $this->setExclude($options['exclude']); + } + + $this->setField($options['field']); + if (array_key_exists('table', $options)) { + $this->setTable($options['table']); + } + + if (array_key_exists('schema', $options)) { + $this->setSchema($options['schema']); + } + } + + /** + * Returns the set adapter + * + * @return Zend_Db_Adapter + */ + public function getAdapter() + { + return $this->_adapter; + } + + /** + * Sets a new database adapter + * + * @param Zend_Db_Adapter_Abstract $adapter + * @return Zend_Validate_Db_Abstract + */ + public function setAdapter($adapter) + { + if (!($adapter instanceof Zend_Db_Adapter_Abstract)) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Adapter option must be a database adapter!'); + } + + $this->_adapter = $adapter; + return $this; + } + + /** + * Returns the set exclude clause + * + * @return string|array + */ + public function getExclude() + { + return $this->_exclude; + } + + /** + * Sets a new exclude clause + * + * @param string|array $exclude + * @return Zend_Validate_Db_Abstract + */ + public function setExclude($exclude) + { + $this->_exclude = $exclude; + return $this; + } + + /** + * Returns the set field + * + * @return string|array + */ + public function getField() + { + return $this->_field; + } + + /** + * Sets a new field + * + * @param string $field + * @return Zend_Validate_Db_Abstract + */ + public function setField($field) + { + $this->_field = (string) $field; + return $this; + } + + /** + * Returns the set table + * + * @return string + */ + public function getTable() + { + return $this->_table; + } + + /** + * Sets a new table + * + * @param string $table + * @return Zend_Validate_Db_Abstract + */ + public function setTable($table) + { + $this->_table = (string) $table; + return $this; + } + + /** + * Returns the set schema + * + * @return string + */ + public function getSchema() + { + return $this->_schema; + } + + /** + * Sets a new schema + * + * @param string $schema + * @return Zend_Validate_Db_Abstract + */ + public function setSchema($schema) + { + $this->_schema = $schema; + return $this; + } + /** * Run query and returns matches, or null if no matches are found. * * @param String $value * @return Array when matches are found. - */ - protected function _query($value) - { + */ + protected function _query($value) + { /** * Check for an adapter being defined. if not, fetch the default adapter. - */ + */ if ($this->_adapter === null) { $this->_adapter = Zend_Db_Table_Abstract::getDefaultAdapter(); if (null === $this->_adapter) { @@ -125,24 +275,24 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract /** * Build select object - */ + */ $select = new Zend_Db_Select($this->_adapter); $select->from($this->_table, array($this->_field), $this->_schema) - ->where($this->_adapter->quoteIdentifier($this->_field).' = ?', $value); - if ($this->_exclude !== null) { - if (is_array($this->_exclude)) { - $select->where($this->_adapter->quoteIdentifier($this->_exclude['field']).' != ?', $this->_exclude['value']); - } else { - $select->where($this->_exclude); - } - } - $select->limit(1); - + ->where($this->_adapter->quoteIdentifier($this->_field, true).' = ?', $value); + if ($this->_exclude !== null) { + if (is_array($this->_exclude)) { + $select->where($this->_adapter->quoteIdentifier($this->_exclude['field'], true).' != ?', $this->_exclude['value']); + } else { + $select->where($this->_exclude); + } + } + $select->limit(1); + /** * Run query - */ - $result = $this->_adapter->fetchRow($select, array(), Zend_Db::FETCH_ASSOC); - - return $result; - } + */ + $result = $this->_adapter->fetchRow($select, array(), Zend_Db::FETCH_ASSOC); + + return $result; + } } diff --git a/lib/zend/Zend/Validate/Db/NoRecordExists.php b/lib/zend/Zend/Validate/Db/NoRecordExists.php index f6e8c7d0e22..816c8f0a9b6 100644 --- a/lib/zend/Zend/Validate/Db/NoRecordExists.php +++ b/lib/zend/Zend/Validate/Db/NoRecordExists.php @@ -1,5 +1,4 @@ _setValue($value); - - $result = $this->_query($value); - if (!$result) { - $valid = false; - $this->_error(self::ERROR_NO_RECORD_FOUND); - } - - return $valid; - } + */ +class Zend_Validate_Db_RecordExists extends Zend_Validate_Db_Abstract +{ + public function isValid($value) + { + $valid = true; + $this->_setValue($value); + + $result = $this->_query($value); + if (!$result) { + $valid = false; + $this->_error(self::ERROR_NO_RECORD_FOUND); + } + + return $valid; + } } diff --git a/lib/zend/Zend/Validate/Digits.php b/lib/zend/Zend/Validate/Digits.php index cf23c2a411d..59a45f90ddc 100644 --- a/lib/zend/Zend/Validate/Digits.php +++ b/lib/zend/Zend/Validate/Digits.php @@ -1,5 +1,4 @@ "'%value%' contains not only digit characters", + self::NOT_DIGITS => "'%value%' contains characters which are not digits; but only digits are allowed", self::STRING_EMPTY => "'%value%' is an empty string", self::INVALID => "Invalid type given, value should be string, integer or float", ); @@ -91,5 +88,4 @@ class Zend_Validate_Digits extends Zend_Validate_Abstract return true; } - } diff --git a/lib/zend/Zend/Validate/EmailAddress.php b/lib/zend/Zend/Validate/EmailAddress.php index 994ec198831..7e9f0f0c72c 100644 --- a/lib/zend/Zend/Validate/EmailAddress.php +++ b/lib/zend/Zend/Validate/EmailAddress.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Validate/Hostname.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract @@ -41,6 +41,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract const INVALID_FORMAT = 'emailAddressInvalidFormat'; const INVALID_HOSTNAME = 'emailAddressInvalidHostname'; const INVALID_MX_RECORD = 'emailAddressInvalidMxRecord'; + const INVALID_SEGMENT = 'emailAddressInvalidSegment'; const DOT_ATOM = 'emailAddressDotAtom'; const QUOTED_STRING = 'emailAddressQuotedString'; const INVALID_LOCAL_PART = 'emailAddressInvalidLocalPart'; @@ -51,13 +52,38 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract */ protected $_messageTemplates = array( self::INVALID => "Invalid type given, value should be a string", - self::INVALID_FORMAT => "'%value%' is not a valid email address in the basic format local-part@hostname", - self::INVALID_HOSTNAME => "'%hostname%' is not a valid hostname for email address '%value%'", + self::INVALID_FORMAT => "'%value%' is no valid email address in the basic format local-part@hostname", + self::INVALID_HOSTNAME => "'%hostname%' is no valid hostname for email address '%value%'", self::INVALID_MX_RECORD => "'%hostname%' does not appear to have a valid MX record for the email address '%value%'", - self::DOT_ATOM => "'%localPart%' not matched against dot-atom format", - self::QUOTED_STRING => "'%localPart%' not matched against quoted-string format", - self::INVALID_LOCAL_PART => "'%localPart%' is not a valid local part for email address '%value%'", - self::LENGTH_EXCEEDED => "'%value%' exceeds the allowed length" + self::INVALID_SEGMENT => "'%hostname%' is not in a routable network segment. The email address '%value%' should not be resolved from public network.", + self::DOT_ATOM => "'%localPart%' can not be matched against dot-atom format", + self::QUOTED_STRING => "'%localPart%' can not be matched against quoted-string format", + self::INVALID_LOCAL_PART => "'%localPart%' is no valid local part for email address '%value%'", + self::LENGTH_EXCEEDED => "'%value%' exceeds the allowed length", + ); + + /** + * @see http://en.wikipedia.org/wiki/IPv4 + * @var array + */ + protected $_invalidIp = array( + '0' => '0.0.0.0/8', + '10' => '10.0.0.0/8', + '127' => '127.0.0.0/8', + '128' => '128.0.0.0/16', + '169' => '169.254.0.0/16', + '172' => '172.16.0.0/12', + '191' => '191.255.0.0/16', + '192' => array( + '192.0.0.0/24', + '192.0.2.0/24', + '192.88.99.0/24', + '192.168.0.0/16' + ), + '198' => '198.18.0.0/15', + '223' => '223.255.255.0/24', + '224' => '224.0.0.0/4', + '240' => '240.0.0.0/4' ); /** @@ -68,21 +94,6 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract 'localPart' => '_localPart' ); - /** - * Local object for validating the hostname part of an email address - * - * @var Zend_Validate_Hostname - * @depreciated - */ - public $hostnameValidator; - - /** - * Whether we check for a valid MX record via DNS - * - * @var boolean - */ - protected $_validateMx = false; - /** * @var string */ @@ -93,22 +104,119 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract */ protected $_localPart; + /** + * Internal options array + */ + protected $_options = array( + 'mx' => false, + 'deep' => false, + 'domain' => true, + 'allow' => Zend_Validate_Hostname::ALLOW_DNS, + 'hostname' => null + ); + /** * Instantiates hostname validator for local use * - * You can pass a bitfield to determine what types of hostnames are allowed. - * These bitfields are defined by the ALLOW_* constants in Zend_Validate_Hostname - * The default is to allow DNS hostnames only + * The following option keys are supported: + * 'hostname' => A hostname validator, see Zend_Validate_Hostname + * 'allow' => Options for the hostname validator, see Zend_Validate_Hostname::ALLOW_* + * 'mx' => If MX check should be enabled, boolean + * 'deep' => If a deep MX check should be done, boolean * - * @param integer $allow OPTIONAL - * @param bool $validateMx OPTIONAL - * @param Zend_Validate_Hostname $hostnameValidator OPTIONAL + * @param array|Zend_Config $options OPTIONAL * @return void */ - public function __construct($allow = Zend_Validate_Hostname::ALLOW_DNS, $validateMx = false, Zend_Validate_Hostname $hostnameValidator = null) + public function __construct($options = array()) { - $this->setValidateMx($validateMx); - $this->setHostnameValidator($hostnameValidator, $allow); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp['allow'] = array_shift($options); + if (!empty($options)) { + $temp['mx'] = array_shift($options); + } + + if (!empty($options)) { + $temp['hostname'] = array_shift($options); + } + + $options = $temp; + } + + $options += $this->_options; + $this->setOptions($options); + } + + /** + * Returns all set Options + * + * @return array + */ + public function getOptions() + { + return $this->_options; + } + + /** + * Set options for the email validator + * + * @param array $options + * @return Zend_Validate_EmailAddress fluid interface + */ + public function setOptions(array $options = array()) + { + if (array_key_exists('messages', $options)) { + $this->setMessages($options['messages']); + } + + if (array_key_exists('hostname', $options)) { + if (array_key_exists('allow', $options)) { + $this->setHostnameValidator($options['hostname'], $options['allow']); + } else { + $this->setHostnameValidator($options['hostname']); + } + } + + if (array_key_exists('mx', $options)) { + $this->setValidateMx($options['mx']); + } + + if (array_key_exists('deep', $options)) { + $this->setDeepMxCheck($options['deep']); + } + + if (array_key_exists('domain', $options)) { + $this->setDomainCheck($options['domain']); + } + + return $this; + } + + /** + * Sets the validation failure message template for a particular key + * Adds the ability to set messages to the attached hostname validator + * + * @param string $messageString + * @param string $messageKey OPTIONAL + * @return Zend_Validate_Abstract Provides a fluent interface + * @throws Zend_Validate_Exception + */ + public function setMessage($messageString, $messageKey = null) + { + $messageKeys = $messageKey; + if ($messageKey === null) { + $keys = array_keys($this->_messageTemplates); + $messageKeys = current($keys); + } + + if (!isset($this->_messageTemplates[$messageKeys])) { + $this->_options['hostname']->setMessage($messageString, $messageKey); + } + + $this->_messageTemplates[$messageKeys] = $messageString; + return $this; } /** @@ -118,7 +226,7 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract */ public function getHostnameValidator() { - return $this->hostnameValidator; + return $this->_options['hostname']; } /** @@ -128,14 +236,17 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract */ public function setHostnameValidator(Zend_Validate_Hostname $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS) { - if ($hostnameValidator === null) { + if (!$hostnameValidator) { $hostnameValidator = new Zend_Validate_Hostname($allow); } - $this->hostnameValidator = $hostnameValidator; + + $this->_options['hostname'] = $hostnameValidator; + $this->_options['allow'] = $allow; + return $this; } /** - * Whether MX checking via dns_get_mx is supported or not + * Whether MX checking via getmxrr is supported or not * * This currently only works on UNIX systems * @@ -143,7 +254,17 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract */ public function validateMxSupported() { - return function_exists('dns_get_mx'); + return function_exists('getmxrr'); + } + + /** + * Returns the set validateMx option + * + * @return boolean + */ + public function getValidateMx() + { + return $this->_options['mx']; } /** @@ -151,11 +272,236 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract * * This only applies when DNS hostnames are validated * - * @param boolean $allowed Set allowed to true to validate for MX records, and false to not validate them + * @param boolean $mx Set allowed to true to validate for MX records, and false to not validate them + * @return Zend_Validate_EmailAddress Fluid Interface */ - public function setValidateMx($allowed) + public function setValidateMx($mx) { - $this->_validateMx = (bool) $allowed; + if ((bool) $mx && !$this->validateMxSupported()) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('MX checking not available on this system'); + } + + $this->_options['mx'] = (bool) $mx; + return $this; + } + + /** + * Returns the set deepMxCheck option + * + * @return boolean + */ + public function getDeepMxCheck() + { + return $this->_options['deep']; + } + + /** + * Set whether we check MX record should be a deep validation + * + * @param boolean $deep Set deep to true to perform a deep validation process for MX records + * @return Zend_Validate_EmailAddress Fluid Interface + */ + public function setDeepMxCheck($deep) + { + $this->_options['deep'] = (bool) $deep; + return $this; + } + + /** + * Returns the set domainCheck option + * + * @return unknown + */ + public function getDomainCheck() + { + return $this->_options['domain']; + } + + /** + * Sets if the domain should also be checked + * or only the local part of the email address + * + * @param boolean $domain + * @return Zend_Validate_EmailAddress Fluid Interface + */ + public function setDomainCheck($domain = true) + { + $this->_options['domain'] = (boolean) $domain; + return $this; + } + + /** + * Returns if the given host is reserved + * + * @param string $host + * @return boolean + */ + private function _isReserved($host){ + if (!preg_match('/^([0-9]{1,3}\.){3}[0-9]{1,3}$/', $host)) { + $host = gethostbyname($host); + } + + $octet = explode('.',$host); + if ((int)$octet[0] >= 224) { + return true; + } else if (array_key_exists($octet[0], $this->_invalidIp)) { + foreach ((array)$this->_invalidIp[$octet[0]] as $subnetData) { + // we skip the first loop as we already know that octet matches + for ($i = 1; $i < 4; $i++) { + if (strpos($subnetData, $octet[$i]) !== $i * 4) { + break; + } + } + + $host = explode("/", $subnetData); + $binaryHost = ""; + $tmp = explode(".", $host[0]); + for ($i = 0; $i < 4 ; $i++) { + $binaryHost .= str_pad(decbin($tmp[$i]), 8, "0", STR_PAD_LEFT); + } + + $segmentData = array( + 'network' => (int)$this->_toIp(str_pad(substr($binaryHost, 0, $host[1]), 32, 0)), + 'broadcast' => (int)$this->_toIp(str_pad(substr($binaryHost, 0, $host[1]), 32, 1)) + ); + + for ($j = $i; $j < 4; $j++) { + if ((int)$octet[$j] < $segmentData['network'][$j] || + (int)$octet[$j] > $segmentData['broadcast'][$j]) { + return false; + } + } + } + + return true; + } else { + return false; + } + } + + /** + * Converts a binary string to an IP address + * + * @param string $binary + * @return mixed + */ + private function _toIp($binary) + { + $ip = array(); + $tmp = explode(".", chunk_split($binary, 8, ".")); + for ($i = 0; $i < 4 ; $i++) { + $ip[$i] = bindec($tmp[$i]); + } + + return $ip; + } + + /** + * Internal method to validate the local part of the email address + * + * @return boolean + */ + private function _validateLocalPart() + { + // First try to match the local part on the common dot-atom format + $result = false; + + // Dot-atom characters are: 1*atext *("." 1*atext) + // atext: ALPHA / DIGIT / and "!", "#", "$", "%", "&", "'", "*", + // "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~" + $atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e'; + if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->_localPart)) { + $result = true; + } else { + // Try quoted string format + + // Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE + // qtext: Non white space controls, and the rest of the US-ASCII characters not + // including "\" or the quote character + $noWsCtl = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f'; + $qtext = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e'; + $ws = '\x20\x09'; + if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->_localPart)) { + $result = true; + } else { + $this->_error(self::DOT_ATOM); + $this->_error(self::QUOTED_STRING); + $this->_error(self::INVALID_LOCAL_PART); + } + } + + return $result; + } + + /** + * Internal method to validate the servers MX records + * + * @return boolean + */ + private function _validateMXRecords() + { + $mxHosts = array(); + $result = getmxrr($this->_hostname, $mxHosts); + if (!$result) { + $this->_error(self::INVALID_MX_RECORD); + } else if ($this->_options['deep'] && function_exists('checkdnsrr')) { + $validAddress = false; + $reserved = true; + foreach ($mxHosts as $hostname) { + $res = $this->_isReserved($hostname); + if (!$res) { + $reserved = false; + } + + if (!$res + && (checkdnsrr($hostname, "A") + || checkdnsrr($hostname, "AAAA") + || checkdnsrr($hostname, "A6"))) { + $validAddress = true; + break; + } + } + + if (!$validAddress) { + $result = false; + if ($reserved) { + $this->_error(self::INVALID_SEGMENT); + } else { + $this->_error(self::INVALID_MX_RECORD); + } + } + } + + return $result; + } + + /** + * Internal method to validate the hostname part of the email address + * + * @return boolean + */ + private function _validateHostnamePart() + { + $hostname = $this->_options['hostname']->setTranslator($this->getTranslator()) + ->isValid($this->_hostname); + if (!$hostname) { + $this->_error(self::INVALID_HOSTNAME); + + // Get messages and errors from hostnameValidator + foreach ($this->_options['hostname']->getMessages() as $code => $message) { + $this->_messages[$code] = $message; + } + + foreach ($this->_options['hostname']->getErrors() as $error) { + $this->_errors[] = $error; + } + } else if ($this->_options['mx']) { + // MX check on hostname + $hostname = $this->_validateMXRecords(); + } + + return $hostname; } /** @@ -176,9 +522,8 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract return false; } - $matches = array(); - $length = true; - + $matches = array(); + $length = true; $this->_setValue($value); // Split email address up and disallow '..' @@ -197,68 +542,19 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract } // Match hostname part - $hostnameResult = $this->hostnameValidator->setTranslator($this->getTranslator()) - ->isValid($this->_hostname); - if (!$hostnameResult) { - $this->_error(self::INVALID_HOSTNAME); - - // Get messages and errors from hostnameValidator - foreach ($this->hostnameValidator->getMessages() as $code => $message) { - $this->_messages[$code] = $message; - } - foreach ($this->hostnameValidator->getErrors() as $error) { - $this->_errors[] = $error; - } - } else if ($this->_validateMx) { - // MX check on hostname via dns_get_record() - if ($this->validateMxSupported()) { - $result = dns_get_mx($this->_hostname, $mxHosts); - if (count($mxHosts) < 1) { - $hostnameResult = false; - $this->_error(self::INVALID_MX_RECORD); - } - } else { - /** - * MX checks are not supported by this system - * @see Zend_Validate_Exception - */ - require_once 'Zend/Validate/Exception.php'; - throw new Zend_Validate_Exception('Internal error: MX checking not available on this system'); - } + if ($this->_options['domain']) { + $hostname = $this->_validateHostnamePart(); } - // First try to match the local part on the common dot-atom format - $localResult = false; - - // Dot-atom characters are: 1*atext *("." 1*atext) - // atext: ALPHA / DIGIT / and "!", "#", "$", "%", "&", "'", "*", - // "+", "-", "/", "=", "?", "^", "_", "`", "{", "|", "}", "~" - $atext = 'a-zA-Z0-9\x21\x23\x24\x25\x26\x27\x2a\x2b\x2d\x2f\x3d\x3f\x5e\x5f\x60\x7b\x7c\x7d\x7e'; - if (preg_match('/^[' . $atext . ']+(\x2e+[' . $atext . ']+)*$/', $this->_localPart)) { - $localResult = true; - } else { - // Try quoted string format - - // Quoted-string characters are: DQUOTE *([FWS] qtext/quoted-pair) [FWS] DQUOTE - // qtext: Non white space controls, and the rest of the US-ASCII characters not - // including "\" or the quote character - $noWsCtl = '\x01-\x08\x0b\x0c\x0e-\x1f\x7f'; - $qtext = $noWsCtl . '\x21\x23-\x5b\x5d-\x7e'; - $ws = '\x20\x09'; - if (preg_match('/^\x22([' . $ws . $qtext . '])*[$ws]?\x22$/', $this->_localPart)) { - $localResult = true; - } else { - $this->_error(self::DOT_ATOM); - $this->_error(self::QUOTED_STRING); - $this->_error(self::INVALID_LOCAL_PART); - } - } + $local = $this->_validateLocalPart(); // If both parts valid, return true - if ($localResult && $hostnameResult && $length) { - return true; - } else { - return false; + if ($local && $length) { + if (($this->_options['domain'] && $hostname) || !$this->_options['domain']) { + return true; + } } + + return false; } } diff --git a/lib/zend/Zend/Validate/Exception.php b/lib/zend/Zend/Validate/Exception.php index c84c759194c..750e70cb63b 100644 --- a/lib/zend/Zend/Validate/Exception.php +++ b/lib/zend/Zend/Validate/Exception.php @@ -1,5 +1,4 @@ "Too much files, maximum '%max%' are allowed but '%count%' are given", - self::TOO_LESS => "Too less files, minimum '%min%' are expected but '%count%' are given" + self::TOO_MANY => "Too many files, maximum '%max%' are allowed but '%count%' are given", + self::TOO_FEW => "Too few files, minimum '%min%' are expected but '%count%' are given", ); /** @@ -115,8 +115,6 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract } if (1 < func_num_args()) { -// @todo: Preperation for 2.0... needs to be cleared with the dev-team -// trigger_error('Multiple arguments are deprecated in favor of an array of named arguments', E_USER_NOTICE); $options['min'] = func_get_arg(0); $options['max'] = func_get_arg(1); } @@ -243,14 +241,25 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract */ public function isValid($value, $file = null) { - $this->addFile($value); + if (($file !== null) && !array_key_exists('destination', $file)) { + $file['destination'] = dirname($value); + } + + if (($file !== null) && array_key_exists('tmp_name', $file)) { + $value = $file['destination'] . DIRECTORY_SEPARATOR . $file['name']; + } + + if (($file === null) || !empty($file['tmp_name'])) { + $this->addFile($value); + } + $this->_count = count($this->_files); if (($this->_max !== null) && ($this->_count > $this->_max)) { - return $this->_throw($file, self::TOO_MUCH); + return $this->_throw($file, self::TOO_MANY); } if (($this->_min !== null) && ($this->_count < $this->_min)) { - return $this->_throw($file, self::TOO_LESS); + return $this->_throw($file, self::TOO_FEW); } return true; diff --git a/lib/zend/Zend/Validate/File/Crc32.php b/lib/zend/Zend/Validate/File/Crc32.php index 0e6b7b37069..29e8bb3e5aa 100644 --- a/lib/zend/Zend/Validate/File/Crc32.php +++ b/lib/zend/Zend/Validate/File/Crc32.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Hash.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash @@ -45,9 +45,9 @@ class Zend_Validate_File_Crc32 extends Zend_Validate_File_Hash * @var array Error message templates */ protected $_messageTemplates = array( - self::DOES_NOT_MATCH => "The file '%value%' does not match the given crc32 hashes", - self::NOT_DETECTED => "There was no crc32 hash detected for the given file", - self::NOT_FOUND => "The file '%value%' could not be found" + self::DOES_NOT_MATCH => "File '%value%' does not match the given crc32 hashes", + self::NOT_DETECTED => "A crc32 hash could not be evaluated for the given file", + self::NOT_FOUND => "File '%value%' could not be found", ); /** diff --git a/lib/zend/Zend/Validate/File/ExcludeExtension.php b/lib/zend/Zend/Validate/File/ExcludeExtension.php index ebfa812912d..57fe95a7e0b 100644 --- a/lib/zend/Zend/Validate/File/ExcludeExtension.php +++ b/lib/zend/Zend/Validate/File/ExcludeExtension.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Extension.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension @@ -44,8 +44,8 @@ class Zend_Validate_File_ExcludeExtension extends Zend_Validate_File_Extension * @var array Error message templates */ protected $_messageTemplates = array( - self::FALSE_EXTENSION => "The file '%value%' has a false extension", - self::NOT_FOUND => "The file '%value%' was not found" + self::FALSE_EXTENSION => "File '%value%' has a false extension", + self::NOT_FOUND => "File '%value%' could not be found", ); /** diff --git a/lib/zend/Zend/Validate/File/ExcludeMimeType.php b/lib/zend/Zend/Validate/File/ExcludeMimeType.php index 850aa9563ef..233eee5975b 100644 --- a/lib/zend/Zend/Validate/File/ExcludeMimeType.php +++ b/lib/zend/Zend/Validate/File/ExcludeMimeType.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/MimeType.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType @@ -73,7 +73,7 @@ class Zend_Validate_File_ExcludeMimeType extends Zend_Validate_File_MimeType $mime = new finfo($const); } - if ($mime !== false) { + if (!empty($mime)) { $this->_type = $mime->file($value); } unset($mime); diff --git a/lib/zend/Zend/Validate/File/Exists.php b/lib/zend/Zend/Validate/File/Exists.php index 0d97b7e1a58..ffa5affe6de 100644 --- a/lib/zend/Zend/Validate/File/Exists.php +++ b/lib/zend/Zend/Validate/File/Exists.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Exists extends Zend_Validate_Abstract @@ -43,7 +43,7 @@ class Zend_Validate_File_Exists extends Zend_Validate_Abstract * @var array Error message templates */ protected $_messageTemplates = array( - self::DOES_NOT_EXIST => "The file '%value%' does not exist" + self::DOES_NOT_EXIST => "File '%value%' does not exist", ); /** diff --git a/lib/zend/Zend/Validate/File/Extension.php b/lib/zend/Zend/Validate/File/Extension.php index 279cdd45ab0..ed5fff25e5b 100644 --- a/lib/zend/Zend/Validate/File/Extension.php +++ b/lib/zend/Zend/Validate/File/Extension.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Extension extends Zend_Validate_Abstract @@ -44,8 +44,8 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract * @var array Error message templates */ protected $_messageTemplates = array( - self::FALSE_EXTENSION => "The file '%value%' has a false extension", - self::NOT_FOUND => "The file '%value%' was not found" + self::FALSE_EXTENSION => "File '%value%' has a false extension", + self::NOT_FOUND => "File '%value%' could not be found", ); /** @@ -81,8 +81,6 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract } if (1 < func_num_args()) { -// @todo: Preperation for 2.0... needs to be cleared with the dev-team -// trigger_error('Multiple arguments to constructor are deprecated in favor of options array', E_USER_NOTICE); $case = func_get_arg(1); $this->setCase($case); } diff --git a/lib/zend/Zend/Validate/File/FilesSize.php b/lib/zend/Zend/Validate/File/FilesSize.php index 076485fdd33..9565f876f30 100644 --- a/lib/zend/Zend/Validate/File/FilesSize.php +++ b/lib/zend/Zend/Validate/File/FilesSize.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Size.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size @@ -47,7 +47,7 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size protected $_messageTemplates = array( self::TOO_BIG => "All files in sum should have a maximum size of '%max%' but '%size%' were detected", self::TOO_SMALL => "All files in sum should have a minimum size of '%min%' but '%size%' were detected", - self::NOT_READABLE => "One or more files can not be read" + self::NOT_READABLE => "One or more files can not be read", ); /** @@ -81,9 +81,6 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size } if (1 < func_num_args()) { -// @todo: Preperation for 2.0... needs to be cleared with the dev-team -// trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE); - $argv = func_get_args(); array_shift($argv); $options['max'] = array_shift($argv); @@ -131,12 +128,14 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size // limited to 2GB files $size += @filesize($files); - $this->_setSize($size); + $this->_size = $size; if (($max !== null) && ($max < $size)) { if ($this->useByteString()) { - $this->setMax($this->_toByteString($max)); + $this->_max = $this->_toByteString($max); + $this->_size = $this->_toByteString($size); $this->_throw($file, self::TOO_BIG); - $this->setMax($max); + $this->_max = $max; + $this->_size = $size; } else { $this->_throw($file, self::TOO_BIG); } @@ -146,9 +145,11 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size // Check that aggregate files are >= minimum size if (($min !== null) && ($size < $min)) { if ($this->useByteString()) { - $this->setMin($this->_toByteString($min)); + $this->_min = $this->_toByteString($min); + $this->_size = $this->_toByteString($size); $this->_throw($file, self::TOO_SMALL); - $this->setMin($min); + $this->_min = $min; + $this->_size = $size; } else { $this->_throw($file, self::TOO_SMALL); } diff --git a/lib/zend/Zend/Validate/File/Hash.php b/lib/zend/Zend/Validate/File/Hash.php index 1e25858dc62..9d72fd21dae 100644 --- a/lib/zend/Zend/Validate/File/Hash.php +++ b/lib/zend/Zend/Validate/File/Hash.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Hash extends Zend_Validate_Abstract @@ -45,9 +45,9 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract * @var array Error message templates */ protected $_messageTemplates = array( - self::DOES_NOT_MATCH => "The file '%value%' does not match the given hashes", - self::NOT_DETECTED => "There was no hash detected for the given file", - self::NOT_FOUND => "The file '%value%' could not be found" + self::DOES_NOT_MATCH => "File '%value%' does not match the given hashes", + self::NOT_DETECTED => "A hash could not be evaluated for the given file", + self::NOT_FOUND => "File '%value%' could not be found" ); /** @@ -75,8 +75,6 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract } if (1 < func_num_args()) { -// @todo: Preperation for 2.0... needs to be cleared with the dev-team -// trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE); $options['algorithm'] = func_get_arg(1); } diff --git a/lib/zend/Zend/Validate/File/ImageSize.php b/lib/zend/Zend/Validate/File/ImageSize.php index 11728fe33d1..42d5e3c0cc0 100644 --- a/lib/zend/Zend/Validate/File/ImageSize.php +++ b/lib/zend/Zend/Validate/File/ImageSize.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract @@ -53,7 +53,7 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract self::HEIGHT_TOO_BIG => "Maximum allowed height for image '%value%' should be '%maxheight%' but '%height%' detected", self::HEIGHT_TOO_SMALL => "Minimum expected height for image '%value%' should be '%minheight%' but '%height%' detected", self::NOT_DETECTED => "The size of image '%value%' could not be detected", - self::NOT_READABLE => "The image '%value%' can not be read" + self::NOT_READABLE => "File '%value%' can not be read", ); /** @@ -127,8 +127,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract if ($options instanceof Zend_Config) { $options = $options->toArray(); } elseif (1 < func_num_args()) { -// @todo: Preperation for 2.0... needs to be cleared with the dev-team -// trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE); if (!is_array($options)) { $options = array('minwidth' => $options); } diff --git a/lib/zend/Zend/Validate/File/IsCompressed.php b/lib/zend/Zend/Validate/File/IsCompressed.php index 8c7cc987559..0b491d9842e 100644 --- a/lib/zend/Zend/Validate/File/IsCompressed.php +++ b/lib/zend/Zend/Validate/File/IsCompressed.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/MimeType.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType @@ -45,9 +45,9 @@ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType * @var array Error message templates */ protected $_messageTemplates = array( - self::FALSE_TYPE => "The file '%value%' is not compressed, '%type%' detected", - self::NOT_DETECTED => "The mimetype of file '%value%' has not been detected", - self::NOT_READABLE => "The file '%value%' can not be read" + self::FALSE_TYPE => "File '%value%' is not compressed, '%type%' detected", + self::NOT_DETECTED => "The mimetype of file '%value%' could not been detected", + self::NOT_READABLE => "File '%value%' can not be read", ); /** @@ -60,27 +60,90 @@ class Zend_Validate_File_IsCompressed extends Zend_Validate_File_MimeType { if ($mimetype instanceof Zend_Config) { $mimetype = $mimetype->toArray(); - } else if (empty($mimetype)) { - $mimetype = array( - 'application/x-tar', - 'application/x-cpio', - 'application/x-debian-package', - 'application/x-archive', - 'application/x-arc', - 'application/x-arj', - 'application/x-lharc', - 'application/x-lha', - 'application/x-rar', - 'application/zip', - 'application/zoo', - 'application/x-eet', - 'application/x-java-pack200', - 'application/x-compress', - 'application/x-gzip', - 'application/x-bzip2' - ); } - $this->setMimeType($mimetype); + $temp = array(); + // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen + $default = array( + 'application/arj', + 'application/gnutar', + 'application/lha', + 'application/lzx', + 'application/vnd.ms-cab-compressed', + 'application/x-ace-compressed', + 'application/x-arc', + 'application/x-archive', + 'application/x-arj', + 'application/x-bzip', + 'application/x-bzip2', + 'application/x-cab-compressed', + 'application/x-compress', + 'application/x-compressed', + 'application/x-cpio', + 'application/x-debian-package', + 'application/x-eet', + 'application/x-gzip', + 'application/x-java-pack200', + 'application/x-lha', + 'application/x-lharc', + 'application/x-lzh', + 'application/x-lzma', + 'application/x-lzx', + 'application/x-rar', + 'application/x-sit', + 'application/x-stuffit', + 'application/x-tar', + 'application/zip', + 'application/zoo', + 'multipart/x-gzip', + ); + + if (is_array($mimetype)) { + $temp = $mimetype; + if (array_key_exists('magicfile', $temp)) { + unset($temp['magicfile']); + } + + if (array_key_exists('headerCheck', $temp)) { + unset($temp['headerCheck']); + } + + if (empty($temp)) { + $mimetype += $default; + } + } + + if (empty($mimetype)) { + $mimetype = $default; + } + + parent::__construct($mimetype); + } + + /** + * Throws an error of the given type + * Duplicates parent method due to OOP Problem with late static binding in PHP 5.2 + * + * @param string $file + * @param string $errorType + * @return false + */ + protected function _throw($file, $errorType) + { + $this->_value = $file['name']; + switch($errorType) { + case Zend_Validate_File_MimeType::FALSE_TYPE : + $errorType = self::FALSE_TYPE; + break; + case Zend_Validate_File_MimeType::NOT_DETECTED : + $errorType = self::NOT_DETECTED; + break; + case Zend_Validate_File_MimeType::NOT_READABLE : + $errorType = self::NOT_READABLE; + break; + } + + $this->_error($errorType); + return false; } } diff --git a/lib/zend/Zend/Validate/File/IsImage.php b/lib/zend/Zend/Validate/File/IsImage.php index 50136b3ef2c..23c996092d0 100644 --- a/lib/zend/Zend/Validate/File/IsImage.php +++ b/lib/zend/Zend/Validate/File/IsImage.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/MimeType.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType @@ -45,9 +45,9 @@ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType * @var array Error message templates */ protected $_messageTemplates = array( - self::FALSE_TYPE => "The file '%value%' is no image, '%type%' detected", - self::NOT_DETECTED => "The mimetype of file '%value%' has not been detected", - self::NOT_READABLE => "The file '%value%' can not be read" + self::FALSE_TYPE => "File '%value%' is no image, '%type%' detected", + self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected", + self::NOT_READABLE => "File '%value%' can not be read", ); /** @@ -60,31 +60,114 @@ class Zend_Validate_File_IsImage extends Zend_Validate_File_MimeType { if ($mimetype instanceof Zend_Config) { $mimetype = $mimetype->toArray(); - } else if (empty($mimetype)) { - $mimetype = array( - 'image/x-quicktime', - 'image/jp2', - 'image/x-xpmi', - 'image/x-portable-bitmap', - 'image/x-portable-greymap', - 'image/x-portable-pixmap', - 'image/x-niff', - 'image/tiff', - 'image/png', - 'image/x-unknown', - 'image/gif', - 'image/x-ms-bmp', - 'application/dicom', - 'image/vnd.adobe.photoshop', - 'image/vnd.djvu', - 'image/x-cpi', - 'image/jpeg', - 'image/x-ico', - 'image/x-coreldraw', - 'image/svg+xml' - ); } - $this->setMimeType($mimetype); + $temp = array(); + // http://de.wikipedia.org/wiki/Liste_von_Dateiendungen + // http://www.iana.org/assignments/media-types/image/ + $default = array( + 'application/cdf', + 'application/dicom', + 'application/fractals', + 'application/postscript', + 'application/vnd.hp-hpgl', + 'application/vnd.oasis.opendocument.graphics', + 'application/x-cdf', + 'application/x-cmu-raster', + 'application/x-ima', + 'application/x-inventor', + 'application/x-koan', + 'application/x-portable-anymap', + 'application/x-world-x-3dmf', + 'image/bmp', + 'image/c', + 'image/cgm', + 'image/fif', + 'image/gif', + 'image/jpeg', + 'image/jpm', + 'image/jpx', + 'image/jp2', + 'image/naplps', + 'image/pjpeg', + 'image/png', + 'image/svg', + 'image/svg+xml', + 'image/tiff', + 'image/vnd.adobe.photoshop', + 'image/vnd.djvu', + 'image/vnd.fpx', + 'image/vnd.net-fpx', + 'image/x-cmu-raster', + 'image/x-cmx', + 'image/x-coreldraw', + 'image/x-cpi', + 'image/x-emf', + 'image/x-ico', + 'image/x-icon', + 'image/x-jg', + 'image/x-ms-bmp', + 'image/x-niff', + 'image/x-pict', + 'image/x-pcx', + 'image/x-portable-anymap', + 'image/x-portable-bitmap', + 'image/x-portable-greymap', + 'image/x-portable-pixmap', + 'image/x-quicktime', + 'image/x-rgb', + 'image/x-tiff', + 'image/x-unknown', + 'image/x-windows-bmp', + 'image/x-xpmi', + ); + + if (is_array($mimetype)) { + $temp = $mimetype; + if (array_key_exists('magicfile', $temp)) { + unset($temp['magicfile']); + } + + if (array_key_exists('headerCheck', $temp)) { + unset($temp['headerCheck']); + } + + if (empty($temp)) { + $mimetype += $default; + } + } + + if (empty($mimetype)) { + $mimetype = $default; + } + + parent::__construct($mimetype); + } + + /** + * Throws an error of the given type + * Duplicates parent method due to OOP Problem with late static binding in PHP 5.2 + * + * @param string $file + * @param string $errorType + * @return false + */ + protected function _throw($file, $errorType) + { + $this->_value = $file['name']; + switch($errorType) { + case Zend_Validate_File_MimeType::FALSE_TYPE : + $errorType = self::FALSE_TYPE; + break; + case Zend_Validate_File_MimeType::NOT_DETECTED : + $errorType = self::NOT_DETECTED; + break; + case Zend_Validate_File_MimeType::NOT_READABLE : + $errorType = self::NOT_READABLE; + break; + } + + $this->_error($errorType); + return false; } } diff --git a/lib/zend/Zend/Validate/File/Md5.php b/lib/zend/Zend/Validate/File/Md5.php index b5fba6338de..c1d5d0d0c0c 100644 --- a/lib/zend/Zend/Validate/File/Md5.php +++ b/lib/zend/Zend/Validate/File/Md5.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Hash.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash @@ -45,9 +45,9 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash * @var array Error message templates */ protected $_messageTemplates = array( - self::DOES_NOT_MATCH => "The file '%value%' does not match the given md5 hashes", - self::NOT_DETECTED => "There was no md5 hash detected for the given file", - self::NOT_FOUND => "The file '%value%' could not be found" + self::DOES_NOT_MATCH => "File '%value%' does not match the given md5 hashes", + self::NOT_DETECTED => "A md5 hash could not be evaluated for the given file", + self::NOT_FOUND => "File '%value%' could not be found", ); /** @@ -123,7 +123,7 @@ class Zend_Validate_File_Md5 extends Zend_Validate_File_Hash * Adds the md5 hash for one or multiple files * * @param string|array $options - * @param string $algorithm (Depreciated) Algorithm to use, fixed to md5 + * @param string $algorithm (Deprecated) Algorithm to use, fixed to md5 * @return Zend_Validate_File_Hash Provides a fluent interface */ public function addHash($options) diff --git a/lib/zend/Zend/Validate/File/MimeType.php b/lib/zend/Zend/Validate/File/MimeType.php index 951a19ca3fa..f04a4d9120c 100644 --- a/lib/zend/Zend/Validate/File/MimeType.php +++ b/lib/zend/Zend/Validate/File/MimeType.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract @@ -46,9 +46,9 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract * @var array Error message templates */ protected $_messageTemplates = array( - self::FALSE_TYPE => "The file '%value%' has a false mimetype of '%type%'", - self::NOT_DETECTED => "The mimetype of file '%value%' could not been detected", - self::NOT_READABLE => "The file '%value%' can not be read" + self::FALSE_TYPE => "File '%value%' has a false mimetype of '%type%'", + self::NOT_DETECTED => "The mimetype of file '%value%' could not be detected", + self::NOT_READABLE => "File '%value%' can not be read", ); /** @@ -79,6 +79,13 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract */ protected $_magicfile; + /** + * Finfo object to use + * + * @var resource + */ + protected $_finfo; + /** * If no $_ENV['MAGIC'] is set, try and autodiscover it based on common locations * @var array @@ -123,10 +130,12 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract if (isset($mimetype['magicfile'])) { $this->setMagicFile($mimetype['magicfile']); + unset($mimetype['magicfile']); } if (isset($mimetype['headerCheck'])) { - $this->enableHeaderCheck(true); + $this->enableHeaderCheck($mimetype['headerCheck']); + unset($mimetype['headerCheck']); } $this->setMimeType($mimetype); @@ -139,33 +148,62 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract */ public function getMagicFile() { - if (null === $this->_magicfile && empty($_ENV['MAGIC'])) { - foreach ($this->_magicFiles as $file) { - if (file_exists($file)) { - $this->setMagicFile($file); - break; + if (null === $this->_magicfile) { + if (!empty($_ENV['MAGIC'])) { + $this->setMagicFile($_ENV['MAGIC']); + } elseif (!(@ini_get("safe_mode") == 'On' || @ini_get("safe_mode") === 1)) { + require_once 'Zend/Validate/Exception.php'; + foreach ($this->_magicFiles as $file) { + // supressing errors which are thrown due to openbase_dir restrictions + try { + $this->setMagicFile($file); + if ($this->_magicfile !== null) { + break; + } + } catch (Zend_Validate_Exception $e) { + // Intentionally, catch and fall through + } } } + + if ($this->_magicfile === null) { + $this->_magicfile = false; + } } + return $this->_magicfile; } /** * Sets the magicfile to use * if null, the MAGIC constant from php is used + * if the MAGIC file is errorous, no file will be set * * @param string $file + * @throws Zend_Validate_Exception When finfo can not read the magicfile * @return Zend_Validate_File_MimeType Provides fluid interface */ public function setMagicFile($file) { if (empty($file)) { $this->_magicfile = null; + } else if (!(class_exists('finfo', false))) { + $this->_magicfile = null; + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Magicfile can not be set. There is no finfo extension installed'); } else if (!is_readable($file)) { require_once 'Zend/Validate/Exception.php'; throw new Zend_Validate_Exception('The given magicfile can not be read'); } else { - $this->_magicfile = (string) $file; + $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME; + $this->_finfo = @finfo_open($const, $file); + if (empty($this->_finfo)) { + $this->_finfo = null; + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('The given magicfile is not accepted by finfo'); + } else { + $this->_magicfile = $file; + } } return $this; @@ -294,24 +332,27 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract $mimefile = $this->getMagicFile(); if (class_exists('finfo', false)) { $const = defined('FILEINFO_MIME_TYPE') ? FILEINFO_MIME_TYPE : FILEINFO_MIME; - if (!empty($mimefile)) { - $mime = new finfo($const, $mimefile); - } else { - $mime = new finfo($const); + if (!empty($mimefile) && empty($this->_finfo)) { + $this->_finfo = @finfo_open($const, $mimefile); } - if ($mime !== false) { - $this->_type = $mime->file($value); + if (empty($this->_finfo)) { + $this->_finfo = @finfo_open($const); + } + + $this->_type = null; + if (!empty($this->_finfo)) { + $this->_type = finfo_file($this->_finfo, $value); } - unset($mime); } - if (empty($this->_type)) { - if (function_exists('mime_content_type') && ini_get('mime_magic.magicfile')) { + if (empty($this->_type) && + (function_exists('mime_content_type') && ini_get('mime_magic.magicfile'))) { $this->_type = mime_content_type($value); - } elseif ($this->_headerCheck) { - $this->_type = $file['type']; - } + } + + if (empty($this->_type) && $this->_headerCheck) { + $this->_type = $file['type']; } if (empty($this->_type)) { @@ -325,6 +366,7 @@ class Zend_Validate_File_MimeType extends Zend_Validate_Abstract $types = explode('/', $this->_type); $types = array_merge($types, explode('-', $this->_type)); + $types = array_merge($types, explode(';', $this->_type)); foreach($mimetype as $mime) { if (in_array($mime, $types)) { return true; diff --git a/lib/zend/Zend/Validate/File/NotExists.php b/lib/zend/Zend/Validate/File/NotExists.php index 354efb76c10..8fb5efe9e00 100644 --- a/lib/zend/Zend/Validate/File/NotExists.php +++ b/lib/zend/Zend/Validate/File/NotExists.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Exists.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_NotExists extends Zend_Validate_File_Exists @@ -43,7 +43,7 @@ class Zend_Validate_File_NotExists extends Zend_Validate_File_Exists * @var array Error message templates */ protected $_messageTemplates = array( - self::DOES_EXIST => "The file '%value%' does exist" + self::DOES_EXIST => "File '%value%' exists", ); /** diff --git a/lib/zend/Zend/Validate/File/Sha1.php b/lib/zend/Zend/Validate/File/Sha1.php index f30b6677232..18bb9f1a9dc 100644 --- a/lib/zend/Zend/Validate/File/Sha1.php +++ b/lib/zend/Zend/Validate/File/Sha1.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Hash.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash @@ -45,9 +45,9 @@ class Zend_Validate_File_Sha1 extends Zend_Validate_File_Hash * @var array Error message templates */ protected $_messageTemplates = array( - self::DOES_NOT_MATCH => "The file '%value%' does not match the given sha1 hashes", - self::NOT_DETECTED => "There was no sha1 hash detected for the given file", - self::NOT_FOUND => "The file '%value%' could not be found" + self::DOES_NOT_MATCH => "File '%value%' does not match the given sha1 hashes", + self::NOT_DETECTED => "A sha1 hash could not be evaluated for the given file", + self::NOT_FOUND => "File '%value%' could not be found", ); /** diff --git a/lib/zend/Zend/Validate/File/Size.php b/lib/zend/Zend/Validate/File/Size.php index 00982b77dcc..5f7922276b5 100644 --- a/lib/zend/Zend/Validate/File/Size.php +++ b/lib/zend/Zend/Validate/File/Size.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Size extends Zend_Validate_Abstract @@ -48,7 +48,7 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract protected $_messageTemplates = array( self::TOO_BIG => "Maximum allowed size for file '%value%' is '%max%' but '%size%' detected", self::TOO_SMALL => "Minimum expected size for file '%value%' is '%min%' but '%size%' detected", - self::NOT_FOUND => "The file '%value%' could not be found" + self::NOT_FOUND => "File '%value%' could not be found", ); /** @@ -112,8 +112,6 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract } if (1 < func_num_args()) { -// @todo: Preperation for 2.0... needs to be cleared with the dev-team -// trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE); $argv = func_get_args(); array_shift($argv); $options['max'] = array_shift($argv); @@ -282,7 +280,8 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract } // limited to 4GB files - $size = sprintf("%u", @filesize($value)); + $size = sprintf("%u", @filesize($value)); + $this->_size = $size; // Check to see if it's smaller than min size $min = $this->getMin(true); diff --git a/lib/zend/Zend/Validate/File/Upload.php b/lib/zend/Zend/Validate/File/Upload.php index daec229cdd1..1bb0e3c4370 100644 --- a/lib/zend/Zend/Validate/File/Upload.php +++ b/lib/zend/Zend/Validate/File/Upload.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_Upload extends Zend_Validate_Abstract @@ -53,16 +53,16 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract * @var array Error message templates */ protected $_messageTemplates = array( - self::INI_SIZE => "The file '%value%' exceeds the defined ini size", - self::FORM_SIZE => "The file '%value%' exceeds the defined form size", - self::PARTIAL => "The file '%value%' was only partially uploaded", - self::NO_FILE => "The file '%value%' was not uploaded", - self::NO_TMP_DIR => "No temporary directory was found for the file '%value%'", - self::CANT_WRITE => "The file '%value%' can't be written", - self::EXTENSION => "The extension returned an error while uploading the file '%value%'", - self::ATTACK => "The file '%value%' was illegal uploaded, possible attack", - self::FILE_NOT_FOUND => "The file '%value%' was not found", - self::UNKNOWN => "Unknown error while uploading the file '%value%'" + self::INI_SIZE => "File '%value%' exceeds the defined ini size", + self::FORM_SIZE => "File '%value%' exceeds the defined form size", + self::PARTIAL => "File '%value%' was only partially uploaded", + self::NO_FILE => "File '%value%' was not uploaded", + self::NO_TMP_DIR => "No temporary directory was found for file '%value%'", + self::CANT_WRITE => "File '%value%' can't be written", + self::EXTENSION => "A PHP extension returned an error while uploading the file '%value%'", + self::ATTACK => "File '%value%' was illegally uploaded. This could be a possible attack", + self::FILE_NOT_FOUND => "File '%value%' was not found", + self::UNKNOWN => "Unknown error while uploading file '%value%'" ); /** @@ -156,6 +156,7 @@ class Zend_Validate_File_Upload extends Zend_Validate_Abstract */ public function isValid($value, $file = null) { + $this->_messages = null; if (array_key_exists($value, $this->_files)) { $files[$value] = $this->_files[$value]; } else { diff --git a/lib/zend/Zend/Validate/File/WordCount.php b/lib/zend/Zend/Validate/File/WordCount.php index 652b8d2b978..5b76c3e6ffd 100644 --- a/lib/zend/Zend/Validate/File/WordCount.php +++ b/lib/zend/Zend/Validate/File/WordCount.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/File/Count.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count @@ -48,7 +48,7 @@ class Zend_Validate_File_WordCount extends Zend_Validate_File_Count protected $_messageTemplates = array( self::TOO_MUCH => "Too much words, maximum '%max%' are allowed but '%count%' were counted", self::TOO_LESS => "Too less words, minimum '%min%' are expected but '%count%' were counted", - self::NOT_FOUND => "The file '%value%' could not be found" + self::NOT_FOUND => "File '%value%' could not be found", ); /** diff --git a/lib/zend/Zend/Validate/Float.php b/lib/zend/Zend/Validate/Float.php index 44b7d8367b6..c74286aa219 100644 --- a/lib/zend/Zend/Validate/Float.php +++ b/lib/zend/Zend/Validate/Float.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Locale/Format.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Float extends Zend_Validate_Abstract @@ -45,7 +45,7 @@ class Zend_Validate_Float extends Zend_Validate_Abstract */ protected $_messageTemplates = array( self::INVALID => "Invalid type given, value should be float, string, or integer", - self::NOT_FLOAT => "'%value%' does not appear to be a float" + self::NOT_FLOAT => "'%value%' does not appear to be a float", ); protected $_locale; @@ -53,13 +53,30 @@ class Zend_Validate_Float extends Zend_Validate_Abstract /** * Constructor for the float validator * - * @param string|Zend_Locale $locale + * @param string|Zend_Config|Zend_Locale $locale */ public function __construct($locale = null) { - if ($locale !== null) { - $this->setLocale($locale); + if ($locale instanceof Zend_Config) { + $locale = $locale->toArray(); } + + if (is_array($locale)) { + if (array_key_exists('locale', $locale)) { + $locale = $locale['locale']; + } else { + $locale = null; + } + } + + if (empty($locale)) { + require_once 'Zend/Registry.php'; + if (Zend_Registry::isRegistered('Zend_Locale')) { + $locale = Zend_Registry::get('Zend_Locale'); + } + } + + $this->setLocale($locale); } /** @@ -97,28 +114,19 @@ class Zend_Validate_Float extends Zend_Validate_Abstract return false; } + if (is_float($value)) { + return true; + } + $this->_setValue($value); - if ($this->_locale === null) { - $locale = localeconv(); - $valueFiltered = str_replace($locale['thousands_sep'], '', (string) $value); - $valueFiltered = str_replace($locale['decimal_point'], '.', $valueFiltered); - - if (strval(floatval($valueFiltered)) != $valueFiltered) { - $this->_error(self::NOT_FLOAT); - return false; - } - - } else { - try { - if (!Zend_Locale_Format::isFloat($value, array('locale' => 'en')) && - !Zend_Locale_Format::isFloat($value, array('locale' => $this->_locale))) { - $this->_error(self::NOT_FLOAT); - return false; - } - } catch (Zend_Locale_Exception $e) { + try { + if (!Zend_Locale_Format::isFloat($value, array('locale' => $this->_locale))) { $this->_error(self::NOT_FLOAT); return false; } + } catch (Zend_Locale_Exception $e) { + $this->_error(self::NOT_FLOAT); + return false; } return true; diff --git a/lib/zend/Zend/Validate/GreaterThan.php b/lib/zend/Zend/Validate/GreaterThan.php index 4f551c5aaec..f9df5f09b9c 100644 --- a/lib/zend/Zend/Validate/GreaterThan.php +++ b/lib/zend/Zend/Validate/GreaterThan.php @@ -1,5 +1,4 @@ "'%value%' is not greater than '%min%'" + self::NOT_GREATER => "'%value%' is not greater than '%min%'", ); /** @@ -62,11 +59,24 @@ class Zend_Validate_GreaterThan extends Zend_Validate_Abstract /** * Sets validator options * - * @param mixed $min + * @param mixed|Zend_Config $min * @return void */ public function __construct($min) { + if ($min instanceof Zend_Config) { + $min = $min->toArray(); + } + + if (is_array($min)) { + if (array_key_exists('min', $min)) { + $min = $min['min']; + } else { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception("Missing option 'min'"); + } + } + $this->setMin($min); } diff --git a/lib/zend/Zend/Validate/Hex.php b/lib/zend/Zend/Validate/Hex.php index 462b8ff81b6..aa0e0a04b19 100644 --- a/lib/zend/Zend/Validate/Hex.php +++ b/lib/zend/Zend/Validate/Hex.php @@ -1,5 +1,4 @@ "Invalid type given, value should be a string", - self::NOT_HEX => "'%value%' has not only hexadecimal digit characters" + self::NOT_HEX => "'%value%' has not only hexadecimal digit characters", ); /** diff --git a/lib/zend/Zend/Validate/Hostname.php b/lib/zend/Zend/Validate/Hostname.php index e12b5318770..3e9eac72589 100644 --- a/lib/zend/Zend/Validate/Hostname.php +++ b/lib/zend/Zend/Validate/Hostname.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -41,7 +41,7 @@ require_once 'Zend/Validate/Ip.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Hostname extends Zend_Validate_Abstract @@ -64,13 +64,13 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract self::INVALID => "Invalid type given, value should be a string", self::IP_ADDRESS_NOT_ALLOWED => "'%value%' appears to be an IP address, but IP addresses are not allowed", self::UNKNOWN_TLD => "'%value%' appears to be a DNS hostname but cannot match TLD against known list", - self::INVALID_DASH => "'%value%' appears to be a DNS hostname but contains a dash (-) in an invalid position", + self::INVALID_DASH => "'%value%' appears to be a DNS hostname but contains a dash in an invalid position", self::INVALID_HOSTNAME_SCHEMA => "'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'", self::UNDECIPHERABLE_TLD => "'%value%' appears to be a DNS hostname but cannot extract TLD part", self::INVALID_HOSTNAME => "'%value%' does not match the expected structure for a DNS hostname", self::INVALID_LOCAL_NAME => "'%value%' does not appear to be a valid local network name", self::LOCAL_NAME_NOT_ALLOWED => "'%value%' appears to be a local network name but local network names are not allowed", - self::CANNOT_DECODE_PUNYCODE => "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded" + self::CANNOT_DECODE_PUNYCODE => "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded", ); /** @@ -100,27 +100,6 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract */ const ALLOW_ALL = 7; - /** - * Whether IDN domains are validated - * - * @var boolean - */ - private $_validateIdn = true; - - /** - * Whether TLDs are validated against a known list - * - * @var boolean - */ - private $_validateTld = true; - - /** - * Bit field of ALLOW constants; determines which types of hostnames are allowed - * - * @var integer - */ - protected $_allow; - /** * Array of valid top-level-domains * @@ -221,6 +200,12 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract 'DE' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'), 'DK' => array(1 => '/^[\x{002d}0-9a-zäéöü]{1,63}$/iu'), 'ES' => array(1 => '/^[\x{002d}0-9a-zàáçèéíïñòóúü·]{1,63}$/iu'), + 'EU' => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu', + 2 => '/^[\x{002d}0-9a-zāăąćĉċčďđēĕėęěĝğġģĥħĩīĭįıĵķĺļľŀłńņňʼnŋōŏőœŕŗřśŝšťŧũūŭůűųŵŷźżž]{1,63}$/iu', + 3 => '/^[\x{002d}0-9a-zșț]{1,63}$/iu', + 4 => '/^[\x{002d}0-9a-zΐάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώ]{1,63}$/iu', + 5 => '/^[\x{002d}0-9a-zабвгдежзийклмнопрстуфхцчшщъыьэюя]{1,63}$/iu', + 6 => '/^[\x{002d}0-9a-zἀ-ἇἐ-ἕἠ-ἧἰ-ἷὀ-ὅὐ-ὗὠ-ὧὰ-ώᾀ-ᾇᾐ-ᾗᾠ-ᾧᾰ-ᾴᾶᾷῂῃῄῆῇῐ-ΐῖῗῠ-ῧῲῳῴῶῷ]{1,63}$/iu'), 'FI' => array(1 => '/^[\x{002d}0-9a-zäåö]{1,63}$/iu'), 'GR' => array(1 => '/^[\x{002d}0-9a-zΆΈΉΊΌΎ-ΡΣ-ώἀ-ἕἘ-Ἕἠ-ὅὈ-Ὅὐ-ὗὙὛὝὟ-ώᾀ-ᾴᾶ-ᾼῂῃῄῆ-ῌῐ-ΐῖ-Ίῠ-Ῥῲῳῴῶ-ῼ]{1,63}$/iu'), 'HK' => 'Zend/Validate/Hostname/Cn.php', @@ -320,6 +305,13 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract '网络' => array(1 => 20), ); + protected $_options = array( + 'allow' => self::ALLOW_DNS, + 'idn' => true, + 'tld' => true, + 'ip' => null + ); + /** * Sets validator options * @@ -330,16 +322,77 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract * @return void * @see http://www.iana.org/cctld/specifications-policies-cctlds-01apr02.htm Technical Specifications for ccTLDs */ - public function __construct($allow = self::ALLOW_DNS, $validateIdn = true, $validateTld = true, Zend_Validate_Ip $ipValidator = null) + public function __construct($options = array()) { - // Set allow options - $this->setAllow($allow); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp['allow'] = array_shift($options); + if (!empty($options)) { + $temp['idn'] = array_shift($options); + } - // Set validation options - $this->_validateIdn = $validateIdn; - $this->_validateTld = $validateTld; + if (!empty($options)) { + $temp['tld'] = array_shift($options); + } - $this->setIpValidator($ipValidator); + if (!empty($options)) { + $temp['ip'] = array_shift($options); + } + + $options = $temp; + } + + $options += $this->_options; + $this->setOptions($options); + } + + /** + * Returns all set options + * + * @return array + */ + public function getOptions() + { + return $this->_options; + } + + /** + * Sets the options for this validator + * + * @param array $options + * @return Zend_Validate_Hostname + */ + public function setOptions($options) + { + if (array_key_exists('allow', $options)) { + $this->setAllow($options['allow']); + } + + if (array_key_exists('idn', $options)) { + $this->setValidateIdn($options['idn']); + } + + if (array_key_exists('tld', $options)) { + $this->setValidateTld($options['tld']); + } + + if (array_key_exists('ip', $options)) { + $this->setIpValidator($options['ip']); + } + + return $this; + } + + /** + * Returns the set ip validator + * + * @return Zend_Validate_Ip + */ + public function getIpValidator() + { + return $this->_options['ip']; } /** @@ -351,7 +404,9 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract if ($ipValidator === null) { $ipValidator = new Zend_Validate_Ip(); } - $this->_ipValidator = $ipValidator; + + $this->_options['ip'] = $ipValidator; + return $this; } /** @@ -361,7 +416,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract */ public function getAllow() { - return $this->_allow; + return $this->_options['allow']; } /** @@ -372,10 +427,20 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract */ public function setAllow($allow) { - $this->_allow = $allow; + $this->_options['allow'] = $allow; return $this; } + /** + * Returns the set idn option + * + * @return boolean + */ + public function getValidateIdn() + { + return $this->_options['idn']; + } + /** * Set whether IDN domains are validated * @@ -385,7 +450,18 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract */ public function setValidateIdn ($allowed) { - $this->_validateIdn = (bool) $allowed; + $this->_options['idn'] = (bool) $allowed; + return $this; + } + + /** + * Returns the set tld option + * + * @return boolean + */ + public function getValidateTld() + { + return $this->_options['tld']; } /** @@ -397,7 +473,8 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract */ public function setValidateTld ($allowed) { - $this->_validateTld = (bool) $allowed; + $this->_options['tld'] = (bool) $allowed; + return $this; } /** @@ -417,11 +494,10 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract } $this->_setValue($value); - // Check input against IP address schema if (preg_match('/^[0-9.a-e:.]*$/i', $value) && - $this->_ipValidator->setTranslator($this->getTranslator())->isValid($value)) { - if (!($this->_allow & self::ALLOW_IP)) { + $this->_options['ip']->setTranslator($this->getTranslator())->isValid($value)) { + if (!($this->_options['allow'] & self::ALLOW_IP)) { $this->_error(self::IP_ADDRESS_NOT_ALLOWED); return false; } else { @@ -452,7 +528,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract // Match TLD against known list $this->_tld = strtolower($matches[1]); - if ($this->_validateTld) { + if ($this->_options['tld']) { if (!in_array($this->_tld, $this->_validTlds)) { $this->_error(self::UNKNOWN_TLD); $status = false; @@ -466,7 +542,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract * @see Zend_Validate_Hostname_Interface */ $regexChars = array(0 => '/^[a-z0-9\x2d]{1,63}$/i'); - if ($this->_validateIdn && isset($this->_validIdns[strtoupper($this->_tld)])) { + if ($this->_options['idn'] && isset($this->_validIdns[strtoupper($this->_tld)])) { if (is_string($this->_validIdns[strtoupper($this->_tld)])) { $regexChars += include($this->_validIdns[strtoupper($this->_tld)]); } else { @@ -475,9 +551,8 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract } // Check each hostname part - $valid = true; + $check = 0; foreach ($domainParts as $domainPart) { - // Decode Punycode domainnames to IDN if (strpos($domainPart, 'xn--') === 0) { $domainPart = $this->decodePunycode(substr($domainPart, 4)); @@ -490,20 +565,16 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract if ((strpos($domainPart, '-') === 0) || ((strlen($domainPart) > 2) && (strpos($domainPart, '-', 2) == 2) && (strpos($domainPart, '-', 3) == 3)) || (strpos($domainPart, '-') === (strlen($domainPart) - 1))) { - $this->_error(self::INVALID_DASH); + $this->_error(self::INVALID_DASH); $status = false; break 2; } // Check each domain part - $check = false; + $checked = false; foreach($regexChars as $regexKey => $regexChar) { $status = @preg_match($regexChar, $domainPart); - if ($status === false) { - iconv_set_encoding('internal_encoding', $origenc); - require_once 'Zend/Validate/Exception.php'; - throw new Zend_Validate_Exception('Internal error: DNS validation failed'); - } elseif ($status !== 0) { + if ($status > 0) { $length = 63; if (array_key_exists(strtoupper($this->_tld), $this->_idnLength) && (array_key_exists($regexKey, $this->_idnLength[strtoupper($this->_tld)]))) { @@ -513,23 +584,22 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract if (iconv_strlen($domainPart, 'UTF-8') > $length) { $this->_error(self::INVALID_HOSTNAME); } else { - $check = true; - break 2; + $checked = true; + break; } } } - if (!$check) { - $valid = false; + if ($checked) { + ++$check; } } - // If all labels didn't match, the hostname is invalid - if (!$valid) { + // If one of the labels doesn't match, the hostname is invalid + if ($check !== count($domainParts)) { $this->_error(self::INVALID_HOSTNAME_SCHEMA); $status = false; } - } else { // Hostname not long enough $this->_error(self::UNDECIPHERABLE_TLD); @@ -540,28 +610,20 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract iconv_set_encoding('internal_encoding', $origenc); // If the input passes as an Internet domain name, and domain names are allowed, then the hostname // passes validation - if ($status && ($this->_allow & self::ALLOW_DNS)) { + if ($status && ($this->_options['allow'] & self::ALLOW_DNS)) { return true; } - } else { + } else if ($this->_options['allow'] & self::ALLOW_DNS) { $this->_error(self::INVALID_HOSTNAME); } // Check input against local network name schema; last chance to pass validation $regexLocal = '/^(([a-zA-Z0-9\x2d]{1,63}\x2e)*[a-zA-Z0-9\x2d]{1,63}){1,254}$/'; $status = @preg_match($regexLocal, $value); - if (false === $status) { - /** - * Regex error - * @see Zend_Validate_Exception - */ - require_once 'Zend/Validate/Exception.php'; - throw new Zend_Validate_Exception('Internal error: local network name validation failed'); - } // If the input passes as a local network name, and local network names are allowed, then the // hostname passes validation - $allowLocal = $this->_allow & self::ALLOW_LOCAL; + $allowLocal = $this->_options['allow'] & self::ALLOW_LOCAL; if ($status && $allowLocal) { return true; } diff --git a/lib/zend/Zend/Validate/Hostname/Biz.php b/lib/zend/Zend/Validate/Hostname/Biz.php index de6b3326e7d..090dffd6cfb 100644 --- a/lib/zend/Zend/Validate/Hostname/Biz.php +++ b/lib/zend/Zend/Validate/Hostname/Biz.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/lib/zend/Zend/Validate/Hostname/Cn.php b/lib/zend/Zend/Validate/Hostname/Cn.php index db87d172c14..33138b98df3 100644 --- a/lib/zend/Zend/Validate/Hostname/Cn.php +++ b/lib/zend/Zend/Validate/Hostname/Cn.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/lib/zend/Zend/Validate/Hostname/Com.php b/lib/zend/Zend/Validate/Hostname/Com.php index b3e1e1a2e1d..931b80742a4 100644 --- a/lib/zend/Zend/Validate/Hostname/Com.php +++ b/lib/zend/Zend/Validate/Hostname/Com.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/lib/zend/Zend/Validate/Hostname/Jp.php b/lib/zend/Zend/Validate/Hostname/Jp.php index 440a3469965..be0946781bc 100644 --- a/lib/zend/Zend/Validate/Hostname/Jp.php +++ b/lib/zend/Zend/Validate/Hostname/Jp.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ return array( diff --git a/lib/zend/Zend/Validate/Iban.php b/lib/zend/Zend/Validate/Iban.php index d6ad12b5c15..ba9450b821c 100644 --- a/lib/zend/Zend/Validate/Iban.php +++ b/lib/zend/Zend/Validate/Iban.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Validate/Abstract.php'; * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Iban extends Zend_Validate_Abstract @@ -44,9 +44,9 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract * @var array */ protected $_messageTemplates = array( - self::NOTSUPPORTED => "'%value%' does not have IBAN", - self::FALSEFORMAT => "'%value%' has a false format", - self::CHECKFAILED => "'%value%' has failed the IBAN check" + self::NOTSUPPORTED => "Unknown country within the IBAN '%value%'", + self::FALSEFORMAT => "'%value%' has a false IBAN format", + self::CHECKFAILED => "'%value%' has failed the IBAN check", ); /** @@ -106,11 +106,30 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract /** * Sets validator options * - * @param string|Zend_Locale $locale OPTIONAL + * @param string|Zend_Config|Zend_Locale $locale OPTIONAL * @return void */ public function __construct($locale = null) { + if ($locale instanceof Zend_Config) { + $locale = $locale->toArray(); + } + + if (is_array($locale)) { + if (array_key_exists('locale', $locale)) { + $locale = $locale['locale']; + } else { + $locale = null; + } + } + + if (empty($locale)) { + require_once 'Zend/Registry.php'; + if (Zend_Registry::isRegistered('Zend_Locale')) { + $locale = Zend_Registry::get('Zend_Locale'); + } + } + if ($locale !== null) { $this->setLocale($locale); } @@ -134,11 +153,13 @@ class Zend_Validate_Iban extends Zend_Validate_Abstract */ public function setLocale($locale = null) { - require_once 'Zend/Locale.php'; - $locale = Zend_Locale::findLocale($locale); - if (strlen($locale) < 4) { - require_once 'Zend/Validate/Exception.php'; - throw new Zend_Validate_Exception('Region must be given for IBAN validation'); + if ($locale !== false) { + require_once 'Zend/Locale.php'; + $locale = Zend_Locale::findLocale($locale); + if (strlen($locale) < 4) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Region must be given for IBAN validation'); + } } $this->_locale = $locale; diff --git a/lib/zend/Zend/Validate/Identical.php b/lib/zend/Zend/Validate/Identical.php index 4ccbb866e35..b78cb2b0c9e 100644 --- a/lib/zend/Zend/Validate/Identical.php +++ b/lib/zend/Zend/Validate/Identical.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -25,7 +25,7 @@ require_once 'Zend/Validate/Abstract.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Identical extends Zend_Validate_Abstract @@ -42,7 +42,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract * @var array */ protected $_messageTemplates = array( - self::NOT_SAME => "The token '%token%' does not match the given token '%value%'", + self::NOT_SAME => "The two given tokens do not match", self::MISSING_TOKEN => 'No token was provided to match against', ); @@ -59,6 +59,7 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract */ protected $_tokenString; protected $_token; + protected $_strict = true; /** * Sets validator options @@ -68,11 +69,31 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract */ public function __construct($token = null) { - if (null !== $token) { + if ($token instanceof Zend_Config) { + $token = $token->toArray(); + } + + if (is_array($token) && array_key_exists('token', $token)) { + if (array_key_exists('strict', $token)) { + $this->setStrict($token['strict']); + } + + $this->setToken($token['token']); + } else if (null !== $token) { $this->setToken($token); } } + /** + * Retrieve token + * + * @return string + */ + public function getToken() + { + return $this->_token; + } + /** * Set token against which to compare * @@ -87,13 +108,24 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract } /** - * Retrieve token + * Returns the strict parameter * - * @return string + * @return boolean */ - public function getToken() + public function getStrict() { - return $this->_token; + return $this->_strict; + } + + /** + * Sets the strict parameter + * + * @param Zend_Validate_Identical + */ + public function setStrict($strict) + { + $this->_strict = (boolean) $strict; + return $this; } /** @@ -103,19 +135,26 @@ class Zend_Validate_Identical extends Zend_Validate_Abstract * matches that token. * * @param mixed $value + * @param array $context * @return boolean */ - public function isValid($value) + public function isValid($value, $context = null) { $this->_setValue((string) $value); - $token = $this->getToken(); + + if (($context !== null) && isset($context) && array_key_exists($this->getToken(), $context)) { + $token = $context[$this->getToken()]; + } else { + $token = $this->getToken(); + } if ($token === null) { $this->_error(self::MISSING_TOKEN); return false; } - if ($value !== $token) { + $strict = $this->getStrict(); + if (($strict && ($value !== $token)) || (!$strict && ($value != $token))) { $this->_error(self::NOT_SAME); return false; } diff --git a/lib/zend/Zend/Validate/InArray.php b/lib/zend/Zend/Validate/InArray.php index 3bcfbb4f9f4..9b4ae7f34c7 100644 --- a/lib/zend/Zend/Validate/InArray.php +++ b/lib/zend/Zend/Validate/InArray.php @@ -1,5 +1,4 @@ "'%value%' was not found in the haystack" + self::NOT_IN_ARRAY => "'%value%' was not found in the haystack", ); /** @@ -57,19 +53,54 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract * * @var boolean */ - protected $_strict; + protected $_strict = false; + + /** + * Whether a recursive search should be done + * + * @var boolean + */ + protected $_recursive = false; /** * Sets validator options * - * @param array $haystack - * @param boolean $strict + * @param array|Zend_Config $haystack * @return void */ - public function __construct(array $haystack, $strict = false) + public function __construct($options) { - $this->setHaystack($haystack) - ->setStrict($strict); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Array expected as parameter'); + } else { + $count = func_num_args(); + $temp = array(); + if ($count > 1) { + $temp['haystack'] = func_get_arg(0); + $temp['strict'] = func_get_arg(1); + $options = $temp; + } else { + $temp = func_get_arg(0); + if (!array_key_exists('haystack', $options)) { + $options = array(); + $options['haystack'] = $temp; + } else { + $options = $temp; + } + } + } + + $this->setHaystack($options['haystack']); + if (array_key_exists('strict', $options)) { + $this->setStrict($options['strict']); + } + + if (array_key_exists('recursive', $options)) { + $this->setRecursive($options['recursive']); + } } /** @@ -112,7 +143,29 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract */ public function setStrict($strict) { - $this->_strict = $strict; + $this->_strict = (boolean) $strict; + return $this; + } + + /** + * Returns the recursive option + * + * @return boolean + */ + public function getRecursive() + { + return $this->_recursive; + } + + /** + * Sets the recursive option + * + * @param boolean $recursive + * @return Zend_Validate_InArray Provides a fluent interface + */ + public function setRecursive($recursive) + { + $this->_recursive = (boolean) $recursive; return $this; } @@ -128,11 +181,24 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract public function isValid($value) { $this->_setValue($value); - if (!in_array($value, $this->_haystack, $this->_strict)) { - $this->_error(self::NOT_IN_ARRAY); - return false; + if ($this->getRecursive()) { + $iterator = new RecursiveIteratorIterator(new RecursiveArrayIterator($this->_haystack)); + foreach($iterator as $element) { + if ($this->_strict) { + if ($element === $value) { + return true; + } + } else if ($element == $value) { + return true; + } + } + } else { + if (in_array($value, $this->_haystack, $this->_strict)) { + return true; + } } - return true; - } + $this->_error(self::NOT_IN_ARRAY); + return false; + } } diff --git a/lib/zend/Zend/Validate/Int.php b/lib/zend/Zend/Validate/Int.php index 9de41b4eb5c..828e7232409 100644 --- a/lib/zend/Zend/Validate/Int.php +++ b/lib/zend/Zend/Validate/Int.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -32,7 +32,7 @@ require_once 'Zend/Locale/Format.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Int extends Zend_Validate_Abstract @@ -44,8 +44,8 @@ class Zend_Validate_Int extends Zend_Validate_Abstract * @var array */ protected $_messageTemplates = array( - self::INVALID => "Invalid type given, value should be a string or a integer", - self::NOT_INT => "'%value%' does not appear to be an integer" + self::INVALID => "Invalid type given, value should be string or integer", + self::NOT_INT => "'%value%' does not appear to be an integer", ); protected $_locale; @@ -53,10 +53,29 @@ class Zend_Validate_Int extends Zend_Validate_Abstract /** * Constructor for the integer validator * - * @param string|Zend_Locale $locale + * @param string|Zend_Config|Zend_Locale $locale */ public function __construct($locale = null) { + if ($locale instanceof Zend_Config) { + $locale = $locale->toArray(); + } + + if (is_array($locale)) { + if (array_key_exists('locale', $locale)) { + $locale = $locale['locale']; + } else { + $locale = null; + } + } + + if (empty($locale)) { + require_once 'Zend/Registry.php'; + if (Zend_Registry::isRegistered('Zend_Locale')) { + $locale = Zend_Registry::get('Zend_Locale'); + } + } + if ($locale !== null) { $this->setLocale($locale); } @@ -97,6 +116,10 @@ class Zend_Validate_Int extends Zend_Validate_Abstract return false; } + if (is_int($value)) { + return true; + } + $this->_setValue($value); if ($this->_locale === null) { $locale = localeconv(); @@ -110,8 +133,7 @@ class Zend_Validate_Int extends Zend_Validate_Abstract } else { try { - if (!Zend_Locale_Format::isInteger($value, array('locale' => 'en')) && - !Zend_Locale_Format::isInteger($value, array('locale' => $this->_locale))) { + if (!Zend_Locale_Format::isInteger($value, array('locale' => $this->_locale))) { $this->_error(self::NOT_INT); return false; } diff --git a/lib/zend/Zend/Validate/Interface.php b/lib/zend/Zend/Validate/Interface.php index fda473832a5..6f020e0a1b8 100644 --- a/lib/zend/Zend/Validate/Interface.php +++ b/lib/zend/Zend/Validate/Interface.php @@ -1,5 +1,4 @@ "Invalid type given, value should be a string", - self::NOT_IP_ADDRESS => "'%value%' does not appear to be a valid IP address" + self::NOT_IP_ADDRESS => "'%value%' does not appear to be a valid IP address", ); + /** + * internal options + * + * @var array + */ + protected $_options = array( + 'allowipv6' => true, + 'allowipv4' => true + ); + + /** + * Sets validator options + * + * @param array $options OPTIONAL Options to set, see the manual for all available options + * @return void + */ + public function __construct($options = array()) + { + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp['allowipv6'] = array_shift($options); + if (!empty($options)) { + $temp['allowipv4'] = array_shift($options); + } + + $options = $temp; + } + + $options += $this->_options; + $this->setOptions($options); + } + + /** + * Returns all set options + * + * @return array + */ + public function getOptions() + { + return $this->_options; + } + + /** + * Sets the options for this validator + * + * @param array $options + * @return Zend_Validate_Ip + */ + public function setOptions($options) + { + if (array_key_exists('allowipv6', $options)) { + $this->_options['allowipv6'] = (boolean) $options['allowipv6']; + } + + if (array_key_exists('allowipv4', $options)) { + $this->_options['allowipv4'] = (boolean) $options['allowipv4']; + } + + if (!$this->_options['allowipv4'] && !$this->_options['allowipv6']) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Nothing to validate. Check your options'); + } + + return $this; + } + /** * Defined by Zend_Validate_Interface * @@ -59,18 +127,65 @@ class Zend_Validate_Ip extends Zend_Validate_Abstract } $this->_setValue($value); - - if ((ip2long($value) === false) || (long2ip(ip2long($value)) !== $value)) { - if (!function_exists('inet_pton')) { - $this->_error(self::NOT_IP_ADDRESS); - return false; - } else if ((@inet_pton($value) === false) ||(inet_ntop(@inet_pton($value)) !== $value)) { - $this->_error(self::NOT_IP_ADDRESS); - return false; - } + if (($this->_options['allowipv4'] && !$this->_options['allowipv6'] && !$this->_validateIPv4($value)) || + (!$this->_options['allowipv4'] && $this->_options['allowipv6'] && !$this->_validateIPv6($value)) || + ($this->_options['allowipv4'] && $this->_options['allowipv6'] && !$this->_validateIPv4($value) && !$this->_validateIPv6($value))) { + $this->_error(self::NOT_IP_ADDRESS); + return false; } return true; } + /** + * Validates an IPv4 address + * + * @param string $value + */ + protected function _validateIPv4($value) { + $ip2long = ip2long($value); + if($ip2long === false) { + return false; + } + + return $value == long2ip($ip2long); + } + + /** + * Validates an IPv6 address + * + * @param string $value Value to check against + * @return boolean True when $value is a valid ipv6 address + * False otherwise + */ + protected function _validateIPv6($value) { + if (strlen($value) < 3) { + return $value == '::'; + } + + if (strpos($value, '.')) { + $lastcolon = strrpos($value, ':'); + if (!($lastcolon && $this->_validateIPv4(substr($value, $lastcolon + 1)))) { + return false; + } + + $value = substr($value, 0, $lastcolon) . ':0:0'; + } + + if (strpos($value, '::') === false) { + return preg_match('/\A(?:[a-f0-9]{1,4}:){7}[a-f0-9]{1,4}\z/i', $value); + } + + $colonCount = substr_count($value, ':'); + if ($colonCount < 8) { + return preg_match('/\A(?::|(?:[a-f0-9]{1,4}:)+):(?:(?:[a-f0-9]{1,4}:)*[a-f0-9]{1,4})?\z/i', $value); + } + + // special case with ending or starting double colon + if ($colonCount == 8) { + return preg_match('/\A(?:::)?(?:[a-f0-9]{1,4}:){6}[a-f0-9]{1,4}(?:::)?\z/i', $value); + } + + return false; + } } diff --git a/lib/zend/Zend/Validate/LessThan.php b/lib/zend/Zend/Validate/LessThan.php index ecbd70879b5..ef3e195da17 100644 --- a/lib/zend/Zend/Validate/LessThan.php +++ b/lib/zend/Zend/Validate/LessThan.php @@ -1,5 +1,4 @@ toArray(); + } + + if (is_array($max)) { + if (array_key_exists('max', $max)) { + $max = $max['max']; + } else { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception("Missing option 'max'"); + } + } + $this->setMax($max); } diff --git a/lib/zend/Zend/Validate/NotEmpty.php b/lib/zend/Zend/Validate/NotEmpty.php index 2680b5ae9cd..7cc53fef620 100644 --- a/lib/zend/Zend/Validate/NotEmpty.php +++ b/lib/zend/Zend/Validate/NotEmpty.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,14 +27,38 @@ require_once 'Zend/Validate/Abstract.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract { + const BOOLEAN = 1; + const INTEGER = 2; + const FLOAT = 4; + const STRING = 8; + const ZERO = 16; + const EMPTY_ARRAY = 32; + const NULL = 64; + const PHP = 127; + const SPACE = 128; + const ALL = 255; + const INVALID = 'notEmptyInvalid'; const IS_EMPTY = 'isEmpty'; + protected $_constants = array( + self::BOOLEAN => 'boolean', + self::INTEGER => 'integer', + self::FLOAT => 'float', + self::STRING => 'string', + self::ZERO => 'zero', + self::EMPTY_ARRAY => 'array', + self::NULL => 'null', + self::PHP => 'php', + self::SPACE => 'space', + self::ALL => 'all' + ); + /** * @var array */ @@ -43,6 +67,80 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract self::INVALID => "Invalid type given, value should be float, string, array, boolean or integer", ); + /** + * Internal type to detect + * + * @var integer + */ + protected $_type = 237; + + /** + * Constructor + * + * @param string|array|Zend_Config $options OPTIONAL + */ + public function __construct($options = null) + { + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp = array(); + if (!empty($options)) { + $temp['type'] = array_shift($options); + } + + $options = $temp; + } + + if (is_array($options) && array_key_exists('type', $options)) { + $this->setType($options['type']); + } + } + + /** + * Returns the set types + * + * @return array + */ + public function getType() + { + return $this->_type; + } + + /** + * Set the types + * + * @param integer|array $type + * @throws Zend_Validate_Exception + * @return Zend_Validate_NotEmpty + */ + public function setType($type = null) + { + if (is_array($type)) { + $detected = 0; + foreach($type as $value) { + if (is_int($value)) { + $detected += $value; + } else if (in_array($value, $this->_constants)) { + $detected += array_search($value, $this->_constants); + } + } + + $type = $detected; + } else if (is_string($type) && in_array($type, $this->_constants)) { + $type = array_search($type, $this->_constants); + } + + if (!is_int($type) || ($type < 0) || ($type > self::ALL)) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception('Unknown type'); + } + + $this->_type = $type; + return $this; + } + /** * Defined by Zend_Validate_Interface * @@ -59,21 +157,81 @@ class Zend_Validate_NotEmpty extends Zend_Validate_Abstract return false; } + $type = $this->getType(); $this->_setValue($value); - if (is_string($value) - && (('' === $value) - || preg_match('/^\s+$/s', $value)) - ) { - $this->_error(self::IS_EMPTY); - return false; - } elseif (is_int($value) && (0 === $value)) { - return true; - } elseif (!is_string($value) && empty($value)) { - $this->_error(self::IS_EMPTY); - return false; + + // SPACE (' ') + if ($type >= self::SPACE) { + $type -= self::SPACE; + if (is_string($value) && (preg_match('/^\s+$/s', $value))) { + $this->_error(self::IS_EMPTY); + return false; + } + } + + // NULL (null) + if ($type >= self::NULL) { + $type -= self::NULL; + if (is_null($value)) { + $this->_error(self::IS_EMPTY); + return false; + } + } + + // EMPTY_ARRAY (array()) + if ($type >= self::EMPTY_ARRAY) { + $type -= self::EMPTY_ARRAY; + if (is_array($value) && ($value == array())) { + $this->_error(self::IS_EMPTY); + return false; + } + } + + // ZERO ('0') + if ($type >= self::ZERO) { + $type -= self::ZERO; + if (is_string($value) && ($value == '0')) { + $this->_error(self::IS_EMPTY); + return false; + } + } + + // STRING ('') + if ($type >= self::STRING) { + $type -= self::STRING; + if (is_string($value) && ($value == '')) { + $this->_error(self::IS_EMPTY); + return false; + } + } + + // FLOAT (0.0) + if ($type >= self::FLOAT) { + $type -= self::FLOAT; + if (is_float($value) && ($value == 0.0)) { + $this->_error(self::IS_EMPTY); + return false; + } + } + + // INTEGER (0) + if ($type >= self::INTEGER) { + $type -= self::INTEGER; + if (is_int($value) && ($value == 0)) { + $this->_error(self::IS_EMPTY); + return false; + } + } + + // BOOLEAN (false) + if ($type >= self::BOOLEAN) { + $type -= self::BOOLEAN; + if (is_bool($value) && ($value == false)) { + $this->_error(self::IS_EMPTY); + return false; + } } return true; } - } diff --git a/lib/zend/Zend/Validate/Regex.php b/lib/zend/Zend/Validate/Regex.php index 7697ccf1f6f..3c31eb9789e 100644 --- a/lib/zend/Zend/Validate/Regex.php +++ b/lib/zend/Zend/Validate/Regex.php @@ -1,5 +1,4 @@ "Invalid type given, value should be string, integer or float", - self::NOT_MATCH => "'%value%' does not match against pattern '%pattern%'" + self::NOT_MATCH => "'%value%' does not match against pattern '%pattern%'", + self::ERROROUS => "There was an internal error while using the pattern '%pattern%'", ); /** @@ -63,11 +62,25 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract /** * Sets validator options * - * @param string $pattern + * @param string|Zend_Config $pattern + * @throws Zend_Validate_Exception On missing 'pattern' parameter * @return void */ public function __construct($pattern) { + if ($pattern instanceof Zend_Config) { + $pattern = $pattern->toArray(); + } + + if (is_array($pattern)) { + if (array_key_exists('pattern', $pattern)) { + $pattern = $pattern['pattern']; + } else { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception("Missing option 'pattern'"); + } + } + $this->setPattern($pattern); } @@ -85,11 +98,19 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract * Sets the pattern option * * @param string $pattern + * @throws Zend_Validate_Exception if there is a fatal error in pattern matching * @return Zend_Validate_Regex Provides a fluent interface */ public function setPattern($pattern) { $this->_pattern = (string) $pattern; + $status = @preg_match($this->_pattern, "Test"); + + if (false === $status) { + require_once 'Zend/Validate/Exception.php'; + throw new Zend_Validate_Exception("Internal error while using the pattern '$this->_pattern'"); + } + return $this; } @@ -99,7 +120,6 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract * Returns true if and only if $value matches against the pattern option * * @param string $value - * @throws Zend_Validate_Exception if there is a fatal error in pattern matching * @return boolean */ public function isValid($value) @@ -113,14 +133,15 @@ class Zend_Validate_Regex extends Zend_Validate_Abstract $status = @preg_match($this->_pattern, $value); if (false === $status) { - require_once 'Zend/Validate/Exception.php'; - throw new Zend_Validate_Exception("Internal error matching pattern '$this->_pattern' against value '$value'"); + $this->_error(self::ERROROUS); + return false; } + if (!$status) { $this->_error(self::NOT_MATCH); return false; } + return true; } - } diff --git a/lib/zend/Zend/Validate/Sitemap/Changefreq.php b/lib/zend/Zend/Validate/Sitemap/Changefreq.php index 33d07a06c48..dc7cb3dbb65 100644 --- a/lib/zend/Zend/Validate/Sitemap/Changefreq.php +++ b/lib/zend/Zend/Validate/Sitemap/Changefreq.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Validate/Abstract.php'; * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract @@ -42,7 +42,8 @@ class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract * Validation key for not valid * */ - const NOT_VALID = 'invalidSitemapChangefreq'; + const NOT_VALID = 'sitemapChangefreqNotValid'; + const INVALID = 'sitemapChangefreqInvalid'; /** * Validation failure message template definitions @@ -50,7 +51,8 @@ class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is not a valid sitemap changefreq", + self::NOT_VALID => "'%value%' is no valid sitemap changefreq", + self::INVALID => "Invalid type given, the value should be a string", ); /** @@ -73,8 +75,12 @@ class Zend_Validate_Sitemap_Changefreq extends Zend_Validate_Abstract */ public function isValid($value) { - $this->_setValue($value); + if (!is_string($value)) { + $this->_error(self::INVALID); + return false; + } + $this->_setValue($value); if (!is_string($value)) { return false; } diff --git a/lib/zend/Zend/Validate/Sitemap/Lastmod.php b/lib/zend/Zend/Validate/Sitemap/Lastmod.php index cc9adfa2f6d..cd3932ad9fc 100644 --- a/lib/zend/Zend/Validate/Sitemap/Lastmod.php +++ b/lib/zend/Zend/Validate/Sitemap/Lastmod.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Validate/Abstract.php'; * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract @@ -42,13 +42,14 @@ class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract * Regular expression to use when validating * */ - const LASTMOD_REGEX = '/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])(T([0-1][0-9]|2[0-3])(:[0-5][0-9]){2}(\\+|-)([0-1][0-9]|2[0-3]):[0-5][0-9])?$/m'; + const LASTMOD_REGEX = '/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])(T([0-1][0-9]|2[0-3])(:[0-5][0-9])(:[0-5][0-9])?(\\+|-)([0-1][0-9]|2[0-3]):[0-5][0-9])?$/'; /** * Validation key for not valid * */ - const NOT_VALID = 'invalidSitemapLastmod'; + const NOT_VALID = 'sitemapLastmodNotValid'; + const INVALID = 'sitemapLastmodInvalid'; /** * Validation failure message template definitions @@ -56,7 +57,8 @@ class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is not a valid sitemap lastmod", + self::NOT_VALID => "'%value%' is no valid sitemap lastmod", + self::INVALID => "Invalid type given, the value should be a string", ); /** @@ -69,13 +71,18 @@ class Zend_Validate_Sitemap_Lastmod extends Zend_Validate_Abstract */ public function isValid($value) { - $this->_setValue($value); - if (!is_string($value)) { + $this->_error(self::INVALID); return false; } - return @preg_match(self::LASTMOD_REGEX, $value) == 1; - } + $this->_setValue($value); + $result = @preg_match(self::LASTMOD_REGEX, $value); + if ($result != 1) { + $this->_error(self::NOT_VALID); + return false; + } + return true; + } } diff --git a/lib/zend/Zend/Validate/Sitemap/Loc.php b/lib/zend/Zend/Validate/Sitemap/Loc.php index 70cbe391ab7..4a8f62b1044 100644 --- a/lib/zend/Zend/Validate/Sitemap/Loc.php +++ b/lib/zend/Zend/Validate/Sitemap/Loc.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -38,7 +38,7 @@ require_once 'Zend/Uri.php'; * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract @@ -47,7 +47,8 @@ class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract * Validation key for not valid * */ - const NOT_VALID = 'invalidSitemapLoc'; + const NOT_VALID = 'sitemapLocNotValid'; + const INVALID = 'sitemapLocInvalid'; /** * Validation failure message template definitions @@ -55,7 +56,8 @@ class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is not a valid sitemap location", + self::NOT_VALID => "'%value%' is no valid sitemap location", + self::INVALID => "Invalid type given, the value should be a string", ); /** @@ -68,12 +70,18 @@ class Zend_Validate_Sitemap_Loc extends Zend_Validate_Abstract */ public function isValid($value) { - $this->_setValue($value); - if (!is_string($value)) { + $this->_error(self::INVALID); return false; } - return Zend_Uri::check($value); + $this->_setValue($value); + $result = Zend_Uri::check($value); + if ($result !== true) { + $this->_error(self::NOT_VALID); + return false; + } + + return true; } } diff --git a/lib/zend/Zend/Validate/Sitemap/Priority.php b/lib/zend/Zend/Validate/Sitemap/Priority.php index e5b4db86b6a..1cabb8b4d24 100644 --- a/lib/zend/Zend/Validate/Sitemap/Priority.php +++ b/lib/zend/Zend/Validate/Sitemap/Priority.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/Validate/Abstract.php'; * @category Zend * @package Zend_Validate * @subpackage Sitemap - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract @@ -42,7 +42,8 @@ class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract * Validation key for not valid * */ - const NOT_VALID = 'invalidSitemapPriority'; + const NOT_VALID = 'sitemapPriorityNotValid'; + const INVALID = 'sitemapPriorityInvalid'; /** * Validation failure message template definitions @@ -50,7 +51,8 @@ class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract * @var array */ protected $_messageTemplates = array( - self::NOT_VALID => "'%value%' is not a valid sitemap priority", + self::NOT_VALID => "'%value%' is no valid sitemap priority", + self::INVALID => "Invalid type given, the value should be a integer, a float or a numeric string", ); /** @@ -63,13 +65,18 @@ class Zend_Validate_Sitemap_Priority extends Zend_Validate_Abstract */ public function isValid($value) { - $this->_setValue($value); - if (!is_numeric($value)) { + $this->_error(self::INVALID); return false; } - $value = (float)$value; - return $value >= 0 && $value <= 1; + $this->_setValue($value); + $value = (float) $value; + if ($value < 0 || $value > 1) { + $this->_error(self::NOT_VALID); + return false; + } + + return true; } } diff --git a/lib/zend/Zend/Validate/StringLength.php b/lib/zend/Zend/Validate/StringLength.php index b67d5292b2a..313b6ea8a84 100644 --- a/lib/zend/Zend/Validate/StringLength.php +++ b/lib/zend/Zend/Validate/StringLength.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -27,7 +27,7 @@ require_once 'Zend/Validate/Abstract.php'; /** * @category Zend * @package Zend_Validate - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_Validate_StringLength extends Zend_Validate_Abstract @@ -42,7 +42,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract protected $_messageTemplates = array( self::INVALID => "Invalid type given, value should be a string", self::TOO_SHORT => "'%value%' is less than %min% characters long", - self::TOO_LONG => "'%value%' is greater than %max% characters long" + self::TOO_LONG => "'%value%' is more than %max% characters long", ); /** @@ -79,15 +79,39 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract /** * Sets validator options * - * @param integer $min - * @param integer $max + * @param integer|array|Zend_Config $options * @return void */ - public function __construct($min = 0, $max = null, $encoding = null) + public function __construct($options = array()) { - $this->setMin($min); - $this->setMax($max); - $this->setEncoding($encoding); + if ($options instanceof Zend_Config) { + $options = $options->toArray(); + } else if (!is_array($options)) { + $options = func_get_args(); + $temp['min'] = array_shift($options); + if (!empty($options)) { + $temp['max'] = array_shift($options); + } + + if (!empty($options)) { + $temp['encoding'] = array_shift($options); + } + + $options = $temp; + } + + if (!array_key_exists('min', $options)) { + $options['min'] = 0; + } + + $this->setMin($options['min']); + if (array_key_exists('max', $options)) { + $this->setMax($options['max']); + } + + if (array_key_exists('encoding', $options)) { + $this->setEncoding($options['encoding']); + } } /** diff --git a/lib/zend/Zend/Version.php b/lib/zend/Zend/Version.php index 21281c75e9c..e1e8de226b4 100644 --- a/lib/zend/Zend/Version.php +++ b/lib/zend/Zend/Version.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Version - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -24,7 +24,7 @@ * * @category Zend * @package Zend_Version - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ final class Zend_Version @@ -32,7 +32,7 @@ final class Zend_Version /** * Zend Framework version identification - see compareVersion() */ - const VERSION = '1.9.5'; + const VERSION = '1.10.6'; /** * Compare the specified Zend Framework version string $version diff --git a/lib/zend/Zend/XmlRpc/Client.php b/lib/zend/Zend/XmlRpc/Client.php index 34c272d956e..bc5099a4926 100644 --- a/lib/zend/Zend/XmlRpc/Client.php +++ b/lib/zend/Zend/XmlRpc/Client.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -71,7 +71,7 @@ require_once 'Zend/XmlRpc/Fault.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client @@ -329,18 +329,28 @@ class Zend_XmlRpc_Client Zend_XmlRpc_Value::XMLRPC_TYPE_STRING, Zend_XmlRpc_Value::XMLRPC_TYPE_STRUCT, ); - $params = (array)$params; + + if (!is_array($params)) { + $params = array($params); + } foreach ($params as $key => $param) { + + if ($param instanceof Zend_XmlRpc_Value) { + continue; + } + $type = Zend_XmlRpc_Value::AUTO_DETECT_TYPE; foreach ($signatures as $signature) { if (!is_array($signature)) { continue; } + if (isset($signature['parameters'][$key])) { $type = $signature['parameters'][$key]; $type = in_array($type, $validTypes) ? $type : Zend_XmlRpc_Value::AUTO_DETECT_TYPE; } } + $params[$key] = Zend_XmlRpc_Value::getXmlRpcValue($param, $type); } } diff --git a/lib/zend/Zend/XmlRpc/Client/Exception.php b/lib/zend/Zend/XmlRpc/Client/Exception.php index d03d1f3b75a..0192b5ae12c 100644 --- a/lib/zend/Zend/XmlRpc/Client/Exception.php +++ b/lib/zend/Zend/XmlRpc/Client/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/XmlRpc/Exception.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_Exception extends Zend_XmlRpc_Exception diff --git a/lib/zend/Zend/XmlRpc/Client/FaultException.php b/lib/zend/Zend/XmlRpc/Client/FaultException.php index 77ad3a1628c..bedd26aa805 100644 --- a/lib/zend/Zend/XmlRpc/Client/FaultException.php +++ b/lib/zend/Zend/XmlRpc/Client/FaultException.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Client/Exception.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_FaultException extends Zend_XmlRpc_Client_Exception diff --git a/lib/zend/Zend/XmlRpc/Client/HttpException.php b/lib/zend/Zend/XmlRpc/Client/HttpException.php index 35a018dd300..2a9ca37fb52 100644 --- a/lib/zend/Zend/XmlRpc/Client/HttpException.php +++ b/lib/zend/Zend/XmlRpc/Client/HttpException.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -34,7 +34,7 @@ require_once 'Zend/XmlRpc/Client/Exception.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_HttpException extends Zend_XmlRpc_Client_Exception diff --git a/lib/zend/Zend/XmlRpc/Client/IntrospectException.php b/lib/zend/Zend/XmlRpc/Client/IntrospectException.php index 67bc2ace60b..9cf0158a1e1 100644 --- a/lib/zend/Zend/XmlRpc/Client/IntrospectException.php +++ b/lib/zend/Zend/XmlRpc/Client/IntrospectException.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/XmlRpc/Client/Exception.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_IntrospectException extends Zend_XmlRpc_Client_Exception diff --git a/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php b/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php index 5d980dcd07e..dcfd98e9282 100644 --- a/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php +++ b/lib/zend/Zend/XmlRpc/Client/ServerIntrospection.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_ServerIntrospection @@ -144,6 +144,11 @@ class Zend_XmlRpc_Client_ServerIntrospection public function getMethodSignature($method) { $signature = $this->_system->methodSignature($method); + if (!is_array($signature)) { + $error = 'Invalid signature for method "' . $method . '"'; + require_once 'Zend/XmlRpc/Client/IntrospectException.php'; + throw new Zend_XmlRpc_Client_IntrospectException($error); + } return $signature; } diff --git a/lib/zend/Zend/XmlRpc/Client/ServerProxy.php b/lib/zend/Zend/XmlRpc/Client/ServerProxy.php index ccf9efdcd95..3231230c098 100644 --- a/lib/zend/Zend/XmlRpc/Client/ServerProxy.php +++ b/lib/zend/Zend/XmlRpc/Client/ServerProxy.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Client - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Client_ServerProxy diff --git a/lib/zend/Zend/XmlRpc/Exception.php b/lib/zend/Zend/XmlRpc/Exception.php index 3eb1b75c7c7..ca688ad6321 100644 --- a/lib/zend/Zend/XmlRpc/Exception.php +++ b/lib/zend/Zend/XmlRpc/Exception.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Exception.php'; /** * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Exception extends Zend_Exception diff --git a/lib/zend/Zend/XmlRpc/Fault.php b/lib/zend/Zend/XmlRpc/Fault.php index 0aa5a79fddf..265984ade8b 100644 --- a/lib/zend/Zend/XmlRpc/Fault.php +++ b/lib/zend/Zend/XmlRpc/Fault.php @@ -14,7 +14,7 @@ * * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -36,7 +36,7 @@ require_once 'Zend/XmlRpc/Value.php'; * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Fault @@ -168,6 +168,7 @@ class Zend_XmlRpc_Fault public function setEncoding($encoding) { $this->_encoding = $encoding; + Zend_XmlRpc_Value::setEncoding($encoding); return $this; } @@ -202,7 +203,7 @@ class Zend_XmlRpc_Fault } catch (Exception $e) { // Not valid XML require_once 'Zend/XmlRpc/Exception.php'; - throw new Zend_XmlRpc_Exception('Failed to parse XML fault: ' . $e->getMessage(), 500); + throw new Zend_XmlRpc_Exception('Failed to parse XML fault: ' . $e->getMessage(), 500, $e); } // Check for fault @@ -218,8 +219,7 @@ class Zend_XmlRpc_Fault } $structXml = $xml->fault->value->asXML(); - $structXml = preg_replace('/<\?xml version=.*?\?>/i', '', $structXml); - $struct = Zend_XmlRpc_Value::getXmlRpcValue(trim($structXml), Zend_XmlRpc_Value::XML_STRING); + $struct = Zend_XmlRpc_Value::getXmlRpcValue($structXml, Zend_XmlRpc_Value::XML_STRING); $struct = $struct->getValue(); if (isset($struct['faultCode'])) { @@ -276,7 +276,7 @@ class Zend_XmlRpc_Fault * * @return string */ - public function saveXML() + public function saveXml() { // Create fault value $faultStruct = array( @@ -284,16 +284,15 @@ class Zend_XmlRpc_Fault 'faultString' => $this->getMessage() ); $value = Zend_XmlRpc_Value::getXmlRpcValue($faultStruct); - $valueDOM = new DOMDocument('1.0', $this->getEncoding()); - $valueDOM->loadXML($value->saveXML()); - // Build response XML - $dom = new DOMDocument('1.0', $this->getEncoding()); - $r = $dom->appendChild($dom->createElement('methodResponse')); - $f = $r->appendChild($dom->createElement('fault')); - $f->appendChild($dom->importNode($valueDOM->documentElement, 1)); + $generator = Zend_XmlRpc_Value::getGenerator(); + $generator->openElement('methodResponse') + ->openElement('fault'); + $value->generateXml(); + $generator->closeElement('fault') + ->closeElement('methodResponse'); - return $dom->saveXML(); + return $generator->flush(); } /** diff --git a/lib/zend/Zend/XmlRpc/Request.php b/lib/zend/Zend/XmlRpc/Request.php index 0f810f3847a..5a05073fca2 100644 --- a/lib/zend/Zend/XmlRpc/Request.php +++ b/lib/zend/Zend/XmlRpc/Request.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -41,7 +41,7 @@ require_once 'Zend/XmlRpc/Fault.php'; * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -116,6 +116,7 @@ class Zend_XmlRpc_Request public function setEncoding($encoding) { $this->_encoding = $encoding; + Zend_XmlRpc_Value::setEncoding($encoding); return $this; } @@ -303,7 +304,7 @@ class Zend_XmlRpc_Request } try { - $xml = @new SimpleXMLElement($request); + $xml = new SimpleXMLElement($request); } catch (Exception $e) { // Not valid XML $this->_fault = new Zend_XmlRpc_Fault(631); @@ -401,29 +402,29 @@ class Zend_XmlRpc_Request * * @return string */ - public function saveXML() + public function saveXml() { $args = $this->_getXmlRpcParams(); $method = $this->getMethod(); - $dom = new DOMDocument('1.0', $this->getEncoding()); - $mCall = $dom->appendChild($dom->createElement('methodCall')); - $mName = $mCall->appendChild($dom->createElement('methodName', $method)); + $generator = Zend_XmlRpc_Value::getGenerator(); + $generator->openElement('methodCall') + ->openElement('methodName', $method) + ->closeElement('methodName'); if (is_array($args) && count($args)) { - $params = $mCall->appendChild($dom->createElement('params')); + $generator->openElement('params'); foreach ($args as $arg) { - /* @var $arg Zend_XmlRpc_Value */ - $argDOM = new DOMDocument('1.0', $this->getEncoding()); - $argDOM->loadXML($arg->saveXML()); - - $param = $params->appendChild($dom->createElement('param')); - $param->appendChild($dom->importNode($argDOM->documentElement, 1)); + $generator->openElement('param'); + $arg->generateXml(); + $generator->closeElement('param'); } + $generator->closeElement('params'); } + $generator->closeElement('methodCall'); - return $dom->saveXML(); + return $generator->flush(); } /** diff --git a/lib/zend/Zend/XmlRpc/Request/Http.php b/lib/zend/Zend/XmlRpc/Request/Http.php index 5ace7b85a03..fd438f67b44 100644 --- a/lib/zend/Zend/XmlRpc/Request/Http.php +++ b/lib/zend/Zend/XmlRpc/Request/Http.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,7 +32,7 @@ require_once 'Zend/XmlRpc/Request.php'; * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/XmlRpc/Request/Stdin.php b/lib/zend/Zend/XmlRpc/Request/Stdin.php index c3757bb05c9..b81005e17e9 100644 --- a/lib/zend/Zend/XmlRpc/Request/Stdin.php +++ b/lib/zend/Zend/XmlRpc/Request/Stdin.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -32,7 +32,7 @@ require_once 'Zend/XmlRpc/Request.php'; * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/XmlRpc/Response.php b/lib/zend/Zend/XmlRpc/Response.php index 6b99dc0bf73..144b7bb6ab9 100644 --- a/lib/zend/Zend/XmlRpc/Response.php +++ b/lib/zend/Zend/XmlRpc/Response.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -35,7 +35,7 @@ require_once 'Zend/XmlRpc/Fault.php'; * * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -89,6 +89,7 @@ class Zend_XmlRpc_Response public function setEncoding($encoding) { $this->_encoding = $encoding; + Zend_XmlRpc_Value::setEncoding($encoding); return $this; } @@ -176,7 +177,7 @@ class Zend_XmlRpc_Response } try { - $xml = @new SimpleXMLElement($response); + $xml = new SimpleXMLElement($response); } catch (Exception $e) { // Not valid XML $this->_fault = new Zend_XmlRpc_Fault(651); @@ -204,8 +205,7 @@ class Zend_XmlRpc_Response throw new Zend_XmlRpc_Value_Exception('Missing XML-RPC value in XML'); } $valueXml = $xml->params->param->value->asXML(); - $valueXml = preg_replace('/<\?xml version=.*?\?>/i', '', $valueXml); - $value = Zend_XmlRpc_Value::getXmlRpcValue(trim($valueXml), Zend_XmlRpc_Value::XML_STRING); + $value = Zend_XmlRpc_Value::getXmlRpcValue($valueXml, Zend_XmlRpc_Value::XML_STRING); } catch (Zend_XmlRpc_Value_Exception $e) { $this->_fault = new Zend_XmlRpc_Fault(653); $this->_fault->setEncoding($this->getEncoding()); @@ -221,20 +221,19 @@ class Zend_XmlRpc_Response * * @return string */ - public function saveXML() + public function saveXml() { $value = $this->_getXmlRpcReturn(); - $valueDOM = new DOMDocument('1.0', $this->getEncoding()); - $valueDOM->loadXML($value->saveXML()); + $generator = Zend_XmlRpc_Value::getGenerator(); + $generator->openElement('methodResponse') + ->openElement('params') + ->openElement('param'); + $value->generateXml(); + $generator->closeElement('param') + ->closeElement('params') + ->closeElement('methodResponse'); - $dom = new DOMDocument('1.0', $this->getEncoding()); - $response = $dom->appendChild($dom->createElement('methodResponse')); - $params = $response->appendChild($dom->createElement('params')); - $param = $params->appendChild($dom->createElement('param')); - - $param->appendChild($dom->importNode($valueDOM->documentElement, true)); - - return $dom->saveXML(); + return $generator->flush(); } /** diff --git a/lib/zend/Zend/XmlRpc/Response/Http.php b/lib/zend/Zend/XmlRpc/Response/Http.php index b0575c28903..751a4dc3189 100644 --- a/lib/zend/Zend/XmlRpc/Response/Http.php +++ b/lib/zend/Zend/XmlRpc/Response/Http.php @@ -14,7 +14,7 @@ * * @category Zend * @package Zend_Controller - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ @@ -29,7 +29,7 @@ require_once 'Zend/XmlRpc/Response.php'; * @uses Zend_XmlRpc_Response * @category Zend * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ diff --git a/lib/zend/Zend/XmlRpc/Server.php b/lib/zend/Zend/XmlRpc/Server.php index 69c198e0297..ed8c354da57 100644 --- a/lib/zend/Zend/XmlRpc/Server.php +++ b/lib/zend/Zend/XmlRpc/Server.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -111,7 +111,7 @@ require_once 'Zend/Server/Reflection/Method.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server extends Zend_Server_Abstract @@ -145,29 +145,35 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract * @var array */ protected $_typeMap = array( - 'i4' => 'i4', - 'int' => 'int', - 'integer' => 'int', - 'double' => 'double', - 'float' => 'double', - 'real' => 'double', - 'boolean' => 'boolean', - 'bool' => 'boolean', - 'true' => 'boolean', - 'false' => 'boolean', - 'string' => 'string', - 'str' => 'string', - 'base64' => 'base64', - 'dateTime.iso8601' => 'dateTime.iso8601', - 'date' => 'dateTime.iso8601', - 'time' => 'dateTime.iso8601', - 'time' => 'dateTime.iso8601', - 'array' => 'array', - 'struct' => 'struct', - 'null' => 'nil', - 'nil' => 'nil', - 'void' => 'void', - 'mixed' => 'struct' + 'i4' => 'i4', + 'int' => 'int', + 'integer' => 'int', + 'Zend_Crypt_Math_BigInteger' => 'i8', + 'i8' => 'i8', + 'ex:i8' => 'i8', + 'double' => 'double', + 'float' => 'double', + 'real' => 'double', + 'boolean' => 'boolean', + 'bool' => 'boolean', + 'true' => 'boolean', + 'false' => 'boolean', + 'string' => 'string', + 'str' => 'string', + 'base64' => 'base64', + 'dateTime.iso8601' => 'dateTime.iso8601', + 'date' => 'dateTime.iso8601', + 'time' => 'dateTime.iso8601', + 'time' => 'dateTime.iso8601', + 'Zend_Date' => 'dateTime.iso8601', + 'DateTime' => 'dateTime.iso8601', + 'array' => 'array', + 'struct' => 'struct', + 'null' => 'nil', + 'nil' => 'nil', + 'ex:nil' => 'nil', + 'void' => 'void', + 'mixed' => 'struct', ); /** @@ -386,6 +392,7 @@ class Zend_XmlRpc_Server extends Zend_Server_Abstract public function setEncoding($encoding) { $this->_encoding = $encoding; + Zend_XmlRpc_Value::setEncoding($encoding); return $this; } diff --git a/lib/zend/Zend/XmlRpc/Server/Cache.php b/lib/zend/Zend/XmlRpc/Server/Cache.php index b95fbbf2641..32ee69bd5a3 100644 --- a/lib/zend/Zend/XmlRpc/Server/Cache.php +++ b/lib/zend/Zend/XmlRpc/Server/Cache.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/Server/Cache.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Cache extends Zend_Server_Cache diff --git a/lib/zend/Zend/XmlRpc/Server/Exception.php b/lib/zend/Zend/XmlRpc/Server/Exception.php index 2088411f8fb..eb4fe1bed08 100644 --- a/lib/zend/Zend/XmlRpc/Server/Exception.php +++ b/lib/zend/Zend/XmlRpc/Server/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -33,7 +33,7 @@ require_once 'Zend/XmlRpc/Exception.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Exception extends Zend_XmlRpc_Exception diff --git a/lib/zend/Zend/XmlRpc/Server/Fault.php b/lib/zend/Zend/XmlRpc/Server/Fault.php index f6bf1863a26..82b851f34ad 100644 --- a/lib/zend/Zend/XmlRpc/Server/Fault.php +++ b/lib/zend/Zend/XmlRpc/Server/Fault.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -44,7 +44,7 @@ require_once 'Zend/XmlRpc/Fault.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_Fault extends Zend_XmlRpc_Fault diff --git a/lib/zend/Zend/XmlRpc/Server/System.php b/lib/zend/Zend/XmlRpc/Server/System.php index 8346ead4327..d49d0fc3e72 100644 --- a/lib/zend/Zend/XmlRpc/Server/System.php +++ b/lib/zend/Zend/XmlRpc/Server/System.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -26,7 +26,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Server - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Server_System @@ -137,7 +137,7 @@ class Zend_XmlRpc_Server_System $request->setMethod($method['methodName']); $request->setParams($method['params']); $response = $this->_server->handle($request); - if ($response instanceof Zend_XmlRpc_Fault + if ($response instanceof Zend_XmlRpc_Fault || $response->isFault() ) { $fault = $response; diff --git a/lib/zend/Zend/XmlRpc/Value.php b/lib/zend/Zend/XmlRpc/Value.php index 7adedbb233a..4d0fe8c2c94 100644 --- a/lib/zend/Zend/XmlRpc/Value.php +++ b/lib/zend/Zend/XmlRpc/Value.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ * from PHP variables, XML string or by specifing the exact XML-RPC natvie type * * @package Zend_XmlRpc - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value @@ -53,12 +53,12 @@ abstract class Zend_XmlRpc_Value /** * XML code representation of this object (will be calculated only once) */ - protected $_as_xml; + protected $_xml; /** - * DOMElement representation of object (will be calculated only once) + * @var Zend_XmlRpc_Generator_GeneratorAbstract */ - protected $_as_dom; + protected static $_generator; /** * Specify that the XML-RPC native type will be auto detected from a PHP variable type @@ -87,7 +87,6 @@ abstract class Zend_XmlRpc_Value const XMLRPC_TYPE_NIL = 'nil'; const XMLRPC_TYPE_APACHENIL = 'ex:nil'; - /** * Get the native XML-RPC type (the type is one of the Zend_XmlRpc_Value::XMLRPC_TYPE_* constants) * @@ -98,6 +97,49 @@ abstract class Zend_XmlRpc_Value return $this->_type; } + /** + * Get XML generator instance + * + * @return Zend_XmlRpc_Generator_GeneratorAbstract + */ + public static function getGenerator() + { + if (!self::$_generator) { + if (extension_loaded('xmlwriter')) { + require_once 'Zend/XmlRpc/Generator/XmlWriter.php'; + self::$_generator = new Zend_XmlRpc_Generator_XmlWriter(); + } else { + require_once 'Zend/XmlRpc/Generator/DomDocument.php'; + self::$_generator = new Zend_XmlRpc_Generator_DomDocument(); + } + } + + return self::$_generator; + } + + /** + * Sets XML generator instance + * + * @param Zend_XmlRpc_Generator_GeneratorAbstract $generator + * @return void + */ + public static function setGenerator(Zend_XmlRpc_Generator_GeneratorAbstract $generator) + { + self::$_generator = $generator; + } + + /** + * Changes the encoding of the generator + * + * @param string $encoding + * @return void + */ + public static function setEncoding($encoding) + { + $generator = self::getGenerator(); + $newGenerator = new $generator($encoding); + self::setGenerator($newGenerator); + } /** * Return the value of this object, convert the XML-RPC native value into a PHP variable @@ -112,31 +154,23 @@ abstract class Zend_XmlRpc_Value * * @return string */ - abstract public function saveXML(); - - /** - * Return DOMElement representation of object - * - * @return DOMElement - */ - public function getAsDOM() + public function saveXml() { - if (!$this->_as_dom) { - $doc = new DOMDocument('1.0'); - $doc->loadXML($this->saveXML()); - $this->_as_dom = $doc->documentElement; + if (!$this->_xml) { + $this->generateXml(); + $this->_xml = (string) $this->getGenerator(); } - - return $this->_as_dom; + return $this->_xml; } /** - * @param DOMDocument $dom - * @return mixed + * Generate XML code that represent a native XML/RPC value + * + * @return void */ - protected function _stripXmlDeclaration(DOMDocument $dom) + public function generateXml() { - return preg_replace('/<\?xml version="1.0"( encoding="[^\"]*")?\?>\n/u', '', $dom->saveXML()); + $this->_generateXml(); } /** @@ -227,7 +261,7 @@ abstract class Zend_XmlRpc_Value * @return Zend_XmlRpc_Value * @static */ - private static function _phpVarToNativeXmlRpc($value) + protected static function _phpVarToNativeXmlRpc($value) { switch (gettype($value)) { case 'object': @@ -236,6 +270,16 @@ abstract class Zend_XmlRpc_Value return $value; } + if ($value instanceof Zend_Crypt_Math_BigInteger) { + require_once 'Zend/XmlRpc/Value/BigInteger.php'; + return new Zend_XmlRpc_Value_BigInteger($value); + } + + if ($value instanceof Zend_Date or $value instanceof DateTime) { + require_once 'Zend/XmlRpc/Value/DateTime.php'; + return new Zend_XmlRpc_Value_DateTime($value); + } + // Otherwise, we convert the object into a struct $value = get_object_vars($value); // Break intentionally omitted @@ -255,10 +299,6 @@ abstract class Zend_XmlRpc_Value require_once 'Zend/XmlRpc/Value/Integer.php'; return new Zend_XmlRpc_Value_Integer($value); - case 'i8': - require_once 'Zend/XmlRpc/Value/BigInteger.php'; - return new Zend_XmlRpc_Value_BigInteger($value); - case 'double': require_once 'Zend/XmlRpc/Value/Double.php'; return new Zend_XmlRpc_Value_Double($value); @@ -291,37 +331,11 @@ abstract class Zend_XmlRpc_Value * @return Zend_XmlRpc_Value * @static */ - private static function _xmlStringToNativeXmlRpc($xml) + protected static function _xmlStringToNativeXmlRpc($xml) { - if (!$xml instanceof SimpleXMLElement) { - try { - $xml = new SimpleXMLElement($xml); - } catch (Exception $e) { - // The given string is not a valid XML - require_once 'Zend/XmlRpc/Value/Exception.php'; - throw new Zend_XmlRpc_Value_Exception('Failed to create XML-RPC value from XML string: '.$e->getMessage(),$e->getCode()); - } - } + self::_createSimpleXMLElement($xml); - $type = null; - $value = null; - list($type, $value) = each($xml); - - if (!$type and $value === null) { - $namespaces = array('ex' => 'http://ws.apache.org/xmlrpc/namespaces/extensions'); - foreach ($namespaces as $namespaceName => $namespaceUri) { - $namespaceXml = $xml->children($namespaceUri); - list($type, $value) = each($namespaceXml); - if ($type !== null) { - $type = $namespaceName . ':' . $type; - break; - } - } - } - - if (!$type) { // If no type was specified, the default is string - $type = self::XMLRPC_TYPE_STRING; - } + self::_extractTypeAndValue($xml, $type, $value); switch ($type) { // All valid and known XML-RPC native values @@ -414,35 +428,57 @@ abstract class Zend_XmlRpc_Value return $xmlrpcValue; } + protected static function _createSimpleXMLElement(&$xml) + { + if ($xml instanceof SimpleXMLElement) { + return; + } + + try { + $xml = new SimpleXMLElement($xml); + } catch (Exception $e) { + // The given string is not a valid XML + require_once 'Zend/XmlRpc/Value/Exception.php'; + throw new Zend_XmlRpc_Value_Exception('Failed to create XML-RPC value from XML string: ' . $e->getMessage(), $e->getCode(), $e); + } + } + + /** + * Extract XML/RPC type and value from SimpleXMLElement object + * + * @param SimpleXMLElement $xml + * @param string &$type Type bind variable + * @param string &$value Value bind variable + * @return void + */ + protected static function _extractTypeAndValue(SimpleXMLElement $xml, &$type, &$value) + { + list($type, $value) = each($xml); + + if (!$type and $value === null) { + $namespaces = array('ex' => 'http://ws.apache.org/xmlrpc/namespaces/extensions'); + foreach ($namespaces as $namespaceName => $namespaceUri) { + $namespaceXml = $xml->children($namespaceUri); + list($type, $value) = each($namespaceXml); + if ($type !== null) { + $type = $namespaceName . ':' . $type; + break; + } + } + } + + // If no type was specified, the default is string + if (!$type) { + $type = self::XMLRPC_TYPE_STRING; + } + } + /** * @param $xml * @return void */ - private function _setXML($xml) + protected function _setXML($xml) { - $this->_as_xml = $xml; - } - - - /** - * Make sure a string will be safe for XML, convert risky characters to entities - * - * @param string $str - * @return string - */ - protected function _escapeXmlEntities($str) - { - return htmlspecialchars($str, ENT_QUOTES, 'UTF-8'); - } - - /** - * Convert XML entities into string values - * - * @param string $str - * @return string - */ - protected function _decodeXmlEntities($str) - { - return html_entity_decode($str, ENT_QUOTES, 'UTF-8'); + $this->_xml = $this->getGenerator()->stripDeclaration($xml); } } diff --git a/lib/zend/Zend/XmlRpc/Value/Array.php b/lib/zend/Zend/XmlRpc/Value/Array.php index 777c41324e5..8fed1a39f78 100644 --- a/lib/zend/Zend/XmlRpc/Value/Array.php +++ b/lib/zend/Zend/XmlRpc/Value/Array.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Collection.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Array extends Zend_XmlRpc_Value_Collection @@ -49,30 +49,25 @@ class Zend_XmlRpc_Value_Array extends Zend_XmlRpc_Value_Collection /** - * Return the XML code that represent an array native MXL-RPC value + * Generate the XML code that represent an array native MXL-RPC value * - * @return string + * @return void */ - public function saveXML() + protected function _generateXml() { - if (!$this->_as_xml) { // The XML code was not calculated yet - $dom = new DOMDocument('1.0'); - $value = $dom->appendChild($dom->createElement('value')); - $array = $value->appendChild($dom->createElement('array')); - $data = $array->appendChild($dom->createElement('data')); + $generator = $this->getGenerator(); + $generator->openElement('value') + ->openElement('array') + ->openElement('data'); - if (is_array($this->_value)) { - foreach ($this->_value as $val) { - /* @var $val Zend_XmlRpc_Value */ - $data->appendChild($dom->importNode($val->getAsDOM(), true)); - } + if (is_array($this->_value)) { + foreach ($this->_value as $val) { + $val->generateXml(); } - - $this->_as_dom = $value; - $this->_as_xml = $this->_stripXmlDeclaration($dom); } - - return $this->_as_xml; + $generator->closeElement('data') + ->closeElement('array') + ->closeElement('value'); } } diff --git a/lib/zend/Zend/XmlRpc/Value/Base64.php b/lib/zend/Zend/XmlRpc/Value/Base64.php index fe7274b8506..ea1e5d8e887 100644 --- a/lib/zend/Zend/XmlRpc/Value/Base64.php +++ b/lib/zend/Zend/XmlRpc/Value/Base64.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar @@ -44,12 +44,12 @@ class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar * @param string $value * @param bool $already_encoded If set, it means that the given string is already base64 encoded */ - public function __construct($value, $already_encoded=false) + public function __construct($value, $alreadyEncoded = false) { $this->_type = self::XMLRPC_TYPE_BASE64; $value = (string)$value; // Make sure this value is string - if (!$already_encoded) { + if (!$alreadyEncoded) { $value = base64_encode($value); // We encode it in base64 } $this->_value = $value; @@ -65,25 +65,4 @@ class Zend_XmlRpc_Value_Base64 extends Zend_XmlRpc_Value_Scalar { return base64_decode($this->_value); } - - /** - * Return the XML code representing the base64-encoded value - * - * @return string - */ - public function saveXML() - { - if (! $this->_as_xml) { // The XML was not generated yet - $dom = new DOMDocument('1.0', 'UTF-8'); - $value = $dom->appendChild($dom->createElement('value')); - $type = $value->appendChild($dom->createElement($this->_type)); - $type->appendChild($dom->createTextNode($this->_value)); - - $this->_as_dom = $value; - $this->_as_xml = $this->_stripXmlDeclaration($dom); - } - - return $this->_as_xml; - } -} - +} \ No newline at end of file diff --git a/lib/zend/Zend/XmlRpc/Value/BigInteger.php b/lib/zend/Zend/XmlRpc/Value/BigInteger.php index bfe37dee4c7..1ce84bb2d3a 100644 --- a/lib/zend/Zend/XmlRpc/Value/BigInteger.php +++ b/lib/zend/Zend/XmlRpc/Value/BigInteger.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Integer.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_BigInteger extends Zend_XmlRpc_Value_Integer diff --git a/lib/zend/Zend/XmlRpc/Value/Boolean.php b/lib/zend/Zend/XmlRpc/Value/Boolean.php index 16bae5592e7..cb25cdd76c6 100644 --- a/lib/zend/Zend/XmlRpc/Value/Boolean.php +++ b/lib/zend/Zend/XmlRpc/Value/Boolean.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Boolean extends Zend_XmlRpc_Value_Scalar @@ -60,25 +60,4 @@ class Zend_XmlRpc_Value_Boolean extends Zend_XmlRpc_Value_Scalar { return (bool)$this->_value; } - - /** - * Return the XML-RPC serialization of the boolean value - * - * @return string - */ - public function saveXML() - { - if (! $this->_as_xml) { // The XML was not generated yet - $dom = new DOMDocument('1.0', 'UTF-8'); - $value = $dom->appendChild($dom->createElement('value')); - $type = $value->appendChild($dom->createElement($this->_type)); - $type->appendChild($dom->createTextNode($this->_value)); - - $this->_as_dom = $value; - $this->_as_xml = $this->_stripXmlDeclaration($dom); - } - - return $this->_as_xml; - } -} - +} \ No newline at end of file diff --git a/lib/zend/Zend/XmlRpc/Value/Collection.php b/lib/zend/Zend/XmlRpc/Value/Collection.php index 810cd2afddf..ad5fbc07d90 100644 --- a/lib/zend/Zend/XmlRpc/Value/Collection.php +++ b/lib/zend/Zend/XmlRpc/Value/Collection.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value_Collection extends Zend_XmlRpc_Value diff --git a/lib/zend/Zend/XmlRpc/Value/DateTime.php b/lib/zend/Zend/XmlRpc/Value/DateTime.php index 509b3f232ce..6386c7e427c 100644 --- a/lib/zend/Zend/XmlRpc/Value/DateTime.php +++ b/lib/zend/Zend/XmlRpc/Value/DateTime.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,11 +31,25 @@ require_once 'Zend/XmlRpc/Value/Scalar.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar { + /** + * PHP compatible format string for XML/RPC datetime values + * + * @var string + */ + protected $_phpFormatString = 'Ymd\\TH:i:s'; + + /** + * ISO compatible format string for XML/RPC datetime values + * + * @var string + */ + protected $_isoFormatString = 'YYYYMMddTHH:mm:ss'; + /** * Set the value of a dateTime.iso8601 native type * @@ -48,23 +62,21 @@ class Zend_XmlRpc_Value_DateTime extends Zend_XmlRpc_Value_Scalar { $this->_type = self::XMLRPC_TYPE_DATETIME; - // If the value is not numeric, we try to convert it to a timestamp (using the strtotime function) - if (is_numeric($value)) { // The value is numeric, we make sure it is an integer - $timestamp = (int)$value; + if ($value instanceof Zend_Date) { + $this->_value = $value->toString($this->_isoFormatString); + } elseif ($value instanceof DateTime) { + $this->_value = $value->format($this->_phpFormatString); + } elseif (is_numeric($value)) { // The value is numeric, we make sure it is an integer + $this->_value = date($this->_phpFormatString, (int)$value); } else { $timestamp = strtotime($value); if ($timestamp === false || $timestamp == -1) { // cannot convert the value to a timestamp + require_once 'Zend/XmlRpc/Value/Exception.php'; throw new Zend_XmlRpc_Value_Exception('Cannot convert given value \''. $value .'\' to a timestamp'); } + + $this->_value = date($this->_phpFormatString, $timestamp); // Convert the timestamp to iso8601 format } - - $date = date('c', $timestamp); // Convert the timestamp to iso8601 format - - // Strip out TZ information and dashes - $date = preg_replace('/(\+|-)\d{2}:\d{2}$/', '', $date); - $date = str_replace('-', '', $date); - - $this->_value = $date; } /** diff --git a/lib/zend/Zend/XmlRpc/Value/Double.php b/lib/zend/Zend/XmlRpc/Value/Double.php index 1d13f89bef6..a4033ed42f6 100644 --- a/lib/zend/Zend/XmlRpc/Value/Double.php +++ b/lib/zend/Zend/XmlRpc/Value/Double.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Double extends Zend_XmlRpc_Value_Scalar @@ -46,8 +46,8 @@ class Zend_XmlRpc_Value_Double extends Zend_XmlRpc_Value_Scalar { $this->_type = self::XMLRPC_TYPE_DOUBLE; $precision = (int)ini_get('precision'); - $formatString = '%1.' . $precision . 'f'; - $this->_value = sprintf($formatString, (float)$value); + $formatString = '%1.' . $precision . 'F'; + $this->_value = rtrim(sprintf($formatString, (float)$value), '0'); } /** diff --git a/lib/zend/Zend/XmlRpc/Value/Exception.php b/lib/zend/Zend/XmlRpc/Value/Exception.php index 5e48c4e3f97..6e79ce4626d 100644 --- a/lib/zend/Zend/XmlRpc/Value/Exception.php +++ b/lib/zend/Zend/XmlRpc/Value/Exception.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Exception.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Exception extends Zend_XmlRpc_Exception diff --git a/lib/zend/Zend/XmlRpc/Value/Integer.php b/lib/zend/Zend/XmlRpc/Value/Integer.php index 3c4e2346f9d..5c99387c385 100644 --- a/lib/zend/Zend/XmlRpc/Value/Integer.php +++ b/lib/zend/Zend/XmlRpc/Value/Integer.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Integer extends Zend_XmlRpc_Value_Scalar diff --git a/lib/zend/Zend/XmlRpc/Value/Nil.php b/lib/zend/Zend/XmlRpc/Value/Nil.php index 5a721ad7091..760872d7f22 100644 --- a/lib/zend/Zend/XmlRpc/Value/Nil.php +++ b/lib/zend/Zend/XmlRpc/Value/Nil.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Nil extends Zend_XmlRpc_Value_Scalar diff --git a/lib/zend/Zend/XmlRpc/Value/Scalar.php b/lib/zend/Zend/XmlRpc/Value/Scalar.php index 291b8425446..ec1af5443e2 100644 --- a/lib/zend/Zend/XmlRpc/Value/Scalar.php +++ b/lib/zend/Zend/XmlRpc/Value/Scalar.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,29 +31,23 @@ require_once 'Zend/XmlRpc/Value.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ abstract class Zend_XmlRpc_Value_Scalar extends Zend_XmlRpc_Value { - /** - * Return the XML code that represent a scalar native MXL-RPC value + * Generate the XML code that represent a scalar native MXL-RPC value * - * @return string + * @return void */ - public function saveXML() + protected function _generateXml() { - if (!$this->_as_xml) { // The XML code was not calculated yet - $dom = new DOMDocument('1.0'); - $value = $dom->appendChild($dom->createElement('value')); - $type = $value->appendChild($dom->createElement($this->_type)); - $type->appendChild($dom->createTextNode($this->getValue())); + $generator = $this->getGenerator(); - $this->_as_dom = $value; - $this->_as_xml = $this->_stripXmlDeclaration($dom); - } - - return $this->_as_xml; + $generator->openElement('value') + ->openElement($this->_type, $this->_value) + ->closeElement($this->_type) + ->closeElement('value'); } -} +} \ No newline at end of file diff --git a/lib/zend/Zend/XmlRpc/Value/String.php b/lib/zend/Zend/XmlRpc/Value/String.php index 3629834493d..98996157e0b 100644 --- a/lib/zend/Zend/XmlRpc/Value/String.php +++ b/lib/zend/Zend/XmlRpc/Value/String.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -29,7 +29,7 @@ require_once 'Zend/XmlRpc/Value/Scalar.php'; /** * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_String extends Zend_XmlRpc_Value_Scalar @@ -45,18 +45,16 @@ class Zend_XmlRpc_Value_String extends Zend_XmlRpc_Value_Scalar $this->_type = self::XMLRPC_TYPE_STRING; // Make sure this value is string and all XML characters are encoded - $this->_value = $this->_escapeXmlEntities($value); + $this->_value = (string)$value; } /** * Return the value of this object, convert the XML-RPC native string value into a PHP string - * Decode all encoded risky XML entities back to normal characters * * @return string */ public function getValue() { - return $this->_decodeXmlEntities($this->_value); + return (string)$this->_value; } -} - +} \ No newline at end of file diff --git a/lib/zend/Zend/XmlRpc/Value/Struct.php b/lib/zend/Zend/XmlRpc/Value/Struct.php index dccdf49c5ed..04baedb7f94 100644 --- a/lib/zend/Zend/XmlRpc/Value/Struct.php +++ b/lib/zend/Zend/XmlRpc/Value/Struct.php @@ -15,7 +15,7 @@ * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License * @version $Id$ */ @@ -31,7 +31,7 @@ require_once 'Zend/XmlRpc/Value/Collection.php'; * @category Zend * @package Zend_XmlRpc * @subpackage Value - * @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com) + * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License */ class Zend_XmlRpc_Value_Struct extends Zend_XmlRpc_Value_Collection @@ -49,31 +49,27 @@ class Zend_XmlRpc_Value_Struct extends Zend_XmlRpc_Value_Collection /** - * Return the XML code that represent struct native MXL-RPC value + * Generate the XML code that represent struct native MXL-RPC value * - * @return string + * @return void */ - public function saveXML() + protected function _generateXML() { - if (!$this->_as_xml) { // The XML code was not calculated yet - $dom = new DOMDocument('1.0'); - $value = $dom->appendChild($dom->createElement('value')); - $struct = $value->appendChild($dom->createElement('struct')); + $generator = $this->getGenerator(); + $generator->openElement('value') + ->openElement('struct'); - if (is_array($this->_value)) { - foreach ($this->_value as $name => $val) { - /* @var $val Zend_XmlRpc_Value */ - $member = $struct->appendChild($dom->createElement('member')); - $member->appendChild($dom->createElement('name', $this->_escapeXmlEntities($name))); - $member->appendChild($dom->importNode($val->getAsDOM(), 1)); - } + if (is_array($this->_value)) { + foreach ($this->_value as $name => $val) { + /* @var $val Zend_XmlRpc_Value */ + $generator->openElement('member') + ->openElement('name', $name) + ->closeElement('name'); + $val->generateXml(); + $generator->closeElement('member'); } - - $this->_as_dom = $value; - $this->_as_xml = $this->_stripXmlDeclaration($dom); } - - return $this->_as_xml; + $generator->closeElement('struct') + ->closeElement('value'); } -} - +} \ No newline at end of file