Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix the test according to how new date code does it
  fix to work on different ICU versions

ext/intl/tests/dateformat_format.phpt

@@ -359,40 +359,40 @@ Formatted DateTime is : 20091231 03:02 PM
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : Dec 30, 2000 5:04:05 PM
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : 12/30/00 5:04 PM
 ------------
 Date is: DateTime::__set_state(array(
    'date' => '2000-12-30 19:04:05',
-   'timezone_type' => 3,
-   'timezone' => 'America/Los_Angeles',
+   'timezone_type' => 2,
+   'timezone' => 'PDT',
 ))
 ------------
 Formatted DateTime is : 20001230 05:04 PM

ext/intl/tests/timezone_toDateTimeZone_basic.phpt

@@ -26,7 +26,7 @@ do_test(IntlTimeZone::createTimeZone('GMT+0405'), true);
 --EXPECTF--
 string(3) "CET"
 int(3600000)
-string(13) "Europe/Berlin"
+string(%d) "%rEurope\/Berlin|CET%r"
 int(3600)
 string(16) "Europe/Amsterdam"
 int(3600000)