Merge branch 'master' of https://github.com/Shardj/zf1-future

Shardj · Oct 4, 2019 · c50baa0 · c50baa0
2 parents b74c432 + cf0f01f
commit c50baa0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/Zend/Date.php b/library/Zend/Date.php
@@ -233,7 +233,7 @@ public function __construct($date = null, $part = null, $locale = null)
      *
      * @param  array  $options  Options to set
      * @throws Zend_Date_Exception
-     * @return Options array if no option was given
+     * @return array|void if no option was given
      */
     public static function setOptions(array $options = array())
     {