Merge pull request #3 from flintweather/fix-bug-14413

Fix Bug 14413

Author: kenguest

Date.php

@@ -465,18 +465,41 @@ class Date
      *
      * @param mixed $date                optional ISO 8601 date/time to initialize;
      *                                    or, a Unix time stamp
-     * @param bool  $pb_countleapseconds whether to count leap seconds
+     * @param mixed $options             optional with backwards compatibility;
+     *                                    accept bool whether to count leap seconds
      *                                    (defaults to
-     *                                    {@link DATE_COUNT_LEAP_SECONDS})
+     *                                    {@link DATE_COUNT_LEAP_SECONDS});
+     *                                    accept array options with default options:
+     *                                    'pb_countleapseconds' to count leap seconds
+     *                                    (defaults to
+     *                                    {@link DATE_COUNT_LEAP_SECONDS});
+     *                                    'format' (DATE_FORMAT_*) of the input date.
+     *                                    This option is not needed, except to force
+     *                                    the setting of the date from a Unix
+     *                                    time-stamp (for which use
+     *                                    {@link DATE_FORMAT_UNIXTIME}).
+     *                                    (Defaults to
+     *                                    {@link DATE_FORMAT_ISO}.)
      *
      * @return   void
      * @access   public
      * @see      Date::setDate()
      */
-    function Date($date = null,
-                  $pb_countleapseconds = DATE_COUNT_LEAP_SECONDS)
+    function Date($date = null, $options = null)
     {
-        $this->ob_countleapseconds = $pb_countleapseconds;
+		$default = array(
+		    "pb_countleapseconds" => DATE_COUNT_LEAP_SECONDS,
+		    "format" => DATE_FORMAT_ISO
+		);
+		if (is_null($options)) {
+			$options = array();
+	    }
+		if (is_bool($options)) {
+			$options["pb_countleapseconds"] = $options;
+	    }
+	    $args = array_merge($default, $options);
+
+        $this->ob_countleapseconds = $args["pb_countleapseconds"];
 
         if (is_a($date, 'Date')) {
             $this->copy($date);
@@ -485,7 +508,7 @@ function Date($date = null,
                 // 'setDate()' expects a time zone to be already set:
                 //
                 $this->_setTZToDefault();
-                $this->setDate($date);
+                $this->setDate($date, $args["format"]);
             } else {
                 $this->setNow();
             }

tests/bugs/bug-2378-1.phpt

@@ -6,7 +6,7 @@ Bug #2378: Date::getDate(DATE_FORMAT_UNIXTIME) doesn't convert to GMT
 require_once "Date.php";
 
 
-$date =& new Date(1095935549);
+$date =& new Date(1095935549, array('format' => DATE_FORMAT_UNIXTIME));
 echo $date->getTime()."\n";
 $date->convertTZbyID('America/Los_Angeles');
 echo $date->getTime()."\n";

tests/bugs/bug-8912.phpt

@@ -25,7 +25,7 @@ $originalTimezone = new Date_TimeZone('Australia/Adelaide');
 $d = new Date("2007-08-31 11:59:59Z");
 $hn_time = $d->getTime();
 foreach ($states as $state) {
-    $new_date = new Date($hn_time);
+    $new_date = new Date($hn_time, array('format' => DATE_FORMAT_UNIXTIME));
     print 'Original Time (Australia/Adelaide): ' . $new_date->formatLikeSQL("TZH:TZM") . " " . $new_date->getTime() . "\n";
     $timezone = new Date_TimeZone($state);
     $new_date->convertTZ($timezone);
@@ -38,49 +38,49 @@ foreach ($states as $state) {
 }
 ?>
 --EXPECT--
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Adelaide: 1188561599
 Difference: 0
 Australia/Adelaide: 1188561599
 Difference: 0
 
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Canberra: 1188561599
 Difference: 0
 Australia/Canberra: 1188563399
 Difference: 1800
 
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Darwin: 1188561599
 Difference: 0
 Australia/Darwin: 1188561599
 Difference: 0
 
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Brisbane: 1188561599
 Difference: 0
 Australia/Brisbane: 1188563399
 Difference: 1800
 
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Hobart: 1188561599
 Difference: 0
 Australia/Hobart: 1188563399
 Difference: 1800
 
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Melbourne: 1188561599
 Difference: 0
 Australia/Melbourne: 1188563399
 Difference: 1800
 
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Perth: 1188561599
 Difference: 0
 Australia/Perth: 1188556199
 Difference: -5400
 
-Original Time (Australia/Adelaide): 01:00 1188561599
+Original Time (Australia/Adelaide): 00:00 1188561599
 Australia/Sydney: 1188561599
 Difference: 0
 Australia/Sydney: 1188563399