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

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category  Zend
 * @package   Zend_Date
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license   http://framework.zend.com/license/new-bsd     New BSD License
-* @version   $Id: Date.php 22713 2010-07-29 11:41:56Z thomas $
+* @version   $Id: Date.php 24880 2012-06-12 20:35:18Z matthew $
 */
 /**
 * Include needed Date classes
 */
 require_once 'Zend/Locale/Math.php';
 /**
 * @category  Zend
 * @package   Zend_Date
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license   http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Date extends Zend_Date_DateObject
 {
 private $_locale  = null;
 if (!empty($match)) {
 return "Etc/UTC";
 }
 preg_match('/([+-]\d{2}):{0,1}\d{2}/', $zone, $match);
-if (!empty($match) and ($match[count($match) - 1] <= 12) and ($match[count($match) - 1] >= -12)) {
+if (!empty($match) and ($match[count($match) - 1] <= 14) and ($match[count($match) - 1] >= -12)) {
 $zone = "Etc/GMT";
 $zone .= ($match[count($match) - 1] < 0) ? "+" : "-";
 $zone .= (int) abs($match[count($match) - 1]);
 return $zone;
 }
 return $this->_assign($calc, $this->mktime($timematch[1], $timematch[2], $timematch[3], 1 + $datematch[2], 1 + $datematch[3], 1970 + $datematch[1], false),
 $this->mktime($hour,         $minute,       $second,       1 + $month,        1 + $day,          1970 + $year,         false), false);
 break;
 case self::RFC_2822:
-$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);
+$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}|\w{1,20})$/', $date, $match);
 if (!$result) {
 require_once 'Zend/Date/Exception.php';
 throw new Zend_Date_Exception("no RFC 2822 format ($date)", 0, null, $date);
 }
 --$parsed['day'];
 } else {
 $parsed['day'] = 0;
 }
-if (isset($parsed['year'])) {
+if (!isset($parsed['year'])) {
-$parsed['year'] -= 1970;
+$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,
 isset($parsed['month']) ? (1 + $parsed['month']) : 1,
 isset($parsed['day']) ? (1 + $parsed['day']) : 1,
-isset($parsed['year']) ? (1970 + $parsed['year']) : 1970,
+$parsed['year'],
 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(), 0, $e, $date);
 /**
 * Check if location is supported
 *
-* @param $location array - locations array
+* @param array $location locations array
 * @return $horizon float
 */
 private function _checkLocation($location)
 {
 if (!isset($location['longitude']) or !isset($location['latitude'])) {
 /**
 * Returns the time of sunrise for this date and a given location as new date object
 * For a list of cities and correct locations use the class Zend_Date_Cities
 *
-* @param  $location array - location of sunrise
+* @param array $location location of sunrise
 *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
 *                   ['longitude'] -> longitude of location
 *                   ['latitude']  -> latitude of location
 * @return Zend_Date
 * @throws Zend_Date_Exception
 /**
 * Returns the time of sunset for this date and a given location as new date object
 * For a list of cities and correct locations use the class Zend_Date_Cities
 *
-* @param  $location array - location of sunset
+* @param array $location location of sunset
 *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
 *                   ['longitude'] -> longitude of location
 *                   ['latitude']  -> latitude of location
 * @return Zend_Date
 * @throws Zend_Date_Exception
 /**
 * Returns an array with the sunset and sunrise dates for all horizon types
 * For a list of cities and correct locations use the class Zend_Date_Cities
 *
-* @param  $location array - location of suninfo
+* @param array $location location of suninfo
 *                   ['horizon']   -> civil, nautic, astronomical, effective (default)
 *                   ['longitude'] -> longitude of location
 *                   ['latitude']  -> latitude of location
 * @return array - [sunset|sunrise][effective|civil|nautic|astronomic]
 * @throws Zend_Date_Exception
 /**
 * Returns the day as new date object
 * Example: 20.May.1986 -> 20.Jan.1970 00:00:00
 *
-* @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+* @param Zend_Locale $locale OPTIONAL Locale for parsing input
 * @return Zend_Date
 */
 public function getDay($locale = null)
 {
 return $this->copyPart(self::DAY_SHORT, $locale);
 /**
 * Returns the calculated day
 *
-* @param $calc    string                    Type of calculation to make
+* @param string      $calc    Type of calculation to make
-* @param $day     string|integer|Zend_Date  Day to calculate, when null the actual day is calculated
+* @param Zend_Date   $day     Day to calculate, when null the actual day is calculated
-* @param $locale  string|Zend_Locale        Locale for parsing input
+* @param Zend_Locale $locale  Locale for parsing input
 * @return Zend_Date|integer
 */
 private function _day($calc, $day, $locale)
 {
 if ($day === null) {
 /**
 * Returns the weekday as new date object
 * Weekday is always from 1-7
 * Example: 09-Jan-2007 -> 2 = Tuesday -> 02-Jan-1970 (when 02.01.1970 is also Tuesday)
 *
-* @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+* @param Zend_Locale $locale OPTIONAL Locale for parsing input
 * @return Zend_Date
 */
 public function getWeekday($locale = null)
 {
 if (self::$_options['format_type'] == 'php') {
 /**
 * Returns the calculated weekday
 *
-* @param  $calc     string                          Type of calculation to make
+* @param  string      $calc     Type of calculation to make
-* @param  $weekday  string|integer|array|Zend_Date  Weekday to calculate, when null the actual weekday is calculated
+* @param  Zend_Date   $weekday  Weekday to calculate, when null the actual weekday is calculated
-* @param  $locale   string|Zend_Locale              Locale for parsing input
+* @param  Zend_Locale $locale   Locale for parsing input
 * @return Zend_Date|integer
 * @throws Zend_Date_Exception
 */
 private function _weekday($calc, $weekday, $locale)
 {
 /**
 * Returns the hour as new date object
 * Example: 02.Feb.1986 10:30:25 -> 01.Jan.1970 10:00:00
 *
-* @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+* @param Zend_Locale $locale OPTIONAL Locale for parsing input
 * @return Zend_Date
 */
 public function getHour($locale = null)
 {
 return $this->copyPart(self::HOUR, $locale);
 /**
 * Returns the week as new date object using monday as begining of the week
 * Example: 12.Jan.2007 -> 08.Jan.1970 00:00:00
 *
-* @param $locale  string|Zend_Locale  OPTIONAL Locale for parsing input
+* @param Zend_Locale $locale OPTIONAL Locale for parsing input
 * @return Zend_Date
 */
 public function getWeek($locale = null)
 {
 if (self::$_options['format_type'] == 'php') {

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