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

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * 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-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license   http://framework.zend.com/license/new-bsd     New BSD License
-* @version   $Id: Date.php 24880 2012-06-12 20:35:18Z matthew $
+* @version   $Id$
 */
 /**
 * Include needed Date classes
 */
 require_once 'Zend/Locale/Math.php';
 /**
 * @category  Zend
 * @package   Zend_Date
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 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;
 /**
 * Sets a new timestamp
 *
 * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to set
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setTimestamp($timestamp)
 {
 return $this->_timestamp('set', $timestamp);
 /**
 * Adds a timestamp
 *
 * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to add
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addTimestamp($timestamp)
 {
 return $this->_timestamp('add', $timestamp);
 /**
 * Subtracts a timestamp
 *
 * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to sub
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subTimestamp($timestamp)
 {
 return $this->_timestamp('sub', $timestamp);
 * For a complete list of supported datepart values look into the docu
 *
 * @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 Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function set($date, $part = null, $locale = null)
 {
 if (self::$_options['format_type'] == 'php') {
 * For a complete list of supported datepart values look into the docu.
 *
 * @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 Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function add($date, $part = self::TIMESTAMP, $locale = null)
 {
 if (self::$_options['format_type'] == 'php') {
 * Be aware: Adding -2 Months is not equal to Subtracting 2 Months !!!
 *
 * @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 Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function sub($date, $part = self::TIMESTAMP, $locale = null)
 {
 if (self::$_options['format_type'] == 'php') {
 $zone .= ($match[count($match) - 1] < 0) ? "+" : "-";
 $zone .= (int) abs($match[count($match) - 1]);
 return $zone;
 }
-preg_match('/([[:alpha:]\/]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
+preg_match('/([[:alpha:]\/_]{3,30})(?!.*([[:alpha:]\/]{3,30}))/', $zone, $match);
 try {
 if (!empty($match) and (!is_int($match[count($match) - 1]))) {
 $oldzone = $this->getTimezone();
 $this->setTimezone($match[count($match) - 1]);
 $result = $this->getTimezone();
 iconv_strlen($date, 'UTF-8') - $dateMatchCharCount,
 'UTF-8');
 }
 // (T)hh:mm:ss
 preg_match('/[T,\s]{0,1}(\d{2}):(\d{2}):(\d{2})/', $tmpdate, $timematch);
+// (T)hhmmss
 if (empty($timematch)) {
 preg_match('/[T,\s]{0,1}(\d{2})(\d{2})(\d{2})/', $tmpdate, $timematch);
+}
+// (T)hh:mm
+if (empty($timematch)) {
+preg_match('/[T,\s]{0,1}(\d{2}):(\d{2})/', $tmpdate, $timematch);
+}
+// (T)hhmm
+if (empty($timematch)) {
+preg_match('/[T,\s]{0,1}(\d{2})(\d{2})/', $tmpdate, $timematch);
 }
 if (empty($datematch) and empty($timematch)) {
 require_once 'Zend/Date/Exception.php';
 throw new Zend_Date_Exception("unsupported ISO8601 format ($date)", 0, null, $date);
 }
 $datematch[1] = self::getFullYear($datematch[1]);
 }
 if (empty($timematch)) {
 $timematch[1] = 0;
 $timematch[2] = 0;
+$timematch[3] = 0;
+}
+if (!isset($timematch[3])) {
 $timematch[3] = 0;
 }
 if (($calc == 'set') || ($calc == 'cmp')) {
 --$datematch[2];
 * Returned is the new date object and the existing date is left as it was before
 *
 * @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 Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setTime($time, $format = null, $locale = null)
 {
 return $this->_time('set', $time, $format, $locale);
 * For example: HH:mm:ss -> 10 -> +10 hours
 *
 * @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 Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addTime($time, $format = null, $locale = null)
 {
 return $this->_time('add', $time, $format, $locale);
 * For example: HH:mm:ss -> 10 -> -10 hours
 *
 * @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 Provides fluid inteface
+* @return Zend_Date Provides a fluent inteface
 * @throws Zend_Date_Exception
 */
 public function subTime($time, $format = null, $locale = null)
 {
 return $this->_time('sub', $time, $format, $locale);
 * Returned is the new date object and the existing time is left as it was before
 *
 * @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 Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setDate($date, $format = null, $locale = null)
 {
 return $this->_date('set', $date, $format, $locale);
 * For example: MM.dd.YYYY -> 10 -> +10 months
 *
 * @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 Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addDate($date, $format = null, $locale = null)
 {
 return $this->_date('add', $date, $format, $locale);
 * Be aware: Subtracting 2 months is not equal to Adding -2 months !!!
 *
 * @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 Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subDate($date, $format = null, $locale = null)
 {
 return $this->_date('sub', $date, $format, $locale);
 * For example: 050901 -> 01.Sept.2005 00:00:00, 20050201T10:00:30 -> 01.Feb.2005 10h00m30s
 * Returned is the new date object
 *
 * @param  string|integer|Zend_Date  $date    ISO Date to set
 * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setIso($date, $locale = null)
 {
 return $this->_calcvalue('set', $date, 'iso', self::ISO_8601, $locale);
 * For example: 050901 -> + 01.Sept.2005 00:00:00, 10:00:00 -> +10h
 * Returned is the new date object
 *
 * @param  string|integer|Zend_Date  $date    ISO Date to add
 * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addIso($date, $locale = null)
 {
 return $this->_calcvalue('add', $date, 'iso', self::ISO_8601, $locale);
 * For example: 050901 -> - 01.Sept.2005 00:00:00, 10:00:00 -> -10h
 * Returned is the new date object
 *
 * @param  string|integer|Zend_Date  $date    ISO Date to sub
 * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subIso($date, $locale = null)
 {
 return $this->_calcvalue('sub', $date, 'iso', self::ISO_8601, $locale);
 * For example: Sat, 14 Feb 09 00:31:30 +0100
 * Returned is the new date object
 *
 * @param  string|integer|Zend_Date  $date    RFC 822 to set
 * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setArpa($date, $locale = null)
 {
 return $this->_calcvalue('set', $date, 'arpa', self::RFC_822, $locale);
 * For example: Sat, 14 Feb 09 00:31:30 +0100
 * Returned is the new date object
 *
 * @param  string|integer|Zend_Date  $date    RFC 822 Date to add
 * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addArpa($date, $locale = null)
 {
 return $this->_calcvalue('add', $date, 'arpa', self::RFC_822, $locale);
 * For example: Sat, 14 Feb 09 00:31:30 +0100
 * Returned is the new date object
 *
 * @param  string|integer|Zend_Date  $date    RFC 822 Date to sub
 * @param  string|Zend_Locale        $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subArpa($date, $locale = null)
 {
 return $this->_calcvalue('sub', $date, 'arpa', self::RFC_822, $locale);
 public function compareArpa($date, $locale = null)
 {
 return $this->_calcvalue('cmp', $date, 'arpa', self::RFC_822, $locale);
 }
 /**
 * Check if location is supported
 *
 * @param array $location locations array
-* @return $horizon float
+* @throws Zend_Date_Exception
+* @return float $horizon float
 */
 private function _checkLocation($location)
 {
 if (!isset($location['longitude']) or !isset($location['latitude'])) {
 require_once 'Zend/Date/Exception.php';
 $suninfo['sunset'][$location['horizon']]  = $result;
 }
 return $suninfo;
 }
 /**
 * Check a given year for leap year.
 *
-* @param  integer|array|Zend_Date  $year  Year to check
+* @param  integer|array|Zend_Date $year Year to check
+* @throws Zend_Date_Exception
 * @return boolean
 */
 public static function checkLeapYear($year)
 {
 if ($year instanceof Zend_Date) {
 /**
 * Calculate date details
 *
 * @param  string                          $calc    Calculation to make
 * @param  string|integer|array|Zend_Date  $date    Date or Part to calculate
-* @param  string                          $part    Datepart for Calculation
+* @param  string                          $type    Datepart for Calculation
 * @param  string|Zend_Locale              $locale  Locale for parsing input
 * @return integer|string  new date
 * @throws Zend_Date_Exception
 */
 private function _calcdetail($calc, $date, $type, $locale)
 }
 /**
 * Internal calculation, returns the requested date type
 *
-* @param  string                    $calc    Calculation to make
+* @param  string                   $calc   Calculation to make
-* @param  string|integer|Zend_Date  $value   Datevalue to calculate with, if null the actual value is taken
+* @param  string|integer|Zend_Date $value  Datevalue to calculate with, if null the actual value is taken
-* @param  string|Zend_Locale        $locale  Locale for parsing input
+* @param  string                   $type
+* @param  string                   $parameter
+* @param  string|Zend_Locale       $locale Locale for parsing input
+* @throws Zend_Date_Exception
 * @return integer|Zend_Date  new date
-* @throws Zend_Date_Exception
 */
 private function _calcvalue($calc, $value, $type, $parameter, $locale)
 {
 if ($value === null) {
 require_once 'Zend/Date/Exception.php';
 * If the year if between 70 and 99, 1999 will be set (1970-1999)
 * 3 or 4 digit years are set as expected. If you need to set year 0-99
 * use set() instead.
 * Returned is the new date object
 *
-* @param  string|integer|array|Zend_Date  $date    Year to set
+* @param  string|integer|array|Zend_Date  $year    Year to set
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setYear($year, $locale = null)
 {
 return $this->_calcvalue('set', $year, 'year', self::YEAR, $locale);
 * If the year if between 70 and 99, 1999 will be added (1970-1999)
 * 3 or 4 digit years are added as expected. If you need to add years from 0-99
 * use add() instead.
 * Returned is the new date object
 *
-* @param  string|integer|array|Zend_Date  $date    Year to add
+* @param  string|integer|array|Zend_Date  $year    Year to add
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addYear($year, $locale = null)
 {
 return $this->_calcvalue('add', $year, 'year', self::YEAR, $locale);
 * If the year if between 70 and 99, 1999 will be subtracted (1970-1999)
 * 3 or 4 digit years are subtracted as expected. If you need to subtract years from 0-99
 * use sub() instead.
 * Returned is the new date object
 *
-* @param  string|integer|array|Zend_Date  $date    Year to sub
+* @param  string|integer|array|Zend_Date  $year    Year to sub
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subYear($year, $locale = null)
 {
 return $this->_calcvalue('sub', $year, 'year', self::YEAR, $locale);
 * set locale.
 * Returned is the new date object
 *
 * @param  string|integer|array|Zend_Date  $month   Month to set
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setMonth($month, $locale = null)
 {
 return $this->_month('set', $month, $locale);
 * set locale.
 * Returned is the new date object
 *
 * @param  string|integer|array|Zend_Date  $month   Month to add
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addMonth($month, $locale = null)
 {
 return $this->_month('add', $month, $locale);
 * set locale.
 * Returned is the new date object
 *
 * @param  string|integer|array|Zend_Date  $month   Month to sub
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subMonth($month, $locale = null)
 {
 return $this->_month('sub', $month, $locale);
 public function getDay($locale = null)
 {
 return $this->copyPart(self::DAY_SHORT, $locale);
 }
 /**
 * Returns the calculated day
 *
-* @param string      $calc    Type of calculation to make
+* @param string      $calc   Type of calculation to make
-* @param Zend_Date   $day     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 Zend_Locale $locale  Locale for parsing input
+* @param Zend_Locale $locale Locale for parsing input
+* @throws Zend_Date_Exception
 * @return Zend_Date|integer
 */
 private function _day($calc, $day, $locale)
 {
 if ($day === null) {
 * 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: setDay('Montag', 'de_AT'); will set the monday of this week as day.
 *
-* @param  string|integer|array|Zend_Date  $month   Day to set
+* @param  string|integer|array|Zend_Date  $day     Day to set
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setDay($day, $locale = null)
 {
 return $this->_day('set', $day, $locale);
 * The day can be a number or a string. Adding days lower then 0 or greater than the number of this months days
 * 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.
 *
-* @param  string|integer|array|Zend_Date  $month   Day to add
+* @param  string|integer|array|Zend_Date  $day     Day to add
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addDay($day, $locale = null)
 {
 return $this->_day('add', $day, $locale);
 * The day can be a number or a string. Subtracting days lower then 0 or greater than the number of this months days
 * 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.
 *
-* @param  string|integer|array|Zend_Date  $month   Day to sub
+* @param  string|integer|array|Zend_Date  $day     Day to sub
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subDay($day, $locale = null)
 {
 return $this->_day('sub', $day, $locale);
 * The weekday can be a number or a string. If a localized weekday name is given,
 * then it will be parsed as a date in $locale (defaults to the same locale as $this).
 * Returned is the new date object.
 * Example: setWeekday(3); will set the wednesday of this week as day.
 *
-* @param  string|integer|array|Zend_Date  $month   Weekday to set
+* @param  string|integer|array|Zend_Date  $weekday Weekday to set
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setWeekday($weekday, $locale = null)
 {
 return $this->_weekday('set', $weekday, $locale);
 * set locale.
 * Returned is the new date object
 * Example: addWeekday(3); will add the difference of days from the begining of the month until
 * wednesday.
 *
-* @param  string|integer|array|Zend_Date  $month   Weekday to add
+* @param  string|integer|array|Zend_Date  $weekday Weekday to add
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addWeekday($weekday, $locale = null)
 {
 return $this->_weekday('add', $weekday, $locale);
 * set locale.
 * Returned is the new date object
 * Example: subWeekday(3); will subtract the difference of days from the begining of the month until
 * wednesday.
 *
-* @param  string|integer|array|Zend_Date  $month   Weekday to sub
+* @param  string|integer|array|Zend_Date  $weekday Weekday to sub
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subWeekday($weekday, $locale = null)
 {
 return $this->_weekday('sub', $weekday, $locale);
 * Returned is the new date object
 * Example: 04.May.2004 -> setDayOfYear(10) -> 10.Jan.2004
 *
 * @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 Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setDayOfYear($day, $locale = null)
 {
 return $this->_calcvalue('set', $day, 'day of year', self::DAY_OF_YEAR, $locale);
 * Returned is the new date object
 * Example: addDayOfYear(10); will add 10 days to the existing date object.
 *
 * @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 Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addDayOfYear($day, $locale = null)
 {
 return $this->_calcvalue('add', $day, 'day of year', self::DAY_OF_YEAR, $locale);
 * Returned is the new date object
 * Example: subDayOfYear(10); will subtract 10 days from the existing date object.
 *
 * @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 Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subDayOfYear($day, $locale = null)
 {
 return $this->_calcvalue('sub', $day, 'day of year', self::DAY_OF_YEAR, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> setHour(7); -> 04.May.1993 07:07:25
 *
 * @param  string|integer|array|Zend_Date  $hour    Hour to set
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setHour($hour, $locale = null)
 {
 return $this->_calcvalue('set', $hour, 'hour', self::HOUR_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> addHour(12); -> 05.May.1993 01:07:25
 *
 * @param  string|integer|array|Zend_Date  $hour    Hour to add
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addHour($hour, $locale = null)
 {
 return $this->_calcvalue('add', $hour, 'hour', self::HOUR_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> subHour(6); -> 05.May.1993 07:07:25
 *
 * @param  string|integer|array|Zend_Date  $hour    Hour to sub
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subHour($hour, $locale = null)
 {
 return $this->_calcvalue('sub', $hour, 'hour', self::HOUR_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> setMinute(29); -> 04.May.1993 13:29:25
 *
 * @param  string|integer|array|Zend_Date  $minute  Minute to set
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setMinute($minute, $locale = null)
 {
 return $this->_calcvalue('set', $minute, 'minute', self::MINUTE_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> addMinute(65); -> 04.May.1993 13:12:25
 *
 * @param  string|integer|array|Zend_Date  $minute  Minute to add
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addMinute($minute, $locale = null)
 {
 return $this->_calcvalue('add', $minute, 'minute', self::MINUTE_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> subMinute(9); -> 04.May.1993 12:58:25
 *
 * @param  string|integer|array|Zend_Date  $minute  Minute to sub
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subMinute($minute, $locale = null)
 {
 return $this->_calcvalue('sub', $minute, 'minute', self::MINUTE_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> setSecond(100); -> 04.May.1993 13:08:40
 *
 * @param  string|integer|array|Zend_Date $second Second to set
 * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setSecond($second, $locale = null)
 {
 return $this->_calcvalue('set', $second, 'second', self::SECOND_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> addSecond(65); -> 04.May.1993 13:08:30
 *
 * @param  string|integer|array|Zend_Date $second Second to add
 * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addSecond($second, $locale = null)
 {
 return $this->_calcvalue('add', $second, 'second', self::SECOND_SHORT, $locale);
 * Returned is the new date object
 * Example: 04.May.1993 13:07:25 -> subSecond(10); -> 04.May.1993 13:07:15
 *
 * @param  string|integer|array|Zend_Date $second Second to sub
 * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subSecond($second, $locale = null)
 {
 return $this->_calcvalue('sub', $second, 'second', self::SECOND_SHORT, $locale);
 /**
 * Sets a new precision for fractional seconds
 *
 * @param  integer $precision Precision for the fractional datepart 3 = milliseconds
 * @throws Zend_Date_Exception
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 */
 public function setFractionalPrecision($precision)
 {
 if (!intval($precision) or ($precision < 0) or ($precision > 9)) {
 require_once 'Zend/Date/Exception.php';
 public function getMilliSecond()
 {
 return $this->_fractional;
 }
 /**
 * Sets new milliseconds for the date object
 * Example: setMilliSecond(550, 2) -> equals +5 Sec +50 MilliSec
 *
 * @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 Zend_Date Provides fluid interface
+* @throws Zend_Date_Exception
+* @return Zend_Date Provides a fluent interface
 */
 public function setMilliSecond($milli = null, $precision = null)
 {
 if ($milli === null) {
 list($milli, $time) = explode(" ", microtime());
 $this->_fractional = 0;
 $this->addMilliSecond($milli, $precision);
 return $this;
 }
 /**
 * Adds milliseconds to the date object
 *
 * @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 Zend_Date Provides fluid interface
+* @throws Zend_Date_Exception
+* @return Zend_Date Provides a fluent interface
 */
 public function addMilliSecond($milli = null, $precision = null)
 {
 if ($milli === null) {
 list($milli, $time) = explode(" ", microtime());
 require_once 'Zend/Date/Exception.php';
 throw new Zend_Date_Exception("invalid milli second ($milli) operand", 0, null, $milli);
 }
 if ($precision === null) {
-$precision = strlen($milli);
+// Use internal default precision
-if ($milli < 0) {
+// Is not as logic as using the length of the input. But this would break tests and maybe other things
---$precision;
+// as an input value of integer 10, which is used in tests, must be parsed as 10 milliseconds (real milliseconds, precision 3)
-}
+// but with auto-detect of precision, 100 milliseconds would be added.
+$precision = $this->_precision;
 }
 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);
+throw new Zend_Date_Exception(
+"precision ($precision) must be a positive integer less than 10", 0, null, $precision
+);
+}
+if ($this->_precision > $precision) {
+$milli = $milli * pow(10, $this->_precision - $precision);
+} elseif ($this->_precision < $precision) {
+$milli = round($milli / pow(10, $precision - $this->_precision));
 }
 $this->_fractional += $milli;
 // Add/sub milliseconds + add/sub seconds
 /**
 * Subtracts a millisecond
 *
 * @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 Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 */
 public function subMilliSecond($milli = null, $precision = null)
 {
 $this->addMilliSecond(0 - $milli, $precision);
 return $this;
 * Returned is the new date object
 * Example: 09.Jan.2007 13:07:25 -> setWeek(1); -> 02.Jan.2007 13:07:25
 *
 * @param  string|integer|array|Zend_Date  $week    Week to set
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function setWeek($week, $locale = null)
 {
 return $this->_calcvalue('set', $week, 'week', self::WEEK, $locale);
 * Returned is the new date object
 * Example: 09.Jan.2007 13:07:25 -> addWeek(1); -> 16.Jan.2007 13:07:25
 *
 * @param  string|integer|array|Zend_Date  $week    Week to add
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function addWeek($week, $locale = null)
 {
 return $this->_calcvalue('add', $week, 'week', self::WEEK, $locale);
 * Returned is the new date object
 * Example: 09.Jan.2007 13:07:25 -> subWeek(1); -> 02.Jan.2007 13:07:25
 *
 * @param  string|integer|array|Zend_Date  $week    Week to sub
 * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
-* @return Zend_Date Provides fluid interface
+* @return Zend_Date Provides a fluent interface
 * @throws Zend_Date_Exception
 */
 public function subWeek($week, $locale = null)
 {
 return $this->_calcvalue('sub', $week, 'week', self::WEEK, $locale);

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd