From 1ed6d9109e355cc45591df3803b411557c4bcdfe Mon Sep 17 00:00:00 2001
From: andy wharmby <wharmby@php.net>
Date: Wed, 18 Mar 2009 23:34:57 +0000
Subject: [PATCH] New tests for various date extension functions. Tested on
 Windows, Linux and linux 64

---
 ext/date/tests/checkdate_basic1.phpt          |   54 +
 ext/date/tests/checkdate_error.phpt           |   49 +
 ext/date/tests/checkdate_variation1.phpt      |  202 +++
 ext/date/tests/checkdate_variation2.phpt      |  202 +++
 ext/date/tests/checkdate_variation3.phpt      |  201 +++
 ext/date/tests/date_basic1.phpt               |   41 +
 ext/date/tests/date_create_basic.phpt         |   34 +
 ext/date/tests/date_create_error.phpt         |   28 +
 ext/date/tests/date_create_variation1.phpt    |  269 ++++
 ext/date/tests/date_create_variation2.phpt    |  252 ++++
 ext/date/tests/date_date_set_basic1.phpt      |   30 +
 ext/date/tests/date_date_set_error.phpt       |   56 +
 ext/date/tests/date_date_set_variation1.phpt  |  254 ++++
 ext/date/tests/date_date_set_variation2.phpt  |  224 ++++
 ext/date/tests/date_date_set_variation3.phpt  |  224 ++++
 ext/date/tests/date_date_set_variation4.phpt  |  224 ++++
 ext/date/tests/date_error.phpt                |   39 +
 ext/date/tests/date_format_basic1.phpt        |   40 +
 ext/date/tests/date_format_error.phpt         |   67 +
 ext/date/tests/date_format_variation1.phpt    |  252 ++++
 ext/date/tests/date_format_variation2.phpt    |  208 +++
 ext/date/tests/date_isodate_set_basic1.phpt   |   38 +
 ext/date/tests/date_isodate_set_error.phpt    |   68 +
 .../tests/date_isodate_set_variation1.phpt    |  254 ++++
 .../tests/date_isodate_set_variation2.phpt    |  225 ++++
 .../tests/date_isodate_set_variation3.phpt    |  224 ++++
 .../tests/date_isodate_set_variation4.phpt    |  224 ++++
 ext/date/tests/date_modify_basic1.phpt        |   39 +
 ext/date/tests/date_modify_error.phpt         |   68 +
 ext/date/tests/date_modify_variation1.phpt    |  252 ++++
 ext/date/tests/date_modify_variation2.phpt    |  208 +++
 ext/date/tests/date_offset_get_basic1.phpt    |   28 +
 ext/date/tests/date_offset_get_error.phpt     |   57 +
 .../tests/date_offset_get_variation1.phpt     |  250 ++++
 ext/date/tests/date_parse_basic1.phpt         |  107 ++
 ext/date/tests/date_parse_error.phpt          |   89 ++
 ext/date/tests/date_parse_variation1.phpt     |  272 ++++
 ext/date/tests/date_time_set_basic1.phpt      |   46 +
 ext/date/tests/date_time_set_error.phpt       |   70 +
 ext/date/tests/date_time_set_variation1.phpt  |  254 ++++
 ext/date/tests/date_time_set_variation2.phpt  |  224 ++++
 ext/date/tests/date_time_set_variation3.phpt  |  224 ++++
 ext/date/tests/date_time_set_variation4.phpt  |  224 ++++
 ext/date/tests/date_timezone_get_basic1.phpt  |   35 +
 ext/date/tests/date_timezone_get_error.phpt   |   56 +
 .../tests/date_timezone_get_variation1.phpt   |  250 ++++
 ext/date/tests/date_timezone_set_basic1.phpt  |   34 +
 ext/date/tests/date_timezone_set_error.phpt   |   64 +
 .../tests/date_timezone_set_variation1.phpt   |  254 ++++
 .../tests/date_timezone_set_variation2.phpt   |  252 ++++
 ext/date/tests/date_variation1.phpt           |  208 +++
 ext/date/tests/date_variation2.phpt           |  222 ++++
 ext/date/tests/idate_error.phpt               |   37 +
 ext/date/tests/localtime_error.phpt           |   33 +
 ext/date/tests/mktime_basic1.phpt             |   47 +
 ext/date/tests/mktime_error.phpt              |   45 +
 ext/date/tests/mktime_variation1.phpt         |  224 ++++
 ext/date/tests/mktime_variation2.phpt         |  218 ++++
 ext/date/tests/mktime_variation3.phpt         |  219 ++++
 ext/date/tests/mktime_variation4.phpt         |  220 ++++
 ext/date/tests/mktime_variation5.phpt         |  221 ++++
 ext/date/tests/mktime_variation6.phpt         |  223 ++++
 ext/date/tests/mktime_variation7.phpt         |  251 ++++
 .../timezone_abbreviations_list_basic1.phpt   |   70 +
 .../timezone_identifiers_list_basic1.phpt     | 1144 +++++++++++++++++
 .../tests/timezone_name_from_abbr_basic1.phpt |   68 +
 .../tests/timezone_name_from_abbr_error.phpt  |   42 +
 .../timezone_name_from_abbr_variation1.phpt   |  205 +++
 .../timezone_name_from_abbr_variation2.phpt   |  219 ++++
 .../timezone_name_from_abbr_variation3.phpt   |  219 ++++
 ext/date/tests/timezone_name_get_error.phpt   |   56 +
 .../tests/timezone_offset_get_basic1.phpt     |   34 +
 ext/date/tests/timezone_offset_get_error.phpt |   84 ++
 .../tests/timezone_offset_get_variation1.phpt |  252 ++++
 .../tests/timezone_offset_get_variation2.phpt |  252 ++++
 ext/date/tests/timezone_open_basic1.phpt      |   27 +
 ext/date/tests/timezone_open_error.phpt       |   35 +
 ext/date/tests/timezone_open_variation1.phpt  |  251 ++++
 .../timezone_transitions_get_basic1.phpt      |   53 +
 .../tests/timezone_transitions_get_error.phpt |   56 +
 .../timezone_transitions_get_variation1.phpt  |  250 ++++
 81 files changed, 12825 insertions(+)
 create mode 100644 ext/date/tests/checkdate_basic1.phpt
 create mode 100644 ext/date/tests/checkdate_error.phpt
 create mode 100644 ext/date/tests/checkdate_variation1.phpt
 create mode 100644 ext/date/tests/checkdate_variation2.phpt
 create mode 100644 ext/date/tests/checkdate_variation3.phpt
 create mode 100644 ext/date/tests/date_basic1.phpt
 create mode 100644 ext/date/tests/date_create_basic.phpt
 create mode 100644 ext/date/tests/date_create_error.phpt
 create mode 100644 ext/date/tests/date_create_variation1.phpt
 create mode 100644 ext/date/tests/date_create_variation2.phpt
 create mode 100644 ext/date/tests/date_date_set_basic1.phpt
 create mode 100644 ext/date/tests/date_date_set_error.phpt
 create mode 100644 ext/date/tests/date_date_set_variation1.phpt
 create mode 100644 ext/date/tests/date_date_set_variation2.phpt
 create mode 100644 ext/date/tests/date_date_set_variation3.phpt
 create mode 100644 ext/date/tests/date_date_set_variation4.phpt
 create mode 100644 ext/date/tests/date_error.phpt
 create mode 100644 ext/date/tests/date_format_basic1.phpt
 create mode 100644 ext/date/tests/date_format_error.phpt
 create mode 100644 ext/date/tests/date_format_variation1.phpt
 create mode 100644 ext/date/tests/date_format_variation2.phpt
 create mode 100644 ext/date/tests/date_isodate_set_basic1.phpt
 create mode 100644 ext/date/tests/date_isodate_set_error.phpt
 create mode 100644 ext/date/tests/date_isodate_set_variation1.phpt
 create mode 100644 ext/date/tests/date_isodate_set_variation2.phpt
 create mode 100644 ext/date/tests/date_isodate_set_variation3.phpt
 create mode 100644 ext/date/tests/date_isodate_set_variation4.phpt
 create mode 100644 ext/date/tests/date_modify_basic1.phpt
 create mode 100644 ext/date/tests/date_modify_error.phpt
 create mode 100644 ext/date/tests/date_modify_variation1.phpt
 create mode 100644 ext/date/tests/date_modify_variation2.phpt
 create mode 100644 ext/date/tests/date_offset_get_basic1.phpt
 create mode 100644 ext/date/tests/date_offset_get_error.phpt
 create mode 100644 ext/date/tests/date_offset_get_variation1.phpt
 create mode 100644 ext/date/tests/date_parse_basic1.phpt
 create mode 100644 ext/date/tests/date_parse_error.phpt
 create mode 100644 ext/date/tests/date_parse_variation1.phpt
 create mode 100644 ext/date/tests/date_time_set_basic1.phpt
 create mode 100644 ext/date/tests/date_time_set_error.phpt
 create mode 100644 ext/date/tests/date_time_set_variation1.phpt
 create mode 100644 ext/date/tests/date_time_set_variation2.phpt
 create mode 100644 ext/date/tests/date_time_set_variation3.phpt
 create mode 100644 ext/date/tests/date_time_set_variation4.phpt
 create mode 100644 ext/date/tests/date_timezone_get_basic1.phpt
 create mode 100644 ext/date/tests/date_timezone_get_error.phpt
 create mode 100644 ext/date/tests/date_timezone_get_variation1.phpt
 create mode 100644 ext/date/tests/date_timezone_set_basic1.phpt
 create mode 100644 ext/date/tests/date_timezone_set_error.phpt
 create mode 100644 ext/date/tests/date_timezone_set_variation1.phpt
 create mode 100644 ext/date/tests/date_timezone_set_variation2.phpt
 create mode 100644 ext/date/tests/date_variation1.phpt
 create mode 100644 ext/date/tests/date_variation2.phpt
 create mode 100644 ext/date/tests/idate_error.phpt
 create mode 100644 ext/date/tests/localtime_error.phpt
 create mode 100644 ext/date/tests/mktime_basic1.phpt
 create mode 100644 ext/date/tests/mktime_error.phpt
 create mode 100644 ext/date/tests/mktime_variation1.phpt
 create mode 100644 ext/date/tests/mktime_variation2.phpt
 create mode 100644 ext/date/tests/mktime_variation3.phpt
 create mode 100644 ext/date/tests/mktime_variation4.phpt
 create mode 100644 ext/date/tests/mktime_variation5.phpt
 create mode 100644 ext/date/tests/mktime_variation6.phpt
 create mode 100644 ext/date/tests/mktime_variation7.phpt
 create mode 100644 ext/date/tests/timezone_abbreviations_list_basic1.phpt
 create mode 100644 ext/date/tests/timezone_identifiers_list_basic1.phpt
 create mode 100644 ext/date/tests/timezone_name_from_abbr_basic1.phpt
 create mode 100644 ext/date/tests/timezone_name_from_abbr_error.phpt
 create mode 100644 ext/date/tests/timezone_name_from_abbr_variation1.phpt
 create mode 100644 ext/date/tests/timezone_name_from_abbr_variation2.phpt
 create mode 100644 ext/date/tests/timezone_name_from_abbr_variation3.phpt
 create mode 100644 ext/date/tests/timezone_name_get_error.phpt
 create mode 100644 ext/date/tests/timezone_offset_get_basic1.phpt
 create mode 100644 ext/date/tests/timezone_offset_get_error.phpt
 create mode 100644 ext/date/tests/timezone_offset_get_variation1.phpt
 create mode 100644 ext/date/tests/timezone_offset_get_variation2.phpt
 create mode 100644 ext/date/tests/timezone_open_basic1.phpt
 create mode 100644 ext/date/tests/timezone_open_error.phpt
 create mode 100644 ext/date/tests/timezone_open_variation1.phpt
 create mode 100644 ext/date/tests/timezone_transitions_get_basic1.phpt
 create mode 100644 ext/date/tests/timezone_transitions_get_error.phpt
 create mode 100644 ext/date/tests/timezone_transitions_get_variation1.phpt

