silverstripe / silverstripe-framework

thirdparty/Zend/Cache/Frontend/Page.php

Doc Comments +3 added lines, -5 removed lines

@@ -123,7 +123,6 @@ 
      * Constructor
      *
      * @param  array   $options                Associative array of options
-     * @param  boolean $doNotTestCacheValidity If set to true, the cache validity won't be tested
      * @throws Zend_Cache_Exception
      * @return void
      */
@@ -205,7 +204,6 @@ 
     /**
      * Specific setter for the 'regexps' option (with some additional tests)
      *
-     * @param  array $options Associative array
      * @throws Zend_Cache_Exception
      * @return void
      */
@@ -237,7 +235,7 @@ 
      *
      * @param  string  $id       (optional) A cache id (if you set a value here, maybe you have to use Output frontend instead)
      * @param  boolean $doNotDie For unit testing only !
-     * @return boolean True if the cache is hit (false else)
+     * @return boolean|null True if the cache is hit (false else)
      */
     public function start($id = false, $doNotDie = false)
     {
@@ -335,7 +333,7 @@ 
     /**
      * Make an id depending on REQUEST_URI and superglobal arrays (depending on options)
      *
-     * @return mixed|false a cache id (string), false if the cache should have not to be used
+     * @return false|string a cache id (string), false if the cache should have not to be used
      */
     protected function _makeId()
     {
@@ -358,7 +356,7 @@ 
      * @param  string $arrayName Superglobal array name
      * @param  bool   $bool1     If true, cache is still on even if there are some variables in the superglobal array
      * @param  bool   $bool2     If true, we have to use the content of the superglobal array to make a partial id
-     * @return mixed|false Partial id (string) or false if the cache should have not to be used
+     * @return false|string Partial id (string) or false if the cache should have not to be used
      */
     protected function _makePartialId($arrayName, $bool1, $bool2)
     {

thirdparty/Zend/Currency.php

Doc Comments +1 added lines, -1 removed lines

@@ -673,7 +673,7 @@
      *
      * @param float|integer|Zend_Currency $value    Compares the currency with this value
      * @param string|Zend_Currency        $currency The currency to compare this value from
-     * @return Zend_Currency
+     * @return integer
      */
     public function compare($value, $currency = null)
     {

thirdparty/Zend/Date.php

Doc Comments +14 added lines, -22 removed lines

@@ -377,7 +377,7 @@ 
     /**
      * Subtracts a timestamp
      *
-     * @param  integer|string|array|Zend_Date  $timestamp  Timestamp to sub
+     * @param  integer  $timestamp  Timestamp to sub
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
      */
@@ -1231,8 +1231,8 @@ 
      *
      * @param  string                    $calc  Calculation to make
      * @param  string|integer            $date  Date for calculation
-     * @param  string|integer            $comp  Second date for calculation
-     * @param  boolean|integer           $dst   Use dst correction if option is set
+     * @param  integer            $comp  Second date for calculation
+     * @param  string|false           $dst   Use dst correction if option is set
      * @return integer|string|Zend_Date  new timestamp or Zend_Date depending on calculation
      */
     private function _assign($calc, $date, $comp = 0, $dst = false)
@@ -2677,7 +2677,7 @@ 
      * For example:
      * 15.May.2000 <-> 15.June.2000 Equals only for Day or Year... all other will return false
      *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to equal with
+     * @param  Zend_Date  $date    Date or datepart to equal with
      * @param  string                          $part    OPTIONAL Part of the date to compare, if null the timestamp is used
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return boolean
@@ -2699,7 +2699,7 @@ 
      * For example:
      * 15.May.2000 <-> 13.June.1999 will return true for day, year and date, but not for month
      *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to compare with
+     * @param  Zend_Date  $date    Date or datepart to compare with
      * @param  string                          $part    OPTIONAL Part of the date to compare, if null the timestamp is used
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return boolean
@@ -2722,7 +2722,7 @@ 
      * 15.May.2000 <-> 13.June.1999 will return true for month but false for day, year and date
      * Returns if the given date is later
      *
-     * @param  string|integer|array|Zend_Date  $date    Date or datepart to compare with
+     * @param  Zend_Date  $date    Date or datepart to compare with
      * @param  string                          $part    OPTIONAL Part of the date to compare, if null the timestamp is used
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return boolean
@@ -2835,7 +2835,7 @@ 
      * For example: dd.MMMM.yyTHH:mm' and 'ss sec'-> 10.May.07T25:11 and 44 sec => 1h11min44sec + 1 day
      * 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  $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
@@ -2997,7 +2997,7 @@ 
      * For example: MMMM.yy HH:mm-> May.07 22:11 => 01.May.07 00:00
      * 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  $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
@@ -3364,7 +3364,7 @@ 
     /**
      * Check a given year for leap year.
      *
-     * @param  integer|array|Zend_Date  $year  Year to check
+     * @param  Zend_Date  $year  Year to check
      * @return boolean
      */
     public static function checkLeapYear($year)
@@ -3460,7 +3460,6 @@ 
      *
      * @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|Zend_Locale              $locale  Locale for parsing input
      * @return integer|string  new date
      * @throws Zend_Date_Exception
@@ -3501,6 +3500,8 @@ 
      * @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|Zend_Locale        $locale  Locale for parsing input
+     * @param string $type
+     * @param string $parameter
      * @return integer|Zend_Date  new date
      * @throws Zend_Date_Exception
      */
@@ -3558,7 +3559,6 @@ 
      * use set() instead.
      * Returned is the new date object
      *
-     * @param  string|integer|array|Zend_Date  $date    Year to set
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -3577,7 +3577,6 @@ 
      * use add() instead.
      * Returned is the new date object
      *
-     * @param  string|integer|array|Zend_Date  $date    Year to add
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -3596,7 +3595,6 @@ 
      * use sub() instead.
      * Returned is the new date object
      *
-     * @param  string|integer|array|Zend_Date  $date    Year to sub
      * @param  string|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -3864,7 +3862,6 @@ 
      * 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|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -3882,7 +3879,6 @@ 
      * 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|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -3900,7 +3896,6 @@ 
      * 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|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -4012,7 +4007,6 @@ 
      * 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|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -4032,7 +4026,6 @@ 
      * 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|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -4052,7 +4045,6 @@ 
      * 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|Zend_Locale              $locale  OPTIONAL Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -4373,7 +4365,7 @@ 
      * 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  integer $second Second to add
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -4390,7 +4382,7 @@ 
      * 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  integer $second Second to sub
      * @param  string|Zend_Locale             $locale (Optional) Locale for parsing input
      * @return Zend_Date Provides fluid interface
      * @throws Zend_Date_Exception
@@ -4456,7 +4448,7 @@ 
     /**
      * Returns the milliseconds of the date object
      *
-     * @return string
+     * @return integer
      */
     public function getMilliSecond()
     {

thirdparty/Zend/Date/DateObject.php

Doc Comments +1 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
      * be hard-coded to use time().  For example, this makes it possible to test isYesterday() in Date.php.
      *
      * @param   integer  $sync      OPTIONAL time syncronisation value
-     * @return  integer  timestamp
+     * @return  double  timestamp
      */
     protected function _getTime($sync = null)
     {
@@ -1072,7 +1072,6 @@ 
     /**
      * Internal method to check if the given cache supports tags
      *
-     * @param Zend_Cache $cache
      */
     protected static function _getTagSupportForCache()
     {

thirdparty/Zend/Exception.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
      *
      * @param  string $method
      * @param  array $args
-     * @return mixed
+     * @return null|Exception
      */
     public function __call($method, array $args)
     {

thirdparty/Zend/Loader/Autoloader.php

Doc Comments +6 added lines, -6 removed lines

@@ -138,7 +138,7 @@ 
      * Set the default autoloader implementation
      *
      * @param  string|array $callback PHP callback
-     * @return void
+     * @return Zend_Loader_Autoloader
      */
     public function setDefaultAutoloader($callback)
     {
@@ -371,8 +371,8 @@ 
     /**
      * Add an autoloader to the beginning of the stack
      *
-     * @param  object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
-     * @param  string|array $namespace Specific namespace(s) under which to register callback
+     * @param  Zend_Loader_Autoloader_Resource $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
+     * @param  string $namespace Specific namespace(s) under which to register callback
      * @return Zend_Loader_Autoloader
      */
     public function unshiftAutoloader($callback, $namespace = '')
@@ -394,7 +394,7 @@ 
     /**
      * Append an autoloader to the autoloader stack
      *
-     * @param  object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
+     * @param  string[] $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
      * @param  string|array $namespace Specific namespace(s) under which to register callback
      * @return Zend_Loader_Autoloader
      */
@@ -417,7 +417,7 @@ 
     /**
      * Remove an autoloader from the autoloader stack
      *
-     * @param  object|array|string $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
+     * @param  string[] $callback PHP callback or Zend_Loader_Autoloader_Interface implementation
      * @param  null|string|array $namespace Specific namespace(s) from which to remove autoloader
      * @return Zend_Loader_Autoloader
      */
@@ -467,7 +467,7 @@ 
      * Internal autoloader implementation
      *
      * @param  string $class
-     * @return bool
+     * @return string|false
      */
     protected function _autoload($class)
     {

thirdparty/Zend/Locale.php

Doc Comments +5 added lines, -6 removed lines

@@ -323,7 +323,7 @@ 
      * requested within HTTP
      *
      * @param  string|Zend_Locale $locale  Locale to set
-     * @param  float              $quality The quality to set from 0 to 1
+     * @param  integer              $quality The quality to set from 0 to 1
      * @throws Zend_Locale_Exception When a autolocale was given
      * @throws Zend_Locale_Exception When a unknown locale was given
      * @return void
@@ -688,7 +688,7 @@ 
      *
      * @param  string $value  Name to get detailed information about
      * @param  string $locale (Optional) Locale for language translation
-     * @return array
+     * @return string|false
      * @deprecated
      */
     public static function getLanguageTranslation($value, $locale = null)
@@ -702,7 +702,7 @@ 
      *
      * @param  string $value  Name to get detailed information about
      * @param  string $locale (Optional) locale for script translation
-     * @return array
+     * @return string|false
      * @deprecated
      */
     public static function getScriptTranslation($value, $locale = null)
@@ -716,7 +716,7 @@ 
      *
      * @param  string             $value  Name to get detailed information about
      * @param  string|Zend_Locale $locale (Optional) Locale for country translation
-     * @return array
+     * @return string|false
      * @deprecated
      */
     public static function getCountryTranslation($value, $locale = null)
@@ -731,7 +731,7 @@ 
      *
      * @param  string             $value  Name to get detailed information about
      * @param  string|Zend_Locale $locale (Optional) Locale for territory translation
-     * @return array
+     * @return string|false
      * @deprecated
      */
     public static function getTerritoryTranslation($value, $locale = null)
@@ -1084,7 +1084,6 @@ 
      *
      * Standard Searchorder is Browser, Environment, Default
      *
-     * @param  string  $searchorder (Optional) Searchorder
      * @return array Returns an array of all detected locales
      */
     public static function getOrder($order = null)

thirdparty/Zend/Locale/Data.php

Doc Comments +1 added lines, -2 removed lines

@@ -275,7 +275,7 @@ 
     /**
      * Internal function for checking the locale
      *
-     * @param string|Zend_Locale $locale Locale to check
+     * @param string $locale Locale to check
      * @return string
      */
     private static function _checkLocale($locale)
@@ -1501,7 +1501,6 @@ 
     /**
      * Internal method to check if the given cache supports tags
      *
-     * @param Zend_Cache $cache
      */
     private static function _getTagSupportForCache()
     {

thirdparty/Zend/Locale/Format.php

Doc Comments +4 added lines, -5 removed lines

@@ -292,7 +292,6 @@ 
      * ##0.00 -> 12345.12345 -> 12345.12
      * ##,##0.00 -> 12345.12345 -> 12,345.12
      *
-     * @param   string  $input    Localized number string
      * @param   array   $options  Options: number_format, locale, precision. See {@link setOptions()} for details.
      * @return  string  locale formatted number
      * @throws Zend_Locale_Exception
@@ -488,6 +487,9 @@ 
         return (string) $format;
     }
 
+    /**
+     * @param string $value
+     */
     private static function _seperateFormat($format, $value, $precision)
     {
         if (iconv_strpos($format, ';') !== false) {
@@ -644,7 +646,6 @@ 
     /**
      * Alias for getNumber
      *
-     * @param   string  $value    Number to localize
      * @param   array   $options  Options: locale, precision. See {@link setOptions()} for details.
      * @return  float
      */
@@ -671,7 +672,6 @@ 
      * Returns if a float was found
      * Alias for isNumber()
      *
-     * @param   string  $input    Localized number string
      * @param   array   $options  Options: locale. See {@link setOptions()} for details.
      * @return  boolean           Returns true if a number was found
      */
@@ -719,7 +719,6 @@ 
     /**
      * Returns if a integer was found
      *
-     * @param   string  $input    Localized number string
      * @param   array   $options  Options: locale. See {@link setOptions()} for details.
      * @return  boolean           Returns true if a integer was found
      */
@@ -1103,7 +1102,7 @@ 
      * @param  string  $number     Date string (modified)
      * @param  array   $monthlist  List of month names
      *
-     * @return int|false           Position of replaced string (false if nothing replaced)
+     * @return string           Position of replaced string (false if nothing replaced)
      */
     protected static function _replaceMonth(&$number, $monthlist)
     {