diff --git a/Zend/tests/bug73350.phpt b/Zend/tests/bug73350.phpt index 7505884efbcdd..80584204b254e 100644 --- a/Zend/tests/bug73350.phpt +++ b/Zend/tests/bug73350.phpt @@ -12,7 +12,7 @@ $e = new Exception(); var_export($e); ?> --EXPECTF-- -Exception::__set_state(array( +\Exception::__set_state(array( 'message' => '', 'string' => 'Exception in %sbug73350.php:%d Stack trace: diff --git a/Zend/tests/enum/enum-in-var-export.phpt b/Zend/tests/enum/enum-in-var-export.phpt new file mode 100644 index 0000000000000..4650861f513d0 --- /dev/null +++ b/Zend/tests/enum/enum-in-var-export.phpt @@ -0,0 +1,28 @@ +--TEST-- +Enum in var_export() +--FILE-- + +--EXPECT-- +\Foo::BAR +\A\Foo::BAR +\A\B\Foo::BAR diff --git a/ext/date/tests/bug52113.phpt b/ext/date/tests/bug52113.phpt index f6d0962625db4..84cd1b5210157 100644 --- a/ext/date/tests/bug52113.phpt +++ b/ext/date/tests/bug52113.phpt @@ -16,7 +16,7 @@ $diff_un = unserialize($diff_s); $p = new DatePeriod($start, $diff_un, 2); var_dump($diff_un, $p); -$unser = DateInterval::__set_state(array( +$unser = \DateInterval::__set_state(array( 'y' => 7, 'm' => 6, 'd' => 5, @@ -68,7 +68,7 @@ object(DateInterval)#%d (16) { int(0) } string(332) "O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:0;s:1:"h";i:4;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";i:0;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}" -DateInterval::__set_state(array( +\DateInterval::__set_state(array( 'y' => 0, 'm' => 0, 'd' => 0, diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt index a545d909b8f12..98b3d5bb078b5 100644 --- a/ext/intl/tests/dateformat_format.phpt +++ b/ext/intl/tests/dateformat_format.phpt @@ -318,7 +318,7 @@ Formatted localtime_array is : 12/17/95 12:13 AM IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Thursday, December 31, 2009 3:02:03 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : December 31, 2009 3:02:03 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Dec 31, 2009 3:02:03 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 12/31/09 3:02 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 20091231 03:02 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Dec 30, 2000 5:04:05 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 12/30/00 5:04 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', diff --git a/ext/intl/tests/dateformat_format_variant2.phpt b/ext/intl/tests/dateformat_format_variant2.phpt index d70e2312564b9..6053ce07c8f72 100644 --- a/ext/intl/tests/dateformat_format_variant2.phpt +++ b/ext/intl/tests/dateformat_format_variant2.phpt @@ -318,7 +318,7 @@ Formatted localtime_array is : 12/17/95, 12:13 AM IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Dec 31, 2009, 3:02:03 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 12/31/09, 3:02 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 20091231 03:02 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Dec 30, 2000, 5:04:05 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 12/30/00, 5:04 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 3, 'timezone' => 'America/Los_Angeles', diff --git a/ext/intl/tests/dateformat_format_variant3.phpt b/ext/intl/tests/dateformat_format_variant3.phpt index c8601aadefd88..9d9fab6e92a45 100644 --- a/ext/intl/tests/dateformat_format_variant3.phpt +++ b/ext/intl/tests/dateformat_format_variant3.phpt @@ -318,7 +318,7 @@ Formatted localtime_array is : 12/17/95, 12:13 AM IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 Formatted localtime_array is : 18951217 12:13 AM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -326,7 +326,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Thursday, December 31, 2009 at 3:02:03 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -334,7 +334,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : December 31, 2009 at 3:02:03 PM GMT-10 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -342,7 +342,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Dec 31, 2009, 3:02:03 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -350,7 +350,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 12/31/09, 3:02 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2010-01-01 01:02:03.000000', 'timezone_type' => 3, 'timezone' => 'UTC', @@ -358,7 +358,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 20091231 03:02 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -366,7 +366,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Saturday, December 30, 2000 at 5:04:05 PM GMT-10:00 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -374,7 +374,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : December 30, 2000 at 5:04:05 PM GMT-10 ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -382,7 +382,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : Dec 30, 2000, 5:04:05 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', @@ -390,7 +390,7 @@ Date is: DateTime::__set_state(array( ------------ Formatted DateTime is : 12/30/00, 5:04 PM ------------ -Date is: DateTime::__set_state(array( +Date is: \DateTime::__set_state(array( 'date' => '2000-12-30 19:04:05.000000', 'timezone_type' => 2, 'timezone' => 'PDT', diff --git a/ext/spl/tests/bug65967.phpt b/ext/spl/tests/bug65967.phpt index e3bb6471c6969..abb83ebf1b330 100644 --- a/ext/spl/tests/bug65967.phpt +++ b/ext/spl/tests/bug65967.phpt @@ -10,5 +10,5 @@ gc_collect_cycles(); var_export($objstore); ?> --EXPECT-- -SplObjectStorage::__set_state(array( +\SplObjectStorage::__set_state(array( )) diff --git a/ext/spl/tests/fixedarray_022.phpt b/ext/spl/tests/fixedarray_022.phpt index c1cff1a926582..c45401bfb8384 100644 --- a/ext/spl/tests/fixedarray_022.phpt +++ b/ext/spl/tests/fixedarray_022.phpt @@ -11,7 +11,7 @@ call_user_func(function () { ?> --EXPECTF-- Warning: var_export does not handle circular references in %s on line 5 -SplFixedArray::__set_state(array( +\SplFixedArray::__set_state(array( 0 => NULL, )) object(SplFixedArray)#2 (1) refcount(4){ diff --git a/ext/spl/tests/fixedarray_023.phpt b/ext/spl/tests/fixedarray_023.phpt index 1d60a2ce6d9f7..781685b7891d6 100644 --- a/ext/spl/tests/fixedarray_023.phpt +++ b/ext/spl/tests/fixedarray_023.phpt @@ -18,7 +18,7 @@ call_user_func(function () { Warning: var_export does not handle circular references in %s on line 8 Warning: var_export does not handle circular references in %s on line 8 -SplFixedArray::__set_state(array( +\SplFixedArray::__set_state(array( 0 => NAN, 1 => 0.0, 2 => NULL, diff --git a/ext/standard/tests/array/007.phpt b/ext/standard/tests/array/007.phpt index a1c984a18be14..fcb6326721bb7 100644 --- a/ext/standard/tests/array/007.phpt +++ b/ext/standard/tests/array/007.phpt @@ -248,54 +248,54 @@ array(9) { -=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=- $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), @@ -326,54 +326,54 @@ array(3) { } $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), @@ -404,54 +404,54 @@ array(3) { } $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), @@ -475,54 +475,54 @@ array(2) { } $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), diff --git a/ext/standard/tests/array/array_intersect_1.phpt b/ext/standard/tests/array/array_intersect_1.phpt index 518dfd392f46f..49890b7fee1f3 100644 --- a/ext/standard/tests/array/array_intersect_1.phpt +++ b/ext/standard/tests/array/array_intersect_1.phpt @@ -66,54 +66,54 @@ echo "end ------------ array_uintersect_uassoc() with method --------\n"; begin ------------ array_uintersect() --------------------------- $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), @@ -146,54 +146,54 @@ end ------------ array_uintersect() --------------------------- begin ------------ array_uintersect_assoc() --------------------- $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), @@ -219,54 +219,54 @@ end ------------ array_uintersect_assoc() --------------------- begin ------------ array_uintersect_uassoc() with ordinary func - $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), @@ -292,54 +292,54 @@ end ------------ array_uintersect_uassoc() with ordinary func - begin ------------ array_uintersect_uassoc() with method -------- $a=array ( '0.1' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 12, 'public_member' => 12, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 23, 'public_member' => 23, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), ); $b=array ( '0.2' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 9, 'public_member' => 9, )), '0.5' => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 22, 'public_member' => 22, )), 0 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 3, 'public_member' => 3, )), 1 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => 4, 'public_member' => 4, )), 2 => - cr::__set_state(array( + \cr::__set_state(array( 'priv_member' => -15, 'public_member' => -15, )), diff --git a/ext/standard/tests/array/var_export3.phpt b/ext/standard/tests/array/var_export3.phpt index e7d3c851f27c2..723cc514f149e 100644 --- a/ext/standard/tests/array/var_export3.phpt +++ b/ext/standard/tests/array/var_export3.phpt @@ -18,7 +18,7 @@ $kake = new kake; var_export($kake); ?> --EXPECT-- -kake::__set_state(array( +\kake::__set_state(array( 'mann' => 42, 'kvinne' => 43, )) diff --git a/ext/standard/tests/general_functions/bug47027.phpt b/ext/standard/tests/general_functions/bug47027.phpt index e4f5aae9dd744..b7d6604dbe90a 100644 --- a/ext/standard/tests/general_functions/bug47027.phpt +++ b/ext/standard/tests/general_functions/bug47027.phpt @@ -6,7 +6,7 @@ $ao = new ArrayObject(array (2 => "foo", "bar" => "baz")); var_export ($ao); ?> --EXPECT-- -ArrayObject::__set_state(array( +\ArrayObject::__set_state(array( 2 => 'foo', 'bar' => 'baz', )) diff --git a/ext/standard/tests/general_functions/bug77638_1.phpt b/ext/standard/tests/general_functions/bug77638_1.phpt index e2a99ffd19953..9d75a9a7ce498 100644 --- a/ext/standard/tests/general_functions/bug77638_1.phpt +++ b/ext/standard/tests/general_functions/bug77638_1.phpt @@ -7,5 +7,5 @@ com_dotnet var_export(new COM("Scripting.Dictionary")); ?> --EXPECT-- -com::__set_state(array( +\com::__set_state(array( )) diff --git a/ext/standard/tests/general_functions/bug77638_2.phpt b/ext/standard/tests/general_functions/bug77638_2.phpt index cec76659c608d..589697011aa60 100644 --- a/ext/standard/tests/general_functions/bug77638_2.phpt +++ b/ext/standard/tests/general_functions/bug77638_2.phpt @@ -7,5 +7,5 @@ ffi var_export(FFI::new('int')); ?> --EXPECT-- -FFI\CData::__set_state(array( +\FFI\CData::__set_state(array( )) diff --git a/ext/standard/tests/general_functions/var_export-locale.phpt b/ext/standard/tests/general_functions/var_export-locale.phpt index c9b0fa8d8750d..88a0b8ef7e4b7 100644 --- a/ext/standard/tests/general_functions/var_export-locale.phpt +++ b/ext/standard/tests/general_functions/var_export-locale.phpt @@ -914,35 +914,35 @@ string(17) "(object) array( Iteration 2 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 3 -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -string(36) "concreteClass::__set_state(array( +string(37) "\concreteClass::__set_state(array( ))" Iteration 4 -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -string(57) "Value::__set_state(array( +string(58) "\Value::__set_state(array( 'vars' => array ( ), @@ -950,146 +950,146 @@ string(57) "Value::__set_state(array( Iteration 5 -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -string(293) "myClass::__set_state(array( +string(298) "\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), ))" Iteration 6 -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -string(293) "myClass::__set_state(array( +string(298) "\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), ))" Iteration 7 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 8 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 9 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 10 -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -string(57) "Value::__set_state(array( +string(58) "\Value::__set_state(array( 'vars' => array ( ), @@ -1097,11 +1097,11 @@ string(57) "Value::__set_state(array( Iteration 11 -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -string(36) "concreteClass::__set_state(array( +string(37) "\concreteClass::__set_state(array( ))" *** Testing var_export() with valid null values *** diff --git a/ext/standard/tests/general_functions/var_export-locale_32.phpt b/ext/standard/tests/general_functions/var_export-locale_32.phpt index 4033eff5c3749..4e06d99804e5e 100644 --- a/ext/standard/tests/general_functions/var_export-locale_32.phpt +++ b/ext/standard/tests/general_functions/var_export-locale_32.phpt @@ -914,35 +914,35 @@ string(17) "(object) array( Iteration 2 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 3 -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -string(36) "concreteClass::__set_state(array( +string(37) "\concreteClass::__set_state(array( ))" Iteration 4 -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -string(57) "Value::__set_state(array( +string(58) "\Value::__set_state(array( 'vars' => array ( ), @@ -950,146 +950,146 @@ string(57) "Value::__set_state(array( Iteration 5 -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -string(293) "myClass::__set_state(array( +string(298) "\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), ))" Iteration 6 -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -string(293) "myClass::__set_state(array( +string(298) "\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), ))" Iteration 7 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 8 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 9 -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" Iteration 10 -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -string(57) "Value::__set_state(array( +string(58) "\Value::__set_state(array( 'vars' => array ( ), @@ -1097,11 +1097,11 @@ string(57) "Value::__set_state(array( Iteration 11 -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -string(36) "concreteClass::__set_state(array( +string(37) "\concreteClass::__set_state(array( ))" *** Testing var_export() with valid null values *** diff --git a/ext/standard/tests/general_functions/var_export_basic6.phpt b/ext/standard/tests/general_functions/var_export_basic6.phpt index a3d3ae639b0b1..a7094d1c579ae 100644 --- a/ext/standard/tests/general_functions/var_export_basic6.phpt +++ b/ext/standard/tests/general_functions/var_export_basic6.phpt @@ -110,35 +110,35 @@ string(17) "(object) array( -- Iteration: new foo -- -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" -- Iteration: new concreteClass -- -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -string(36) "concreteClass::__set_state(array( +string(37) "\concreteClass::__set_state(array( ))" -- Iteration: new Value -- -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -string(57) "Value::__set_state(array( +string(58) "\Value::__set_state(array( 'vars' => array ( ), @@ -146,146 +146,146 @@ string(57) "Value::__set_state(array( -- Iteration: new myClass -- -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -string(293) "myClass::__set_state(array( +string(298) "\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), ))" -- Iteration: myClass_object -- -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -myClass::__set_state(array( +\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), )) -string(293) "myClass::__set_state(array( +string(298) "\myClass::__set_state(array( 'foo_object' => - foo::__set_state(array( + \foo::__set_state(array( )), 'public_var' => 10, 'public_var1' => - foo::__set_state(array( + \foo::__set_state(array( )), 'private_var' => - foo::__set_state(array( + \foo::__set_state(array( )), 'protected_var' => NULL, 'proected_var' => - foo::__set_state(array( + \foo::__set_state(array( )), ))" -- Iteration: myClass_object->foo_object -- -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" -- Iteration: myClass_object->public_var1 -- -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" -- Iteration: foo_object -- -foo::__set_state(array( +\foo::__set_state(array( )) -foo::__set_state(array( +\foo::__set_state(array( )) -string(26) "foo::__set_state(array( +string(27) "\foo::__set_state(array( ))" -- Iteration: Value_object -- -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -Value::__set_state(array( +\Value::__set_state(array( 'vars' => array ( ), )) -string(57) "Value::__set_state(array( +string(58) "\Value::__set_state(array( 'vars' => array ( ), @@ -293,10 +293,10 @@ string(57) "Value::__set_state(array( -- Iteration: concreteClass_object -- -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -concreteClass::__set_state(array( +\concreteClass::__set_state(array( )) -string(36) "concreteClass::__set_state(array( +string(37) "\concreteClass::__set_state(array( ))" diff --git a/ext/standard/var.c b/ext/standard/var.c index c429763eb9c86..d841a2415cdd9 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -575,6 +575,7 @@ PHPAPI void php_var_export_ex(zval *struc, int level, smart_str *buf) /* {{{ */ if (ce == zend_standard_class_def) { smart_str_appendl(buf, "(object) array(\n", 16); } else { + smart_str_appendl(buf, "\\", 1); smart_str_append(buf, ce->name); if (is_enum) { zend_object *zobj = Z_OBJ_P(struc);