diff --git a/ext/date/tests/checkdate_basic1.phpt b/ext/date/tests/checkdate_basic1.phpt
new file mode 100644
index 0000000000..2937f29a8e
--- /dev/null
+++ b/ext/date/tests/checkdate_basic1.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Test date_create() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
+ * Description: Checks the validity of the date formed by the arguments. 
+ *              A date is considered valid if each parameter is properly defined. 
+ * Source code: ext/date/php_date.c
+ */
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing checkdate() : basic functionality ***\n";
+
+echo "-- The following are all valid dates --\n";
+var_dump( checkdate(1, 1, 2009) );
+var_dump( checkdate(12, 31, 2009) );
+var_dump( checkdate(7, 2, 1963) );
+var_dump( checkdate(5, 31, 2009) );
+var_dump( checkdate(2, 28, 2009) ); // non-leap year
+var_dump( checkdate(2, 29, 2008) ); // leap year
+var_dump( checkdate(7, 2, 1) );     // min year 
+var_dump( checkdate(7, 2, 32767) ); // max year 
+
+echo "-- The following are all invalid dates --\n";
+var_dump( checkdate(13, 1, 2009) );
+var_dump( checkdate(2, 31, 2009) );
+var_dump( checkdate(1, 32, 2009) );
+var_dump( checkdate(2, 29, 2009) ); // non-leap year
+var_dump( checkdate(7, 2, 32768) ); // >max year
+var_dump( checkdate(7, 2, 0) ); // <min year  
+
+?>
+===DONE===
+--EXPECT--
+*** Testing checkdate() : basic functionality ***
+-- The following are all valid dates --
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+-- The following are all invalid dates --
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+===DONE===
diff --git a/ext/date/tests/checkdate_error.phpt b/ext/date/tests/checkdate_error.phpt
new file mode 100644
index 0000000000..4546408304
--- /dev/null
+++ b/ext/date/tests/checkdate_error.phpt
@@ -0,0 +1,49 @@
+--TEST--
+Test checkdate() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
+ * Description: Validate a Gregorian date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing checkdate() : error conditions ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("America/Chicago");
+
+$arg_0 = 1;
+$arg_1 = 1;
+$arg_2 = 1;
+$extra_arg = 1;
+
+echo "\n-- Testing checkdate() function with more than expected no. of arguments --\n";
+var_dump (checkdate($arg_0, $arg_1, $arg_2, $extra_arg));
+
+echo "\n-- Testing checkdate() function with less than expected no. of arguments --\n";
+var_dump (checkdate());
+var_dump (checkdate($arg_0));
+var_dump (checkdate($arg_0, $arg_1));
+
+?>
+===DONE=== 
+--EXPECTF--
+*** Testing checkdate() : error conditions ***
+
+-- Testing checkdate() function with more than expected no. of arguments --
+
+Warning: checkdate() expects exactly 3 parameters, 4 given in %s on line %d
+bool(false)
+
+-- Testing checkdate() function with less than expected no. of arguments --
+
+Warning: checkdate() expects exactly 3 parameters, 0 given in %s on line %d
+bool(false)
+
+Warning: checkdate() expects exactly 3 parameters, 1 given in %s on line %d
+bool(false)
+
+Warning: checkdate() expects exactly 3 parameters, 2 given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/checkdate_variation1.phpt b/ext/date/tests/checkdate_variation1.phpt
new file mode 100644
index 0000000000..378270cc80
--- /dev/null
+++ b/ext/date/tests/checkdate_variation1.phpt
@@ -0,0 +1,202 @@
+--TEST--
+Test checkdate() function : usage variation - Passing unexpected values to first argument $month.
+--FILE--
+<?php
+/* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
+ * Description: Checks the validity of the date formed by the arguments. 
+ *              A date is considered valid if each parameter is properly defined. 
+ * Source code: ext/date/php_date.c
+ */
+
+echo "*** Testing checkdate() : usage variation -  unexpected values to first argument \$month***\n";
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$day = 2;
+$year = 1963;
+
+foreach($inputs as $variation =>$month) {
+      echo "\n-- $variation --\n";
+      var_dump( checkdate($month, $day, $year) );
+};
+
+// closing the resource
+fclose( $file_handle);
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing checkdate() : usage variation -  unexpected values to first argument $month***
+
+-- float 10.5 --
+bool(true)
+
+-- float -10.5 --
+bool(false)
+
+-- float .5 --
+bool(false)
+
+-- empty array --
+
+Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: checkdate() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+bool(false)
+
+-- lowercase null --
+bool(false)
+
+-- lowercase true --
+bool(true)
+
+-- lowercase false --
+bool(false)
+
+-- uppercase TRUE --
+bool(true)
+
+-- uppercase FALSE --
+bool(false)
+
+-- empty string DQ --
+
+Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: checkdate() expects parameter 1 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: checkdate() expects parameter 1 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+bool(false)
+
+-- unset var --
+bool(false)
+
+-- resource --
+
+Warning: checkdate() expects parameter 1 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/checkdate_variation2.phpt b/ext/date/tests/checkdate_variation2.phpt
new file mode 100644
index 0000000000..76afbdce74
--- /dev/null
+++ b/ext/date/tests/checkdate_variation2.phpt
@@ -0,0 +1,202 @@
+--TEST--
+Test checkdate() function : usage variation - Passing unexpected values to second argument $day.
+--FILE--
+<?php
+/* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
+ * Description: Checks the validity of the date formed by the arguments. 
+ *              A date is considered valid if each parameter is properly defined. 
+ * Source code: ext/date/php_date.c
+ */
+
+echo "*** Testing checkdate() : usage variation -  unexpected values to second argument \$day***\n";
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$month = 7;
+$year = 1963;
+
+foreach($inputs as $variation =>$day) {
+      echo "\n-- $variation --\n";
+      var_dump( checkdate($month, $day, $year) );
+};
+
+// closing the resource
+fclose( $file_handle);
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing checkdate() : usage variation -  unexpected values to second argument $day***
+
+-- float 10.5 --
+bool(true)
+
+-- float -10.5 --
+bool(false)
+
+-- float .5 --
+bool(false)
+
+-- empty array --
+
+Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: checkdate() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+bool(false)
+
+-- lowercase null --
+bool(false)
+
+-- lowercase true --
+bool(true)
+
+-- lowercase false --
+bool(false)
+
+-- uppercase TRUE --
+bool(true)
+
+-- uppercase FALSE --
+bool(false)
+
+-- empty string DQ --
+
+Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: checkdate() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: checkdate() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: checkdate() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+bool(false)
+
+-- unset var --
+bool(false)
+
+-- resource --
+
+Warning: checkdate() expects parameter 2 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/checkdate_variation3.phpt b/ext/date/tests/checkdate_variation3.phpt
new file mode 100644
index 0000000000..b94605646a
--- /dev/null
+++ b/ext/date/tests/checkdate_variation3.phpt
@@ -0,0 +1,201 @@
+--TEST--
+Test checkdate() function : usage variation - Passing unexpected values to third argument $year.
+--FILE--
+<?php
+/* Prototype  : bool checkdate  ( int $month  , int $day  , int $year  )
+ * Description: Checks the validity of the date formed by the arguments. 
+ *              A date is considered valid if each parameter is properly defined. 
+ * Source code: ext/date/php_date.c
+ */
+
+echo "*** Testing checkdate() : usage variation -  unexpected values to third argument \$year***\n";
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$day = 2;
+$month = 7;
+
+foreach($inputs as $variation =>$year) {
+      echo "\n-- $variation --\n";
+      var_dump( checkdate($month, $day, $year) );
+};
+
+// closing the resource
+fclose( $file_handle);
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing checkdate() : usage variation -  unexpected values to third argument $year***
+
+-- float 10.5 --
+bool(true)
+
+-- float -10.5 --
+bool(false)
+
+-- float .5 --
+bool(false)
+
+-- empty array --
+
+Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: checkdate() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+bool(false)
+
+-- lowercase null --
+bool(false)
+
+-- lowercase true --
+bool(true)
+
+-- lowercase false --
+bool(false)
+
+-- uppercase TRUE --
+bool(true)
+
+-- uppercase FALSE --
+bool(false)
+
+-- empty string DQ --
+
+Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: checkdate() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: checkdate() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: checkdate() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+bool(false)
+
+-- unset var --
+bool(false)
+
+-- resource --
+
+Warning: checkdate() expects parameter 3 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt
new file mode 100644
index 0000000000..f4d922b78f
--- /dev/null
+++ b/ext/date/tests/date_basic1.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Test date() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : string date  ( string $format  [, int $timestamp  ] )
+ * Description: Format a local time/date.
+ * Source code: ext/date/php_date.c
+ */
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date() : basic functionality ***\n";
+
+$timestamp = mktime(10, 44, 30, 2, 27, 2009);
+
+var_dump( date("F j, Y, g:i a", $timestamp) );     
+var_dump( date("m.d.y", $timestamp) );                         
+var_dump( date("j, n, Y", $timestamp) );             
+var_dump( date("Ymd", $timestamp) );      
+var_dump( date('h-i-s, j-m-y, it is w Day', $timestamp) );    
+var_dump( date('\i\t \i\s \t\h\e jS \d\a\y.', $timestamp) );
+var_dump( date("D M j G:i:s T Y", $timestamp) );
+var_dump( date('H:m:s \m \i\s\ \m\o\n\t\h', $timestamp) );  
+var_dump( date("H:i:s", $timestamp) );
+
+?>
+===DONE===
+--EXPECT--
+*** Testing date() : basic functionality ***
+string(27) "February 27, 2009, 10:44 am"
+string(8) "02.27.09"
+string(11) "27, 2, 2009"
+string(8) "20090227"
+string(39) "10-44-30, 27-02-09, 4428 4430 5 Friam09"
+string(19) "it is the 27th day."
+string(28) "Fri Feb 27 10:44:30 GMT 2009"
+string(19) "10:02:30 m is month"
+string(8) "10:44:30"
+===DONE===
+
diff --git a/ext/date/tests/date_create_basic.phpt b/ext/date/tests/date_create_basic.phpt
new file mode 100644
index 0000000000..9cb5053cfd
--- /dev/null
+++ b/ext/date/tests/date_create_basic.phpt
@@ -0,0 +1,34 @@
+--TEST--
+Test date_create() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : DateTime date_create  ([ string $time  [, DateTimeZone $timezone  ]] )
+ * Description: Returns new DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::__construct
+ */
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_create() : basic functionality ***\n";
+
+var_dump( date_create() );
+
+var_dump( date_create("GMT") );
+var_dump( date_create("2005-07-14 22:30:41") );
+var_dump( date_create("2005-07-14 22:30:41 GMT") );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_create() : basic functionality ***
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+===DONE===
diff --git a/ext/date/tests/date_create_error.phpt b/ext/date/tests/date_create_error.phpt
new file mode 100644
index 0000000000..0a42f28810
--- /dev/null
+++ b/ext/date/tests/date_create_error.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test date_create() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : DateTime date_create  ([ string $time  [, DateTimeZone $timezone  ]] )
+ * Description: Returns new DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::__construct
+ */
+
+echo "*** Testing date_create() : error conditions ***\n";
+
+echo "\n-- Testing date_create() function with more than expected no. of arguments --\n";
+$time = "GMT";
+$timezone  = timezone_open("GMT");
+$extra_arg = 99;
+var_dump( date_create($time, $timezone, $extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_create() : error conditions ***
+
+-- Testing date_create() function with more than expected no. of arguments --
+
+Warning: date_create() expects at most 2 parameters, 3 given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_create_variation1.phpt b/ext/date/tests/date_create_variation1.phpt
new file mode 100644
index 0000000000..db510bbfd6
--- /dev/null
+++ b/ext/date/tests/date_create_variation1.phpt
@@ -0,0 +1,269 @@
+--TEST--
+Test date_create() function : usage variation - Passing unexpected values to first argument $time.
+--FILE--
+<?php
+/* Prototype  : DateTime date_create  ([ string $time  [, DateTimeZone $timezone  ]] )
+ * Description: Returns new DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::__construct
+ */
+
+echo "*** Testing date_create() : usage variation -  unexpected values to first argument \$time***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$timezone = new DateTimeZone("Europe/London");
+
+foreach($inputs as $variation =>$time) {
+      echo "\n-- $variation --\n";
+      var_dump( date_create($time) );
+      var_dump( date_create($time, $timezone) );
+};
+
+// closing the resource
+fclose( $file_handle);
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_create() : usage variation -  unexpected values to first argument $time***
+
+-- int 0 --
+bool(false)
+bool(false)
+
+-- int 1 --
+bool(false)
+bool(false)
+
+-- int 12345 --
+bool(false)
+bool(false)
+
+-- int -12345 --
+bool(false)
+bool(false)
+
+-- float 10.5 --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- float -10.5 --
+bool(false)
+bool(false)
+
+-- float .5 --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- empty array --
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+Warning: date_create() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- lowercase null --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- lowercase true --
+bool(false)
+bool(false)
+
+-- lowercase false --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- uppercase TRUE --
+bool(false)
+bool(false)
+
+-- uppercase FALSE --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- empty string DQ --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- empty string SQ --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- string DQ --
+bool(false)
+bool(false)
+
+-- string SQ --
+bool(false)
+bool(false)
+
+-- mixed case string --
+bool(false)
+bool(false)
+
+-- heredoc --
+bool(false)
+bool(false)
+
+-- instance of classWithToString --
+bool(false)
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_create() expects parameter 1 to be string, object given in %s on line %d
+bool(false)
+
+Warning: date_create() expects parameter 1 to be string, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- unset var --
+object(DateTime)#%d (0) {
+}
+object(DateTime)#%d (0) {
+}
+
+-- resource --
+
+Warning: date_create() expects parameter 1 to be string, resource given in %s on line %d
+bool(false)
+
+Warning: date_create() expects parameter 1 to be string, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_create_variation2.phpt b/ext/date/tests/date_create_variation2.phpt
new file mode 100644
index 0000000000..25e5a2a352
--- /dev/null
+++ b/ext/date/tests/date_create_variation2.phpt
@@ -0,0 +1,252 @@
+--TEST--
+Test date_create() function : usage variation - Passing unexpected values to second argument $timezone.
+--FILE--
+<?php
+/* Prototype  : DateTime date_create  ([ string $time  [, DateTimeZone $timezone  ]] )
+ * Description: Returns new DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::__construct
+ */
+
+echo "*** Testing date_create() : usage variation -  unexpected values to second argument \$timezone***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$time = "2005-07-14 22:30:41";
+
+foreach($inputs as $variation =>$timezone) {
+      echo "\n-- $variation --\n";
+        var_dump( date_create($time, $timezone) );
+};
+
+// closing the resource
+fclose( $file_handle);
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_create() : usage variation -  unexpected values to second argument $timezone***
+
+-- int 0 --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_create() expects parameter 2 to be DateTimeZone, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_date_set_basic1.phpt b/ext/date/tests/date_date_set_basic1.phpt
new file mode 100644
index 0000000000..24d772dd86
--- /dev/null
+++ b/ext/date/tests/date_date_set_basic1.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Test date_date_set() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : void date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
+ * Description: Resets the current date of the DateTime object to a different date. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setDate
+ */
+ 
+ //Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_date_set() : basic functionality ***\n";
+
+$datetime = date_create("2009-01-30 19:34:10");
+
+echo date_format($datetime, DATE_RFC2822) . "\n";
+
+date_date_set($datetime, 2008, 02, 01);
+
+echo date_format($datetime, DATE_RFC2822) . "\n";
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_date_set() : basic functionality ***
+Fri, 30 Jan 2009 19:34:10 +0000
+Fri, 01 Feb 2008 19:34:10 +0000
+===DONE===
diff --git a/ext/date/tests/date_date_set_error.phpt b/ext/date/tests/date_date_set_error.phpt
new file mode 100644
index 0000000000..6dc4870bc8
--- /dev/null
+++ b/ext/date/tests/date_date_set_error.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Test date_date_set() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : void date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
+ * Description: Resets the current date of the DateTime object to a different date. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setDate
+ */
+ 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_date_set() : error conditions ***\n";
+
+echo "\n-- Testing date_date_set() function with zero arguments --\n";
+var_dump( date_date_set() );
+
+echo "\n-- Testing date_date_set() function with less than expected no. of arguments --\n";
+$datetime = date_create("2009-01-30 19:34:10");
+$year = 2009;
+$month = 1;
+$day = 30;
+var_dump( date_date_set($datetime) );
+var_dump( date_date_set($datetime, $year) );
+var_dump( date_date_set($datetime, $year, $month) );
+
+echo "\n-- Testing date_date_set() function with more than expected no. of arguments --\n";
+$extra_arg = 10;
+var_dump( date_date_set($datetime, $year, $month, $day, $extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_date_set() : error conditions ***
+
+-- Testing date_date_set() function with zero arguments --
+
+Warning: date_date_set() expects exactly 4 parameters, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_date_set() function with less than expected no. of arguments --
+
+Warning: date_date_set() expects exactly 4 parameters, 1 given in %s on line %d
+bool(false)
+
+Warning: date_date_set() expects exactly 4 parameters, 2 given in %s on line %d
+bool(false)
+
+Warning: date_date_set() expects exactly 4 parameters, 3 given in %s on line %d
+bool(false)
+
+-- Testing date_date_set() function with more than expected no. of arguments --
+
+Warning: date_date_set() expects exactly 4 parameters, 5 given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_date_set_variation1.phpt b/ext/date/tests/date_date_set_variation1.phpt
new file mode 100644
index 0000000000..f05e3c84b8
--- /dev/null
+++ b/ext/date/tests/date_date_set_variation1.phpt
@@ -0,0 +1,254 @@
+--TEST--
+Test date_date_set() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : void date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
+ * Description: Resets the current date of the DateTime object to a different date. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setDate
+ */
+
+echo "*** Testing date_date_set() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$day = 2;
+$month = 7;
+$year = 1963;
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_date_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_date_set() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_date_set() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_date_set_variation2.phpt b/ext/date/tests/date_date_set_variation2.phpt
new file mode 100644
index 0000000000..31257f441b
--- /dev/null
+++ b/ext/date/tests/date_date_set_variation2.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_date_set() function : usage variation - Passing unexpected values to second argument $year.
+--FILE--
+<?php
+/* Prototype  : void date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
+ * Description: Resets the current date of the DateTime object to a different date. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setDate
+ */
+
+echo "*** Testing date_date_set() : usage variation -  unexpected values to second argument \$year***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-02-27 08:34:10");
+$day = 2;
+$month = 7;
+
+foreach($inputs as $variation =>$year) {
+      echo "\n-- $variation --\n";
+      var_dump( date_date_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_date_set() : usage variation -  unexpected values to second argument $year***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_date_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_date_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_date_set() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_date_set() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_date_set() expects parameter 2 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_date_set_variation3.phpt b/ext/date/tests/date_date_set_variation3.phpt
new file mode 100644
index 0000000000..c9f3c29fa7
--- /dev/null
+++ b/ext/date/tests/date_date_set_variation3.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_date_set() function : usage variation - Passing unexpected values to third argument $month.
+--FILE--
+<?php
+/* Prototype  : void date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
+ * Description: Resets the current date of the DateTime object to a different date. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setDate
+ */
+
+echo "*** Testing date_date_set() : usage variation -  unexpected values to third argument \$month***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-02-27 08:34:10");
+$day = 2;
+$year = 1963;
+
+foreach($inputs as $variation =>$month) {
+      echo "\n-- $variation --\n";
+      var_dump( date_date_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_date_set() : usage variation -  unexpected values to third argument $month***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_date_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_date_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_date_set() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_date_set() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_date_set() expects parameter 3 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_date_set_variation4.phpt b/ext/date/tests/date_date_set_variation4.phpt
new file mode 100644
index 0000000000..ddd3583961
--- /dev/null
+++ b/ext/date/tests/date_date_set_variation4.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_date_set() function : usage variation - Passing unexpected values to forth argument $day.
+--FILE--
+<?php
+/* Prototype  : void date_date_set  ( DateTime $object  , int $year  , int $month  , int $day  )
+ * Description: Resets the current date of the DateTime object to a different date. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setDate
+ */
+
+echo "*** Testing date_date_set() : usage variation -  unexpected values to forth argument \$day***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-02-27 08:34:10");
+$month = 7;
+$year = 1963;
+
+foreach($inputs as $variation =>$day) {
+      echo "\n-- $variation --\n";
+      var_dump( date_date_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_date_set() : usage variation -  unexpected values to forth argument $day***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_date_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_date_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_date_set() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_date_set() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_date_set() expects parameter 4 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_error.phpt b/ext/date/tests/date_error.phpt
new file mode 100644
index 0000000000..ee9b8f9806
--- /dev/null
+++ b/ext/date/tests/date_error.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Test date() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : string date  ( string $format  [, int $timestamp  ] )
+ * Description: Format a local time/date.
+ * Source code: ext/date/php_date.c
+ */
+
+echo "*** Testing date() : error conditions ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("America/Chicago");
+
+$format = "m.d.y";
+$timestamp = mktime(10, 44, 30, 2, 27, 2009);
+
+echo "\n-- Testing date function with no arguments --\n";
+var_dump (date());
+
+echo "\n-- Testing date function with more than expected no. of arguments --\n";
+$extra_arg = true;
+var_dump (checkdate($format, $timestamp, $extra_arg));
+
+?>
+===DONE=== 
+--EXPECTF--
+*** Testing date() : error conditions ***
+
+-- Testing date function with no arguments --
+
+Warning: date() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing date function with more than expected no. of arguments --
+
+Warning: checkdate() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_format_basic1.phpt b/ext/date/tests/date_format_basic1.phpt
new file mode 100644
index 0000000000..dc55efb0ae
--- /dev/null
+++ b/ext/date/tests/date_format_basic1.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test date_format() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : string date_format  ( DateTime $object  , string $format  )
+ * Description: Returns date formatted according to given format
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::format
+ */
+ 
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_format() : basic functionality ***\n";
+$date = date_create("2005-07-14 22:30:41");
+
+var_dump( date_format($date, "F j, Y, g:i a") );                 
+var_dump( date_format($date, "m.d.y") );                         
+var_dump( date_format($date, "j, n, Y") );                       
+var_dump( date_format($date, "Ymd") );                          
+var_dump( date_format($date, 'h-i-s, j-m-y, it is w Day') );     
+var_dump( date_format($date, '\i\t \i\s \t\h\e jS \d\a\y.') );   
+var_dump( date_format($date, "D M j G:i:s T Y") );               
+var_dump( date_format($date, 'H:m:s \m \i\s\ \m\o\n\t\h') );     
+var_dump( date_format($date, "H:i:s") );                         
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_format() : basic functionality ***
+string(23) "July 14, 2005, 10:30 pm"
+string(8) "07.14.05"
+string(11) "14, 7, 2005"
+string(8) "20050714"
+string(39) "10-30-41, 14-07-05, 3031 3041 4 Thupm05"
+string(19) "it is the 14th day."
+string(28) "Thu Jul 14 22:30:41 BST 2005"
+string(19) "22:07:41 m is month"
+string(8) "22:30:41"
+===DONE===
diff --git a/ext/date/tests/date_format_error.phpt b/ext/date/tests/date_format_error.phpt
new file mode 100644
index 0000000000..967695a86d
--- /dev/null
+++ b/ext/date/tests/date_format_error.phpt
@@ -0,0 +1,67 @@
+--TEST--
+Test date_format() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : string date_format  ( DateTime $object  , string $format  )
+ * Description: Returns date formatted according to given format
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::format
+ */
+ 
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_format() : error conditions ***\n";
+
+echo "\n-- Testing date_create() function with zero arguments --\n";
+var_dump( date_format() );
+
+$date = date_create("2005-07-14 22:30:41");
+
+echo "\n-- Testing date_create() function with less than expected no. of arguments --\n";
+var_dump( date_format($date) );
+
+echo "\n-- Testing date_create() function with more than expected no. of arguments --\n";
+$format = "F j, Y, g:i a";
+$extra_arg = 10;
+var_dump( date_format($date, $format, $extra_arg) );
+
+echo "\n-- Testing date_create() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( date_format($invalid_obj, $format) );  
+$invalid_obj = 10;
+var_dump( date_format($invalid_obj, $format) );
+$invalid_obj = null;
+var_dump( date_format($invalid_obj, $format) );    
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_format() : error conditions ***
+
+-- Testing date_create() function with zero arguments --
+
+Warning: date_format() expects exactly 2 parameters, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_create() function with less than expected no. of arguments --
+
+Warning: date_format() expects exactly 2 parameters, 1 given in %s on line %d
+bool(false)
+
+-- Testing date_create() function with more than expected no. of arguments --
+
+Warning: date_format() expects exactly 2 parameters, 3 given in %s on line %d
+bool(false)
+
+-- Testing date_create() function with an invalid values for $object argument --
+
+Warning: date_format() expects parameter 1 to be DateTime, object given in %sp on line %d
+bool(false)
+
+Warning: date_format() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: date_format() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_format_variation1.phpt b/ext/date/tests/date_format_variation1.phpt
new file mode 100644
index 0000000000..025b7d332f
--- /dev/null
+++ b/ext/date/tests/date_format_variation1.phpt
@@ -0,0 +1,252 @@
+--TEST--
+Test date_format() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : string date_format  ( DateTime $object  , string $format  )
+ * Description: Returns date formatted according to given format
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::format
+ */
+ 
+echo "*** Testing date_format() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$format = 'H:m:s \m \i\s\ \m\o\n\t\h';
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_format($object, $format) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_format() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_format() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_format() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_format() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_format() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_format() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_format() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_format() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_format() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_format() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_format() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_format() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_format() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_format() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_format() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_format() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_format() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_format() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_format() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_format() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_format() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_format() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_format() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_format() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_format() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_format() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_format() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_format() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_format() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_format_variation2.phpt b/ext/date/tests/date_format_variation2.phpt
new file mode 100644
index 0000000000..1a90951bd8
--- /dev/null
+++ b/ext/date/tests/date_format_variation2.phpt
@@ -0,0 +1,208 @@
+--TEST--
+Test date_format() function : usage variation - Passing unexpected values to second argument $format.
+--FILE--
+<?php
+/* Prototype  : string date_format  ( DateTime $object  , string $format  )
+ * Description: Returns date formatted according to given format
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::format
+ */
+ 
+echo "*** Testing date_format() : usage variation -  unexpected values to second argument \$format***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2005-07-14 22:30:41");
+
+foreach($inputs as $variation =>$format) {
+      echo "\n-- $variation --\n";
+      var_dump( date_format($object, $format) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_format() : usage variation -  unexpected values to second argument $format***
+
+-- int 0 --
+string(1) "0"
+
+-- int 1 --
+string(1) "1"
+
+-- int 12345 --
+string(5) "12345"
+
+-- int -12345 --
+string(6) "-12345"
+
+-- float 10.5 --
+string(4) "10.5"
+
+-- float -10.5 --
+string(5) "-10.5"
+
+-- float .5 --
+string(3) "0.5"
+
+-- empty array --
+
+Warning: date_format() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_format() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_format() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_format() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+string(0) ""
+
+-- lowercase null --
+string(0) ""
+
+-- lowercase true --
+string(1) "1"
+
+-- lowercase false --
+string(0) ""
+
+-- uppercase TRUE --
+string(1) "1"
+
+-- uppercase FALSE --
+string(0) ""
+
+-- empty string DQ --
+string(0) ""
+
+-- empty string SQ --
+string(0) ""
+
+-- string DQ --
+string(40) "4131Thu, 14 Jul 2005 22:30:41 +010030710"
+
+-- string SQ --
+string(40) "4131Thu, 14 Jul 2005 22:30:41 +010030710"
+
+-- mixed case string --
+string(40) "41BSTThu, 14 Jul 2005 22:30:41 +01001722"
+
+-- heredoc --
+string(82) "10Europe/LondonThursdayThursday2005 42005Thu, 14 Jul 2005 22:30:41 +0100Thursday14"
+
+-- instance of classWithToString --
+string(66) "CThursdaypm4141 PM 2005b14Europe/London2005-07-14T22:30:41+01:0031"
+
+-- instance of classWithoutToString --
+
+Warning: date_format() expects parameter 2 to be string, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+string(0) ""
+
+-- unset var --
+string(0) ""
+
+-- resource --
+
+Warning: date_format() expects parameter 2 to be string, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_isodate_set_basic1.phpt b/ext/date/tests/date_isodate_set_basic1.phpt
new file mode 100644
index 0000000000..dc8daba533
--- /dev/null
+++ b/ext/date/tests/date_isodate_set_basic1.phpt
@@ -0,0 +1,38 @@
+--TEST--
+Test date_isodate_set() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setISODate
+ */
+
+echo "*** Testing date_isodate_set() : basic functionality ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+// Create a deate object
+$datetime = date_create("2009-01-30 17:57:32");
+
+// Which month is week 40 ?
+date_isodate_set($datetime, 2008, 40);
+echo "Week 40 of 2009 is in \"" . date_format($datetime, "F") . "\"\n";
+
+// What date is week  week 30 day 3 ?
+date_isodate_set($datetime, 2009, 30, 3);
+echo "Week 30 day 3 of 2009 is \"" . date_format($datetime, "D M j") . "\"\n";
+
+// What date was is last year  ?
+date_isodate_set($datetime, 2008, 30, 3);
+echo "..same day last year was \"" . date_format($datetime, "D M j") . "\"\n";
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_isodate_set() : basic functionality ***
+Week 40 of 2009 is in "September"
+Week 30 day 3 of 2009 is "Wed Jul 22"
+..same day last year was "Wed Jul 23"
+===DONE===
diff --git a/ext/date/tests/date_isodate_set_error.phpt b/ext/date/tests/date_isodate_set_error.phpt
new file mode 100644
index 0000000000..9accd92d93
--- /dev/null
+++ b/ext/date/tests/date_isodate_set_error.phpt
@@ -0,0 +1,68 @@
+--TEST--
+Test date_isodate_set() function : error conditions 
+--FILE--
+<?php
+
+/* Prototype  : DateTime date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setISODate
+ */
+ 
+ //Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_isodate_set() : error conditions ***\n";
+
+echo "\n-- Testing date_isodate_set() function with zero arguments --\n";
+var_dump( date_isodate_set() );
+
+$datetime = date_create("2009-01-30 19:34:10");
+echo "\n-- Testing date_isodate_set() function with less than expected no. of arguments --\n";
+var_dump( date_isodate_set($datetime) );
+
+echo "\n-- Testing date_isodate_set() function with more than expected no. of arguments --\n";
+$year = 2009;
+$week = 30; 
+$day = 7;
+$extra_arg = 30;
+var_dump( date_isodate_set($datetime, $year, $week, $day, $extra_arg) );
+
+echo "\n-- Testing date_isodate_set() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );  
+$invalid_obj = 10;
+var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );
+$invalid_obj = null;
+var_dump( date_isodate_set($invalid_obj, $year, $week, $day) );  
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_isodate_set() : error conditions ***
+
+-- Testing date_isodate_set() function with zero arguments --
+
+Warning: date_isodate_set() expects at least 3 parameters, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_isodate_set() function with less than expected no. of arguments --
+
+Warning: date_isodate_set() expects at least 3 parameters, 1 given in %s on line %d
+bool(false)
+
+-- Testing date_isodate_set() function with more than expected no. of arguments --
+
+Warning: date_isodate_set() expects at most 4 parameters, 5 given in %s on line %d
+bool(false)
+
+-- Testing date_isodate_set() function with an invalid values for $object argument --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_isodate_set_variation1.phpt b/ext/date/tests/date_isodate_set_variation1.phpt
new file mode 100644
index 0000000000..ad88f55562
--- /dev/null
+++ b/ext/date/tests/date_isodate_set_variation1.phpt
@@ -0,0 +1,254 @@
+--TEST--
+Test date_isodate_set() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : void date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setISODate
+ */
+
+echo "*** Testing date_isodate_set() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$day = 2;
+$month = 7;
+$year = 1963;
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_isodate_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_isodate_set() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_isodate_set() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_isodate_set_variation2.phpt b/ext/date/tests/date_isodate_set_variation2.phpt
new file mode 100644
index 0000000000..309904dc7c
--- /dev/null
+++ b/ext/date/tests/date_isodate_set_variation2.phpt
@@ -0,0 +1,225 @@
+--TEST--
+Test date_isodate_set() function : usage variation - Passing unexpected values to second argument $year.
+--FILE--
+<?php
+/* Prototype  : void date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setISODate
+ */
+
+echo "*** Testing date_isodate_set() : usage variation -  unexpected values to second argument \$year***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-02-27 08:34:10");
+$day = 2;
+$month = 7;
+
+foreach($inputs as $variation =>$year) {
+      echo "\n-- $variation --\n";
+      var_dump( date_isodate_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_isodate_set() : usage variation -  unexpected values to second argument $year***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_isodate_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_isodate_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_isodate_set() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_isodate_set() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_isodate_set() expects parameter 2 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/date_isodate_set_variation3.phpt b/ext/date/tests/date_isodate_set_variation3.phpt
new file mode 100644
index 0000000000..9a6adaeaea
--- /dev/null
+++ b/ext/date/tests/date_isodate_set_variation3.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_isodate_set() function : usage variation - Passing unexpected values to third argument $week.
+--FILE--
+<?php
+/* Prototype  : void date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setISODate
+ */
+
+echo "*** Testing date_isodate_set() : usage variation -  unexpected values to third argument \$week***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-02-27 08:34:10");
+$day = 2;
+$year = 1963;
+
+foreach($inputs as $variation =>$month) {
+      echo "\n-- $variation --\n";
+      var_dump( date_isodate_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_isodate_set() : usage variation -  unexpected values to third argument $week***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_isodate_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_isodate_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_isodate_set() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_isodate_set() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_isodate_set() expects parameter 3 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_isodate_set_variation4.phpt b/ext/date/tests/date_isodate_set_variation4.phpt
new file mode 100644
index 0000000000..07371a838d
--- /dev/null
+++ b/ext/date/tests/date_isodate_set_variation4.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_isodate_set() function : usage variation - Passing unexpected values to forth argument $day.
+--FILE--
+<?php
+/* Prototype  : void date_isodate_set  ( DateTime $object  , int $year  , int $week  [, int $day  ] )
+ * Description: Set a date according to the ISO 8601 standard - using weeks and day offsets rather than specific dates. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setISODate
+ */
+
+echo "*** Testing date_isodate_set() : usage variation -  unexpected values to forth argument \$day***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-02-27 08:34:10");
+$year = 1963;
+$month = 7;
+
+foreach($inputs as $variation =>$day) {
+      echo "\n-- $variation --\n";
+      var_dump( date_isodate_set($object, $year, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_isodate_set() : usage variation -  unexpected values to forth argument $day***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_isodate_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_isodate_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_isodate_set() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_isodate_set() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_isodate_set() expects parameter 4 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_modify_basic1.phpt b/ext/date/tests/date_modify_basic1.phpt
new file mode 100644
index 0000000000..943f65f7a6
--- /dev/null
+++ b/ext/date/tests/date_modify_basic1.phpt
@@ -0,0 +1,39 @@
+--TEST--
+Test date_modify() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : void date_modify  ( DateTime $object  , string $modify  )
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: public DateTime DateTime::modify()
+ */
+
+ //Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_modify() : basic functionality ***\n";
+
+// Create a date object to modify
+$datetime = date_create("2009-01-31 14:28:41");
+
+date_modify($datetime, "+1 day"); 
+echo "After modification 1: " . date_format($datetime, "D, d M Y") . "\n"; 
+
+date_modify($datetime, "+1 week 2 days 4 hours 2 seconds"); 
+echo "After modification 2: " . date_format($datetime, "D, d M Y H:i:s") . "\n";
+
+date_modify($datetime, "next Thursday"); 
+echo "After modification 3: " . date_format($datetime, "D, d M Y") . "\n"; 
+
+date_modify($datetime, "last Sunday"); 
+echo "After modification 4: " . date_format($datetime, "D, d M Y") . "\n";
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_modify() : basic functionality ***
+After modification 1: Sun, 01 Feb 2009
+After modification 2: Tue, 10 Feb 2009 18:28:43
+After modification 3: Thu, 12 Feb 2009
+After modification 4: Sun, 08 Feb 2009
+===DONE===
diff --git a/ext/date/tests/date_modify_error.phpt b/ext/date/tests/date_modify_error.phpt
new file mode 100644
index 0000000000..47dc74ad34
--- /dev/null
+++ b/ext/date/tests/date_modify_error.phpt
@@ -0,0 +1,68 @@
+--TEST--
+Test date_modify() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : void date_modify  ( DateTime $object  , string $modify  )
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: public DateTime DateTime::modify()
+ */
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_modify() : error conditions ***\n";
+
+echo "\n-- Testing date_modify() function with zero arguments --\n";
+var_dump( date_modify() );
+
+// Create a date object
+$datetime = date_create("2009-01-30 19:34:10");
+
+echo "\n-- Testing date_modify() function with less than expected no. of arguments --\n";
+var_dump( date_modify($datetime) );
+
+echo "\n-- Testing date_modify() function with more than expected no. of arguments --\n";
+$modify = "+1 day";
+$extra_arg = 99;
+var_dump( date_modify($datetime, $modify, $extra_arg) );
+
+echo "\n-- Testing date_modify() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( date_modify($invalid_obj, $modify) );  
+$invalid_obj = 10;
+var_dump( date_modify($invalid_obj, $modify) );
+$invalid_obj = null;
+var_dump( date_modify($invalid_obj, $modify) );  
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_modify() : error conditions ***
+
+-- Testing date_modify() function with zero arguments --
+
+Warning: date_modify() expects exactly 2 parameters, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_modify() function with less than expected no. of arguments --
+
+Warning: date_modify() expects exactly 2 parameters, 1 given in %s on line %d
+bool(false)
+
+-- Testing date_modify() function with more than expected no. of arguments --
+
+Warning: date_modify() expects exactly 2 parameters, 3 given in %s on line %d
+bool(false)
+
+-- Testing date_modify() function with an invalid values for $object argument --
+
+Warning: date_modify() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: date_modify() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_modify_variation1.phpt b/ext/date/tests/date_modify_variation1.phpt
new file mode 100644
index 0000000000..a59f62f283
--- /dev/null
+++ b/ext/date/tests/date_modify_variation1.phpt
@@ -0,0 +1,252 @@
+--TEST--
+Test date_modify() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : void date_modify  ( DateTime $object  , string $modify  )
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: public DateTime DateTime::modify()
+ */
+
+echo "*** Testing date_modify() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$format = "D, d M Y";
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_modify($object, $format) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_modify() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_modify() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_modify() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_modify() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_modify() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_modify() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_modify() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_modify() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_modify() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_modify() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_modify() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_modify() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_modify() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_modify() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_modify() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_modify() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_modify() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_modify() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_modify() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_modify() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_modify() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_modify() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_modify() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_modify_variation2.phpt b/ext/date/tests/date_modify_variation2.phpt
new file mode 100644
index 0000000000..c8236837ea
--- /dev/null
+++ b/ext/date/tests/date_modify_variation2.phpt
@@ -0,0 +1,208 @@
+--TEST--
+Test date_modify() function : usage variation - Passing unexpected values to second argument $format.
+--FILE--
+<?php
+/* Prototype  : void date_modify  ( DateTime $object  , string $modify  )
+ * Description: Alter the timestamp of a DateTime object by incrementing or decrementing in a format accepted by strtotime(). 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: public DateTime DateTime::modify()
+ */
+
+echo "*** Testing date_modify() : usage variation -  unexpected values to second argument \$format***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-01-31 14:28:41");
+
+foreach($inputs as $variation =>$format) {
+      echo "\n-- $variation --\n";
+      var_dump( date_modify($object, $format) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_modify() : usage variation -  unexpected values to second argument $format***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_modify() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_modify() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_modify() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_modify() expects parameter 2 to be string, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+NULL
+
+-- empty string SQ --
+NULL
+
+-- string DQ --
+NULL
+
+-- string SQ --
+NULL
+
+-- mixed case string --
+NULL
+
+-- heredoc --
+NULL
+
+-- instance of classWithToString --
+NULL
+
+-- instance of classWithoutToString --
+
+Warning: date_modify() expects parameter 2 to be string, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_modify() expects parameter 2 to be string, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_offset_get_basic1.phpt b/ext/date/tests/date_offset_get_basic1.phpt
new file mode 100644
index 0000000000..42f38939e8
--- /dev/null
+++ b/ext/date/tests/date_offset_get_basic1.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test date_offset_get() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : int date_offset_get  ( DateTime $object  )
+ * Description: Returns the daylight saving time offset
+ * Source code: ext/date/php_date.c
+ * Alias to functions:  DateTime::getOffset
+ */
+ 
+//Set the default time zone 
+date_default_timezone_set('Europe/London');
+
+echo "*** Testing date_offset_get() : basic functionality ***\n";
+
+$winter = date_create('2008-12-25 14:25:41');
+$summer = date_create('2008-07-02 14:25:41');
+
+echo "Winter offset: " . date_offset_get($winter) / 3600 . " hours\n"; 
+echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n"; 
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_offset_get() : basic functionality ***
+Winter offset: 0 hours
+Summer offset: 1 hours
+===DONE===
diff --git a/ext/date/tests/date_offset_get_error.phpt b/ext/date/tests/date_offset_get_error.phpt
new file mode 100644
index 0000000000..bd4e429225
--- /dev/null
+++ b/ext/date/tests/date_offset_get_error.phpt
@@ -0,0 +1,57 @@
+--TEST--
+Test date_offset_get() function : error conditions 
+--FILE--
+<?php
+
+/* Prototype  : int date_offset_get  ( DateTime $object  )
+ * Description: Returns the daylight saving time offset
+ * Source code: ext/date/php_date.c
+ * Alias to functions:  DateTime::getOffset
+ */
+ 
+ //Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_offset_get() : error conditions ***\n";
+
+echo "\n-- Testing date_offset_get() function with zero arguments --\n";
+var_dump( date_offset_get() );
+
+echo "\n-- Testing date_offset_get() function with more than expected no. of arguments --\n";
+$datetime = date_create("2009-01-30 19:34:10");
+$extra_arg = 30;
+var_dump( date_offset_get($datetime, $extra_arg) );
+
+echo "\n-- Testing date_offset_get() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( date_offset_get($invalid_obj) );  
+$invalid_obj = 10;
+var_dump( date_offset_get($invalid_obj) );
+$invalid_obj = null;
+var_dump( date_offset_get($invalid_obj) ); 
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_offset_get() : error conditions ***
+
+-- Testing date_offset_get() function with zero arguments --
+
+Warning: date_offset_get() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_offset_get() function with more than expected no. of arguments --
+
+Warning: date_offset_get() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
+
+-- Testing date_offset_get() function with an invalid values for $object argument --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_offset_get_variation1.phpt b/ext/date/tests/date_offset_get_variation1.phpt
new file mode 100644
index 0000000000..9df6e2d16b
--- /dev/null
+++ b/ext/date/tests/date_offset_get_variation1.phpt
@@ -0,0 +1,250 @@
+--TEST--
+Test date_offset_get() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : int date_offset_get  ( DateTime $object  )
+ * Description: Returns the daylight saving time offset
+ * Source code: ext/date/php_date.c
+ * Alias to functions:  DateTime::getOffset
+ */
+
+echo "*** Testing date_offset_get() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_offset_get($object) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_offset_get() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_offset_get() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_parse_basic1.phpt b/ext/date/tests/date_parse_basic1.phpt
new file mode 100644
index 0000000000..04710d1adb
--- /dev/null
+++ b/ext/date/tests/date_parse_basic1.phpt
@@ -0,0 +1,107 @@
+--TEST--
+Test date_parse() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : array date_parse  ( string $date  ) 
+ * Description: Returns associative array with detailed info about given date.
+ * Source code: ext/date/php_date.c
+ */
+ 
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_parse() : basic functionality ***\n";
+
+var_dump( date_parse("2009-02-27 10:00:00.5") );
+var_dump( date_parse("10:00:00.5") );
+var_dump( date_parse("2009-02-27") );
+
+?>
+===DONE===
+--EXPECT--
+*** Testing date_parse() : basic functionality ***
+array(12) {
+  ["year"]=>
+  int(2009)
+  ["month"]=>
+  int(2)
+  ["day"]=>
+  int(27)
+  ["hour"]=>
+  int(10)
+  ["minute"]=>
+  int(0)
+  ["second"]=>
+  int(0)
+  ["fraction"]=>
+  float(0.5)
+  ["warning_count"]=>
+  int(0)
+  ["warnings"]=>
+  array(0) {
+  }
+  ["error_count"]=>
+  int(0)
+  ["errors"]=>
+  array(0) {
+  }
+  ["is_localtime"]=>
+  bool(false)
+}
+array(12) {
+  ["year"]=>
+  bool(false)
+  ["month"]=>
+  bool(false)
+  ["day"]=>
+  bool(false)
+  ["hour"]=>
+  int(10)
+  ["minute"]=>
+  int(0)
+  ["second"]=>
+  int(0)
+  ["fraction"]=>
+  float(0.5)
+  ["warning_count"]=>
+  int(0)
+  ["warnings"]=>
+  array(0) {
+  }
+  ["error_count"]=>
+  int(0)
+  ["errors"]=>
+  array(0) {
+  }
+  ["is_localtime"]=>
+  bool(false)
+}
+array(12) {
+  ["year"]=>
+  int(2009)
+  ["month"]=>
+  int(2)
+  ["day"]=>
+  int(27)
+  ["hour"]=>
+  bool(false)
+  ["minute"]=>
+  bool(false)
+  ["second"]=>
+  bool(false)
+  ["fraction"]=>
+  bool(false)
+  ["warning_count"]=>
+  int(0)
+  ["warnings"]=>
+  array(0) {
+  }
+  ["error_count"]=>
+  int(0)
+  ["errors"]=>
+  array(0) {
+  }
+  ["is_localtime"]=>
+  bool(false)
+}
+===DONE===
diff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt
new file mode 100644
index 0000000000..ba07c9d6ee
--- /dev/null
+++ b/ext/date/tests/date_parse_error.phpt
@@ -0,0 +1,89 @@
+--TEST--
+Test date_parse() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : array date_parse  ( string $date  ) 
+ * Description: Returns associative array with detailed info about given date.
+ * Source code: ext/date/php_date.c
+ */
+ 
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_parse() : error conditions ***\n";
+
+echo "\n-- Testing date_parse() function with zero arguments --\n";
+var_dump( date_parse() );
+
+echo "\n-- Testing date_parse() function with more than expected no. of arguments --\n";
+$date = "2009-02-27 10:00:00.5";
+$extra_arg = 10;
+var_dump( date_parse($date, $extra_arg) );
+
+echo "\n-- Testing date_parse() function with unexpected characters in \$date argument --\n";
+$invalid_date = "2OO9-02--27 10:00?00.5";
+var_dump( date_parse($invalid_date) );  
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_parse() : error conditions ***
+
+-- Testing date_parse() function with zero arguments --
+
+Warning: date_parse() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_parse() function with more than expected no. of arguments --
+
+Warning: date_parse() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
+
+-- Testing date_parse() function with unexpected characters in $date argument --
+array(13) {
+  ["year"]=>
+  bool(false)
+  ["month"]=>
+  bool(false)
+  ["day"]=>
+  bool(false)
+  ["hour"]=>
+  int(10)
+  ["minute"]=>
+  int(0)
+  ["second"]=>
+  int(0)
+  ["fraction"]=>
+  float(0)
+  ["warning_count"]=>
+  int(2)
+  ["warnings"]=>
+  array(2) {
+    [4]=>
+    string(29) "Double timezone specification"
+    [8]=>
+    string(29) "Double timezone specification"
+  }
+  ["error_count"]=>
+  int(6)
+  ["errors"]=>
+  array(6) {
+    [0]=>
+    string(20) "Unexpected character"
+    [1]=>
+    string(47) "The timezone could not be found in the database"
+    [3]=>
+    string(20) "Unexpected character"
+    [7]=>
+    string(20) "Unexpected character"
+    [17]=>
+    string(20) "Unexpected character"
+    [18]=>
+    string(25) "Double time specification"
+  }
+  ["is_localtime"]=>
+  bool(true)
+  ["zone_type"]=>
+  int(0)
+}
+===DONE===
diff --git a/ext/date/tests/date_parse_variation1.phpt b/ext/date/tests/date_parse_variation1.phpt
new file mode 100644
index 0000000000..8086f4debe
--- /dev/null
+++ b/ext/date/tests/date_parse_variation1.phpt
@@ -0,0 +1,272 @@
+--TEST--
+Test date_parse() function : usage variation - Passing unexpected values to first argument $date.
+--FILE--
+<?php
+/* Prototype  : array date_parse  ( string $date  ) 
+ * Description: Returns associative array with detailed info about given date.
+ * Source code: ext/date/php_date.c
+ */
+
+echo "*** Testing date_parse() : usage variation -  unexpected values to first argument \$date***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+foreach($inputs as $variation =>$date) {
+      echo "\n-- $variation --\n";
+      $result = date_parse($date);
+      if (is_array($result)) {
+      	  var_dump($result["errors"]);
+      } else {
+      	  var_dump($result); 
+      }		
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_parse() : usage variation -  unexpected values to first argument $date***
+
+-- int 0 --
+array(1) {
+  [0]=>
+  string(20) "Unexpected character"
+}
+
+-- int 1 --
+array(1) {
+  [0]=>
+  string(20) "Unexpected character"
+}
+
+-- int 12345 --
+array(1) {
+  [4]=>
+  string(20) "Unexpected character"
+}
+
+-- int -12345 --
+array(1) {
+  [5]=>
+  string(20) "Unexpected character"
+}
+
+-- float 10.5 --
+array(0) {
+}
+
+-- float -10.5 --
+array(1) {
+  [4]=>
+  string(20) "Unexpected character"
+}
+
+-- float .5 --
+array(0) {
+}
+
+-- empty array --
+
+Warning: date_parse() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_parse() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_parse() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_parse() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- lowercase null --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- lowercase true --
+array(1) {
+  [0]=>
+  string(20) "Unexpected character"
+}
+
+-- lowercase false --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- uppercase TRUE --
+array(1) {
+  [0]=>
+  string(20) "Unexpected character"
+}
+
+-- uppercase FALSE --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- empty string DQ --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- empty string SQ --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- string DQ --
+array(1) {
+  [0]=>
+  string(47) "The timezone could not be found in the database"
+}
+
+-- string SQ --
+array(1) {
+  [0]=>
+  string(47) "The timezone could not be found in the database"
+}
+
+-- mixed case string --
+array(1) {
+  [0]=>
+  string(47) "The timezone could not be found in the database"
+}
+
+-- heredoc --
+array(1) {
+  [0]=>
+  string(47) "The timezone could not be found in the database"
+}
+
+-- instance of classWithToString --
+array(1) {
+  [0]=>
+  string(47) "The timezone could not be found in the database"
+}
+
+-- instance of classWithoutToString --
+
+Warning: date_parse() expects parameter 1 to be string, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- unset var --
+array(1) {
+  [0]=>
+  string(12) "Empty string"
+}
+
+-- resource --
+
+Warning: date_parse() expects parameter 1 to be string, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_time_set_basic1.phpt b/ext/date/tests/date_time_set_basic1.phpt
new file mode 100644
index 0000000000..0ef55367d5
--- /dev/null
+++ b/ext/date/tests/date_time_set_basic1.phpt
@@ -0,0 +1,46 @@
+--TEST--
+Test date_time_set() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : void date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTime
+ */
+ 
+ //Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_time_set() : basic functionality ***\n";
+
+// Create a DateTime object
+$datetime = date_create("2009-01-31 15:14:10");
+
+echo "Initial date: " . date_format($datetime, DATE_RFC2822) . "\n";
+
+date_time_set($datetime, 17, 20);
+echo "After modification1 " . date_format($datetime, DATE_RFC2822) . "\n";
+
+date_time_set($datetime, 19, 05, 59);
+echo "After modification2 " . date_format($datetime, DATE_RFC2822) . "\n";
+
+date_time_set($datetime, 24, 10);
+echo "After modification3 " . date_format($datetime, DATE_RFC2822) . "\n";
+
+date_time_set($datetime, 47, 35, 47);
+echo "After modification4 " . date_format($datetime, DATE_RFC2822) . "\n";
+
+date_time_set($datetime, 54, 25);
+echo "After modification5 " . date_format($datetime, DATE_RFC2822) . "\n";
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_time_set() : basic functionality ***
+Initial date: Sat, 31 Jan 2009 15:14:10 +0000
+After modification1 Sat, 31 Jan 2009 17:20:00 +0000
+After modification2 Sat, 31 Jan 2009 19:05:59 +0000
+After modification3 Sun, 01 Feb 2009 00:10:00 +0000
+After modification4 Mon, 02 Feb 2009 23:35:47 +0000
+After modification5 Wed, 04 Feb 2009 06:25:00 +0000
+===DONE===
diff --git a/ext/date/tests/date_time_set_error.phpt b/ext/date/tests/date_time_set_error.phpt
new file mode 100644
index 0000000000..403ab9c3b2
--- /dev/null
+++ b/ext/date/tests/date_time_set_error.phpt
@@ -0,0 +1,70 @@
+--TEST--
+Test date_time_set() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : void date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTime
+ */
+ 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_time_set() : error conditions ***\n";
+
+echo "\n-- Testing date_time_set() function with zero arguments --\n";
+var_dump( date_time_set() );
+
+echo "\n-- Testing date_time_set() function with less than expected no. of arguments --\n";
+$datetime = date_create("2009-01-31 15:34:10");
+$hour = 18;
+var_dump( date_time_set($datetime) );
+var_dump( date_time_set($datetime, $hour) );
+
+echo "\n-- Testing date_time_set() function with more than expected no. of arguments --\n";
+$min = 15;
+$sec = 30;
+$extra_arg = 10;
+var_dump( date_time_set($datetime, $hour, $min, $sec, $extra_arg) );
+
+echo "\n-- Testing date_time_set() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( date_time_set($invalid_obj, $hour, $min, $sec) );  
+$invalid_obj = 10;
+var_dump( date_time_set($invalid_obj, $hour, $min, $sec) );
+$invalid_obj = null;
+var_dump( date_time_set($invalid_obj, $hour, $min, $sec) ); 
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_time_set() : error conditions ***
+
+-- Testing date_time_set() function with zero arguments --
+
+Warning: date_time_set() expects at least 3 parameters, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_time_set() function with less than expected no. of arguments --
+
+Warning: date_time_set() expects at least 3 parameters, 1 given in %s on line %d
+bool(false)
+
+Warning: date_time_set() expects at least 3 parameters, 2 given in %s on line %d
+bool(false)
+
+-- Testing date_time_set() function with more than expected no. of arguments --
+
+Warning: date_time_set() expects at most 4 parameters, 5 given in %s on line %d
+bool(false)
+
+-- Testing date_time_set() function with an invalid values for $object argument --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: date_time_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_time_set_variation1.phpt b/ext/date/tests/date_time_set_variation1.phpt
new file mode 100644
index 0000000000..bcaec5740c
--- /dev/null
+++ b/ext/date/tests/date_time_set_variation1.phpt
@@ -0,0 +1,254 @@
+--TEST--
+Test date_time_set() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : void date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTime
+ */
+
+echo "*** Testing date_time_set() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+$minute = 13;
+$sec = 45;
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_time_set($object, $hour, $minute, $sec) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_time_set() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_time_set() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_time_set_variation2.phpt b/ext/date/tests/date_time_set_variation2.phpt
new file mode 100644
index 0000000000..6c416df7ae
--- /dev/null
+++ b/ext/date/tests/date_time_set_variation2.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_time_set() function : usage variation - Passing unexpected values to second argument $hour.
+--FILE--
+<?php
+/* Prototype  : void date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTime
+ */
+
+echo "*** Testing date_time_set() : usage variation -  unexpected values to second argument \$hour***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-01-31 15:14:10");
+$minute = 13;
+$sec = 45;
+
+foreach($inputs as $variation =>$hour) {
+      echo "\n-- $variation --\n";
+      var_dump( date_time_set($object, $hour, $minute, $sec) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_time_set() : usage variation -  unexpected values to second argument $hour***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_time_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_time_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_time_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_time_set() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_time_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_time_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_time_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_time_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_time_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_time_set() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_time_set() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_time_set() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_time_set() expects parameter 2 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_time_set_variation3.phpt b/ext/date/tests/date_time_set_variation3.phpt
new file mode 100644
index 0000000000..192b7fe00e
--- /dev/null
+++ b/ext/date/tests/date_time_set_variation3.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_time_set() function : usage variation - Passing unexpected values to third argument $minute.
+--FILE--
+<?php
+/* Prototype  : void date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTime
+ */
+
+echo "*** Testing date_time_set() : usage variation -  unexpected values to third argument \$minute***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-01-31 15:14:10");
+$hour = 10;
+$sec = 45;
+
+foreach($inputs as $variation =>$minute) {
+      echo "\n-- $variation --\n";
+      var_dump( date_time_set($object, $hour, $minute, $sec) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_time_set() : usage variation -  unexpected values to third argument $minute***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_time_set() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_time_set() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_time_set() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_time_set() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_time_set() expects parameter 3 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_time_set_variation4.phpt b/ext/date/tests/date_time_set_variation4.phpt
new file mode 100644
index 0000000000..cd1e37df91
--- /dev/null
+++ b/ext/date/tests/date_time_set_variation4.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test date_time_set() function : usage variation - Passing unexpected values to forth argument $sec.
+--FILE--
+<?php
+/* Prototype  : void date_time_set  ( DateTime $object  , int $hour  , int $minute  [, int $second  ] )
+ * Description: Resets the current time of the DateTime object to a different time. 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTime
+ */
+
+echo "*** Testing date_time_set() : usage variation -  unexpected values to forth argument \$sec***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-01-31 15:14:10");
+$hour = 10;
+$minute = 13;
+
+foreach($inputs as $variation =>$sec) {
+      echo "\n-- $variation --\n";
+      var_dump( date_time_set($object, $hour, $minute, $sec) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_time_set() : usage variation -  unexpected values to forth argument $sec***
+
+-- int 0 --
+NULL
+
+-- int 1 --
+NULL
+
+-- int 12345 --
+NULL
+
+-- int -12345 --
+NULL
+
+-- float 10.5 --
+NULL
+
+-- float -10.5 --
+NULL
+
+-- float .5 --
+NULL
+
+-- empty array --
+
+Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_time_set() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+NULL
+
+-- lowercase null --
+NULL
+
+-- lowercase true --
+NULL
+
+-- lowercase false --
+NULL
+
+-- uppercase TRUE --
+NULL
+
+-- uppercase FALSE --
+NULL
+
+-- empty string DQ --
+
+Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_time_set() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_time_set() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_time_set() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+NULL
+
+-- unset var --
+NULL
+
+-- resource --
+
+Warning: date_time_set() expects parameter 4 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt
new file mode 100644
index 0000000000..f77352ef8f
--- /dev/null
+++ b/ext/date/tests/date_timezone_get_basic1.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test date_timezone_get() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : DateTimeZone date_timezone_get  ( DateTime $object  )
+ * Description: Return time zone relative to given DateTime
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTimezone
+ */
+
+echo "*** Testing date_timezone_get() : basic functionality ***\n";
+
+date_default_timezone_set("Europe/London");
+$object = date_create("2009-01-30 17:57:32");
+$tz = date_timezone_get($object); 
+var_dump( timezone_name_get($tz) );
+
+date_default_timezone_set("America/New_York");
+$object = date_create("2009-01-30 17:57:32");
+$tz = date_timezone_get($object); 
+var_dump( timezone_name_get($tz) );
+
+$la_time = timezone_open("America/Los_Angeles");
+date_timezone_set($object, $la_time);
+$tz = date_timezone_get($object); 
+var_dump( timezone_name_get($tz) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_timezone_get() : basic functionality ***
+string(13) "Europe/London"
+string(16) "America/New_York"
+string(19) "America/Los_Angeles"
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/date_timezone_get_error.phpt b/ext/date/tests/date_timezone_get_error.phpt
new file mode 100644
index 0000000000..1310cbe9d6
--- /dev/null
+++ b/ext/date/tests/date_timezone_get_error.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Test date_timezone_get() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : DateTimeZone date_timezone_get  ( DateTime $object  )
+ * Description: Return time zone relative to given DateTime
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::getTimezone
+ */
+ 
+// Set timezone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing date_timezone_get() : error conditions ***\n";
+
+echo "\n-- Testing date_timezone_get() function with zero arguments --\n";
+var_dump( date_timezone_get() ); 
+
+echo "\n-- Testing date_timezone_get() function with more than expected no. of arguments --\n";
+$datetime = date_create("2009-01-30 17:57:32");
+$extra_arg = 99;
+var_dump( date_timezone_get($datetime, $extra_arg) );
+
+echo "\n-- Testing date_timezone_get() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( date_timezone_get($invalid_obj) );  
+$invalid_obj = 10;
+var_dump( date_timezone_get($invalid_obj) );
+$invalid_obj = null;
+var_dump( date_timezone_get($invalid_obj) ); 
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_timezone_get() : error conditions ***
+
+-- Testing date_timezone_get() function with zero arguments --
+
+Warning: date_timezone_get() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_timezone_get() function with more than expected no. of arguments --
+
+Warning: date_timezone_get() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
+
+-- Testing date_timezone_get() function with an invalid values for $object argument --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_timezone_get_variation1.phpt b/ext/date/tests/date_timezone_get_variation1.phpt
new file mode 100644
index 0000000000..3b2034ecc2
--- /dev/null
+++ b/ext/date/tests/date_timezone_get_variation1.phpt
@@ -0,0 +1,250 @@
+--TEST--
+Test date_timezone_get() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : DateTimeZone date_timezone_get  ( DateTime $object  )
+ * Description: Return time zone relative to given DateTime
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::getTimezone
+ */
+
+echo "*** Testing date_timezone_get() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_timezone_get($object) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_timezone_get() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_timezone_get() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt
new file mode 100644
index 0000000000..2e9154cebe
--- /dev/null
+++ b/ext/date/tests/date_timezone_set_basic1.phpt
@@ -0,0 +1,34 @@
+--TEST--
+Test date_timezone_set() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : DateTime date_timezone_set  ( DateTime $object  , DateTimeZone $timezone  )
+ * Description: Sets the time zone for the DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTimezone
+ */
+
+echo "*** Testing date_timezone_set() : basic functionality ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+$datetime = date_create("2009-01-30 17:57:32");
+$tz = date_timezone_get($datetime);
+echo "Default timezone: " . timezone_name_get($tz) . "\n";
+
+$datetime = date_create("2009-01-30 22:57:32");
+$la_time = timezone_open("America/Los_Angeles");
+
+date_timezone_set($datetime, $la_time);
+$tz = date_timezone_get($datetime);
+echo "New timezone: " . timezone_name_get($tz) . "\n";
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_timezone_set() : basic functionality ***
+Default timezone: Europe/London
+New timezone: America/Los_Angeles
+===DONE===
+
diff --git a/ext/date/tests/date_timezone_set_error.phpt b/ext/date/tests/date_timezone_set_error.phpt
new file mode 100644
index 0000000000..8c9c00d638
--- /dev/null
+++ b/ext/date/tests/date_timezone_set_error.phpt
@@ -0,0 +1,64 @@
+--TEST--
+Test date_timezone_set() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : DateTime date_timezone_set  ( DateTime $object  , DateTimeZone $timezone  )
+ * Description: Sets the time zone for the DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTimezone
+ */
+ 
+date_default_timezone_set("UTC");
+
+echo "*** Testing date_timezone_set() : error conditions ***\n";
+
+echo "\n-- Testing date_timezone_set() function with zero arguments --\n";
+var_dump( date_timezone_set() ); 
+
+echo "\n-- Testing date_timezone_set() function with less than expected no. of arguments --\n";
+$datetime = date_create("2009-01-30 17:57:32");
+var_dump( date_timezone_set($datetime) ); 
+
+echo "\n-- Testing date_timezone_set() function with more than expected no. of arguments --\n";
+$timezone  = timezone_open("GMT");
+$extra_arg = 99;
+var_dump( date_timezone_set($datetime, $timezone, $extra_arg) );
+
+echo "\n-- Testing date_timezone_set() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( date_timezone_set($invalid_obj, $timezone) );  
+$invalid_obj = 10;
+var_dump( date_timezone_set($invalid_obj, $timezone) );
+$invalid_obj = null;
+var_dump( date_timezone_set($invalid_obj, $timezone) );  
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_timezone_set() : error conditions ***
+
+-- Testing date_timezone_set() function with zero arguments --
+
+Warning: date_timezone_set() expects exactly 2 parameters, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_timezone_set() function with less than expected no. of arguments --
+
+Warning: date_timezone_set() expects exactly 2 parameters, 1 given in %s on line %d
+bool(false)
+
+-- Testing date_timezone_set() function with more than expected no. of arguments --
+
+Warning: date_timezone_set() expects exactly 2 parameters, 3 given in %s on line %d
+bool(false)
+
+-- Testing date_timezone_set() function with an invalid values for $object argument --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_timezone_set_variation1.phpt b/ext/date/tests/date_timezone_set_variation1.phpt
new file mode 100644
index 0000000000..cde2d6985a
--- /dev/null
+++ b/ext/date/tests/date_timezone_set_variation1.phpt
@@ -0,0 +1,254 @@
+--TEST--
+Test date_timezone_set() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : DateTime date_timezone_set  ( DateTime $object  , DateTimeZone $timezone  )
+ * Description: Sets the time zone for the DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTimezone
+ */
+
+echo "*** Testing date_timezone_set() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$timezone = timezone_open("America/Los_Angeles");
+
+foreach($inputs as $variation =>$object) {
+      echo "\n-- $variation --\n";
+      var_dump( date_timezone_set($object, $timezone) );
+};
+
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_timezone_set() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_timezone_set() expects parameter 1 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/date_timezone_set_variation2.phpt b/ext/date/tests/date_timezone_set_variation2.phpt
new file mode 100644
index 0000000000..b85ddef389
--- /dev/null
+++ b/ext/date/tests/date_timezone_set_variation2.phpt
@@ -0,0 +1,252 @@
+--TEST--
+Test date_timezone_set() function : usage variation - Passing unexpected values to second argument $timezone.
+--FILE--
+<?php
+/* Prototype  : DateTime date_timezone_set  ( DateTime $object  , DateTimeZone $timezone  )
+ * Description: Sets the time zone for the DateTime object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::setTimezone
+ */
+
+echo "*** Testing date_timezone_set() : usage variation -  unexpected values to second argument \$timezone***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = date_create("2009-01-30 17:57:32");
+
+foreach($inputs as $variation =>$timezone) {
+      echo "\n-- $variation --\n";
+      var_dump( date_timezone_set($object, $timezone) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date_timezone_set() : usage variation -  unexpected values to second argument $timezone***
+
+-- int 0 --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: date_timezone_set() expects parameter 2 to be DateTimeZone, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/date_variation1.phpt b/ext/date/tests/date_variation1.phpt
new file mode 100644
index 0000000000..a7193591d0
--- /dev/null
+++ b/ext/date/tests/date_variation1.phpt
@@ -0,0 +1,208 @@
+--TEST--
+Test date() function : usage variation - Passing unexpected values to first argument $format.
+--FILE--
+<?php
+/* Prototype  : string date  ( string $format  [, int $timestamp  ] )
+ * Description: Format a local time/date.
+ * Source code: ext/date/php_date.c
+ */
+
+echo "*** Testing date() : usage variation -  unexpected values to first argument \$format***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$timestamp = mktime(10, 44, 30, 2, 27, 2009);
+
+foreach($inputs as $variation =>$format) {
+      echo "\n-- $variation --\n";
+      var_dump( date($format, $timestamp) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date() : usage variation -  unexpected values to first argument $format***
+
+-- int 0 --
+string(1) "0"
+
+-- int 1 --
+string(1) "1"
+
+-- int 12345 --
+string(5) "12345"
+
+-- int -12345 --
+string(6) "-12345"
+
+-- float 10.5 --
+string(4) "10.5"
+
+-- float -10.5 --
+string(5) "-10.5"
+
+-- float .5 --
+string(3) "0.5"
+
+-- empty array --
+
+Warning: date() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+string(0) ""
+
+-- lowercase null --
+string(0) ""
+
+-- lowercase true --
+string(1) "1"
+
+-- lowercase false --
+string(0) ""
+
+-- uppercase TRUE --
+string(1) "1"
+
+-- uppercase FALSE --
+string(0) ""
+
+-- empty string DQ --
+string(0) ""
+
+-- empty string SQ --
+string(0) ""
+
+-- string DQ --
+string(40) "3028Fri, 27 Feb 2009 10:44:30 +000044210"
+
+-- string SQ --
+string(40) "3028Fri, 27 Feb 2009 10:44:30 +000044210"
+
+-- mixed case string --
+string(40) "30GMTFri, 27 Feb 2009 10:44:30 +00000210"
+
+-- heredoc --
+string(76) "10Europe/LondonFridayFriday2009 52009Fri, 27 Feb 2009 10:44:30 +0000Friday27"
+
+-- instance of classWithToString --
+string(64) "CFridayam3030 AM 2009b27Europe/London2009-02-27T10:44:30+00:0028"
+
+-- instance of classWithoutToString --
+
+Warning: date() expects parameter 1 to be string, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+string(0) ""
+
+-- unset var --
+string(0) ""
+
+-- resource --
+
+Warning: date() expects parameter 1 to be string, resource given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/date_variation2.phpt b/ext/date/tests/date_variation2.phpt
new file mode 100644
index 0000000000..f30e6ede73
--- /dev/null
+++ b/ext/date/tests/date_variation2.phpt
@@ -0,0 +1,222 @@
+--TEST--
+Test date() function : usage variation - Passing unexpected values to second argument $timestamp.
+--FILE--
+<?php
+/* Prototype  : string date  ( string $format  [, int $timestamp  ] )
+ * Description: Format a local time/date.
+ * Source code: ext/date/php_date.c
+ */
+
+echo "*** Testing date() : usage variation -  unexpected values to second argument \$timestamp***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$format = "F j, Y, g:i a";
+
+foreach($inputs as $variation =>$timestamp) {
+      echo "\n-- $variation --\n";
+      var_dump( date($format, $timestamp) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing date() : usage variation -  unexpected values to second argument $timestamp***
+
+-- int 0 --
+string(24) "January 1, 1970, 1:00 am"
+
+-- int 1 --
+string(24) "January 1, 1970, 1:00 am"
+
+-- int 12345 --
+string(24) "January 1, 1970, 4:25 am"
+
+-- int -12345 --
+string(26) "December 31, 1969, 9:34 pm"
+
+-- float 10.5 --
+string(24) "January 1, 1970, 1:00 am"
+
+-- float -10.5 --
+string(25) "January 1, 1970, 12:59 am"
+
+-- float .5 --
+string(24) "January 1, 1970, 1:00 am"
+
+-- empty array --
+
+Warning: date() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: date() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: date() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: date() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+string(24) "January 1, 1970, 1:00 am"
+
+-- lowercase null --
+string(24) "January 1, 1970, 1:00 am"
+
+-- lowercase true --
+string(24) "January 1, 1970, 1:00 am"
+
+-- lowercase false --
+string(24) "January 1, 1970, 1:00 am"
+
+-- uppercase TRUE --
+string(24) "January 1, 1970, 1:00 am"
+
+-- uppercase FALSE --
+string(24) "January 1, 1970, 1:00 am"
+
+-- empty string DQ --
+
+Warning: date() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: date() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: date() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: date() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: date() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: date() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: date() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: date() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+string(24) "January 1, 1970, 1:00 am"
+
+-- unset var --
+string(24) "January 1, 1970, 1:00 am"
+
+-- resource --
+
+Warning: date() expects parameter 2 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/idate_error.phpt b/ext/date/tests/idate_error.phpt
new file mode 100644
index 0000000000..7dad4606d7
--- /dev/null
+++ b/ext/date/tests/idate_error.phpt
@@ -0,0 +1,37 @@
+--TEST--
+Test idate() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : int idate(string format [, int timestamp])
+ * Description: Format a local time/date as integer 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing idate() : error conditions ***\n";
+
+echo "\n-- Testing idate() function with Zero arguments --\n";
+var_dump( idate() );
+
+echo "\n-- Testing idate() function with more than expected no. of arguments --\n";
+$format = '%b %d %Y %H:%M:%S';
+$timestamp = gmmktime(8, 8, 8, 8, 8, 2008);
+$extra_arg = 10;
+var_dump( idate($format, $timestamp, $extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing idate() : error conditions ***
+
+-- Testing idate() function with Zero arguments --
+
+Warning: idate() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing idate() function with more than expected no. of arguments --
+
+Warning: idate() expects at most 2 parameters, 3 given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/localtime_error.phpt b/ext/date/tests/localtime_error.phpt
new file mode 100644
index 0000000000..b231ed0749
--- /dev/null
+++ b/ext/date/tests/localtime_error.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test localtime() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : array localtime([int timestamp [, bool associative_array]])
+ * Description: Returns the results of the C system call localtime as an associative array 
+ * if the associative_array argument is set to 1 other wise it is a regular array 
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing localtime() : error conditions ***\n";
+
+echo "\n-- Testing localtime() function with more than expected no. of arguments --\n";
+$timestamp = gmmktime(8, 8, 8, 8, 8, 2008);
+$assoc = true;
+$extra_arg = 10;
+var_dump( localtime($timestamp, $assoc, $extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing localtime() : error conditions ***
+
+-- Testing localtime() function with more than expected no. of arguments --
+
+Warning: localtime() expects at most 2 parameters, 3 given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt
new file mode 100644
index 0000000000..0f7cd8c714
--- /dev/null
+++ b/ext/date/tests/mktime_basic1.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Test mktime() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+error_reporting(E_ALL | E_STRICT);
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing DateTime::modify() : basic functionality ***\n";
+
+$hour = 10;
+$minute = 30;
+$sec = 45;
+$month = 7;
+$day = 2;
+$year = 1963;
+$is_dst = 0; 
+
+var_dump( mktime($hour) );
+var_dump( mktime($hour, $minute) );
+var_dump( mktime($hour, $minute, $sec) );
+var_dump( mktime($hour, $minute, $sec, $month) );
+var_dump( mktime($hour, $minute, $sec, $month, $day) );
+var_dump( mktime($hour, $minute, $sec, $month, $day, $year) );
+var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing DateTime::modify() : basic functionality ***
+int(%i)
+int(%i)
+int(%i)
+int(%i)
+int(%i)
+int(%i)
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+===DONE===
+
diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt
new file mode 100644
index 0000000000..f517dc8aa3
--- /dev/null
+++ b/ext/date/tests/mktime_error.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Test mktime() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+error_reporting(E_ALL | E_STRICT);
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing mktime() : error conditions ***\n";
+
+echo "\n-- Testing mktime() function with Zero arguments --\n";
+var_dump( mktime() );
+
+echo "\n-- Testing mktime() function with more than expected no. of arguments --\n";
+$hour = 10;
+$minute = 30;
+$sec = 45;
+$month = 7;
+$day = 2;
+$year = 1963;
+$is_dst = 0; 
+$extra_arg = 10;
+var_dump( mktime($hour, $minute, $sec, $month, $day, $year, $is_dst, $extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : error conditions ***
+
+-- Testing mktime() function with Zero arguments --
+
+Strict Standards: mktime(): You should be using the time() function instead in %s on line %d
+int(%d)
+
+-- Testing mktime() function with more than expected no. of arguments --
+
+Warning: mktime() expects at most 7 parameters, 8 given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/mktime_variation1.phpt b/ext/date/tests/mktime_variation1.phpt
new file mode 100644
index 0000000000..eec97da304
--- /dev/null
+++ b/ext/date/tests/mktime_variation1.phpt
@@ -0,0 +1,224 @@
+--TEST--
+Test mktime() function : usage variation - Passing unexpected values to first argument $hour.
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mktime() : usage variation -  unexpected values to first argument \$hour***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+$minute = 30;
+$sec = 45;
+$month = 7;
+$day = 2;
+$year = 1963;
+$is_dst = 0; 
+
+foreach($inputs as $variation =>$hour) {
+      echo "\n-- $variation --\n";
+      var_dump( mktime($hour) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : usage variation -  unexpected values to first argument $hour***
+
+-- int 0 --
+int(%i)
+
+-- int 12345 --
+int(%i)
+
+-- int -12345 --
+int(%i)
+
+-- float 10.5 --
+int(%i)
+
+-- float -10.5 --
+int(%i)
+
+-- float .5 --
+int(%i)
+
+-- empty array --
+
+Warning: mktime() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: mktime() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: mktime() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: mktime() expects parameter 1 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+int(%i)
+
+-- lowercase null --
+int(%i)
+
+-- lowercase true --
+int(%i)
+
+-- lowercase false --
+int(%i)
+
+-- uppercase TRUE --
+int(%i)
+
+-- uppercase FALSE --
+int(%i)
+
+-- empty string DQ --
+
+Warning: mktime() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: mktime() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: mktime() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: mktime() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: mktime() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: mktime() expects parameter 1 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: mktime() expects parameter 1 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: mktime() expects parameter 1 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+int(%i)
+
+-- unset var --
+int(%i)
+
+-- resource --
+
+Warning: mktime() expects parameter 1 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/mktime_variation2.phpt b/ext/date/tests/mktime_variation2.phpt
new file mode 100644
index 0000000000..a969b32b7b
--- /dev/null
+++ b/ext/date/tests/mktime_variation2.phpt
@@ -0,0 +1,218 @@
+--TEST--
+Test mktime() function : usage variation - Passing unexpected values to second argument $minute.
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mktime() : usage variation -  unexpected values to second argument \$minute***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+
+foreach($inputs as $variation =>$minute) {
+      echo "\n-- $variation --\n";
+      var_dump( mktime($hour, $minute) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : usage variation -  unexpected values to second argument $minute***
+
+-- int 0 --
+int(%i)
+
+-- int 12345 --
+int(%i)
+
+-- int -12345 --
+int(%i)
+
+-- float 10.5 --
+int(%i)
+
+-- float -10.5 --
+int(%i)
+
+-- float .5 --
+int(%i)
+
+-- empty array --
+
+Warning: mktime() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: mktime() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: mktime() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: mktime() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+int(%i)
+
+-- lowercase null --
+int(%i)
+
+-- lowercase true --
+int(%i)
+
+-- lowercase false --
+int(%i)
+
+-- uppercase TRUE --
+int(%i)
+
+-- uppercase FALSE --
+int(%i)
+
+-- empty string DQ --
+
+Warning: mktime() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: mktime() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: mktime() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: mktime() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: mktime() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: mktime() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: mktime() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: mktime() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+int(%i)
+
+-- unset var --
+int(%i)
+
+-- resource --
+
+Warning: mktime() expects parameter 2 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/mktime_variation3.phpt b/ext/date/tests/mktime_variation3.phpt
new file mode 100644
index 0000000000..52155f8f91
--- /dev/null
+++ b/ext/date/tests/mktime_variation3.phpt
@@ -0,0 +1,219 @@
+--TEST--
+Test mktime() function : usage variation - Passing unexpected values to third argument $second.
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mktime() : usage variation -  unexpected values to third argument \$second***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+$minute = 30;
+
+foreach($inputs as $variation =>$second) {
+      echo "\n-- $variation --\n";
+      var_dump( mktime($hour, $minute, $second) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : usage variation -  unexpected values to third argument $second***
+
+-- int 0 --
+int(%i)
+
+-- int 12345 --
+int(%i)
+
+-- int -12345 --
+int(%i)
+
+-- float 10.5 --
+int(%i)
+
+-- float -10.5 --
+int(%i)
+
+-- float .5 --
+int(%i)
+
+-- empty array --
+
+Warning: mktime() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: mktime() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: mktime() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: mktime() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+int(%i)
+
+-- lowercase null --
+int(%i)
+
+-- lowercase true --
+int(%i)
+
+-- lowercase false --
+int(%i)
+
+-- uppercase TRUE --
+int(%i)
+
+-- uppercase FALSE --
+int(%i)
+
+-- empty string DQ --
+
+Warning: mktime() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: mktime() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: mktime() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: mktime() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: mktime() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: mktime() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: mktime() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: mktime() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+int(%i)
+
+-- unset var --
+int(%i)
+
+-- resource --
+
+Warning: mktime() expects parameter 3 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/mktime_variation4.phpt b/ext/date/tests/mktime_variation4.phpt
new file mode 100644
index 0000000000..3b0e200a5e
--- /dev/null
+++ b/ext/date/tests/mktime_variation4.phpt
@@ -0,0 +1,220 @@
+--TEST--
+Test mktime() function : usage variation - Passing unexpected values to forth argument $month.
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mktime() : usage variation -  unexpected values to forth argument \$month***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+$minute = 30;
+$second = 45;
+
+foreach($inputs as $variation =>$month) {
+      echo "\n-- $variation --\n";
+      var_dump( mktime($hour, $minute, $second, $month) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : usage variation -  unexpected values to forth argument $month***
+
+-- int 0 --
+int(%i)
+
+-- int 12345 --
+%rint\(-?[1-9][0-9]*\)|bool\(false\)%r
+
+-- int -12345 --
+%rint\(-?[1-9][0-9]*\)|bool\(false\)%r
+
+-- float 10.5 --
+int(%i)
+
+-- float -10.5 --
+int(%i)
+
+-- float .5 --
+int(%i)
+
+-- empty array --
+
+Warning: mktime() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: mktime() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: mktime() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: mktime() expects parameter 4 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+int(%i)
+
+-- lowercase null --
+int(%i)
+
+-- lowercase true --
+int(%i)
+
+-- lowercase false --
+int(%i)
+
+-- uppercase TRUE --
+int(%i)
+
+-- uppercase FALSE --
+int(%i)
+
+-- empty string DQ --
+
+Warning: mktime() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: mktime() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: mktime() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: mktime() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: mktime() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: mktime() expects parameter 4 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: mktime() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: mktime() expects parameter 4 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+int(%i)
+
+-- unset var --
+int(%i)
+
+-- resource --
+
+Warning: mktime() expects parameter 4 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/mktime_variation5.phpt b/ext/date/tests/mktime_variation5.phpt
new file mode 100644
index 0000000000..4e3690a9b0
--- /dev/null
+++ b/ext/date/tests/mktime_variation5.phpt
@@ -0,0 +1,221 @@
+--TEST--
+Test mktime() function : usage variation - Passing unexpected values to fifth argument $day.
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mktime() : usage variation -  unexpected values to fifth argument \$day***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+$minute = 30;
+$second = 45;
+$month = 7;
+
+foreach($inputs as $variation =>$day) {
+      echo "\n-- $variation --\n";
+      var_dump( mktime($hour, $minute, $second, $month, $day) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : usage variation -  unexpected values to fifth argument $day***
+
+-- int 0 --
+int(%i)
+
+-- int 12345 --
+%rint\(-?[1-9][0-9]*\)|bool\(false\)%r
+
+-- int -12345 --
+int(%i)
+
+-- float 10.5 --
+int(%i)
+
+-- float -10.5 --
+int(%i)
+
+-- float .5 --
+int(%i)
+
+-- empty array --
+
+Warning: mktime() expects parameter 5 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: mktime() expects parameter 5 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: mktime() expects parameter 5 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: mktime() expects parameter 5 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+int(%i)
+
+-- lowercase null --
+int(%i)
+
+-- lowercase true --
+int(%i)
+
+-- lowercase false --
+int(%i)
+
+-- uppercase TRUE --
+int(%i)
+
+-- uppercase FALSE --
+int(%i)
+
+-- empty string DQ --
+
+Warning: mktime() expects parameter 5 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: mktime() expects parameter 5 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: mktime() expects parameter 5 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: mktime() expects parameter 5 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: mktime() expects parameter 5 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: mktime() expects parameter 5 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: mktime() expects parameter 5 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: mktime() expects parameter 5 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+int(%i)
+
+-- unset var --
+int(%i)
+
+-- resource --
+
+Warning: mktime() expects parameter 5 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/mktime_variation6.phpt b/ext/date/tests/mktime_variation6.phpt
new file mode 100644
index 0000000000..d0961ff2a2
--- /dev/null
+++ b/ext/date/tests/mktime_variation6.phpt
@@ -0,0 +1,223 @@
+--TEST--
+Test mktime() function : usage variation - Passing unexpected values to sixth argument $year.
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mktime() : usage variation -  unexpected values to sixth argument \$year***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+$minute = 30;
+$second = 45;
+$month = 7;
+$day = 2;
+
+foreach($inputs as $variation =>$year) {
+    echo "\n-- $variation --\n";
+	var_dump( mktime($hour, $minute, $second, $month, $day, $year) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : usage variation -  unexpected values to sixth argument $year***
+
+-- int 0 --
+int(%i)
+
+-- int 12345 --
+%rint\(-?[1-9][0-9]*\)|bool\(false\)%r
+
+-- int -12345 --
+%rint\(-?[1-9][0-9]*\)|bool\(false\)%r
+
+-- float 10.5 --
+int(%i)
+
+-- float -10.5 --
+%rint\(-?[1-9][0-9]*\)|bool\(false\)%r
+
+-- float .5 --
+int(%i)
+
+-- empty array --
+
+Warning: mktime() expects parameter 6 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: mktime() expects parameter 6 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: mktime() expects parameter 6 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: mktime() expects parameter 6 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+int(%i)
+
+-- lowercase null --
+int(%i)
+
+-- lowercase true --
+int(%i)
+
+-- lowercase false --
+int(%i)
+
+-- uppercase TRUE --
+int(%i)
+
+-- uppercase FALSE --
+int(%i)
+
+-- empty string DQ --
+
+Warning: mktime() expects parameter 6 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: mktime() expects parameter 6 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: mktime() expects parameter 6 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: mktime() expects parameter 6 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: mktime() expects parameter 6 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: mktime() expects parameter 6 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: mktime() expects parameter 6 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: mktime() expects parameter 6 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+int(%i)
+
+-- unset var --
+int(%i)
+
+-- resource --
+
+Warning: mktime() expects parameter 6 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
+
diff --git a/ext/date/tests/mktime_variation7.phpt b/ext/date/tests/mktime_variation7.phpt
new file mode 100644
index 0000000000..b10f400c3f
--- /dev/null
+++ b/ext/date/tests/mktime_variation7.phpt
@@ -0,0 +1,251 @@
+--TEST--
+Test mktime() function : usage variation - Passing unexpected values to seventh argument $is_dst.
+--FILE--
+<?php
+/* Prototype  : int mktime  ([ int $hour= date("H")  [, int $minute= date("i")  [, int $second= date("s")  [, int $month= date("n")  [, int $day= date("j")  [, int $year= date("Y")  [, int $is_dst= -1  ]]]]]]] )
+ * Description: Get Unix timestamp for a date
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing mktime() : usage variation -  unexpected values to seventh argument \$is_dst***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 0' => 1,
+      'int 0' => -1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$hour = 10;
+$minute = 30;
+$second = 45;
+$month = 7;
+$day = 2;
+$year = 1963;
+
+foreach($inputs as $variation =>$is_dst) {
+      echo "\n-- $variation --\n";
+      var_dump( mktime($hour, $minute, $second, $month, $day, $year, $is_dst) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing mktime() : usage variation -  unexpected values to seventh argument $is_dst***
+
+-- int 0 --
+int(%i)
+
+-- int 12345 --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- int -12345 --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- float 10.5 --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- float -10.5 --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- float .5 --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- empty array --
+
+Warning: mktime() expects parameter 7 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: mktime() expects parameter 7 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: mktime() expects parameter 7 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: mktime() expects parameter 7 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- lowercase null --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- lowercase true --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- lowercase false --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- uppercase TRUE --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- uppercase FALSE --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- empty string DQ --
+
+Warning: mktime() expects parameter 7 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: mktime() expects parameter 7 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: mktime() expects parameter 7 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: mktime() expects parameter 7 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: mktime() expects parameter 7 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: mktime() expects parameter 7 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: mktime() expects parameter 7 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: mktime() expects parameter 7 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- unset var --
+
+Strict Standards: mktime(): The is_dst parameter is deprecated in %s on line %d
+int(%i)
+
+-- resource --
+
+Warning: mktime() expects parameter 7 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
new file mode 100644
index 0000000000..6fc3480153
--- /dev/null
+++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt
@@ -0,0 +1,70 @@
+--TEST--
+Test timezone_abbreviations_list() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : array timezone_abbreviations_list  ( void  )
+ * Description: Returns associative array containing dst, offset and the timezone name
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::listAbbreviations
+ */
+
+echo "*** Testing timezone_abbreviations_list() : basic functionality ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("GMT");
+
+$abbr = timezone_abbreviations_list();
+
+var_dump( gettype($abbr) );
+var_dump( count($abbr) );
+
+echo "\n-- Format a sample entry --\n";
+var_dump( $abbr["acst"] );	
+
+?>
+===DONE===
+--EXPECT--
+*** Testing timezone_abbreviations_list() : basic functionality ***
+string(5) "array"
+int(338)
+
+-- Format a sample entry --
+array(4) {
+  [0]=>
+  array(3) {
+    ["dst"]=>
+    bool(true)
+    ["offset"]=>
+    int(-14400)
+    ["timezone_id"]=>
+    string(18) "America/Porto_Acre"
+  }
+  [1]=>
+  array(3) {
+    ["dst"]=>
+    bool(true)
+    ["offset"]=>
+    int(-14400)
+    ["timezone_id"]=>
+    string(16) "America/Eirunepe"
+  }
+  [2]=>
+  array(3) {
+    ["dst"]=>
+    bool(true)
+    ["offset"]=>
+    int(-14400)
+    ["timezone_id"]=>
+    string(18) "America/Rio_Branco"
+  }
+  [3]=>
+  array(3) {
+    ["dst"]=>
+    bool(true)
+    ["offset"]=>
+    int(-14400)
+    ["timezone_id"]=>
+    string(11) "Brazil/Acre"
+  }
+}
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt
new file mode 100644
index 0000000000..0e87b80ccb
--- /dev/null
+++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt
@@ -0,0 +1,1144 @@
+--TEST--
+Test timezone_identifiers_list() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : array timezone_identifiers_list  ( void )
+ * Description: Returns numerically index array with all timezone identifiers  
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing timezone_identifiers_list() : basic functionality ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("GMT");
+
+var_dump (timezone_identifiers_list() );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_identifiers_list() : basic functionality ***
+array(560) {
+  [0]=>
+  string(14) "Africa/Abidjan"
+  [1]=>
+  string(12) "Africa/Accra"
+  [2]=>
+  string(18) "Africa/Addis_Ababa"
+  [3]=>
+  string(14) "Africa/Algiers"
+  [4]=>
+  string(13) "Africa/Asmara"
+  [5]=>
+  string(13) "Africa/Asmera"
+  [6]=>
+  string(13) "Africa/Bamako"
+  [7]=>
+  string(13) "Africa/Bangui"
+  [8]=>
+  string(13) "Africa/Banjul"
+  [9]=>
+  string(13) "Africa/Bissau"
+  [10]=>
+  string(15) "Africa/Blantyre"
+  [11]=>
+  string(18) "Africa/Brazzaville"
+  [12]=>
+  string(16) "Africa/Bujumbura"
+  [13]=>
+  string(12) "Africa/Cairo"
+  [14]=>
+  string(17) "Africa/Casablanca"
+  [15]=>
+  string(12) "Africa/Ceuta"
+  [16]=>
+  string(14) "Africa/Conakry"
+  [17]=>
+  string(12) "Africa/Dakar"
+  [18]=>
+  string(20) "Africa/Dar_es_Salaam"
+  [19]=>
+  string(15) "Africa/Djibouti"
+  [20]=>
+  string(13) "Africa/Douala"
+  [21]=>
+  string(15) "Africa/El_Aaiun"
+  [22]=>
+  string(15) "Africa/Freetown"
+  [23]=>
+  string(15) "Africa/Gaborone"
+  [24]=>
+  string(13) "Africa/Harare"
+  [25]=>
+  string(19) "Africa/Johannesburg"
+  [26]=>
+  string(14) "Africa/Kampala"
+  [27]=>
+  string(15) "Africa/Khartoum"
+  [28]=>
+  string(13) "Africa/Kigali"
+  [29]=>
+  string(15) "Africa/Kinshasa"
+  [30]=>
+  string(12) "Africa/Lagos"
+  [31]=>
+  string(17) "Africa/Libreville"
+  [32]=>
+  string(11) "Africa/Lome"
+  [33]=>
+  string(13) "Africa/Luanda"
+  [34]=>
+  string(17) "Africa/Lubumbashi"
+  [35]=>
+  string(13) "Africa/Lusaka"
+  [36]=>
+  string(13) "Africa/Malabo"
+  [37]=>
+  string(13) "Africa/Maputo"
+  [38]=>
+  string(13) "Africa/Maseru"
+  [39]=>
+  string(14) "Africa/Mbabane"
+  [40]=>
+  string(16) "Africa/Mogadishu"
+  [41]=>
+  string(15) "Africa/Monrovia"
+  [42]=>
+  string(14) "Africa/Nairobi"
+  [43]=>
+  string(15) "Africa/Ndjamena"
+  [44]=>
+  string(13) "Africa/Niamey"
+  [45]=>
+  string(17) "Africa/Nouakchott"
+  [46]=>
+  string(18) "Africa/Ouagadougou"
+  [47]=>
+  string(17) "Africa/Porto-Novo"
+  [48]=>
+  string(15) "Africa/Sao_Tome"
+  [49]=>
+  string(15) "Africa/Timbuktu"
+  [50]=>
+  string(14) "Africa/Tripoli"
+  [51]=>
+  string(12) "Africa/Tunis"
+  [52]=>
+  string(15) "Africa/Windhoek"
+  [53]=>
+  string(12) "America/Adak"
+  [54]=>
+  string(17) "America/Anchorage"
+  [55]=>
+  string(16) "America/Anguilla"
+  [56]=>
+  string(15) "America/Antigua"
+  [57]=>
+  string(17) "America/Araguaina"
+  [58]=>
+  string(30) "America/Argentina/Buenos_Aires"
+  [59]=>
+  string(27) "America/Argentina/Catamarca"
+  [60]=>
+  string(32) "America/Argentina/ComodRivadavia"
+  [61]=>
+  string(25) "America/Argentina/Cordoba"
+  [62]=>
+  string(23) "America/Argentina/Jujuy"
+  [63]=>
+  string(26) "America/Argentina/La_Rioja"
+  [64]=>
+  string(25) "America/Argentina/Mendoza"
+  [65]=>
+  string(30) "America/Argentina/Rio_Gallegos"
+  [66]=>
+  string(23) "America/Argentina/Salta"
+  [67]=>
+  string(26) "America/Argentina/San_Juan"
+  [68]=>
+  string(26) "America/Argentina/San_Luis"
+  [69]=>
+  string(25) "America/Argentina/Tucuman"
+  [70]=>
+  string(25) "America/Argentina/Ushuaia"
+  [71]=>
+  string(13) "America/Aruba"
+  [72]=>
+  string(16) "America/Asuncion"
+  [73]=>
+  string(16) "America/Atikokan"
+  [74]=>
+  string(12) "America/Atka"
+  [75]=>
+  string(13) "America/Bahia"
+  [76]=>
+  string(16) "America/Barbados"
+  [77]=>
+  string(13) "America/Belem"
+  [78]=>
+  string(14) "America/Belize"
+  [79]=>
+  string(20) "America/Blanc-Sablon"
+  [80]=>
+  string(17) "America/Boa_Vista"
+  [81]=>
+  string(14) "America/Bogota"
+  [82]=>
+  string(13) "America/Boise"
+  [83]=>
+  string(20) "America/Buenos_Aires"
+  [84]=>
+  string(21) "America/Cambridge_Bay"
+  [85]=>
+  string(20) "America/Campo_Grande"
+  [86]=>
+  string(14) "America/Cancun"
+  [87]=>
+  string(15) "America/Caracas"
+  [88]=>
+  string(17) "America/Catamarca"
+  [89]=>
+  string(15) "America/Cayenne"
+  [90]=>
+  string(14) "America/Cayman"
+  [91]=>
+  string(15) "America/Chicago"
+  [92]=>
+  string(17) "America/Chihuahua"
+  [93]=>
+  string(21) "America/Coral_Harbour"
+  [94]=>
+  string(15) "America/Cordoba"
+  [95]=>
+  string(18) "America/Costa_Rica"
+  [96]=>
+  string(14) "America/Cuiaba"
+  [97]=>
+  string(15) "America/Curacao"
+  [98]=>
+  string(20) "America/Danmarkshavn"
+  [99]=>
+  string(14) "America/Dawson"
+  [100]=>
+  string(20) "America/Dawson_Creek"
+  [101]=>
+  string(14) "America/Denver"
+  [102]=>
+  string(15) "America/Detroit"
+  [103]=>
+  string(16) "America/Dominica"
+  [104]=>
+  string(16) "America/Edmonton"
+  [105]=>
+  string(16) "America/Eirunepe"
+  [106]=>
+  string(19) "America/El_Salvador"
+  [107]=>
+  string(16) "America/Ensenada"
+  [108]=>
+  string(18) "America/Fort_Wayne"
+  [109]=>
+  string(17) "America/Fortaleza"
+  [110]=>
+  string(17) "America/Glace_Bay"
+  [111]=>
+  string(15) "America/Godthab"
+  [112]=>
+  string(17) "America/Goose_Bay"
+  [113]=>
+  string(18) "America/Grand_Turk"
+  [114]=>
+  string(15) "America/Grenada"
+  [115]=>
+  string(18) "America/Guadeloupe"
+  [116]=>
+  string(17) "America/Guatemala"
+  [117]=>
+  string(17) "America/Guayaquil"
+  [118]=>
+  string(14) "America/Guyana"
+  [119]=>
+  string(15) "America/Halifax"
+  [120]=>
+  string(14) "America/Havana"
+  [121]=>
+  string(18) "America/Hermosillo"
+  [122]=>
+  string(28) "America/Indiana/Indianapolis"
+  [123]=>
+  string(20) "America/Indiana/Knox"
+  [124]=>
+  string(23) "America/Indiana/Marengo"
+  [125]=>
+  string(26) "America/Indiana/Petersburg"
+  [126]=>
+  string(25) "America/Indiana/Tell_City"
+  [127]=>
+  string(21) "America/Indiana/Vevay"
+  [128]=>
+  string(25) "America/Indiana/Vincennes"
+  [129]=>
+  string(23) "America/Indiana/Winamac"
+  [130]=>
+  string(20) "America/Indianapolis"
+  [131]=>
+  string(14) "America/Inuvik"
+  [132]=>
+  string(15) "America/Iqaluit"
+  [133]=>
+  string(15) "America/Jamaica"
+  [134]=>
+  string(13) "America/Jujuy"
+  [135]=>
+  string(14) "America/Juneau"
+  [136]=>
+  string(27) "America/Kentucky/Louisville"
+  [137]=>
+  string(27) "America/Kentucky/Monticello"
+  [138]=>
+  string(15) "America/Knox_IN"
+  [139]=>
+  string(14) "America/La_Paz"
+  [140]=>
+  string(12) "America/Lima"
+  [141]=>
+  string(19) "America/Los_Angeles"
+  [142]=>
+  string(18) "America/Louisville"
+  [143]=>
+  string(14) "America/Maceio"
+  [144]=>
+  string(15) "America/Managua"
+  [145]=>
+  string(14) "America/Manaus"
+  [146]=>
+  string(15) "America/Marigot"
+  [147]=>
+  string(18) "America/Martinique"
+  [148]=>
+  string(16) "America/Mazatlan"
+  [149]=>
+  string(15) "America/Mendoza"
+  [150]=>
+  string(17) "America/Menominee"
+  [151]=>
+  string(14) "America/Merida"
+  [152]=>
+  string(19) "America/Mexico_City"
+  [153]=>
+  string(16) "America/Miquelon"
+  [154]=>
+  string(15) "America/Moncton"
+  [155]=>
+  string(17) "America/Monterrey"
+  [156]=>
+  string(18) "America/Montevideo"
+  [157]=>
+  string(16) "America/Montreal"
+  [158]=>
+  string(18) "America/Montserrat"
+  [159]=>
+  string(14) "America/Nassau"
+  [160]=>
+  string(16) "America/New_York"
+  [161]=>
+  string(15) "America/Nipigon"
+  [162]=>
+  string(12) "America/Nome"
+  [163]=>
+  string(15) "America/Noronha"
+  [164]=>
+  string(27) "America/North_Dakota/Center"
+  [165]=>
+  string(30) "America/North_Dakota/New_Salem"
+  [166]=>
+  string(14) "America/Panama"
+  [167]=>
+  string(19) "America/Pangnirtung"
+  [168]=>
+  string(18) "America/Paramaribo"
+  [169]=>
+  string(15) "America/Phoenix"
+  [170]=>
+  string(22) "America/Port-au-Prince"
+  [171]=>
+  string(21) "America/Port_of_Spain"
+  [172]=>
+  string(18) "America/Porto_Acre"
+  [173]=>
+  string(19) "America/Porto_Velho"
+  [174]=>
+  string(19) "America/Puerto_Rico"
+  [175]=>
+  string(19) "America/Rainy_River"
+  [176]=>
+  string(20) "America/Rankin_Inlet"
+  [177]=>
+  string(14) "America/Recife"
+  [178]=>
+  string(14) "America/Regina"
+  [179]=>
+  string(16) "America/Resolute"
+  [180]=>
+  string(18) "America/Rio_Branco"
+  [181]=>
+  string(15) "America/Rosario"
+  [182]=>
+  string(16) "America/Santarem"
+  [183]=>
+  string(16) "America/Santiago"
+  [184]=>
+  string(21) "America/Santo_Domingo"
+  [185]=>
+  string(17) "America/Sao_Paulo"
+  [186]=>
+  string(20) "America/Scoresbysund"
+  [187]=>
+  string(16) "America/Shiprock"
+  [188]=>
+  string(21) "America/St_Barthelemy"
+  [189]=>
+  string(16) "America/St_Johns"
+  [190]=>
+  string(16) "America/St_Kitts"
+  [191]=>
+  string(16) "America/St_Lucia"
+  [192]=>
+  string(17) "America/St_Thomas"
+  [193]=>
+  string(18) "America/St_Vincent"
+  [194]=>
+  string(21) "America/Swift_Current"
+  [195]=>
+  string(19) "America/Tegucigalpa"
+  [196]=>
+  string(13) "America/Thule"
+  [197]=>
+  string(19) "America/Thunder_Bay"
+  [198]=>
+  string(15) "America/Tijuana"
+  [199]=>
+  string(15) "America/Toronto"
+  [200]=>
+  string(15) "America/Tortola"
+  [201]=>
+  string(17) "America/Vancouver"
+  [202]=>
+  string(14) "America/Virgin"
+  [203]=>
+  string(18) "America/Whitehorse"
+  [204]=>
+  string(16) "America/Winnipeg"
+  [205]=>
+  string(15) "America/Yakutat"
+  [206]=>
+  string(19) "America/Yellowknife"
+  [207]=>
+  string(16) "Antarctica/Casey"
+  [208]=>
+  string(16) "Antarctica/Davis"
+  [209]=>
+  string(25) "Antarctica/DumontDUrville"
+  [210]=>
+  string(17) "Antarctica/Mawson"
+  [211]=>
+  string(18) "Antarctica/McMurdo"
+  [212]=>
+  string(17) "Antarctica/Palmer"
+  [213]=>
+  string(18) "Antarctica/Rothera"
+  [214]=>
+  string(21) "Antarctica/South_Pole"
+  [215]=>
+  string(16) "Antarctica/Syowa"
+  [216]=>
+  string(17) "Antarctica/Vostok"
+  [217]=>
+  string(19) "Arctic/Longyearbyen"
+  [218]=>
+  string(9) "Asia/Aden"
+  [219]=>
+  string(11) "Asia/Almaty"
+  [220]=>
+  string(10) "Asia/Amman"
+  [221]=>
+  string(11) "Asia/Anadyr"
+  [222]=>
+  string(10) "Asia/Aqtau"
+  [223]=>
+  string(11) "Asia/Aqtobe"
+  [224]=>
+  string(13) "Asia/Ashgabat"
+  [225]=>
+  string(14) "Asia/Ashkhabad"
+  [226]=>
+  string(12) "Asia/Baghdad"
+  [227]=>
+  string(12) "Asia/Bahrain"
+  [228]=>
+  string(9) "Asia/Baku"
+  [229]=>
+  string(12) "Asia/Bangkok"
+  [230]=>
+  string(11) "Asia/Beirut"
+  [231]=>
+  string(12) "Asia/Bishkek"
+  [232]=>
+  string(11) "Asia/Brunei"
+  [233]=>
+  string(13) "Asia/Calcutta"
+  [234]=>
+  string(15) "Asia/Choibalsan"
+  [235]=>
+  string(14) "Asia/Chongqing"
+  [236]=>
+  string(14) "Asia/Chungking"
+  [237]=>
+  string(12) "Asia/Colombo"
+  [238]=>
+  string(10) "Asia/Dacca"
+  [239]=>
+  string(13) "Asia/Damascus"
+  [240]=>
+  string(10) "Asia/Dhaka"
+  [241]=>
+  string(9) "Asia/Dili"
+  [242]=>
+  string(10) "Asia/Dubai"
+  [243]=>
+  string(13) "Asia/Dushanbe"
+  [244]=>
+  string(9) "Asia/Gaza"
+  [245]=>
+  string(11) "Asia/Harbin"
+  [246]=>
+  string(16) "Asia/Ho_Chi_Minh"
+  [247]=>
+  string(14) "Asia/Hong_Kong"
+  [248]=>
+  string(9) "Asia/Hovd"
+  [249]=>
+  string(12) "Asia/Irkutsk"
+  [250]=>
+  string(13) "Asia/Istanbul"
+  [251]=>
+  string(12) "Asia/Jakarta"
+  [252]=>
+  string(13) "Asia/Jayapura"
+  [253]=>
+  string(14) "Asia/Jerusalem"
+  [254]=>
+  string(10) "Asia/Kabul"
+  [255]=>
+  string(14) "Asia/Kamchatka"
+  [256]=>
+  string(12) "Asia/Karachi"
+  [257]=>
+  string(12) "Asia/Kashgar"
+  [258]=>
+  string(14) "Asia/Kathmandu"
+  [259]=>
+  string(13) "Asia/Katmandu"
+  [260]=>
+  string(12) "Asia/Kolkata"
+  [261]=>
+  string(16) "Asia/Krasnoyarsk"
+  [262]=>
+  string(17) "Asia/Kuala_Lumpur"
+  [263]=>
+  string(12) "Asia/Kuching"
+  [264]=>
+  string(11) "Asia/Kuwait"
+  [265]=>
+  string(10) "Asia/Macao"
+  [266]=>
+  string(10) "Asia/Macau"
+  [267]=>
+  string(12) "Asia/Magadan"
+  [268]=>
+  string(13) "Asia/Makassar"
+  [269]=>
+  string(11) "Asia/Manila"
+  [270]=>
+  string(11) "Asia/Muscat"
+  [271]=>
+  string(12) "Asia/Nicosia"
+  [272]=>
+  string(16) "Asia/Novosibirsk"
+  [273]=>
+  string(9) "Asia/Omsk"
+  [274]=>
+  string(9) "Asia/Oral"
+  [275]=>
+  string(15) "Asia/Phnom_Penh"
+  [276]=>
+  string(14) "Asia/Pontianak"
+  [277]=>
+  string(14) "Asia/Pyongyang"
+  [278]=>
+  string(10) "Asia/Qatar"
+  [279]=>
+  string(14) "Asia/Qyzylorda"
+  [280]=>
+  string(12) "Asia/Rangoon"
+  [281]=>
+  string(11) "Asia/Riyadh"
+  [282]=>
+  string(11) "Asia/Saigon"
+  [283]=>
+  string(13) "Asia/Sakhalin"
+  [284]=>
+  string(14) "Asia/Samarkand"
+  [285]=>
+  string(10) "Asia/Seoul"
+  [286]=>
+  string(13) "Asia/Shanghai"
+  [287]=>
+  string(14) "Asia/Singapore"
+  [288]=>
+  string(11) "Asia/Taipei"
+  [289]=>
+  string(13) "Asia/Tashkent"
+  [290]=>
+  string(12) "Asia/Tbilisi"
+  [291]=>
+  string(11) "Asia/Tehran"
+  [292]=>
+  string(13) "Asia/Tel_Aviv"
+  [293]=>
+  string(11) "Asia/Thimbu"
+  [294]=>
+  string(12) "Asia/Thimphu"
+  [295]=>
+  string(10) "Asia/Tokyo"
+  [296]=>
+  string(18) "Asia/Ujung_Pandang"
+  [297]=>
+  string(16) "Asia/Ulaanbaatar"
+  [298]=>
+  string(15) "Asia/Ulan_Bator"
+  [299]=>
+  string(11) "Asia/Urumqi"
+  [300]=>
+  string(14) "Asia/Vientiane"
+  [301]=>
+  string(16) "Asia/Vladivostok"
+  [302]=>
+  string(12) "Asia/Yakutsk"
+  [303]=>
+  string(18) "Asia/Yekaterinburg"
+  [304]=>
+  string(12) "Asia/Yerevan"
+  [305]=>
+  string(15) "Atlantic/Azores"
+  [306]=>
+  string(16) "Atlantic/Bermuda"
+  [307]=>
+  string(15) "Atlantic/Canary"
+  [308]=>
+  string(19) "Atlantic/Cape_Verde"
+  [309]=>
+  string(15) "Atlantic/Faeroe"
+  [310]=>
+  string(14) "Atlantic/Faroe"
+  [311]=>
+  string(18) "Atlantic/Jan_Mayen"
+  [312]=>
+  string(16) "Atlantic/Madeira"
+  [313]=>
+  string(18) "Atlantic/Reykjavik"
+  [314]=>
+  string(22) "Atlantic/South_Georgia"
+  [315]=>
+  string(18) "Atlantic/St_Helena"
+  [316]=>
+  string(16) "Atlantic/Stanley"
+  [317]=>
+  string(13) "Australia/ACT"
+  [318]=>
+  string(18) "Australia/Adelaide"
+  [319]=>
+  string(18) "Australia/Brisbane"
+  [320]=>
+  string(21) "Australia/Broken_Hill"
+  [321]=>
+  string(18) "Australia/Canberra"
+  [322]=>
+  string(16) "Australia/Currie"
+  [323]=>
+  string(16) "Australia/Darwin"
+  [324]=>
+  string(15) "Australia/Eucla"
+  [325]=>
+  string(16) "Australia/Hobart"
+  [326]=>
+  string(13) "Australia/LHI"
+  [327]=>
+  string(18) "Australia/Lindeman"
+  [328]=>
+  string(19) "Australia/Lord_Howe"
+  [329]=>
+  string(19) "Australia/Melbourne"
+  [330]=>
+  string(15) "Australia/North"
+  [331]=>
+  string(13) "Australia/NSW"
+  [332]=>
+  string(15) "Australia/Perth"
+  [333]=>
+  string(20) "Australia/Queensland"
+  [334]=>
+  string(15) "Australia/South"
+  [335]=>
+  string(16) "Australia/Sydney"
+  [336]=>
+  string(18) "Australia/Tasmania"
+  [337]=>
+  string(18) "Australia/Victoria"
+  [338]=>
+  string(14) "Australia/West"
+  [339]=>
+  string(20) "Australia/Yancowinna"
+  [340]=>
+  string(11) "Brazil/Acre"
+  [341]=>
+  string(16) "Brazil/DeNoronha"
+  [342]=>
+  string(11) "Brazil/East"
+  [343]=>
+  string(11) "Brazil/West"
+  [344]=>
+  string(15) "Canada/Atlantic"
+  [345]=>
+  string(14) "Canada/Central"
+  [346]=>
+  string(24) "Canada/East-Saskatchewan"
+  [347]=>
+  string(14) "Canada/Eastern"
+  [348]=>
+  string(15) "Canada/Mountain"
+  [349]=>
+  string(19) "Canada/Newfoundland"
+  [350]=>
+  string(14) "Canada/Pacific"
+  [351]=>
+  string(19) "Canada/Saskatchewan"
+  [352]=>
+  string(12) "Canada/Yukon"
+  [353]=>
+  string(3) "CET"
+  [354]=>
+  string(17) "Chile/Continental"
+  [355]=>
+  string(18) "Chile/EasterIsland"
+  [356]=>
+  string(7) "CST6CDT"
+  [357]=>
+  string(4) "Cuba"
+  [358]=>
+  string(3) "EET"
+  [359]=>
+  string(5) "Egypt"
+  [360]=>
+  string(4) "Eire"
+  [361]=>
+  string(3) "EST"
+  [362]=>
+  string(7) "EST5EDT"
+  [363]=>
+  string(7) "Etc/GMT"
+  [364]=>
+  string(9) "Etc/GMT+0"
+  [365]=>
+  string(9) "Etc/GMT+1"
+  [366]=>
+  string(10) "Etc/GMT+10"
+  [367]=>
+  string(10) "Etc/GMT+11"
+  [368]=>
+  string(10) "Etc/GMT+12"
+  [369]=>
+  string(9) "Etc/GMT+2"
+  [370]=>
+  string(9) "Etc/GMT+3"
+  [371]=>
+  string(9) "Etc/GMT+4"
+  [372]=>
+  string(9) "Etc/GMT+5"
+  [373]=>
+  string(9) "Etc/GMT+6"
+  [374]=>
+  string(9) "Etc/GMT+7"
+  [375]=>
+  string(9) "Etc/GMT+8"
+  [376]=>
+  string(9) "Etc/GMT+9"
+  [377]=>
+  string(9) "Etc/GMT-0"
+  [378]=>
+  string(9) "Etc/GMT-1"
+  [379]=>
+  string(10) "Etc/GMT-10"
+  [380]=>
+  string(10) "Etc/GMT-11"
+  [381]=>
+  string(10) "Etc/GMT-12"
+  [382]=>
+  string(10) "Etc/GMT-13"
+  [383]=>
+  string(10) "Etc/GMT-14"
+  [384]=>
+  string(9) "Etc/GMT-2"
+  [385]=>
+  string(9) "Etc/GMT-3"
+  [386]=>
+  string(9) "Etc/GMT-4"
+  [387]=>
+  string(9) "Etc/GMT-5"
+  [388]=>
+  string(9) "Etc/GMT-6"
+  [389]=>
+  string(9) "Etc/GMT-7"
+  [390]=>
+  string(9) "Etc/GMT-8"
+  [391]=>
+  string(9) "Etc/GMT-9"
+  [392]=>
+  string(8) "Etc/GMT0"
+  [393]=>
+  string(13) "Etc/Greenwich"
+  [394]=>
+  string(7) "Etc/UCT"
+  [395]=>
+  string(13) "Etc/Universal"
+  [396]=>
+  string(7) "Etc/UTC"
+  [397]=>
+  string(8) "Etc/Zulu"
+  [398]=>
+  string(16) "Europe/Amsterdam"
+  [399]=>
+  string(14) "Europe/Andorra"
+  [400]=>
+  string(13) "Europe/Athens"
+  [401]=>
+  string(14) "Europe/Belfast"
+  [402]=>
+  string(15) "Europe/Belgrade"
+  [403]=>
+  string(13) "Europe/Berlin"
+  [404]=>
+  string(17) "Europe/Bratislava"
+  [405]=>
+  string(15) "Europe/Brussels"
+  [406]=>
+  string(16) "Europe/Bucharest"
+  [407]=>
+  string(15) "Europe/Budapest"
+  [408]=>
+  string(15) "Europe/Chisinau"
+  [409]=>
+  string(17) "Europe/Copenhagen"
+  [410]=>
+  string(13) "Europe/Dublin"
+  [411]=>
+  string(16) "Europe/Gibraltar"
+  [412]=>
+  string(15) "Europe/Guernsey"
+  [413]=>
+  string(15) "Europe/Helsinki"
+  [414]=>
+  string(18) "Europe/Isle_of_Man"
+  [415]=>
+  string(15) "Europe/Istanbul"
+  [416]=>
+  string(13) "Europe/Jersey"
+  [417]=>
+  string(18) "Europe/Kaliningrad"
+  [418]=>
+  string(11) "Europe/Kiev"
+  [419]=>
+  string(13) "Europe/Lisbon"
+  [420]=>
+  string(16) "Europe/Ljubljana"
+  [421]=>
+  string(13) "Europe/London"
+  [422]=>
+  string(17) "Europe/Luxembourg"
+  [423]=>
+  string(13) "Europe/Madrid"
+  [424]=>
+  string(12) "Europe/Malta"
+  [425]=>
+  string(16) "Europe/Mariehamn"
+  [426]=>
+  string(12) "Europe/Minsk"
+  [427]=>
+  string(13) "Europe/Monaco"
+  [428]=>
+  string(13) "Europe/Moscow"
+  [429]=>
+  string(14) "Europe/Nicosia"
+  [430]=>
+  string(11) "Europe/Oslo"
+  [431]=>
+  string(12) "Europe/Paris"
+  [432]=>
+  string(16) "Europe/Podgorica"
+  [433]=>
+  string(13) "Europe/Prague"
+  [434]=>
+  string(11) "Europe/Riga"
+  [435]=>
+  string(11) "Europe/Rome"
+  [436]=>
+  string(13) "Europe/Samara"
+  [437]=>
+  string(17) "Europe/San_Marino"
+  [438]=>
+  string(15) "Europe/Sarajevo"
+  [439]=>
+  string(17) "Europe/Simferopol"
+  [440]=>
+  string(13) "Europe/Skopje"
+  [441]=>
+  string(12) "Europe/Sofia"
+  [442]=>
+  string(16) "Europe/Stockholm"
+  [443]=>
+  string(14) "Europe/Tallinn"
+  [444]=>
+  string(13) "Europe/Tirane"
+  [445]=>
+  string(15) "Europe/Tiraspol"
+  [446]=>
+  string(15) "Europe/Uzhgorod"
+  [447]=>
+  string(12) "Europe/Vaduz"
+  [448]=>
+  string(14) "Europe/Vatican"
+  [449]=>
+  string(13) "Europe/Vienna"
+  [450]=>
+  string(14) "Europe/Vilnius"
+  [451]=>
+  string(16) "Europe/Volgograd"
+  [452]=>
+  string(13) "Europe/Warsaw"
+  [453]=>
+  string(13) "Europe/Zagreb"
+  [454]=>
+  string(17) "Europe/Zaporozhye"
+  [455]=>
+  string(13) "Europe/Zurich"
+  [456]=>
+  string(7) "Factory"
+  [457]=>
+  string(2) "GB"
+  [458]=>
+  string(7) "GB-Eire"
+  [459]=>
+  string(3) "GMT"
+  [460]=>
+  string(5) "GMT+0"
+  [461]=>
+  string(5) "GMT-0"
+  [462]=>
+  string(4) "GMT0"
+  [463]=>
+  string(9) "Greenwich"
+  [464]=>
+  string(8) "Hongkong"
+  [465]=>
+  string(3) "HST"
+  [466]=>
+  string(7) "Iceland"
+  [467]=>
+  string(19) "Indian/Antananarivo"
+  [468]=>
+  string(13) "Indian/Chagos"
+  [469]=>
+  string(16) "Indian/Christmas"
+  [470]=>
+  string(12) "Indian/Cocos"
+  [471]=>
+  string(13) "Indian/Comoro"
+  [472]=>
+  string(16) "Indian/Kerguelen"
+  [473]=>
+  string(11) "Indian/Mahe"
+  [474]=>
+  string(15) "Indian/Maldives"
+  [475]=>
+  string(16) "Indian/Mauritius"
+  [476]=>
+  string(14) "Indian/Mayotte"
+  [477]=>
+  string(14) "Indian/Reunion"
+  [478]=>
+  string(4) "Iran"
+  [479]=>
+  string(6) "Israel"
+  [480]=>
+  string(7) "Jamaica"
+  [481]=>
+  string(5) "Japan"
+  [482]=>
+  string(9) "Kwajalein"
+  [483]=>
+  string(5) "Libya"
+  [484]=>
+  string(3) "MET"
+  [485]=>
+  string(16) "Mexico/BajaNorte"
+  [486]=>
+  string(14) "Mexico/BajaSur"
+  [487]=>
+  string(14) "Mexico/General"
+  [488]=>
+  string(3) "MST"
+  [489]=>
+  string(7) "MST7MDT"
+  [490]=>
+  string(6) "Navajo"
+  [491]=>
+  string(2) "NZ"
+  [492]=>
+  string(7) "NZ-CHAT"
+  [493]=>
+  string(12) "Pacific/Apia"
+  [494]=>
+  string(16) "Pacific/Auckland"
+  [495]=>
+  string(15) "Pacific/Chatham"
+  [496]=>
+  string(14) "Pacific/Easter"
+  [497]=>
+  string(13) "Pacific/Efate"
+  [498]=>
+  string(17) "Pacific/Enderbury"
+  [499]=>
+  string(15) "Pacific/Fakaofo"
+  [500]=>
+  string(12) "Pacific/Fiji"
+  [501]=>
+  string(16) "Pacific/Funafuti"
+  [502]=>
+  string(17) "Pacific/Galapagos"
+  [503]=>
+  string(15) "Pacific/Gambier"
+  [504]=>
+  string(19) "Pacific/Guadalcanal"
+  [505]=>
+  string(12) "Pacific/Guam"
+  [506]=>
+  string(16) "Pacific/Honolulu"
+  [507]=>
+  string(16) "Pacific/Johnston"
+  [508]=>
+  string(18) "Pacific/Kiritimati"
+  [509]=>
+  string(14) "Pacific/Kosrae"
+  [510]=>
+  string(17) "Pacific/Kwajalein"
+  [511]=>
+  string(14) "Pacific/Majuro"
+  [512]=>
+  string(17) "Pacific/Marquesas"
+  [513]=>
+  string(14) "Pacific/Midway"
+  [514]=>
+  string(13) "Pacific/Nauru"
+  [515]=>
+  string(12) "Pacific/Niue"
+  [516]=>
+  string(15) "Pacific/Norfolk"
+  [517]=>
+  string(14) "Pacific/Noumea"
+  [518]=>
+  string(17) "Pacific/Pago_Pago"
+  [519]=>
+  string(13) "Pacific/Palau"
+  [520]=>
+  string(16) "Pacific/Pitcairn"
+  [521]=>
+  string(14) "Pacific/Ponape"
+  [522]=>
+  string(20) "Pacific/Port_Moresby"
+  [523]=>
+  string(17) "Pacific/Rarotonga"
+  [524]=>
+  string(14) "Pacific/Saipan"
+  [525]=>
+  string(13) "Pacific/Samoa"
+  [526]=>
+  string(14) "Pacific/Tahiti"
+  [527]=>
+  string(14) "Pacific/Tarawa"
+  [528]=>
+  string(17) "Pacific/Tongatapu"
+  [529]=>
+  string(12) "Pacific/Truk"
+  [530]=>
+  string(12) "Pacific/Wake"
+  [531]=>
+  string(14) "Pacific/Wallis"
+  [532]=>
+  string(11) "Pacific/Yap"
+  [533]=>
+  string(6) "Poland"
+  [534]=>
+  string(8) "Portugal"
+  [535]=>
+  string(3) "PRC"
+  [536]=>
+  string(7) "PST8PDT"
+  [537]=>
+  string(3) "ROC"
+  [538]=>
+  string(3) "ROK"
+  [539]=>
+  string(9) "Singapore"
+  [540]=>
+  string(6) "Turkey"
+  [541]=>
+  string(3) "UCT"
+  [542]=>
+  string(9) "Universal"
+  [543]=>
+  string(9) "US/Alaska"
+  [544]=>
+  string(11) "US/Aleutian"
+  [545]=>
+  string(10) "US/Arizona"
+  [546]=>
+  string(10) "US/Central"
+  [547]=>
+  string(15) "US/East-Indiana"
+  [548]=>
+  string(10) "US/Eastern"
+  [549]=>
+  string(9) "US/Hawaii"
+  [550]=>
+  string(17) "US/Indiana-Starke"
+  [551]=>
+  string(11) "US/Michigan"
+  [552]=>
+  string(11) "US/Mountain"
+  [553]=>
+  string(10) "US/Pacific"
+  [554]=>
+  string(14) "US/Pacific-New"
+  [555]=>
+  string(8) "US/Samoa"
+  [556]=>
+  string(3) "UTC"
+  [557]=>
+  string(4) "W-SU"
+  [558]=>
+  string(3) "WET"
+  [559]=>
+  string(4) "Zulu"
+}
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/timezone_name_from_abbr_basic1.phpt b/ext/date/tests/timezone_name_from_abbr_basic1.phpt
new file mode 100644
index 0000000000..b591fe28f9
--- /dev/null
+++ b/ext/date/tests/timezone_name_from_abbr_basic1.phpt
@@ -0,0 +1,68 @@
+--TEST--
+Test timezone_name_from_abbr() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
+ * Description: Returns the timezone name from abbrevation
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing timezone_name_from_abbr() : basic functionality ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "-- Tests with special cases first - no lookup needed --\n"; 
+var_dump( timezone_name_from_abbr("GMT") );
+var_dump( timezone_name_from_abbr("UTC") );
+
+echo "-- Lookup with just name --\n";
+var_dump( timezone_name_from_abbr("CET") );
+var_dump( timezone_name_from_abbr("EDT") );
+
+echo "-- Lookup with name and offset--\n"; 
+var_dump( timezone_name_from_abbr("ADT", -10800) );
+var_dump( timezone_name_from_abbr("ADT", 14400) );
+var_dump( timezone_name_from_abbr("AKTT", 14400) );
+var_dump( timezone_name_from_abbr("aktt", 18000) );
+var_dump( timezone_name_from_abbr("Aktt", 21600) );
+var_dump( timezone_name_from_abbr("AMST", -10800) );
+var_dump( timezone_name_from_abbr("amst", 180000) );
+
+echo "-- Tests without valid name - uses gmtOffset and isdst to find match --\n"; 
+var_dump( timezone_name_from_abbr("", 3600, 1) );
+var_dump( timezone_name_from_abbr("FOO", -7200, 1) );
+var_dump( timezone_name_from_abbr("", -14400, 1) );
+var_dump( timezone_name_from_abbr("", -14400, 0) );
+
+echo "-- Tests with invalid offsets --\n"; 
+var_dump( timezone_name_from_abbr("", 5400) ); // offset = 1.5 hrs
+var_dump( timezone_name_from_abbr("", 62400) ); // offset = 24 hrs
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_name_from_abbr() : basic functionality ***
+-- Tests with special cases first - no lookup needed --
+string(3) "UTC"
+string(3) "UTC"
+-- Lookup with just name --
+string(13) "Europe/Berlin"
+string(16) "America/New_York"
+-- Lookup with name and offset--
+string(15) "America/Halifax"
+string(12) "Asia/Baghdad"
+string(11) "Asia/Aqtobe"
+string(11) "Asia/Aqtobe"
+string(11) "Asia/Aqtobe"
+string(17) "America/Boa_Vista"
+string(12) "Asia/Yerevan"
+-- Tests without valid name - uses gmtOffset and isdst to find match --
+string(13) "Europe/London"
+string(17) "America/Sao_Paulo"
+string(16) "America/New_York"
+string(15) "America/Halifax"
+-- Tests with invalid offsets --
+bool(false)
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/timezone_name_from_abbr_error.phpt b/ext/date/tests/timezone_name_from_abbr_error.phpt
new file mode 100644
index 0000000000..640caaec54
--- /dev/null
+++ b/ext/date/tests/timezone_name_from_abbr_error.phpt
@@ -0,0 +1,42 @@
+--TEST--
+Test timezone_name_from_abbr() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
+ * Description: Returns the timezone name from abbrevation
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+error_reporting(E_ALL | E_STRICT);
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing timezone_name_from_abbr() : error conditions ***\n";
+
+echo "\n-- Testing timezone_name_from_abbr() function with Zero arguments --\n";
+var_dump( timezone_name_from_abbr() );
+
+echo "\n-- Testing timezone_name_from_abbr() function with more than expected no. of arguments --\n";
+$abbr = 10;
+$gmtOffset = 30;
+$isdst = 45;
+$extra_arg = 10;
+var_dump( timezone_name_from_abbr($abbr, $gmtOffset, $isdst, $extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_name_from_abbr() : error conditions ***
+
+-- Testing timezone_name_from_abbr() function with Zero arguments --
+
+Warning: timezone_name_from_abbr() expects at least 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing timezone_name_from_abbr() function with more than expected no. of arguments --
+
+Warning: timezone_name_from_abbr() expects at most 3 parameters, 4 given in %s on line %d
+bool(false)
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/timezone_name_from_abbr_variation1.phpt b/ext/date/tests/timezone_name_from_abbr_variation1.phpt
new file mode 100644
index 0000000000..4825d09f5b
--- /dev/null
+++ b/ext/date/tests/timezone_name_from_abbr_variation1.phpt
@@ -0,0 +1,205 @@
+--TEST--
+Test timezone_name_from_abbr() function : usage variation - Passing unexpected values to first argument $abbr.
+--FILE--
+<?php
+/* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
+ * Description: Returns the timezone name from abbrevation
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to first argument \$abbr***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$gmtOffset= 3600;
+$isdst = 1;
+
+foreach($inputs as $variation =>$abbr) {
+      echo "\n-- $variation --\n";
+      var_dump( timezone_name_from_abbr($abbr, $gmtOffset, $isdst) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to first argument $abbr***
+
+-- int 0 --
+string(13) "Europe/London"
+
+-- int 12345 --
+string(13) "Europe/London"
+
+-- int -12345 --
+string(13) "Europe/London"
+
+-- float 10.5 --
+string(13) "Europe/London"
+
+-- float -10.5 --
+string(13) "Europe/London"
+
+-- float .5 --
+string(13) "Europe/London"
+
+-- empty array --
+
+Warning: timezone_name_from_abbr() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: timezone_name_from_abbr() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: timezone_name_from_abbr() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: timezone_name_from_abbr() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+string(13) "Europe/London"
+
+-- lowercase null --
+string(13) "Europe/London"
+
+-- lowercase true --
+string(13) "Europe/London"
+
+-- lowercase false --
+string(13) "Europe/London"
+
+-- uppercase TRUE --
+string(13) "Europe/London"
+
+-- uppercase FALSE --
+string(13) "Europe/London"
+
+-- empty string DQ --
+string(13) "Europe/London"
+
+-- empty string SQ --
+string(13) "Europe/London"
+
+-- string DQ --
+string(13) "Europe/London"
+
+-- string SQ --
+string(13) "Europe/London"
+
+-- mixed case string --
+string(13) "Europe/London"
+
+-- heredoc --
+string(13) "Europe/London"
+
+-- instance of classWithToString --
+string(13) "Europe/London"
+
+-- instance of classWithoutToString --
+
+Warning: timezone_name_from_abbr() expects parameter 1 to be string, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+string(13) "Europe/London"
+
+-- unset var --
+string(13) "Europe/London"
+
+-- resource --
+
+Warning: timezone_name_from_abbr() expects parameter 1 to be string, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_name_from_abbr_variation2.phpt b/ext/date/tests/timezone_name_from_abbr_variation2.phpt
new file mode 100644
index 0000000000..0a587a34eb
--- /dev/null
+++ b/ext/date/tests/timezone_name_from_abbr_variation2.phpt
@@ -0,0 +1,219 @@
+--TEST--
+Test timezone_name_from_abbr() function : usage variation - Passing unexpected values to second argument $gmtOffset.
+--FILE--
+<?php
+/* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
+ * Description: Returns the timezone name from abbrevation
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to second argument \$gmtOffset***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$abbr= "GMT";
+$isdst = 1;
+
+foreach($inputs as $variation =>$gmtOffset) {
+      echo "\n-- $variation --\n";
+      var_dump( timezone_name_from_abbr($abbr, $gmtOffset, $isdst) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to second argument $gmtOffset***
+
+-- int 0 --
+string(3) "UTC"
+
+-- int 12345 --
+string(3) "UTC"
+
+-- int -12345 --
+string(3) "UTC"
+
+-- float 10.5 --
+string(3) "UTC"
+
+-- float -10.5 --
+string(3) "UTC"
+
+-- float .5 --
+string(3) "UTC"
+
+-- empty array --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+string(3) "UTC"
+
+-- lowercase null --
+string(3) "UTC"
+
+-- lowercase true --
+string(3) "UTC"
+
+-- lowercase false --
+string(3) "UTC"
+
+-- uppercase TRUE --
+string(3) "UTC"
+
+-- uppercase FALSE --
+string(3) "UTC"
+
+-- empty string DQ --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+string(3) "UTC"
+
+-- unset var --
+string(3) "UTC"
+
+-- resource --
+
+Warning: timezone_name_from_abbr() expects parameter 2 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_name_from_abbr_variation3.phpt b/ext/date/tests/timezone_name_from_abbr_variation3.phpt
new file mode 100644
index 0000000000..66cb210e31
--- /dev/null
+++ b/ext/date/tests/timezone_name_from_abbr_variation3.phpt
@@ -0,0 +1,219 @@
+--TEST--
+Test timezone_name_from_abbr() function : usage variation - Passing unexpected values to third argument $isdst.
+--FILE--
+<?php
+/* Prototype  : string timezone_name_from_abbr  ( string $abbr  [, int $gmtOffset= -1  [, int $isdst= -1  ]] )
+ * Description: Returns the timezone name from abbrevation
+ * Source code: ext/date/php_date.c
+ * Alias to functions: 
+ */
+
+echo "*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to third argument \$isdst***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$abbr= "GMT";
+$gmtOffset = 3600;
+
+foreach($inputs as $variation =>$isdst) {
+      echo "\n-- $variation --\n";
+      var_dump( timezone_name_from_abbr($abbr, $gmtOffset, $isdst) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_name_from_abbr() : usage variation -  unexpected values to third argument $isdst***
+
+-- int 0 --
+string(3) "UTC"
+
+-- int 12345 --
+string(3) "UTC"
+
+-- int -12345 --
+string(3) "UTC"
+
+-- float 10.5 --
+string(3) "UTC"
+
+-- float -10.5 --
+string(3) "UTC"
+
+-- float .5 --
+string(3) "UTC"
+
+-- empty array --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+string(3) "UTC"
+
+-- lowercase null --
+string(3) "UTC"
+
+-- lowercase true --
+string(3) "UTC"
+
+-- lowercase false --
+string(3) "UTC"
+
+-- uppercase TRUE --
+string(3) "UTC"
+
+-- uppercase FALSE --
+string(3) "UTC"
+
+-- empty string DQ --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+string(3) "UTC"
+
+-- unset var --
+string(3) "UTC"
+
+-- resource --
+
+Warning: timezone_name_from_abbr() expects parameter 3 to be long, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_name_get_error.phpt b/ext/date/tests/timezone_name_get_error.phpt
new file mode 100644
index 0000000000..3c33e33f4d
--- /dev/null
+++ b/ext/date/tests/timezone_name_get_error.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Test timezone_name_get() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : string timezone_name_get ( DateTime $object  )
+ * Description: Returns the name of the timezone
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getName() 
+ */
+ 
+// Set timezone 
+date_default_timezone_set("Europe/London");
+
+echo "*** Testing timezone_name_get() : error conditions ***\n";
+
+echo "\n-- Testing timezone_name_get() function with zero arguments --\n";
+var_dump( timezone_name_get() ); 
+
+echo "\n-- Testing date_timezone_set() function with more than expected no. of arguments --\n";
+$datetime = date_create("2009-01-30 17:57:32");
+$extra_arg = 99;
+var_dump( timezone_name_get($datetime,  $extra_arg) );
+
+echo "\n-- Testing timezone_name_get() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( timezone_name_get($invalid_obj) );  
+$invalid_obj = 10;
+var_dump( timezone_name_get($invalid_obj) );
+$invalid_obj = null;
+var_dump( timezone_name_get($invalid_obj) ); 
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_name_get() : error conditions ***
+
+-- Testing timezone_name_get() function with zero arguments --
+
+Warning: timezone_name_get() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing date_timezone_set() function with more than expected no. of arguments --
+
+Warning: timezone_name_get() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
+
+-- Testing timezone_name_get() function with an invalid values for $object argument --
+
+Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+Warning: timezone_name_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_offset_get_basic1.phpt b/ext/date/tests/timezone_offset_get_basic1.phpt
new file mode 100644
index 0000000000..bf241788da
--- /dev/null
+++ b/ext/date/tests/timezone_offset_get_basic1.phpt
@@ -0,0 +1,34 @@
+--TEST--
+Test timezone_offset_get() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : int timezone_offset_get  ( DateTimeZone $object  , DateTime $datetime  )
+ * Description: Returns the timezone offset from GMT
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getOffset
+ */
+
+echo "*** Testing timezone_offset_get() : basic functionality ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("GMT");
+
+$tz = timezone_open("Europe/London");
+$date = date_create("GMT");
+
+var_dump(timezone_offset_get($tz, $date));
+
+$tz = timezone_open("America/New_York");
+var_dump(timezone_offset_get($tz, $date));
+
+$tz = timezone_open("America/Los_Angeles");
+var_dump(timezone_offset_get($tz, $date));
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_offset_get() : basic functionality ***
+int(0)
+%rint\(-18000\)|int\(-14400\)%r
+%rint\(-28800\)|int\(-25200\)%r
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt
new file mode 100644
index 0000000000..b8ca2c1c15
--- /dev/null
+++ b/ext/date/tests/timezone_offset_get_error.phpt
@@ -0,0 +1,84 @@
+--TEST--
+Test timezone_offset_get() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : int timezone_offset_get  ( DateTimeZone $object  , DateTime $datetime  )
+ * Description: Returns the timezone offset from GMT
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getOffset
+ */
+ 
+//Set the default time zone 
+date_default_timezone_set("GMT");
+$tz = timezone_open("Europe/London");
+$date = date_create("GMT");
+ 
+echo "*** Testing timezone_offset_get() : error conditions ***\n";
+
+echo "\n-- Testing timezone_offset_get() function with zero arguments --\n";
+var_dump( timezone_offset_get() );
+
+echo "\n-- Testing timezone_offset_get() function with less than expected no. of arguments --\n";
+var_dump( timezone_offset_get($tz) );
+
+echo "\n-- Testing timezone_offset_get() function with more than expected no. of arguments --\n";
+$extra_arg = 99;
+var_dump( timezone_offset_get($tz, $date, $extra_arg) );
+
+echo "\n-- Testing timezone_offset_get() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( timezone_offset_get($invalid_obj, $date) );  
+$invalid_obj = 10;
+var_dump( timezone_offset_get($invalid_obj, $date) );
+$invalid_obj = null;
+var_dump( timezone_offset_get($invalid_obj, $date) );
+
+echo "\n-- Testing timezone_offset_get() function with an invalid values for \$datetime argument --\n";
+$invalid_obj = new stdClass();
+var_dump( timezone_offset_get($tz, $invalid_obj) );  
+$invalid_obj = 10;
+var_dump( timezone_offset_get($tz, $invalid_obj) );
+$invalid_obj = null;
+var_dump( timezone_offset_get($tz, $invalid_obj) );  
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_offset_get() : error conditions ***
+
+-- Testing timezone_offset_get() function with zero arguments --
+
+Warning: timezone_offset_get() expects exactly 2 parameters, 0 given in %s on line %d
+bool(false)
+
+-- Testing timezone_offset_get() function with less than expected no. of arguments --
+
+Warning: timezone_offset_get() expects exactly 2 parameters, 1 given in %s on line %d
+bool(false)
+
+-- Testing timezone_offset_get() function with more than expected no. of arguments --
+
+Warning: timezone_offset_get() expects exactly 2 parameters, 3 given in %s on line %d
+bool(false)
+
+-- Testing timezone_offset_get() function with an invalid values for $object argument --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- Testing timezone_offset_get() function with an invalid values for $datetime argument --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, object given in %s on line %d
+bool(false)
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
+bool(false)
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_offset_get_variation1.phpt b/ext/date/tests/timezone_offset_get_variation1.phpt
new file mode 100644
index 0000000000..5fd5e8b270
--- /dev/null
+++ b/ext/date/tests/timezone_offset_get_variation1.phpt
@@ -0,0 +1,252 @@
+--TEST--
+Test timezone_offset_get() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : int timezone_offset_get  ( DateTimeZone $object  , DateTime $datetime  )
+ * Description: Returns the timezone offset from GMT
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getOffset()
+ */
+ 
+echo "*** Testing timezone_offset_get() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$datetime = new DateTime("2009-01-31 15:14:10");
+
+foreach($inputs as $variation =>$object) {
+    echo "\n-- $variation --\n";
+   	var_dump( timezone_offset_get($object, $datetime) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_offset_get() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: timezone_offset_get() expects parameter 1 to be DateTimeZone, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_offset_get_variation2.phpt b/ext/date/tests/timezone_offset_get_variation2.phpt
new file mode 100644
index 0000000000..93311f3a6b
--- /dev/null
+++ b/ext/date/tests/timezone_offset_get_variation2.phpt
@@ -0,0 +1,252 @@
+--TEST--
+Test timezone_offset_get() function : usage variation - Passing unexpected values to second argument $datetime.
+--FILE--
+<?php
+/* Prototype  : int timezone_offset_get  ( DateTimeZone $object  , DateTime $datetime  )
+ * Description: Returns the timezone offset from GMT
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getOffset()
+ */
+ 
+echo "*** Testing timezone_offset_get() : usage variation -  unexpected values to second argument \$datetime***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+$object = new DateTimezone("Europe/London");
+
+foreach($inputs as $variation =>$datetime) {
+    echo "\n-- $variation --\n";
+   	var_dump( timezone_offset_get($object, $datetime) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_offset_get() : usage variation -  unexpected values to second argument $datetime***
+
+-- int 0 --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: timezone_offset_get() expects parameter 2 to be DateTime, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_open_basic1.phpt b/ext/date/tests/timezone_open_basic1.phpt
new file mode 100644
index 0000000000..7a989362b0
--- /dev/null
+++ b/ext/date/tests/timezone_open_basic1.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Test timezone_open() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : DateTimeZone timezone_open  ( string $timezone  )
+ * Description: Returns new DateTimeZone object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::__construct()
+ */
+
+echo "*** Testing timezone_open() : basic functionality ***\n";
+
+var_dump( timezone_open("GMT") );
+var_dump( timezone_open("Europe/London") );
+var_dump( timezone_open("America/Los_Angeles") );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_open() : basic functionality ***
+object(DateTimeZone)#%d (0) {
+}
+object(DateTimeZone)#%d (0) {
+}
+object(DateTimeZone)#%d (0) {
+}
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/timezone_open_error.phpt b/ext/date/tests/timezone_open_error.phpt
new file mode 100644
index 0000000000..16c5f0b09f
--- /dev/null
+++ b/ext/date/tests/timezone_open_error.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test timezone_open() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : DateTimeZone timezone_open  ( string $timezone  )
+ * Description: Returns new DateTimeZone object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::__construct()
+ */
+ 
+echo "*** Testing timezone_open() : error conditions ***\n";
+
+echo "\n-- Testing timezone_open() function with zero arguments --\n";
+var_dump( timezone_open() );
+
+echo "\n-- Testing timezone_open() function with more than expected no. of arguments --\n";
+$time = "GMT";
+$extra_arg = 99;
+var_dump( timezone_open($time, $extra_arg) );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_open() : error conditions ***
+
+-- Testing timezone_open() function with zero arguments --
+
+Warning: timezone_open() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing timezone_open() function with more than expected no. of arguments --
+
+Warning: timezone_open() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_open_variation1.phpt b/ext/date/tests/timezone_open_variation1.phpt
new file mode 100644
index 0000000000..9a069f6472
--- /dev/null
+++ b/ext/date/tests/timezone_open_variation1.phpt
@@ -0,0 +1,251 @@
+--TEST--
+Test timezone_open function : usage variation - Passing unexpected values to first argument $timezone.
+--FILE--
+<?php
+/* Prototype  : DateTimeZone timezone_open  ( string $timezone  )
+ * Description: Returns new DateTimeZone object
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTime::__construct()
+ */
+
+echo "*** Testing timezone_open() : usage variation -  unexpected values to first argument \$timezone***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+foreach($inputs as $variation =>$timezone) {
+    echo "\n-- $variation --\n";
+	var_dump( timezone_open($timezone) );
+      
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_open() : usage variation -  unexpected values to first argument $timezone***
+
+-- int 0 --
+
+Warning: timezone_open(): Unknown or bad timezone (0) in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: timezone_open(): Unknown or bad timezone (1) in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: timezone_open(): Unknown or bad timezone (12345) in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: timezone_open(): Unknown or bad timezone (-12345) in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: timezone_open(): Unknown or bad timezone (10.5) in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: timezone_open(): Unknown or bad timezone (-10.5) in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: timezone_open(): Unknown or bad timezone (0.5) in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: timezone_open() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: timezone_open() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: timezone_open() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: timezone_open() expects parameter 1 to be string, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: timezone_open(): Unknown or bad timezone (1) in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: timezone_open(): Unknown or bad timezone (1) in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: timezone_open(): Unknown or bad timezone (string) in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: timezone_open(): Unknown or bad timezone (string) in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: timezone_open(): Unknown or bad timezone (sTrInG) in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: timezone_open(): Unknown or bad timezone (hello world) in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: timezone_open(): Unknown or bad timezone (Class A object) in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: timezone_open() expects parameter 1 to be string, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: timezone_open(): Unknown or bad timezone () in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: timezone_open() expects parameter 1 to be string, resource given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt
new file mode 100644
index 0000000000..304a177951
--- /dev/null
+++ b/ext/date/tests/timezone_transitions_get_basic1.phpt
@@ -0,0 +1,53 @@
+--TEST--
+Test timezone_transitions_get() function : basic functionality 
+--FILE--
+<?php
+/* Prototype  : array timezone_transitions_get  ( DateTimeZone $object, [ int $timestamp_begin  [, int $timestamp_end  ]]  )
+ * Description: Returns all transitions for the timezone
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getTransitions()
+ */
+
+echo "*** Testing timezone_transitions_get() : basic functionality ***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+// Create a DateTimeZone object
+$tz = timezone_open("Europe/London");
+
+$tran = timezone_transitions_get($tz);
+
+echo "\n-- Get all transitions --\n"; 
+$tran = timezone_transitions_get($tz);
+var_dump( gettype($tran) );
+
+echo "\n-- Total number of transitions: " . count($tran). " --\n"; 
+
+echo "\n-- Format a sample entry pfor Spring 1963 --\n";
+var_dump( $tran[96] );	
+
+?>
+===DONE===
+--EXPECT--
+*** Testing timezone_transitions_get() : basic functionality ***
+
+-- Get all transitions --
+string(5) "array"
+
+-- Total number of transitions: 242 --
+
+-- Format a sample entry pfor Spring 1963 --
+array(5) {
+  ["ts"]=>
+  int(-213228000)
+  ["time"]=>
+  string(24) "1963-03-31T02:00:00+0000"
+  ["offset"]=>
+  int(3600)
+  ["isdst"]=>
+  bool(true)
+  ["abbr"]=>
+  string(3) "BST"
+}
+===DONE===
\ No newline at end of file
diff --git a/ext/date/tests/timezone_transitions_get_error.phpt b/ext/date/tests/timezone_transitions_get_error.phpt
new file mode 100644
index 0000000000..a8d9dbb87b
--- /dev/null
+++ b/ext/date/tests/timezone_transitions_get_error.phpt
@@ -0,0 +1,56 @@
+--TEST--
+Test timezone_transitions_get() function : error conditions 
+--FILE--
+<?php
+/* Prototype  : array timezone_transitions_get  ( DateTimeZone $object )
+ * Description: Returns all transitions for the timezone
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getTransitions()
+ */
+ 
+//Set the default time zone 
+date_default_timezone_set("GMT");
+$tz = timezone_open("Europe/London");
+ 
+echo "*** Testing timezone_transitions_get() : error conditions ***\n";
+
+echo "\n-- Testing timezone_transitions_get() function with zero arguments --\n";
+var_dump( timezone_transitions_get() );
+
+echo "\n-- Testing timezone_transitions_get() function with more than expected no. of arguments --\n";
+$extra_arg = 99;
+var_dump( timezone_transitions_get($tz, $extra_arg) );
+
+echo "\n-- Testing timezone_transitions_get() function with an invalid values for \$object argument --\n";
+$invalid_obj = new stdClass();
+var_dump( timezone_transitions_get($invalid_obj) );  
+$invalid_obj = 10;
+var_dump( timezone_transitions_get($invalid_obj) );
+$invalid_obj = null;
+var_dump( timezone_transitions_get($invalid_obj) ); 
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_transitions_get() : error conditions ***
+
+-- Testing timezone_transitions_get() function with zero arguments --
+
+Warning: timezone_transitions_get() expects exactly 1 parameter, 0 given in %s on line %d
+bool(false)
+
+-- Testing timezone_transitions_get() function with more than expected no. of arguments --
+
+Warning: timezone_transitions_get() expects exactly 1 parameter, 2 given in %s on line %d
+bool(false)
+
+-- Testing timezone_transitions_get() function with an invalid values for $object argument --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+===DONE===
diff --git a/ext/date/tests/timezone_transitions_get_variation1.phpt b/ext/date/tests/timezone_transitions_get_variation1.phpt
new file mode 100644
index 0000000000..a8570ad96c
--- /dev/null
+++ b/ext/date/tests/timezone_transitions_get_variation1.phpt
@@ -0,0 +1,250 @@
+--TEST--
+Test timezone_transitions_get() function : usage variation - Passing unexpected values to first argument $object.
+--FILE--
+<?php
+/* Prototype  : array timezone_transitions_get  ( DateTimeZone $object )
+ * Description: Returns all transitions for the timezone
+ * Source code: ext/date/php_date.c
+ * Alias to functions: DateTimeZone::getTransitions()
+ */
+ 
+echo "*** Testing timezone_transitions_get() : usage variation -  unexpected values to first argument \$object***\n";
+
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+// define some classes
+class classWithToString
+{
+	public function __toString() {
+		return "Class A object";
+	}
+}
+
+class classWithoutToString
+{
+}
+
+// heredoc string
+$heredoc = <<<EOT
+hello world
+EOT;
+
+// add arrays
+$index_array = array (1, 2, 3);
+$assoc_array = array ('one' => 1, 'two' => 2);
+
+// resource
+$file_handle = fopen(__FILE__, 'r');
+
+//array of values to iterate over
+$inputs = array(
+
+      // int data
+      'int 0' => 0,
+      'int 1' => 1,
+      'int 12345' => 12345,
+      'int -12345' => -12345,
+
+      // float data
+      'float 10.5' => 10.5,
+      'float -10.5' => -10.5,
+      'float .5' => .5,
+
+      // array data
+      'empty array' => array(),
+      'int indexed array' => $index_array,
+      'associative array' => $assoc_array,
+      'nested arrays' => array('foo', $index_array, $assoc_array),
+
+      // null data
+      'uppercase NULL' => NULL,
+      'lowercase null' => null,
+
+      // boolean data
+      'lowercase true' => true,
+      'lowercase false' =>false,
+      'uppercase TRUE' =>TRUE,
+      'uppercase FALSE' =>FALSE,
+
+      // empty data
+      'empty string DQ' => "",
+      'empty string SQ' => '',
+
+      // string data
+      'string DQ' => "string",
+      'string SQ' => 'string',
+      'mixed case string' => "sTrInG",
+      'heredoc' => $heredoc,
+
+      // object data
+      'instance of classWithToString' => new classWithToString(),
+      'instance of classWithoutToString' => new classWithoutToString(),
+
+      // undefined data
+      'undefined var' => @$undefined_var,
+
+      // unset data
+      'unset var' => @$unset_var,
+      
+      // resource 
+      'resource' => $file_handle
+);
+
+foreach($inputs as $variation =>$object) {
+    echo "\n-- $variation --\n";
+   	var_dump( timezone_transitions_get($object) );
+};
+
+// closing the resource
+fclose( $file_handle );
+
+?>
+===DONE===
+--EXPECTF--
+*** Testing timezone_transitions_get() : usage variation -  unexpected values to first argument $object***
+
+-- int 0 --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 1 --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int 12345 --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- int -12345 --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, integer given in %s on line %d
+bool(false)
+
+-- float 10.5 --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float -10.5 --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- float .5 --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, double given in %s on line %d
+bool(false)
+
+-- empty array --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- int indexed array --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- associative array --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- nested arrays --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, array given in %s on line %d
+bool(false)
+
+-- uppercase NULL --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase null --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- lowercase true --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- lowercase false --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase TRUE --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- uppercase FALSE --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, boolean given in %s on line %d
+bool(false)
+
+-- empty string DQ --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- empty string SQ --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string DQ --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- string SQ --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- mixed case string --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- heredoc --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, string given in %s on line %d
+bool(false)
+
+-- instance of classWithToString --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- instance of classWithoutToString --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, object given in %s on line %d
+bool(false)
+
+-- undefined var --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- unset var --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, null given in %s on line %d
+bool(false)
+
+-- resource --
+
+Warning: timezone_transitions_get() expects parameter 1 to be DateTimeZone, resource given in %s on line %d
+bool(false)
+===DONE===
-- 
2.50.1