Test engine is improved to support unicode mode

diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt
index 06a5c3242c10e31f3ddf007791abc6529b5eaece..eefd80dfab236bee071357e47c07c0c696e68d66 100644 (file)
--- a/Zend/tests/bug22836.phpt
+++ b/Zend/tests/bug22836.phpt
@@ -32,3 +32,20 @@ string(3) "foo"
 'foo'
 string(3) "foo"
 'foo'
+--UEXPECTF--
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'
+unicode(3) "foo"
+'foo'

diff --git a/Zend/tests/bug23104.phpt b/Zend/tests/bug23104.phpt
index 04df3bdeb54dd10a19d5982986ecce18f2993889..9c4e805cdd6951c81d5d35f8070cda33c4fca75c 100644 (file)
--- a/Zend/tests/bug23104.phpt
+++ b/Zend/tests/bug23104.phpt
@@ -10,3 +10,5 @@ foo();
 ?>
 --EXPECT--
 string(1) "a"
+--UEXPECT--
+unicode(1) "a"

diff --git a/Zend/tests/bug26010.phpt b/Zend/tests/bug26010.phpt
index a3c41faefc61ee2d9a9e12e2136a2fe08ed6ea62..83192f799b6c1d47a96596745ce849202b43cd5b 100644 (file)
--- a/Zend/tests/bug26010.phpt
+++ b/Zend/tests/bug26010.phpt
@@ -16,4 +16,8 @@ array(1) {
   ["public"]=>
   string(6) "public"
 }
-
+--UEXPECT--
+array(1) {
+  [u"public"]=>
+  unicode(6) "public"
+}

diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/bug27798.phpt
index f0d1cd5e99e446ecf08cca6ced1149c9b8132319..d9f6d963987c24db1318d99e52ec17ff019dea58 100755 (executable)
--- a/Zend/tests/bug27798.phpt
+++ b/Zend/tests/bug27798.phpt
@@ -70,3 +70,40 @@ array(1) {
   int(1)
 }
 ===DONE===
+--UEXPECT--
+Base::__construct
+array(3) {
+  [u"Foo"]=>
+  int(1)
+  [u"Bar"]=>
+  int(2)
+  [u"Baz"]=>
+  int(3)
+}
+array(1) {
+  [u"Foo"]=>
+  int(1)
+}
+Base::__construct
+array(3) {
+  [u"Baz"]=>
+  int(4)
+  [u"Foo"]=>
+  int(1)
+  [u"Bar"]=>
+  int(2)
+}
+Child::__construct
+array(3) {
+  [u"Baz"]=>
+  int(4)
+  [u"Foo"]=>
+  int(1)
+  [u"Bar"]=>
+  int(2)
+}
+array(1) {
+  [u"Foo"]=>
+  int(1)
+}
+===DONE===

diff --git a/Zend/tests/bug28442.phpt b/Zend/tests/bug28442.phpt
index 1237357ccaf9c33cf3a468f5be35e86254a714ce..99ed5e6cbec7058368f13a0fa2b389d81ba4cdc3 100755 (executable)
--- a/Zend/tests/bug28442.phpt
+++ b/Zend/tests/bug28442.phpt
@@ -63,3 +63,21 @@ string(2) "A2"
 string(2) "C2"
 string(2) "C2"
 ===DONE===
+--UEXPECTF--
+===INIT===
+unicode(1) "A"
+unicode(1) "C"
+unicode(1) "C"
+===SetA===
+unicode(2) "A2"
+unicode(1) "C"
+unicode(1) "C"
+===SetB===
+unicode(2) "A2"
+unicode(2) "B2"
+unicode(2) "B2"
+===SetC===
+unicode(2) "A2"
+unicode(2) "C2"
+unicode(2) "C2"
+===DONE===

diff --git a/Zend/tests/bug28444.phpt b/Zend/tests/bug28444.phpt
index f8a5513e0b9c88ff229e326bf53a6db9785407a3..5d84edc8a9c65d0982dec3bc9d7cba6dd7a1c116 100755 (executable)
--- a/Zend/tests/bug28444.phpt
+++ b/Zend/tests/bug28444.phpt
@@ -72,3 +72,26 @@ int(5)
 Overloaded::__get(z)
 int(6)
 ===DONE===
+--UEXPECTF--
+object(Object)#%d (1) {
+  [u"x"]=>
+  int(2)
+}
+int(2)
+int(3)
+Overloaded::__set(y,3)
+int(3)
+Overloaded::__get(y)
+int(3)
+Overloaded::__set(z,Object id #3)
+object(Object)#%d (1) {
+  [u"x"]=>
+  int(4)
+}
+Overloaded::__get(z)
+int(4)
+Overloaded::__get(z)
+int(5)
+Overloaded::__get(z)
+int(6)
+===DONE===

diff --git a/Zend/tests/bug29505.phpt b/Zend/tests/bug29505.phpt
index 4d7c05351679973eac1faca3de2f18e24a531e79..2814157b58a8f0009d078b9bdffea67b320782c7 100755 (executable)
--- a/Zend/tests/bug29505.phpt
+++ b/Zend/tests/bug29505.phpt
@@ -29,3 +29,20 @@ array(2) {
   }
 }
 ===DONE===
+--UEXPECT--
+array(2) {
+  [u"empty"]=>
+  array(0) {
+  }
+  [u"three"]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [u"b"]=>
+    unicode(1) "c"
+    [3]=>
+    array(0) {
+    }
+  }
+}
+===DONE===

diff --git a/Zend/tests/bug29674.phpt b/Zend/tests/bug29674.phpt
index aef91f4061949ff9c13d0d88a735fc4fb196af55..c8346f46492d5af76c233125ace09895f4b0af8d 100755 (executable)
--- a/Zend/tests/bug29674.phpt
+++ b/Zend/tests/bug29674.phpt
@@ -39,3 +39,13 @@ NULL
 string(4) "Base"
 
 Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
+--UEXPECTF--
+===BASE===
+unicode(4) "Base"
+
+Notice: Undefined property:  BaseClass::$private_child in %sbug29674.php on line %d
+NULL
+===CHILD===
+unicode(4) "Base"
+
+Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d

diff --git a/Zend/tests/bug30140.phpt b/Zend/tests/bug30140.phpt
index 1dfb83500f317a2e59e65018e1f46ccd3b13bd3a..1a17a1f6c1c911efb848d125bd98e3cac97cb62b 100755 (executable)
--- a/Zend/tests/bug30140.phpt
+++ b/Zend/tests/bug30140.phpt
@@ -28,3 +28,10 @@ string(1) "z"
 string(1) "x"
 string(1) "y"
 string(1) "z"
+--UEXPECT--
+unicode(1) "x"
+unicode(1) "y"
+unicode(1) "z"
+unicode(1) "x"
+unicode(1) "y"
+unicode(1) "z"

diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt
index ae11f8ff8b71150d26fb890ea9f4fb61d3352169..a94ed5d7afc8a788c85046b13251301c79b74ac8 100755 (executable)
--- a/Zend/tests/bug30162.phpt
+++ b/Zend/tests/bug30162.phpt
@@ -50,3 +50,12 @@ object(hariCow)#1 (2) {
   ["y"]=>
   string(1) "y"
 }
+--UEXPECTF--
+Notice: Undefined variable: db in %sbug30162.php on line 35
+NULL
+object(hariCow)#1 (2) {
+  [u"x"]=>
+  unicode(1) "x"
+  [u"y"]=>
+  unicode(1) "y"
+}

diff --git a/Zend/tests/bug30407.phpt b/Zend/tests/bug30407.phpt
index 6dcc6b3481fef3ab097d0829d60e32e9e93d3021..dd43bd47d38305cdcc51dabb2b4161cbfaaedf41 100644 (file)
--- a/Zend/tests/bug30407.phpt
+++ b/Zend/tests/bug30407.phpt
@@ -16,3 +16,7 @@ haricow();
 string(3) "one"
 string(3) "one"
 ===DONE===
+--UEXPECT--
+unicode(3) "one"
+unicode(3) "one"
+===DONE===

diff --git a/Zend/tests/bug30702.phpt b/Zend/tests/bug30702.phpt
index 17e44a389569eb9d9507843a149040a1a72d538b..537e7981f574deaff0ce2d52821756cff526cee4 100644 (file)
--- a/Zend/tests/bug30702.phpt
+++ b/Zend/tests/bug30702.phpt
@@ -37,3 +37,18 @@ object(bar)#1 (6) {
   ["c6"]=>
   int(1)
 }
+--UEXPECT--
+object(bar)#1 (6) {
+  [u"c1"]=>
+  int(1)
+  [u"c2"]=>
+  int(2)
+  [u"c3"]=>
+  int(1)
+  [u"c4"]=>
+  int(2)
+  [u"c5"]=>
+  int(1)
+  [u"c6"]=>
+  int(1)
+}

diff --git a/Zend/tests/bug31683.phpt b/Zend/tests/bug31683.phpt
index 4e0159d6c2108a49899fb248389aa8125267bbb5..306ed81b64c1ae5f6eed8f80021a05c10736355e 100644 (file)
--- a/Zend/tests/bug31683.phpt
+++ b/Zend/tests/bug31683.phpt
@@ -95,3 +95,30 @@ NULL
 string(2) "ok"
 string(2) "ok"
 ---
+--UEXPECT--
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+NULL
+unicode(2) "ok"
+unicode(2) "ok"
+---
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+unicode(2) "ok"
+NULL
+unicode(2) "ok"
+unicode(2) "ok"
+---

diff --git a/Zend/tests/bug32799.phpt b/Zend/tests/bug32799.phpt
index 7b09a502746768c28a33c272304e2aac387cbfc5..18b5a1e8c6556415cfe0bab4f4235b30db953635 100755 (executable)
--- a/Zend/tests/bug32799.phpt
+++ b/Zend/tests/bug32799.phpt
@@ -19,3 +19,9 @@ object(test)#1 (1) {
   ["c"]=>
   int(2)
 }
+--UEXPECT--
+2
+object(test)#1 (1) {
+  [u"c"]=>
+  int(2)
+}

diff --git a/Zend/tests/bug33243.phpt b/Zend/tests/bug33243.phpt
index bb5d77c7bf6af8192851dac21db38c99da20496f..ec791af4cfceadf654724c3a413d96305d3446e8 100755 (executable)
--- a/Zend/tests/bug33243.phpt
+++ b/Zend/tests/bug33243.phpt
@@ -23,3 +23,16 @@ object(stdClass)#%d (1) {
     int(0)
   }
 }
+--UEXPECTF--
+Strict Standards: Creating default object from empty value in %sbug33243.php on line 2
+
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 3
+
+Strict Standards: Implicit cloning object of class 'stdClass' because of 'zend.ze1_compatibility_mode' in %sbug33243.php on line 5
+object(stdClass)#%d (1) {
+  [u"y"]=>
+  object(stdClass)#%d (1) {
+    [u"z"]=>
+    int(0)
+  }
+}

diff --git a/Zend/tests/bug33999.phpt b/Zend/tests/bug33999.phpt
index 1946280712d37530bbbbf8652d0e66c5471fed3a..477179e9be3fe0df0c0103e8dd76cb15e8c23108 100755 (executable)
--- a/Zend/tests/bug33999.phpt
+++ b/Zend/tests/bug33999.phpt
@@ -28,3 +28,14 @@ int(1)
 
 Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12
 float(1)
+--UEXPECTF--
+object(Foo)#1 (1) {
+  [u"bar"]=>
+  unicode(3) "bat"
+}
+
+Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9
+int(1)
+
+Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12
+float(1)

diff --git a/Zend/tests/bug34064.phpt b/Zend/tests/bug34064.phpt
index 84208a54f8654f1fb76e7f2322032c984609482a..d8d9f546be84afb41bb0800537f3953d1ae46d3e 100755 (executable)
--- a/Zend/tests/bug34064.phpt
+++ b/Zend/tests/bug34064.phpt
@@ -32,4 +32,10 @@ array(1) {
 }
 
 Fatal error: Cannot use [] for reading in %sbug34064.php on line 18
+--UEXPECTF--
+array(1) {
+  [0]=>
+  unicode(2) "ok"
+}
 
+Fatal error: Cannot use [] for reading in %sbug34064.php on line 18

diff --git a/Zend/tests/unset_cv11.phpt b/Zend/tests/unset_cv11.phpt
index 152ea0229b6002999d446c23b72729a3d17fa6a6..95788b6c6e6d6d51b35af9034292921f64c6b812 100644 (file)
--- a/Zend/tests/unset_cv11.phpt
+++ b/Zend/tests/unset_cv11.phpt
@@ -19,3 +19,13 @@ array(1) {
   string(2) "ok"
 }
 ok
+--UEXPECT--
+array(1) {
+  [u"default"]=>
+  unicode(2) "ok"
+}
+array(1) {
+  [u"default"]=>
+  unicode(2) "ok"
+}
+ok

diff --git a/ext/pdo/tests/pdo_001.phpt b/ext/pdo/tests/pdo_001.phpt
index 6740411f77a70936624d7f78e368ca16ff759c4b..cf2013bfcec66c166e74997348e5b26f142dc08b 100644 (file)
--- a/ext/pdo/tests/pdo_001.phpt
+++ b/ext/pdo/tests/pdo_001.phpt
@@ -47,3 +47,27 @@ array(3) {
     string(1) "C"
   }
 }
+--UEXPECT--
+array(3) {
+  [0]=>
+  array(2) {
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val"]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(2) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(2) {
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val"]=>
+    unicode(1) "C"
+  }
+}

diff --git a/ext/pdo/tests/pdo_002.phpt b/ext/pdo/tests/pdo_002.phpt
index 9de520ba70be6409914de506b28a5fff4fdf9db0..3dbdff2945c6becfb497d921abdf4e0367e4d6f2 100644 (file)
--- a/ext/pdo/tests/pdo_002.phpt
+++ b/ext/pdo/tests/pdo_002.phpt
@@ -47,3 +47,27 @@ array(3) {
     string(1) "C"
   }
 }
+--UEXPECT--
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    unicode(1) "1"
+    [1]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(1) "2"
+    [1]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    unicode(1) "3"
+    [1]=>
+    unicode(1) "C"
+  }
+}

diff --git a/ext/pdo/tests/pdo_003.phpt b/ext/pdo/tests/pdo_003.phpt
index 255eb124cf0b0ba3e5d8dea938dc8147cd174082..963b43b9422b7a47acd6edc4e260fa59d943ef6d 100644 (file)
--- a/ext/pdo/tests/pdo_003.phpt
+++ b/ext/pdo/tests/pdo_003.phpt
@@ -59,3 +59,39 @@ array(3) {
     string(1) "C"
   }
 }
+--UEXPECT--
+array(3) {
+  [0]=>
+  array(4) {
+    [u"id"]=>
+    unicode(1) "1"
+    [0]=>
+    unicode(1) "1"
+    [u"val"]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(4) {
+    [u"id"]=>
+    unicode(1) "2"
+    [0]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+    [1]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(4) {
+    [u"id"]=>
+    unicode(1) "3"
+    [0]=>
+    unicode(1) "3"
+    [u"val"]=>
+    unicode(1) "C"
+    [1]=>
+    unicode(1) "C"
+  }
+}

diff --git a/ext/pdo/tests/pdo_004.phpt b/ext/pdo/tests/pdo_004.phpt
index 1f3f0f980ed7feabaab33aa496db8255a747f631..6c8363885c22e5c36339b4e77d1de06b8fc44584 100644 (file)
--- a/ext/pdo/tests/pdo_004.phpt
+++ b/ext/pdo/tests/pdo_004.phpt
@@ -47,3 +47,27 @@ array(3) {
     string(1) "C"
   }
 }
+--UEXPECTF--
+array(3) {
+  [0]=>
+  object(stdClass)#%d (2) {
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val"]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  object(stdClass)#%d (2) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  object(stdClass)#%d (2) {
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val"]=>
+    unicode(1) "C"
+  }
+}

diff --git a/ext/pdo/tests/pdo_005.phpt b/ext/pdo/tests/pdo_005.phpt
index bf1779fc1c62ab522fdb50e97cc7f444562769f8..2b658de8fabdf252a83e8d034fb29f3bfb7b097a 100644 (file)
--- a/ext/pdo/tests/pdo_005.phpt
+++ b/ext/pdo/tests/pdo_005.phpt
@@ -151,3 +151,106 @@ array(3) {
     string(2) "CC"
   }
 }
+--UEXPECTF--
+array(3) {
+  [0]=>
+  object(stdClass)#%d (3) {
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val"]=>
+    unicode(1) "A"
+    [u"val2"]=>
+    unicode(2) "AA"
+  }
+  [1]=>
+  object(stdClass)#%d (3) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+    [u"val2"]=>
+    unicode(2) "BB"
+  }
+  [2]=>
+  object(stdClass)#%d (3) {
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val"]=>
+    unicode(1) "C"
+    [u"val2"]=>
+    unicode(2) "CC"
+  }
+}
+array(3) {
+  [0]=>
+  object(TestBase)#%d (3) {
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val":protected]=>
+    unicode(1) "A"
+    [u"val2":u"TestBase":private]=>
+    unicode(2) "AA"
+  }
+  [1]=>
+  object(TestBase)#%d (3) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val":protected]=>
+    unicode(1) "B"
+    [u"val2":u"TestBase":private]=>
+    unicode(2) "BB"
+  }
+  [2]=>
+  object(TestBase)#%d (3) {
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val":protected]=>
+    unicode(1) "C"
+    [u"val2":u"TestBase":private]=>
+    unicode(2) "CC"
+  }
+}
+TestDerived::__construct(0,1)
+TestDerived::__construct(1,2)
+TestDerived::__construct(2,3)
+array(3) {
+  [0]=>
+  object(TestDerived)#%d (5) {
+    [u"row":protected]=>
+    int(0)
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val":protected]=>
+    unicode(1) "A"
+    [u"val2":u"TestBase":private]=>
+    NULL
+    [u"val2"]=>
+    unicode(2) "AA"
+  }
+  [1]=>
+  object(TestDerived)#%d (5) {
+    [u"row":protected]=>
+    int(1)
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val":protected]=>
+    unicode(1) "B"
+    [u"val2":u"TestBase":private]=>
+    NULL
+    [u"val2"]=>
+    unicode(2) "BB"
+  }
+  [2]=>
+  object(TestDerived)#%d (5) {
+    [u"row":protected]=>
+    int(2)
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val":protected]=>
+    unicode(1) "C"
+    [u"val2":u"TestBase":private]=>
+    NULL
+    [u"val2"]=>
+    unicode(2) "CC"
+  }
+}

diff --git a/ext/pdo/tests/pdo_006.phpt b/ext/pdo/tests/pdo_006.phpt
index 90dbe0ba882dba2d5f05cac41d2ddd7f7f35fda5..a07bc856a5af16d55f6f539e78930deb5ac25bb6 100644 (file)
--- a/ext/pdo/tests/pdo_006.phpt
+++ b/ext/pdo/tests/pdo_006.phpt
@@ -74,3 +74,50 @@ array(2) {
     }
   }
 }
+--UEXPECT--
+array(2) {
+  [u"A"]=>
+  array(2) {
+    [0]=>
+    array(1) {
+      [0]=>
+      unicode(1) "1"
+    }
+    [1]=>
+    array(1) {
+      [0]=>
+      unicode(1) "2"
+    }
+  }
+  [u"C"]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      unicode(1) "3"
+    }
+  }
+}
+array(2) {
+  [u"A"]=>
+  array(2) {
+    [0]=>
+    array(1) {
+      [u"id"]=>
+      unicode(1) "1"
+    }
+    [1]=>
+    array(1) {
+      [u"id"]=>
+      unicode(1) "2"
+    }
+  }
+  [u"C"]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [u"id"]=>
+      unicode(1) "3"
+    }
+  }
+}

diff --git a/ext/pdo/tests/pdo_007.phpt b/ext/pdo/tests/pdo_007.phpt
index 49df24061dcbea4ac00c57432737700897e6bbd7..e50846ec9e7997e6cfed78765788d2b33ab61f8d 100644 (file)
--- a/ext/pdo/tests/pdo_007.phpt
+++ b/ext/pdo/tests/pdo_007.phpt
@@ -62,3 +62,38 @@ array(3) {
     string(1) "C"
   }
 }
+--UEXPECT--
+array(3) {
+  [u"A"]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+  [u"B"]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+  [u"C"]=>
+  array(1) {
+    [0]=>
+    unicode(1) "C"
+  }
+}
+array(3) {
+  [u"A"]=>
+  array(1) {
+    [u"val"]=>
+    unicode(1) "A"
+  }
+  [u"B"]=>
+  array(1) {
+    [u"val"]=>
+    unicode(1) "A"
+  }
+  [u"C"]=>
+  array(1) {
+    [u"val"]=>
+    unicode(1) "C"
+  }
+}

diff --git a/ext/pdo/tests/pdo_008.phpt b/ext/pdo/tests/pdo_008.phpt
index 594ccdab3d1c6aa09f0cff9a9f4d78fadb716c4d..9b49324a37841818558ee8f94e680db26f4f13db 100644 (file)
--- a/ext/pdo/tests/pdo_008.phpt
+++ b/ext/pdo/tests/pdo_008.phpt
@@ -37,3 +37,16 @@ array(2) {
     string(1) "C"
   }
 }
+--UEXPECT--
+array(2) {
+  [u"A"]=>
+  array(1) {
+    [0]=>
+    unicode(1) "B"
+  }
+  [u"C"]=>
+  array(1) {
+    [0]=>
+    unicode(1) "C"
+  }
+}

diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
index b5527aba39e6670212673c9d101de523a926cc17..61e198773466f0734750cf8380c356cf68da9092 100644 (file)
--- a/ext/pdo/tests/pdo_009.phpt
+++ b/ext/pdo/tests/pdo_009.phpt
@@ -128,3 +128,75 @@ array(4) {
     string(1) "D"
   }
 }
+--UEXPECTF--
+array(4) {
+  [0]=>
+  array(3) {
+    [0]=>
+    unicode(8) "stdClass"
+    [1]=>
+    unicode(1) "1"
+    [2]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    unicode(5) "Test1"
+    [1]=>
+    unicode(1) "2"
+    [2]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(3) {
+    [0]=>
+    unicode(5) "Test2"
+    [1]=>
+    unicode(1) "3"
+    [2]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  array(3) {
+    [0]=>
+    NULL
+    [1]=>
+    unicode(1) "4"
+    [2]=>
+    unicode(1) "D"
+  }
+}
+Test1::__construct()
+Test2::__construct()
+Test3::__construct()
+array(4) {
+  [0]=>
+  object(stdClass)#%d (2) {
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val"]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  object(Test2)#%d (2) {
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val"]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  object(Test3)#%d (2) {
+    [u"id"]=>
+    unicode(1) "4"
+    [u"val"]=>
+    unicode(1) "D"
+  }
+}

diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
index 6de31d1ea12857ad6f4499ed80fff4bd4be65b1f..d78d1bf7ee9f8b12f287ebd7e734ff0aeaf9b6db 100644 (file)
--- a/ext/pdo/tests/pdo_010.phpt
+++ b/ext/pdo/tests/pdo_010.phpt
@@ -116,3 +116,62 @@ array(2) {
     string(1) "D"
   }
 }
+--UEXPECTF--
+Test1::__construct()
+Test2::__construct()
+Test3::__construct()
+array(2) {
+  [u"Group1"]=>
+  array(2) {
+    [0]=>
+    object(stdClass)#%d (2) {
+      [u"id"]=>
+      unicode(1) "1"
+      [u"val"]=>
+      unicode(1) "A"
+    }
+    [1]=>
+    object(Test1)#%d (2) {
+      [u"id"]=>
+      unicode(1) "2"
+      [u"val"]=>
+      unicode(1) "B"
+    }
+  }
+  [u"Group2"]=>
+  array(2) {
+    [0]=>
+    object(Test2)#%d (2) {
+      [u"id"]=>
+      unicode(1) "3"
+      [u"val"]=>
+      unicode(1) "C"
+    }
+    [1]=>
+    object(Test3)#%d (2) {
+      [u"id"]=>
+      unicode(1) "4"
+      [u"val"]=>
+      unicode(1) "D"
+    }
+  }
+}
+Test1::__construct()
+Test2::__construct()
+Test3::__construct()
+array(2) {
+  [u"Group1"]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+  }
+  [u"Group2"]=>
+  object(Test3)#%d (2) {
+    [u"id"]=>
+    unicode(1) "4"
+    [u"val"]=>
+    unicode(1) "D"
+  }
+}

diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index 38ae8ff62af2ebf50c3542289448e27cfd34ea32..c2ff2b6e964490161f460aa1c715f51c23091a66 100644 (file)
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -242,3 +242,167 @@ array(4) {
     string(1) "D"
   }
 }
+--UEXPECTF--
+DerivedStatement::__construct(Overloaded)
+Test1::__construct(0,0)
+test(1,N/A)
+test(2,N/A)
+test(3,N/A)
+test(4,N/A)
+array(2) {
+  [u"Group1"]=>
+  array(2) {
+    [0]=>
+    array(1) {
+      [1]=>
+      unicode(3) "N/A"
+    }
+    [1]=>
+    array(1) {
+      [2]=>
+      unicode(3) "N/A"
+    }
+  }
+  [u"Group2"]=>
+  array(2) {
+    [0]=>
+    array(1) {
+      [3]=>
+      unicode(3) "N/A"
+    }
+    [1]=>
+    array(1) {
+      [4]=>
+      unicode(3) "N/A"
+    }
+  }
+}
+test(1,A)
+test(2,B)
+test(3,C)
+test(4,D)
+array(4) {
+  [0]=>
+  array(1) {
+    [1]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(1) {
+    [2]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(1) {
+    [3]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  array(1) {
+    [4]=>
+    unicode(1) "D"
+  }
+}
+Test1::factory(1,A)
+Test1::__construct(1,A)
+Test1::factory(2,B)
+Test1::__construct(2,B)
+Test1::factory(3,C)
+Test1::__construct(3,C)
+Test1::factory(4,D)
+Test1::__construct(4,D)
+array(4) {
+  [0]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val"]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val"]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "4"
+    [u"val"]=>
+    unicode(1) "D"
+  }
+}
+Test1::factory(1,A)
+Test1::__construct(1,A)
+Test1::factory(2,B)
+Test1::__construct(2,B)
+Test1::factory(3,C)
+Test1::__construct(3,C)
+Test1::factory(4,D)
+Test1::__construct(4,D)
+array(4) {
+  [0]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "1"
+    [u"val"]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "2"
+    [u"val"]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "3"
+    [u"val"]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  object(Test1)#%d (2) {
+    [u"id"]=>
+    unicode(1) "4"
+    [u"val"]=>
+    unicode(1) "D"
+  }
+}
+unicode(16) "DerivedStatement"
+DerivedStatement::retrieve(1,A)
+DerivedStatement::retrieve(2,B)
+DerivedStatement::retrieve(3,C)
+DerivedStatement::retrieve(4,D)
+array(4) {
+  [0]=>
+  array(1) {
+    [1]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(1) {
+    [2]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(1) {
+    [3]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  array(1) {
+    [4]=>
+    unicode(1) "D"
+  }
+}

diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index 77a625c3c4fddb0396219d3eea2ebf0e30ec96ae..de6857ae154004e4628deb826866ab3e39b8662f 100644 (file)
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -95,3 +95,56 @@ array(2) {
     string(6) "Group2"
   }
 }
+--UEXPECTF--
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(6) "Group1"
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(1) "B"
+    [1]=>
+    unicode(6) "Group2"
+  }
+}
+Test::__construct(N/A)
+Test::__construct(N/A)
+array(2) {
+  [0]=>
+  object(Test)#%d (2) {
+    [u"val"]=>
+    unicode(1) "A"
+    [u"grp"]=>
+    unicode(6) "Group1"
+  }
+  [1]=>
+  object(Test)#%d (2) {
+    [u"val"]=>
+    unicode(1) "B"
+    [u"grp"]=>
+    unicode(6) "Group2"
+  }
+}
+Test::__construct(Changed)
+Test::__construct(Changed)
+array(2) {
+  [0]=>
+  object(Test)#%d (2) {
+    [u"val"]=>
+    unicode(1) "A"
+    [u"grp"]=>
+    unicode(6) "Group1"
+  }
+  [1]=>
+  object(Test)#%d (2) {
+    [u"val"]=>
+    unicode(1) "B"
+    [u"grp"]=>
+    unicode(6) "Group2"
+  }
+}

diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index 09296063362ea7c1ae9d17178c81978f374921fd..1a0e601c47450ba01c268bfb16234ded48756155 100644 (file)
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -93,3 +93,44 @@ object(Test)#%d (2) {
   ["grp"]=>
   string(6) "Group2"
 }
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(1) "A"
+  [1]=>
+  unicode(6) "Group1"
+}
+array(2) {
+  [0]=>
+  unicode(1) "B"
+  [1]=>
+  unicode(6) "Group2"
+}
+Test::__construct(N/A)
+object(Test)#%d (2) {
+  [u"val"]=>
+  unicode(1) "A"
+  [u"grp"]=>
+  unicode(6) "Group1"
+}
+Test::__construct(N/A)
+object(Test)#%d (2) {
+  [u"val"]=>
+  unicode(1) "B"
+  [u"grp"]=>
+  unicode(6) "Group2"
+}
+Test::__construct(WOW)
+object(Test)#%d (2) {
+  [u"val"]=>
+  unicode(1) "A"
+  [u"grp"]=>
+  unicode(6) "Group1"
+}
+Test::__construct(WOW)
+object(Test)#%d (2) {
+  [u"val"]=>
+  unicode(1) "B"
+  [u"grp"]=>
+  unicode(6) "Group2"
+}

diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt
index 1d21cb4a00df15fa9283ed3a0f29ee2fb4b049e5..316b8447f22299236c7fcc28aefcff9f1d744dbe 100644 (file)
--- a/ext/pdo/tests/pdo_014.phpt
+++ b/ext/pdo/tests/pdo_014.phpt
@@ -99,3 +99,34 @@ array(2) {
   [1]=>
   string(6) "Group2"
 }
+--UEXPECTF--
+Test::__construct(WOW)
+object(Test)#4 (2) {
+  [u"val"]=>
+  unicode(1) "A"
+  [u"grp"]=>
+  unicode(6) "Group1"
+}
+Test::__construct(WOW)
+object(Test)#6 (2) {
+  [u"val"]=>
+  unicode(1) "B"
+  [u"grp"]=>
+  unicode(6) "Group2"
+}
+NULL
+bool(false)
+PDOStatementAggregate::__construct
+PDOStatementAggregate::getIterator
+array(2) {
+  [0]=>
+  unicode(1) "A"
+  [1]=>
+  unicode(6) "Group1"
+}
+array(2) {
+  [0]=>
+  unicode(1) "B"
+  [1]=>
+  unicode(6) "Group2"
+}

diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
index 66424060bf31dbdcdfae24559f09343e9d047167..7a00a77acbe2c85b36378db31dcfb6cc3f132f51 100644 (file)
--- a/ext/pdo/tests/pdo_015.phpt
+++ b/ext/pdo/tests/pdo_015.phpt
@@ -97,3 +97,61 @@ array(1) {
     string(2) "B2"
   }
 }
+--UEXPECT--
+array(2) {
+  [0]=>
+  unicode(1) "1"
+  [1]=>
+  unicode(1) "2"
+}
+array(2) {
+  [0]=>
+  unicode(2) "A2"
+  [1]=>
+  unicode(2) "B2"
+}
+array(2) {
+  [1]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+}
+array(2) {
+  [1]=>
+  unicode(1) "A"
+  [2]=>
+  unicode(1) "A"
+}
+array(2) {
+  [1]=>
+  unicode(1) "1"
+  [2]=>
+  unicode(1) "2"
+}
+array(2) {
+  [1]=>
+  unicode(1) "A"
+  [2]=>
+  unicode(1) "A"
+}
+array(2) {
+  [1]=>
+  unicode(2) "A2"
+  [2]=>
+  unicode(2) "B2"
+}
+array(1) {
+  [u"A"]=>
+  array(2) {
+    [0]=>
+    unicode(2) "A2"
+    [1]=>
+    unicode(2) "B2"
+  }
+}

diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index e2faf05c46d5f18aecc7e24bbda42f03fcd4fbca..21e7a80b78777fbff2f8f8b69991686ac837ed74 100644 (file)
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -196,3 +196,98 @@ string(1) "2"
 string(7) "String0"
 string(7) "String1"
 string(7) "String2"
+--UXPECT--
+unicode(1) "3"
+array(3) {
+  [0]=>
+  unicode(7) "String0"
+  [1]=>
+  unicode(7) "String1"
+  [2]=>
+  unicode(7) "String2"
+}
+===WHILE===
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+===ALONE===
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+===REBIND/SAME===
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+bool(true)
+bool(true)
+unicode(7) "String0"
+bool(true)
+bool(true)
+unicode(1) "0"
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+bool(true)
+bool(true)
+unicode(7) "String1"
+bool(true)
+bool(true)
+unicode(1) "1"
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+bool(true)
+bool(true)
+unicode(7) "String2"
+bool(true)
+bool(true)
+unicode(1) "2"
+===REBIND/CONFLICT===
+unicode(7) "String0"
+unicode(7) "String1"
+unicode(7) "String2"

diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt
index 34d626aed8988dc19277a71907fa1e2bfd959140..0303ea8ce72f0b7185ad24434455c9c1f087bf11 100755 (executable)
--- a/ext/pdo/tests/pdo_016a.phpt
+++ b/ext/pdo/tests/pdo_016a.phpt
@@ -196,3 +196,98 @@ string(1) "2"
 string(7) "String0"
 string(7) "String1"
 string(7) "String2"
+--UEXPECT--
+unicode(1) "3"
+array(3) {
+  [0]=>
+  unicode(7) "String0"
+  [1]=>
+  unicode(7) "String1"
+  [2]=>
+  unicode(7) "String2"
+}
+===WHILE===
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+===ALONE===
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+===REBIND/SAME===
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+bool(true)
+bool(true)
+unicode(7) "String0"
+bool(true)
+bool(true)
+unicode(1) "0"
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+bool(true)
+bool(true)
+unicode(7) "String1"
+bool(true)
+bool(true)
+unicode(1) "1"
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+bool(true)
+bool(true)
+unicode(7) "String2"
+bool(true)
+bool(true)
+unicode(1) "2"
+===REBIND/CONFLICT===
+unicode(7) "String0"
+unicode(7) "String1"
+unicode(7) "String2"

diff --git a/ext/pdo/tests/pdo_018.phpt b/ext/pdo/tests/pdo_018.phpt
index ee2514498ae0b68ac6c46b7763e0512e79c98305..ad6cea8cd839bde0e18b961622ba6ac41e5b3b49 100644 (file)
--- a/ext/pdo/tests/pdo_018.phpt
+++ b/ext/pdo/tests/pdo_018.phpt
@@ -267,3 +267,116 @@ array(3) {
     string(7) "Private"
   }
 }
+--UEXPECTF--
+unicode(1) "3"
+array(3) {
+  [0]=>
+  unicode(8) "stdClass"
+  [1]=>
+  unicode(8) "TestBase"
+  [2]=>
+  unicode(11) "TestDerived"
+}
+===TYPES===
+array(4) {
+  [u"stdClass"]=>
+  unicode(1) "0"
+  [u"TestBase"]=>
+  unicode(1) "1"
+  [u"TestDerived"]=>
+  unicode(1) "2"
+  [u"TestLeaf"]=>
+  NULL
+}
+===INSERT===
+TestBase::serialize() = 'a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}'
+TestDerived::serialize()
+TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}'
+TestDerived::serialize()
+TestBase::serialize() = 'a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}'
+===DATA===
+array(4) {
+  [0]=>
+  unicode(0) ""
+  [1]=>
+  unicode(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}"
+  [2]=>
+  unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
+  [3]=>
+  unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
+}
+===FAILURE===
+Exception:SQLSTATE[HY000]: General error: cannot unserialize class
+===COUNT===
+unicode(1) "3"
+===DATABASE===
+array(3) {
+  [0]=>
+  array(2) {
+    [u"name"]=>
+    unicode(8) "TestBase"
+    [u"val"]=>
+    unicode(91) "a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";}"
+  }
+  [1]=>
+  array(2) {
+    [u"name"]=>
+    unicode(11) "TestDerived"
+    [u"val"]=>
+    unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
+  }
+  [2]=>
+  array(2) {
+    [u"name"]=>
+    NULL
+    [u"val"]=>
+    unicode(144) "a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";}"
+  }
+}
+===FETCHCLASS===
+TestBase::unserialize(a:3:{s:7:"BasePub";s:6:"Public";s:7:"BasePro";s:9:"Protected";s:7:"BasePri";s:7:"Private";})
+TestDerived::unserialize()
+TestBase::unserialize(a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";})
+TestDerived::unserialize()
+TestBase::unserialize(a:4:{s:7:"BasePub";s:13:"DerivedPublic";s:7:"BasePro";s:16:"DerivdeProtected";s:10:"DerivedPub";s:6:"Public";s:10:"DerivedPro";s:9:"Protected";})
+array(3) {
+  [0]=>
+  object(TestBase)#%d (3) {
+    [u"BasePub"]=>
+    unicode(7) "#Public"
+    [u"BasePro":protected]=>
+    unicode(10) "#Protected"
+    [u"BasePri":u"TestBase":private]=>
+    unicode(8) "#Private"
+  }
+  [1]=>
+  object(TestDerived)#%d (6) {
+    [u"BasePub"]=>
+    unicode(14) "#DerivedPublic"
+    [u"BasePro":protected]=>
+    unicode(17) "#DerivdeProtected"
+    [u"DerivedPub"]=>
+    unicode(7) "#Public"
+    [u"DerivedPro":protected]=>
+    unicode(10) "#Protected"
+    [u"DerivedPri":u"TestDerived":private]=>
+    unicode(7) "Private"
+    [u"BasePri":u"TestBase":private]=>
+    unicode(7) "Private"
+  }
+  [2]=>
+  object(TestLeaf)#%d (6) {
+    [u"BasePub"]=>
+    unicode(14) "#DerivedPublic"
+    [u"BasePro":protected]=>
+    unicode(17) "#DerivdeProtected"
+    [u"DerivedPub"]=>
+    unicode(7) "#Public"
+    [u"DerivedPro":protected]=>
+    unicode(10) "#Protected"
+    [u"DerivedPri":u"TestDerived":private]=>
+    unicode(7) "Private"
+    [u"BasePri":u"TestBase":private]=>
+    unicode(7) "Private"
+  }
+}

diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
index 36d70349b37a090703414efc7cecf00239573561..3a4652a3e72b5e517afe4107ea6f283493c61f8d 100644 (file)
--- a/ext/pdo/tests/pdo_019.phpt
+++ b/ext/pdo/tests/pdo_019.phpt
@@ -68,3 +68,32 @@ array(1) {
   [3]=>
   string(7) "String3"
 }
+--UEXPECT--
+unicode(1) "4"
+array(4) {
+  [0]=>
+  unicode(7) "String0"
+  [1]=>
+  unicode(7) "String1"
+  [2]=>
+  unicode(7) "String2"
+  [3]=>
+  unicode(7) "String3"
+}
+===WHILE===
+array(1) {
+  [0]=>
+  unicode(7) "String0"
+}
+array(1) {
+  [1]=>
+  unicode(7) "String1"
+}
+array(1) {
+  [2]=>
+  unicode(7) "String2"
+}
+array(1) {
+  [3]=>
+  unicode(7) "String3"
+}

diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
index e6ad370ef53f7141c7c5d81e3a7cb0628ce8d851..109781e23a4726e3816a673a9339fbdc1d636eba 100644 (file)
--- a/ext/pdo/tests/pdo_023.phpt
+++ b/ext/pdo/tests/pdo_023.phpt
@@ -109,3 +109,39 @@ array(2) {
 }
 PDOStatementX::__destruct()
 PDODatabaseX::__destruct()
+--UEXPECTF--
+int(1)
+int(2)
+object(PDODatabaseX)#%d (2) {
+  [u"test1"]=>
+  int(1)
+  [u"test2"]=>
+  int(22)
+}
+PDODatabaseX::query()
+PDOStatementX::__construct()
+PDOStatementX::__destruct()
+PDODatabaseX::query()
+PDOStatementX::__construct()
+PDOStatementX::__destruct()
+PDODatabaseX::query()
+PDOStatementX::__construct()
+PDOStatementX::__destruct()
+PDODatabaseX::query()
+PDOStatementX::__construct()
+object(PDOStatementX)#%d (3) {
+  [u"test1"]=>
+  int(1)
+  [u"queryString"]=>
+  unicode(24) "SELECT val, id FROM test"
+  [u"test2"]=>
+  int(22)
+}
+array(2) {
+  [u"A"]=>
+  unicode(1) "0"
+  [u"B"]=>
+  unicode(1) "1"
+}
+PDOStatementX::__destruct()
+PDODatabaseX::__destruct()

diff --git a/ext/pdo/tests/pdo_025.phpt b/ext/pdo/tests/pdo_025.phpt
index cc2c162b0688b01f2be8cadeec3cd66773bc4cb0..b97db84991f430744dd1041883b14c8564307496 100644 (file)
--- a/ext/pdo/tests/pdo_025.phpt
+++ b/ext/pdo/tests/pdo_025.phpt
@@ -110,3 +110,55 @@ object(Test)#%d (3) {
 ===FAIL===
 
 Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d
+--UEXPECTF--
+object(Test)#%d (3) {
+  [u"id"]=>
+  unicode(2) "10"
+  [u"val"]=>
+  unicode(3) "Abc"
+  [u"val2"]=>
+  unicode(3) "zxy"
+}
+object(Test)#%d (3) {
+  [u"id"]=>
+  unicode(2) "20"
+  [u"val"]=>
+  unicode(3) "Def"
+  [u"val2"]=>
+  unicode(3) "wvu"
+}
+object(Test)#%d (3) {
+  [u"id"]=>
+  unicode(2) "30"
+  [u"val"]=>
+  unicode(3) "Ghi"
+  [u"val2"]=>
+  unicode(3) "tsr"
+}
+object(Test)#%d (3) {
+  [u"id"]=>
+  unicode(2) "40"
+  [u"val"]=>
+  unicode(3) "Jkl"
+  [u"val2"]=>
+  unicode(3) "qpo"
+}
+object(Test)#%d (3) {
+  [u"id"]=>
+  unicode(2) "50"
+  [u"val"]=>
+  unicode(3) "Mno"
+  [u"val2"]=>
+  unicode(3) "nml"
+}
+object(Test)#%d (3) {
+  [u"id"]=>
+  unicode(2) "60"
+  [u"val"]=>
+  unicode(3) "Pqr"
+  [u"val2"]=>
+  unicode(3) "kji"
+}
+===FAIL===
+
+Fatal error: Cannot access protected property Fail::$id in %spdo_025.php on line %d

diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index 5207f8d3f5d21273c5795ee73599d508a3bae5e5..e0a4a7ea554ed1c244366e14aa9d0a9f6c556a0e 100644 (file)
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -108,3 +108,37 @@ array(3) {
 ===DONE===
 PDODatabase::__destruct()
 PDOStatementX::__destruct()
+--UEXPECT--
+unicode(11) "PDODatabase"
+unicode(12) "PDOStatement"
+PDODatabase::query()
+PDOStatementX::__construct()
+unicode(13) "PDOStatementX"
+unicode(11) "PDODatabase"
+array(3) {
+  [u"id"]=>
+  unicode(2) "10"
+  [u"val"]=>
+  unicode(3) "Abc"
+  [u"val2"]=>
+  unicode(3) "zxy"
+}
+array(3) {
+  [u"id"]=>
+  unicode(2) "20"
+  [u"val"]=>
+  unicode(3) "Def"
+  [u"val2"]=>
+  unicode(3) "wvu"
+}
+array(3) {
+  [u"id"]=>
+  unicode(2) "30"
+  [u"val"]=>
+  unicode(3) "Ghi"
+  [u"val2"]=>
+  unicode(3) "tsr"
+}
+===DONE===
+PDODatabase::__destruct()
+PDOStatementX::__destruct()

diff --git a/ext/reflection/tests/001.phpt b/ext/reflection/tests/001.phpt
index f68afc950e3ef6dab8326a61fe01f3aa735cbac9..f60d4dd884c37bd1f2a3fbcb026cf73f8498ff42 100755 (executable)
--- a/ext/reflection/tests/001.phpt
+++ b/ext/reflection/tests/001.phpt
@@ -87,3 +87,14 @@ array(2) {
 }
 string(17) "ReflectionClassEx"
 ===DONE===
+--UEXPECT--
+array(0) {
+}
+array(2) {
+  [0]=>
+  unicode(3) "bla"
+  [1]=>
+  unicode(4) "name"
+}
+unicode(17) "ReflectionClassEx"
+===DONE===

diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt
index 195aeb23e7d9fa24d2c9134d6411d928d8934848..41c0373c209019d5f79211bc48034eecf03e80d0 100755 (executable)
--- a/ext/reflection/tests/002.phpt
+++ b/ext/reflection/tests/002.phpt
@@ -61,3 +61,16 @@ string(7) "getName"
 string(3) "bar"
 string(3) "baz"
 ===DONE===
+--UEXPECTF--
+ReflectionMethodEx::__construct
+unicode(18) "ReflectionMethodEx"
+unicode(7) "getName"
+unicode(3) "xyz"
+NULL
+Cannot set read-only property ReflectionMethodEx::$class
+Cannot set read-only property ReflectionMethodEx::$name
+unicode(18) "ReflectionMethodEx"
+unicode(7) "getName"
+unicode(3) "bar"
+unicode(3) "baz"
+===DONE===

diff --git a/ext/reflection/tests/006.phpt b/ext/reflection/tests/006.phpt
index 89c438765a1f4a3ce88ed408034ba0503ea46d74..72803c7bfe8b8eee08227b4121b7892c3cceb3e3 100755 (executable)
--- a/ext/reflection/tests/006.phpt
+++ b/ext/reflection/tests/006.phpt
@@ -101,3 +101,20 @@ string(7) "updated"
 EXCEPTION
 EXCEPTION
 ===DONE===
+--UEXPECT--
+unicode(3) "pub"
+unicode(3) "pub"
+unicode(7) "updated"
+EXCEPTION
+EXCEPTION
+unicode(7) "updated"
+unicode(7) "updated"
+unicede(7) "updated"
+EXCEPTION
+EXCEPTION
+unicode(7) "updated"
+unicode(7) "updated"
+unicode(7) "updated"
+EXCEPTION
+EXCEPTION
+===DONE===

diff --git a/ext/reflection/tests/bug26695.phpt b/ext/reflection/tests/bug26695.phpt
index 859168f6ae0d6f56b1bf01b26215cc4bd90b2865..2d2deb53426a7e0cae2277bce3d4d87638333b66 100755 (executable)
--- a/ext/reflection/tests/bug26695.phpt
+++ b/ext/reflection/tests/bug26695.phpt
@@ -22,4 +22,7 @@ var_dump($class->getName());
 ===DONE===
 --EXPECT--
 string(3) "Foo"
-===DONE===
\ No newline at end of file
+===DONE===
+--UEXPECT--
+unicode(3) "Foo"
+===DONE===

diff --git a/ext/reflection/tests/bug30209.phpt b/ext/reflection/tests/bug30209.phpt
index 6705c6704d7cbf2bf962db0cebc5efb3952afa39..1f230d38b8280321f83adb04f90c5a368966dd4a 100755 (executable)
--- a/ext/reflection/tests/bug30209.phpt
+++ b/ext/reflection/tests/bug30209.phpt
@@ -29,3 +29,7 @@ $foo->testBAR();
 string(7) "testBAR"
 string(7) "testBAR"
 ===DONE===
+--UEXPECTF--
+unicode(7) "testBAR"
+unicode(7) "testBAR"
+===DONE===

diff --git a/ext/reflection/tests/bug30856.phpt b/ext/reflection/tests/bug30856.phpt
index 9b54221860185b358a700713ec9435fd559ad8fb..4eb3715943919bb53a97d9abe56c02822baf93a7 100755 (executable)
--- a/ext/reflection/tests/bug30856.phpt
+++ b/ext/reflection/tests/bug30856.phpt
@@ -18,3 +18,9 @@ array(1) {
   string(4) "test"
 }
 ===DONE===
+--UEXPECT--
+array(1) {
+  [u"a"]=>
+  unicode(4) "test"
+}
+===DONE===

diff --git a/ext/reflection/tests/bug32981.phpt b/ext/reflection/tests/bug32981.phpt
index 298756e1470fbb059cb379e319b6cfe33c90797c..39d8bba12bb0757fa45f7aa5a09965e2c669ab60 100755 (executable)
--- a/ext/reflection/tests/bug32981.phpt
+++ b/ext/reflection/tests/bug32981.phpt
@@ -28,7 +28,17 @@ array(1) {
   [0]=>
   array(1) {
     ["enabled"]=>
-    UNKNOWN:0
+    UNKNOWN:0 /* FIXME */
+  }
+}
+===DONE===
+--UEXPECT--
+unicode(4) "test"
+array(1) {
+  [0]=>
+  array(1) {
+    [u"enabled"]=>
+    UNKNOWN:0 /* FIXME */
   }
 }
 ===DONE===

diff --git a/ext/simplexml/tests/005.phpt b/ext/simplexml/tests/005.phpt
index 237a5d26169d13ce714001d88a5b06374671c0c5..a2c3756f3e9c199b8f8fc89e18cdfddeee8e20b2 100755 (executable)
--- a/ext/simplexml/tests/005.phpt
+++ b/ext/simplexml/tests/005.phpt
@@ -38,3 +38,8 @@ string(28) "Here we have some text data."
 string(19) "And here some more."
 string(15) "Wow once again."
 ---Done--- 
+--UEXPECT--
+unicode(28) "Here we have some text data."
+unicode(19) "And here some more."
+unicode(15) "Wow once again."
+---Done--- 

diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt
index 9360b2dff314d2ff1d19bbc912685a7843142c68..5b44c18a3113142104a3720bd817c6fc28702a3f 100755 (executable)
--- a/ext/simplexml/tests/006.phpt
+++ b/ext/simplexml/tests/006.phpt
@@ -78,3 +78,20 @@ string(10) "Bla bla 2."
 string(5) "elem1"
 string(10) "Bla bla 1."
 ===DONE===
+--UEXPECT--
+unicode(5) "elem1"
+unicode(10) "Bla bla 1."
+unicode(6) "elem11"
+unicode(10) "Bla bla 2."
+===CLONE===
+unicode(5) "elem1"
+unicode(10) "Bla bla 1."
+unicode(6) "elem11"
+unicode(10) "Bla bla 2."
+===ELEMENT===
+unicode(6) "elem11"
+unicode(10) "Bla bla 2."
+===COMMENT===
+unicode(5) "elem1"
+unicode(10) "Bla bla 1."
+===DONE===

diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt
index b55d324966dbb361a04717aa497b0f6cf4de8689..754ecf6f55879056084f726f3097e418a870f516 100755 (executable)
--- a/ext/simplexml/tests/007.phpt
+++ b/ext/simplexml/tests/007.phpt
@@ -90,3 +90,47 @@ NULL
 int(4)
 int(4)
 ===Done===
+--UEXPECTF--
+===Property===
+object(SimpleXMLElement)#%d (2) {
+  [u"comment"]=>
+  object(SimpleXMLElement)#%d (0) {
+  }
+  [u"elem2"]=>
+  object(SimpleXMLElement)#%d (1) {
+    [u"elem3"]=>
+    object(SimpleXMLElement)#%d (1) {
+      [u"elem4"]=>
+      object(SimpleXMLElement)#%d (1) {
+        [u"test"]=>
+        object(SimpleXMLElement)#%d (0) {
+        }
+      }
+    }
+  }
+}
+===Array===
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(5) "elem1"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(5) "first"
+}
+===Set===
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(8) "Changed1"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(2) "12"
+}
+===Unset===
+NULL
+NULL
+===Misc.===
+int(4)
+int(4)
+===Done===

diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt
index 2115dd31424f9ef93994d64db7466fdb5a4ac390..a5502ac4aa06bfc27c5ecc9989b508afcc338f97 100755 (executable)
--- a/ext/simplexml/tests/009.phpt
+++ b/ext/simplexml/tests/009.phpt
@@ -43,3 +43,11 @@ string(6) "elem11"
 string(16) "SimpleXMLElement"
 string(10) "Bla bla 2."
 ===DONE===
+--UEXPECT--
+unicode(5) "elem1"
+unicode(16) "SimpleXMLElement"
+unicode(10) "Bla bla 1."
+unicode(6) "elem11"
+unicode(16) "SimpleXMLElement"
+unicode(10) "Bla bla 2."
+===DONE===

diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt
index d1d736e7b59ce1874ddee303388da5296f447d95..ba5097598bcf7e3a16a9b616b02e0669625bbaa1 100644 (file)
--- a/ext/simplexml/tests/014.phpt
+++ b/ext/simplexml/tests/014.phpt
@@ -58,3 +58,31 @@ object(SimpleXMLElement)#%d (1) {
   string(2) "35"
 }
 ===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "Joe"
+}
+NULL
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "XXX"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(2) "30"
+}
+---Unset:---
+---Unset?---
+NULL
+bool(false)
+---Unsupported---
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(2) "30"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(2) "35"
+}
+===DONE===

diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt
index 770cb448126c0cddaf1a0c3a5901a055fe167e64..59315f884e08850a2411072bef72d4081a537cfd 100755 (executable)
--- a/ext/simplexml/tests/014a.phpt
+++ b/ext/simplexml/tests/014a.phpt
@@ -53,4 +53,29 @@ object(SimpleXMLElement)#%d (1) {
   [0]=>
   string(1) "5"
 }
-===DONE===
\ No newline at end of file
+===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "Joe"
+}
+NULL
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "XXX"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(2) "30"
+}
+---Unset:---
+---Unset?---
+NULL
+bool(false)
+---Unsupported---
+NULL
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(1) "5"
+}
+===DONE===

diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt
index 14bd6ce864a867b001c3eeb929cdd307357115c3..04bcb75224fa64e81db2e8a75eec9cdc1541cf2e 100755 (executable)
--- a/ext/simplexml/tests/014b.phpt
+++ b/ext/simplexml/tests/014b.phpt
@@ -52,4 +52,28 @@ object(SimpleXMLElement)#%d (1) {
   [0]=>
   string(1) "5"
 }
-===DONE===
\ No newline at end of file
+===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "Joe"
+}
+NULL
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "XXX"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(2) "30"
+}
+---Unset:---
+---Unset?---
+NULL
+bool(false)
+---Unsupported---
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(1) "5"
+}
+===DONE===

diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt
index ab80a7a19aa100d839d17c6916e4941a7ebca9f9..87b9a0ef9826fb81127a96323f1edb1733af6650 100644 (file)
--- a/ext/simplexml/tests/016.phpt
+++ b/ext/simplexml/tests/016.phpt
@@ -55,3 +55,30 @@ object(SimpleXMLElement)#%d (1) {
   string(9) "JoeFooBar"
 }
 ===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "Joe"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(6) "JoeFoo"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(9) "JoeFooBar"
+}
+---[0]---
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "Joe"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(6) "JoeFoo"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(9) "JoeFooBar"
+}
+===DONE===

diff --git a/ext/simplexml/tests/016a.phpt b/ext/simplexml/tests/016a.phpt
index 9797e2930564b079a7438cefe8bc0c102a7e66c0..aa9ad53064cb1aca8ede2f60ba23427a663e1d02 100755 (executable)
--- a/ext/simplexml/tests/016a.phpt
+++ b/ext/simplexml/tests/016a.phpt
@@ -27,3 +27,13 @@ object(SimpleXMLElement)#%d (1) {
   string(6) "FooBar"
 }
 ===DONE===
+--UEXPECTF--
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(3) "Foo"
+}
+object(SimpleXMLElement)#%d (1) {
+  [0]=>
+  unicode(6) "FooBar"
+}
+===DONE===

diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt
index a54a1bdd52e9250792567d5ef083a180a471590c..9376b93e8ef9c7a7ceb3c9ac0fae12401c845783 100755 (executable)
--- a/ext/simplexml/tests/019.phpt
+++ b/ext/simplexml/tests/019.phpt
@@ -78,3 +78,20 @@ string(7) "Foo Bar"
 string(5) "elem2"
 string(28) "Here we have some text data."
 ===DONE===
+--UEXPECT--
+unicode(5) "elem1"
+unicode(10) "Bla bla 1."
+unicode(6) "elem11"
+unicode(10) "Bla bla 2."
+===CLONE===
+unicode(5) "elem1"
+unicode(10) "Bla bla 1."
+unicode(6) "elem11"
+unicode(10) "Bla bla 2."
+===ELEMENT===
+unicode(7) "elem111"
+unicode(7) "Foo Bar"
+===COMMENT===
+unicode(5) "elem2"
+unicode(28) "Here we have some text data."
+===DONE===

diff --git a/ext/spl/tests/array_001.phpt b/ext/spl/tests/array_001.phpt
index 1c7566ecb9ab80f7d4af4032ec584d72f039222d..8ddfdc67c6d65a39c3d83b9ce491f507ab80f43e 100755 (executable)
--- a/ext/spl/tests/array_001.phpt
+++ b/ext/spl/tests/array_001.phpt
@@ -101,3 +101,67 @@ object(ArrayObject)#1 (4) {
   int(4)
 }
 ===DONE===
+--UEXPECTF--
+object(ArrayObject)#1 (2) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+}
+int(2)
+int(3)
+array(6) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+  [3]=>
+  int(3)
+  [4]=>
+  int(4)
+  [5]=>
+  int(5)
+}
+unicode(1) "a"
+object(ArrayObject)#1 (5) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+  [3]=>
+  int(3)
+  [u"a"]=>
+  unicode(1) "a"
+}
+int(0)
+
+Notice: Undefined offset:  6 in %sarray_001.php on line %d
+NULL
+
+Notice: Undefined index:  b in %sarray_001.php on line %d
+NULL
+
+Notice: Undefined offset:  7 in %sarray_001.php on line %d
+
+Notice: Undefined index:  c in %sarray_001.php on line %d
+object(ArrayObject)#1 (2) {
+  [0]=>
+  int(0)
+  [2]=>
+  int(2)
+}
+object(ArrayObject)#1 (4) {
+  [0]=>
+  int(0)
+  [2]=>
+  int(2)
+  [4]=>
+  unicode(1) "3"
+  [5]=>
+  int(4)
+}
+===DONE===

diff --git a/ext/spl/tests/array_002.phpt b/ext/spl/tests/array_002.phpt
index 960253f33503a03a50268343b45ff24077779886..122953c9750bd94729e1e186887f83f6051df6c0 100755 (executable)
--- a/ext/spl/tests/array_002.phpt
+++ b/ext/spl/tests/array_002.phpt
@@ -35,3 +35,17 @@ object(ArrayObject)#%d (5) {
   string(4) "five"
 }
 ===DONE===
+--UEXPECTF--
+object(ArrayObject)#%d (5) {
+  [1]=>
+  unicode(3) "one"
+  [2]=>
+  unicode(3) "two"
+  [3]=>
+  unicode(5) "three"
+  [4]=>
+  unicode(4) "four"
+  [5]=>
+  unicode(4) "five"
+}
+===DONE===

diff --git a/ext/spl/tests/array_010.phpt b/ext/spl/tests/array_010.phpt
index dae6b93d6de280c842f7598e69a9780bec802514..7a7cc54e18c8e45d8e87a6f3209b217a31902e45 100755 (executable)
--- a/ext/spl/tests/array_010.phpt
+++ b/ext/spl/tests/array_010.phpt
@@ -144,3 +144,82 @@ array(4) {
   string(9) "changed 6"
 }
 ===DONE===
+--UEXPECTF--
+array(4) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  int(1)
+  [2]=>
+  unicode(3) "3rd"
+  [u"4th"]=>
+  int(4)
+}
+===EMPTY===
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+===isset===
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(false)
+===offsetGet===
+unicode(3) "1st"
+int(1)
+unicode(3) "3rd"
+int(4)
+
+Notice: Undefined index:  5th in %sarray_010.php on line %d
+NULL
+
+Notice: Undefined offset:  6 in %sarray_010.php on line %d
+NULL
+===offsetSet===
+WRITE 1
+unicode(9) "Changed 1"
+WRITE 2
+unicode(11) "Changed 4th"
+WRITE 3
+unicode(9) "Added 5th"
+WRITE 4
+unicode(7) "Added 6"
+unicode(3) "1st"
+unicode(3) "3rd"
+unicode(9) "changed 6"
+unicode(9) "changed 6"
+===unset===
+array(6) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  unicode(9) "Changed 1"
+  [2]=>
+  unicode(3) "3rd"
+  [u"4th"]=>
+  unicode(11) "Changed 4th"
+  [u"5th"]=>
+  unicode(9) "Added 5th"
+  [6]=>
+  unicode(9) "changed 6"
+}
+
+Notice: Undefined offset:  7 in %sarray_010.php on line %d
+
+Notice: Undefined index:  8th in %sarray_010.php on line %d
+array(4) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  unicode(9) "Changed 1"
+  [u"5th"]=>
+  unicode(9) "Added 5th"
+  [6]=>
+  unicode(9) "changed 6"
+}
+===DONE===

diff --git a/ext/spl/tests/array_011.phpt b/ext/spl/tests/array_011.phpt
index 09b132cfef244b3110358dcfaef38f73671ffaa4..b648a3f8be8a1b7f2278edfcd257b1a8be5c7aab 100755 (executable)
--- a/ext/spl/tests/array_011.phpt
+++ b/ext/spl/tests/array_011.phpt
@@ -35,3 +35,23 @@ array(2) {
   int(3)
 }
 ===DONE===
+--UEXPECT--
+array(2) {
+  [0]=>
+  unicode(3) "one"
+  [1]=>
+  int(1)
+}
+array(2) {
+  [0]=>
+  unicode(3) "two"
+  [1]=>
+  int(2)
+}
+array(2) {
+  [0]=>
+  unicode(5) "three"
+  [1]=>
+  int(3)
+}
+===DONE===

diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt
index 512a98325209e3d74805ee159135aa75cb696b25..50a3979b57f6ae538459bbdfb0e8b0da92638595 100755 (executable)
--- a/ext/spl/tests/array_017.phpt
+++ b/ext/spl/tests/array_017.phpt
@@ -647,3 +647,518 @@ ArrayIteratorEx::setFlags(3)
 int(1)
 bool(true)
 ===DONE===
+--UEXPECTF--
+ArrayObjectEx::__construct()
+===CHECK===
+ArrayObjectEx::setFlags(0)
+ArrayObjectEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(0)
+  [u"OVars"]=>
+  array(2) {
+    [u"a"]=>
+    int(25)
+    [u"pub1"]=>
+    int(42)
+  }
+  [u"$this"]=>
+  object(ArrayObjectEx)#1 (3) {
+    [0]=>
+    int(1)
+    [u"a"]=>
+    int(25)
+    [u"pub1"]=>
+    int(42)
+  }
+}
+ArrayObjectEx::show()
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(0)
+  [u"OVars"]=>
+  array(2) {
+    [u"a"]=>
+    int(25)
+    [u"pub1"]=>
+    int(42)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#2 (3) {
+    [0]=>
+    int(1)
+    [u"a"]=>
+    int(25)
+    [u"pub1"]=>
+    int(42)
+  }
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+array(1) {
+  [u"a"]=>
+  int(25)
+}
+array(1) {
+  [u"pub1"]=>
+  int(42)
+}
+===FOREACH===
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(0)
+  [u"OVars"]=>
+  array(2) {
+    [u"a"]=>
+    int(25)
+    [u"pub1"]=>
+    int(42)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#3 (3) {
+    [0]=>
+    int(1)
+    [u"a"]=>
+    int(25)
+    [u"pub1"]=>
+    int(42)
+  }
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+array(1) {
+  [u"a"]=>
+  int(25)
+}
+array(1) {
+  [u"pub1"]=>
+  int(42)
+}
+===PROPERTY===
+int(1)
+bool(false)
+ArrayObjectEx::setFlags(2)
+int(1)
+bool(true)
+int(1)
+bool(false)
+ArrayIteratorEx::setFlags(2)
+int(1)
+bool(true)
+===CHECK===
+ArrayObjectEx::setFlags(1)
+ArrayObjectEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(1)
+  [u"OVars"]=>
+  array(5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1"]=>
+    int(2)
+    [u"pri1"]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayObjectEx)#1 (5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1":protected]=>
+    int(2)
+    [u"pri1":u"ArrayObjectEx":private]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+}
+ArrayObjectEx::show()
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(1)
+  [u"OVars"]=>
+  array(5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2"]=>
+    int(2)
+    [u"pri2"]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#3 (5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2":protected]=>
+    int(2)
+    [u"pri2":u"ArrayIteratorEx":private]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+array(1) {
+  [u"a"]=>
+  int(25)
+}
+array(1) {
+  [u"pub1"]=>
+  int(42)
+}
+===FOREACH===
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(1)
+  [u"OVars"]=>
+  array(5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2"]=>
+    int(2)
+    [u"pri2"]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#2 (5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2":protected]=>
+    int(2)
+    [u"pri2":u"ArrayIteratorEx":private]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+array(1) {
+  [u"a"]=>
+  int(25)
+}
+array(1) {
+  [u"pub1"]=>
+  int(42)
+}
+===PROPERTY===
+int(1)
+bool(false)
+ArrayObjectEx::setFlags(3)
+int(1)
+bool(true)
+int(1)
+bool(false)
+ArrayIteratorEx::setFlags(3)
+int(1)
+bool(true)
+#####EXCHANGE#####
+ArrayObjectEx::exchange()
+===CHECK===
+ArrayObjectEx::setFlags(0)
+ArrayObjectEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(0)
+  [u"OVars"]=>
+  array(5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1"]=>
+    int(2)
+    [u"pri1"]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayObjectEx)#1 (5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1":protected]=>
+    int(2)
+    [u"pri1":u"ArrayObjectEx":private]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+}
+ArrayObjectEx::show()
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(0)
+  [u"OVars"]=>
+  array(4) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1"]=>
+    int(2)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#2 (5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1":protected]=>
+    int(2)
+    [u"pri1":u"ArrayObjectEx":private]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+}
+array(1) {
+  [u"pub1"]=>
+  int(1)
+}
+array(1) {
+  [u"imp1"]=>
+  int(4)
+}
+array(1) {
+  [u"dyn1"]=>
+  int(5)
+}
+===FOREACH===
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(0)
+  [u"OVars"]=>
+  array(4) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1"]=>
+    int(2)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#3 (5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1":protected]=>
+    int(2)
+    [u"pri1":u"ArrayObjectEx":private]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+}
+array(1) {
+  [u"pub1"]=>
+  int(1)
+}
+array(1) {
+  [u"imp1"]=>
+  int(4)
+}
+array(1) {
+  [u"dyn1"]=>
+  int(5)
+}
+===PROPERTY===
+int(1)
+bool(false)
+ArrayObjectEx::setFlags(2)
+int(1)
+bool(false)
+int(1)
+bool(false)
+ArrayIteratorEx::setFlags(2)
+int(1)
+bool(true)
+===CHECK===
+ArrayObjectEx::setFlags(1)
+ArrayObjectEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(1)
+  [u"OVars"]=>
+  array(5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1"]=>
+    int(2)
+    [u"pri1"]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayObjectEx)#1 (5) {
+    [u"pub1"]=>
+    int(1)
+    [u"pro1":protected]=>
+    int(2)
+    [u"pri1":u"ArrayObjectEx":private]=>
+    int(3)
+    [u"imp1"]=>
+    int(4)
+    [u"dyn1"]=>
+    int(5)
+  }
+}
+ArrayObjectEx::show()
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(1)
+  [u"OVars"]=>
+  array(5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2"]=>
+    int(2)
+    [u"pri2"]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#3 (5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2":protected]=>
+    int(2)
+    [u"pri2":u"ArrayIteratorEx":private]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+}
+array(1) {
+  [u"pub1"]=>
+  int(1)
+}
+array(1) {
+  [u"imp1"]=>
+  int(4)
+}
+array(1) {
+  [u"dyn1"]=>
+  int(5)
+}
+===FOREACH===
+ArrayObjectEx::getIterator()
+ArrayIteratorEx::__construct()
+ArrayIteratorEx::dump()
+array(3) {
+  [u"Flags"]=>
+  int(1)
+  [u"OVars"]=>
+  array(5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2"]=>
+    int(2)
+    [u"pri2"]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+  [u"$this"]=>
+  object(ArrayIteratorEx)#2 (5) {
+    [u"pub2"]=>
+    int(1)
+    [u"pro2":protected]=>
+    int(2)
+    [u"pri2":u"ArrayIteratorEx":private]=>
+    int(3)
+    [u"imp2"]=>
+    int(4)
+    [u"dyn2"]=>
+    int(5)
+  }
+}
+array(1) {
+  [u"pub1"]=>
+  int(1)
+}
+array(1) {
+  [u"imp1"]=>
+  int(4)
+}
+array(1) {
+  [u"dyn1"]=>
+  int(5)
+}
+===PROPERTY===
+int(1)
+bool(false)
+ArrayObjectEx::setFlags(3)
+int(1)
+bool(false)
+int(1)
+bool(false)
+ArrayIteratorEx::setFlags(3)
+int(1)
+bool(true)
+===DONE===

diff --git a/ext/spl/tests/bug31926.phpt b/ext/spl/tests/bug31926.phpt
index 428039b1cb46f1c4406da154055abb8ecdd41abc..1159051a4a5537ab5cc85fe2b3672d6f2f955a8e 100755 (executable)
--- a/ext/spl/tests/bug31926.phpt
+++ b/ext/spl/tests/bug31926.phpt
@@ -25,3 +25,6 @@ foreach($it as $key => $val) {
 --EXPECT--
 int(0)
 string(5) "world"
+--UEXPECT--
+int(0)
+unicode(5) "world"

diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt
index 5a880b321d1c7ea0d5e8d715ced16525a6a0ddca..84001984ac198d26c617cc9a1f0d8ea2cf3a8a72 100755 (executable)
--- a/ext/spl/tests/bug32134.phpt
+++ b/ext/spl/tests/bug32134.phpt
@@ -46,3 +46,11 @@ myArray::offsetSet(two,two)
 myArray::offsetGet(two)
 string(3) "two"
 ===DONE===
+--UEXPECT--
+myArray::offsetSet(one,one)
+myArray::offsetGet(one)
+unicode(3) "one"
+myArray::offsetSet(two,two)
+myArray::offsetGet(two)
+unicode(3) "two"
+===DONE===

diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt
index 3adddfb5bb54d565c125d7b5e825ac2edc2c7b18..bb2e335a7cadc09698fa38397ff07bfe0b9ee9f4 100755 (executable)
--- a/ext/spl/tests/bug33136.phpt
+++ b/ext/spl/tests/bug33136.phpt
@@ -70,3 +70,25 @@ Collection Object
 )
 int(3)
 ===DONE===
+--UEXPECT--
+Initiate Obj
+Assign values
+Collection::offsetSet(NULL,foo)
+Collection::offsetGet(0)
+unicode(3) "foo"
+Collection::offsetSet(NULL,bar)
+Collection::offsetGet(0)
+unicode(3) "foo"
+Collection::offsetGet(1)
+unicode(3) "bar"
+Collection::offsetSet(foo,baz)
+Collection::offsetGet(foo)
+unicode(3) "baz"
+Collection Object
+(
+    [0] => foo
+    [1] => bar
+    [foo] => baz
+)
+int(3)
+===DONE===

diff --git a/ext/standard/tests/array/001.phpt b/ext/standard/tests/array/001.phpt
index 797a79781f2c06d9ea63dce3742813a4b069ba48..f5d0eb81aef6bcc272b09db2d184f25552352b2a 100644 (file)
--- a/ext/standard/tests/array/001.phpt
+++ b/ext/standard/tests/array/001.phpt
@@ -155,3 +155,115 @@ array(1) {
     }
   }
 }
+--UEXPECT--
+array(11) {
+  [0]=>
+  unicode(3) "PHP"
+  [1]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [2]=>
+  unicode(4) "Test"
+  [u"test"]=>
+  int(27)
+  [3]=>
+  unicode(4) "test"
+  [4]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [5]=>
+  unicode(6) "monkey"
+  [6]=>
+  float(-0.33333333333333)
+  [7]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      array(1) {
+        [0]=>
+        int(0)
+      }
+    }
+  }
+  [8]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      array(1) {
+        [0]=>
+        int(0)
+      }
+    }
+  }
+  [9]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      array(1) {
+        [0]=>
+        int(0)
+      }
+    }
+  }
+}
+ -- Testing array_walk() -- 
+int(0)
+unicode(3) "PHP"
+int(1)
+unicode(27) "PHP: Hypertext Preprocessor"
+int(2)
+unicode(4) "Test"
+unicode(4) "test"
+int(27)
+int(3)
+unicode(4) "test"
+int(4)
+array(2) {
+  [0]=>
+  unicode(6) "banana"
+  [1]=>
+  unicode(6) "orange"
+}
+int(5)
+unicode(6) "monkey"
+int(6)
+float(-0.33333333333333)
+int(7)
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      int(0)
+    }
+  }
+}
+int(8)
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      int(0)
+    }
+  }
+}
+int(9)
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [0]=>
+      int(0)
+    }
+  }
+}

diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/002.phpt
index f33cf4206746387d351db70c44a2ab0839179e6a..7109f92c4cae7fc9f0881332262fdb3ac416544f 100644 (file)
--- a/ext/standard/tests/array/002.phpt
+++ b/ext/standard/tests/array/002.phpt
@@ -642,3 +642,616 @@ array(8) {
   [7]=>
   string(4) "test"
 }
+--UEXPECT--
+Unsorted data:
+array(8) {
+  [0]=>
+  unicode(3) "PHP"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [u"test"]=>
+  int(27)
+  [1000]=>
+  unicode(4) "test"
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [1001]=>
+  unicode(6) "monkey"
+  [16777216]=>
+  float(-0.33333333333333)
+}
+
+ -- Testing arsort() -- 
+No second argument:
+array(8) {
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [u"test"]=>
+  int(27)
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [0]=>
+  unicode(3) "PHP"
+  [16777216]=>
+  float(-0.33333333333333)
+}
+Using SORT_REGULAR:
+array(8) {
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [u"test"]=>
+  int(27)
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [0]=>
+  unicode(3) "PHP"
+  [16777216]=>
+  float(-0.33333333333333)
+}
+Using SORT_NUMERIC:
+array(8) {
+  [u"test"]=>
+  int(27)
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [0]=>
+  unicode(3) "PHP"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [1001]=>
+  unicode(6) "monkey"
+  [5]=>
+  unicode(4) "Test"
+  [1000]=>
+  unicode(4) "test"
+  [16777216]=>
+  float(-0.33333333333333)
+}
+Using SORT_STRING
+array(8) {
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [0]=>
+  unicode(3) "PHP"
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [u"test"]=>
+  int(27)
+  [16777216]=>
+  float(-0.33333333333333)
+}
+
+ -- Testing asort() -- 
+No second argument:
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [0]=>
+  unicode(3) "PHP"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+  [u"test"]=>
+  int(27)
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+Using SORT_REGULAR:
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [0]=>
+  unicode(3) "PHP"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+  [u"test"]=>
+  int(27)
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+Using SORT_NUMERIC:
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [0]=>
+  unicode(3) "PHP"
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [u"test"]=>
+  int(27)
+}
+Using SORT_STRING
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [u"test"]=>
+  int(27)
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [0]=>
+  unicode(3) "PHP"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+}
+
+ -- Testing krsort() -- 
+No second argument:
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [u"test"]=>
+  int(27)
+  [0]=>
+  unicode(3) "PHP"
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+Using SORT_REGULAR:
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [0]=>
+  unicode(3) "PHP"
+  [u"test"]=>
+  int(27)
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+Using SORT_NUMERIC:
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [u"test"]=>
+  int(27)
+  [0]=>
+  unicode(3) "PHP"
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+Using SORT_STRING
+array(8) {
+  [u"test"]=>
+  int(27)
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [16777216]=>
+  float(-0.33333333333333)
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+  [0]=>
+  unicode(3) "PHP"
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+
+ -- Testing ksort() -- 
+No second argument:
+array(8) {
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [0]=>
+  unicode(3) "PHP"
+  [u"test"]=>
+  int(27)
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [16777216]=>
+  float(-0.33333333333333)
+}
+Using SORT_REGULAR:
+array(8) {
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [u"test"]=>
+  int(27)
+  [0]=>
+  unicode(3) "PHP"
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [16777216]=>
+  float(-0.33333333333333)
+}
+Using SORT_NUMERIC:
+array(8) {
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [0]=>
+  unicode(3) "PHP"
+  [u"test"]=>
+  int(27)
+  [5]=>
+  unicode(4) "Test"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [16777216]=>
+  float(-0.33333333333333)
+}
+Using SORT_STRING
+array(8) {
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [0]=>
+  unicode(3) "PHP"
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [16777216]=>
+  float(-0.33333333333333)
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [u"test"]=>
+  int(27)
+}
+
+ -- Testing rsort() -- 
+No second argument:
+array(8) {
+  [0]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [1]=>
+  int(27)
+  [2]=>
+  unicode(4) "test"
+  [3]=>
+  unicode(6) "monkey"
+  [4]=>
+  unicode(4) "Test"
+  [5]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [6]=>
+  unicode(3) "PHP"
+  [7]=>
+  float(-0.33333333333333)
+}
+Using SORT_REGULAR:
+array(8) {
+  [0]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [1]=>
+  int(27)
+  [2]=>
+  unicode(4) "test"
+  [3]=>
+  unicode(6) "monkey"
+  [4]=>
+  unicode(4) "Test"
+  [5]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [6]=>
+  unicode(3) "PHP"
+  [7]=>
+  float(-0.33333333333333)
+}
+Using SORT_NUMERIC:
+array(8) {
+  [0]=>
+  int(27)
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [2]=>
+  unicode(3) "PHP"
+  [3]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [4]=>
+  unicode(6) "monkey"
+  [5]=>
+  unicode(4) "Test"
+  [6]=>
+  unicode(4) "test"
+  [7]=>
+  float(-0.33333333333333)
+}
+Using SORT_STRING
+array(8) {
+  [0]=>
+  unicode(4) "test"
+  [1]=>
+  unicode(6) "monkey"
+  [2]=>
+  unicode(4) "Test"
+  [3]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [4]=>
+  unicode(3) "PHP"
+  [5]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [6]=>
+  int(27)
+  [7]=>
+  float(-0.33333333333333)
+}
+
+ -- Testing sort() -- 
+No second argument:
+array(8) {
+  [0]=>
+  float(-0.33333333333333)
+  [1]=>
+  unicode(3) "PHP"
+  [2]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [3]=>
+  unicode(4) "Test"
+  [4]=>
+  unicode(6) "monkey"
+  [5]=>
+  unicode(4) "test"
+  [6]=>
+  int(27)
+  [7]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+Using SORT_REGULAR:
+array(8) {
+  [0]=>
+  float(-0.33333333333333)
+  [1]=>
+  unicode(3) "PHP"
+  [2]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [3]=>
+  unicode(4) "Test"
+  [4]=>
+  unicode(6) "monkey"
+  [5]=>
+  unicode(4) "test"
+  [6]=>
+  int(27)
+  [7]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+}
+Using SORT_NUMERIC:
+array(8) {
+  [0]=>
+  float(-0.33333333333333)
+  [1]=>
+  unicode(6) "monkey"
+  [2]=>
+  unicode(4) "test"
+  [3]=>
+  unicode(4) "Test"
+  [4]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(3) "PHP"
+  [6]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [7]=>
+  int(27)
+}
+Using SORT_STRING
+array(8) {
+  [0]=>
+  float(-0.33333333333333)
+  [1]=>
+  int(27)
+  [2]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [3]=>
+  unicode(3) "PHP"
+  [4]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [6]=>
+  unicode(6) "monkey"
+  [7]=>
+  unicode(4) "test"
+}

diff --git a/ext/standard/tests/array/003.phpt b/ext/standard/tests/array/003.phpt
index f307186553378a688fb1cd81afd752bc20f8b8ae..1a17a44d21d7a4426ed9a2fc17d329fcf6b3d77e 100644 (file)
--- a/ext/standard/tests/array/003.phpt
+++ b/ext/standard/tests/array/003.phpt
@@ -102,3 +102,78 @@ array(8) {
   [7]=>
   string(4) "test"
 }
+--UEXPECT--
+-- Testing uasort() -- 
+array(8) {
+  [16777216]=>
+  float(-0.33333333333333)
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [u"test"]=>
+  int(27)
+  [0]=>
+  unicode(3) "PHP"
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [1001]=>
+  unicode(6) "monkey"
+  [1000]=>
+  unicode(4) "test"
+}
+
+ -- Testing uksort() -- 
+array(8) {
+  [-1000]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [0]=>
+  unicode(3) "PHP"
+  [1000]=>
+  unicode(4) "test"
+  [1001]=>
+  unicode(6) "monkey"
+  [16777216]=>
+  float(-0.33333333333333)
+  [17]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [u"test"]=>
+  int(27)
+}
+
+ -- Testing usort() -- 
+array(8) {
+  [0]=>
+  float(-0.33333333333333)
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(6) "banana"
+    [1]=>
+    unicode(6) "orange"
+  }
+  [2]=>
+  int(27)
+  [3]=>
+  unicode(3) "PHP"
+  [4]=>
+  unicode(27) "PHP: Hypertext Preprocessor"
+  [5]=>
+  unicode(4) "Test"
+  [6]=>
+  unicode(6) "monkey"
+  [7]=>
+  unicode(4) "test"
+}

diff --git a/ext/standard/tests/array/004.phpt b/ext/standard/tests/array/004.phpt
index 10741348902b0196520bc7daffa5dc58e5798a1e..fa64c3028c373c5d9e3ce444aa7e984458f866ce 100644 (file)
--- a/ext/standard/tests/array/004.phpt
+++ b/ext/standard/tests/array/004.phpt
@@ -56,4 +56,41 @@ array(5) {
   string(6) "test10"
   [6]=>
   string(6) "test21"
+}
+--UEXPECT--
+array(5) {
+  [0]=>
+  unicode(5) "Test1"
+  [u"teST2"]=>
+  int(0)
+  [5]=>
+  unicode(5) "test2"
+  [u"abc"]=>
+  unicode(6) "test10"
+  [6]=>
+  unicode(6) "test21"
+}
+array(5) {
+  [u"teST2"]=>
+  int(0)
+  [0]=>
+  unicode(5) "Test1"
+  [5]=>
+  unicode(5) "test2"
+  [u"abc"]=>
+  unicode(6) "test10"
+  [6]=>
+  unicode(6) "test21"
+}
+array(5) {
+  [u"teST2"]=>
+  int(0)
+  [0]=>
+  unicode(5) "Test1"
+  [5]=>
+  unicode(5) "test2"
+  [u"abc"]=>
+  unicode(6) "test10"
+  [6]=>
+  unicode(6) "test21"
 }
\ No newline at end of file

diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt
index cdf731827d02db0e2e0e11efc8dd15a6e3485a8d..d38bf940d157f5c4be7e9ad15df0d93f88c0aaab 100644 (file)
--- a/ext/standard/tests/array/005.phpt
+++ b/ext/standard/tests/array/005.phpt
@@ -44,3 +44,25 @@ array(2) {
   ["c"]=>
   string(5) "fubar"
 }
+--UEXPECT--
+foo
+array(2) {
+  [0]=>
+  unicode(3) "bar"
+  [1]=>
+  unicode(5) "fubar"
+}
+foo
+array(2) {
+  [0]=>
+  unicode(3) "bar"
+  [1]=>
+  unicode(5) "fubar"
+}
+foo
+array(2) {
+  [u"b"]=>
+  unicode(3) "bar"
+  [u"c"]=>
+  unicode(5) "fubar"
+}

diff --git a/ext/standard/tests/array/006.phpt b/ext/standard/tests/array/006.phpt
index 4893ad3f0623e2dd2d4ce18737d3d7a262e49cd3..6a6f32dc974fdb6d1e3f985e3e118bf9a9049def 100644 (file)
--- a/ext/standard/tests/array/006.phpt
+++ b/ext/standard/tests/array/006.phpt
@@ -47,3 +47,27 @@ array(2) {
   ["b"]=>
   string(3) "bar"
 }
+--UEXPECT--
+fubar
+array(3) {
+  [0]=>
+  unicode(3) "foo"
+  [1]=>
+  unicode(3) "bar"
+  [2]=>
+  unicode(6) "foobar"
+}
+fubar
+array(2) {
+  [3]=>
+  unicode(3) "foo"
+  [4]=>
+  unicode(3) "bar"
+}
+fubar
+array(2) {
+  [u"a"]=>
+  unicode(3) "foo"
+  [u"b"]=>
+  unicode(3) "bar"
+}

diff --git a/ext/standard/tests/array/007.phpt b/ext/standard/tests/array/007.phpt
index 4eb911373024087bbcd6e63018bb60c6ef12ab80..971216a88ebebd63bbe62474149017da4b099adf 100644 (file)
--- a/ext/standard/tests/array/007.phpt
+++ b/ext/standard/tests/array/007.phpt
@@ -649,3 +649,526 @@ array(3) {
     int(23)
   }
 }
+--UEXPECTF--
+$a=array (
+  0 => 1,
+  'big' => 2,
+  1 => 3,
+  2 => 6,
+  3 => 3,
+  4 => 5,
+  5 => 3,
+  6 => 3,
+  7 => 3,
+  8 => 3,
+  9 => 3,
+  10 => 3,
+  11 => 3,
+  12 => 3,
+  13 => 3,
+  14 => 3,
+);
+$b=array (
+  0 => 2,
+  1 => 2,
+  2 => 3,
+  3 => 3,
+  4 => 3,
+  5 => 3,
+  6 => 3,
+  7 => 3,
+  8 => 3,
+  9 => 3,
+  10 => 3,
+  11 => 3,
+  12 => 3,
+  13 => 3,
+  14 => 3,
+);
+$c=array (
+  0 => -1,
+  1 => 1,
+);
+array(2) {
+  [2]=>
+  int(6)
+  [4]=>
+  int(5)
+}
+array(5) {
+  [0]=>
+  int(1)
+  [u"big"]=>
+  int(2)
+  [1]=>
+  int(3)
+  [2]=>
+  int(6)
+  [4]=>
+  int(5)
+}
+$a=array (
+  'a' => 2,
+  'b' => 'some',
+  'c' => 'done',
+  'z' => 'foo',
+  'f' => 5,
+  'fan' => 'fen',
+  7 => 18,
+  9 => 25,
+  11 => 42,
+  12 => 42,
+  45 => 42,
+  73 => 'foo',
+  95 => 'some',
+  'som3' => 'some',
+  'want' => 'wanna',
+);
+$b=array (
+  'a' => 7,
+  7 => 18,
+  9 => 13,
+  11 => 42,
+  45 => 46,
+  'som3' => 'some',
+  'foo' => 'some',
+  'goo' => 'foo',
+  'f' => 5,
+  'z' => 'equal',
+);
+$c=array (
+  73 => 'foo',
+  95 => 'some',
+);
+Results:
+
+array(5) {
+  [u"a"]=>
+  int(2)
+  [u"c"]=>
+  unicode(4) "done"
+  [u"fan"]=>
+  unicode(3) "fen"
+  [9]=>
+  int(25)
+  [u"want"]=>
+  unicode(5) "wanna"
+}
+array(9) {
+  [u"a"]=>
+  int(2)
+  [u"b"]=>
+  unicode(4) "some"
+  [u"c"]=>
+  unicode(4) "done"
+  [u"z"]=>
+  unicode(3) "foo"
+  [u"fan"]=>
+  unicode(3) "fen"
+  [9]=>
+  int(25)
+  [12]=>
+  int(42)
+  [45]=>
+  int(42)
+  [u"want"]=>
+  unicode(5) "wanna"
+}
+-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
+array(3) {
+  [u"0.1"]=>
+  object(cr)#1 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(9)
+    [u"public_member"]=>
+    int(9)
+  }
+  [u"0.5"]=>
+  object(cr)#2 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(12)
+    [u"public_member"]=>
+    int(12)
+  }
+  [0]=>
+  object(cr)#3 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(23)
+    [u"public_member"]=>
+    int(23)
+  }
+}
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
+array(3) {
+  [u"0.1"]=>
+  object(cr)#1 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(9)
+    [u"public_member"]=>
+    int(9)
+  }
+  [u"0.5"]=>
+  object(cr)#2 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(12)
+    [u"public_member"]=>
+    int(12)
+  }
+  [0]=>
+  object(cr)#3 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(23)
+    [u"public_member"]=>
+    int(23)
+  }
+}
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_diff_assoc($a, $b));
+array(5) {
+  [u"0.1"]=>
+  object(cr)#1 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(9)
+    [u"public_member"]=>
+    int(9)
+  }
+  [u"0.5"]=>
+  object(cr)#2 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(12)
+    [u"public_member"]=>
+    int(12)
+  }
+  [0]=>
+  object(cr)#3 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(23)
+    [u"public_member"]=>
+    int(23)
+  }
+  [1]=>
+  object(cr)#4 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(4)
+    [u"public_member"]=>
+    int(4)
+  }
+  [2]=>
+  object(cr)#5 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(-15)
+    [u"public_member"]=>
+    int(-15)
+  }
+}
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_udiff($a, $b, "comp_func_cr"));
+array(2) {
+  [u"0.5"]=>
+  object(cr)#2 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(12)
+    [u"public_member"]=>
+    int(12)
+  }
+  [0]=>
+  object(cr)#3 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(23)
+    [u"public_member"]=>
+    int(23)
+  }
+}
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
+array(3) {
+  [u"0.1"]=>
+  object(cr)#1 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(9)
+    [u"public_member"]=>
+    int(9)
+  }
+  [u"0.5"]=>
+  object(cr)#2 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(12)
+    [u"public_member"]=>
+    int(12)
+  }
+  [0]=>
+  object(cr)#3 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(23)
+    [u"public_member"]=>
+    int(23)
+  }
+}

diff --git a/ext/standard/tests/array/008.phpt b/ext/standard/tests/array/008.phpt
index a3dde36296ed38cf0d56d5e2bfbfb66a3b6b4bd1..295a3d3f313fb70d52f1a127931d1711d8790f59 100644 (file)
--- a/ext/standard/tests/array/008.phpt
+++ b/ext/standard/tests/array/008.phpt
@@ -308,3 +308,230 @@ array(5) {
   ["som3"]=>
   string(4) "some"
 }
+--UEXPECT--
+-=-=-=-=-=-=-=-=-=-= TEST 1 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+$a=array (
+  0 => 1,
+  'big' => 2,
+  1 => 2,
+  2 => 6,
+  3 => 3,
+  4 => 5,
+  5 => 3,
+  6 => 3,
+  7 => 454,
+  8 => 'some_string',
+  9 => 3,
+  10 => 3,
+  11 => 3,
+  12 => 3,
+  13 => 3,
+  14 => 3,
+  15 => 3,
+  16 => 3,
+  17 => 17,
+);
+$b=array (
+  0 => 2,
+  1 => 2,
+  2 => 3,
+  3 => 3,
+  4 => 3,
+  5 => 3,
+  6 => 3,
+  7 => 3,
+  8 => 3,
+  9 => 3,
+  10 => 3,
+  11 => 3,
+  12 => 3,
+  13 => 3,
+  14 => 3,
+  15 => 17,
+  16 => 25,
+  17 => 'some_string',
+  18 => 7,
+  19 => 8,
+  20 => 9,
+  21 => 109,
+  22 => 78,
+  23 => 17,
+);
+$c=array (
+  0 => -1,
+  1 => 2,
+  2 => 1,
+  3 => 15,
+  4 => 25,
+  5 => 17,
+);
+array_intersect($a,$b,$c);
+array(3) {
+  [u"big"]=>
+  int(2)
+  [1]=>
+  int(2)
+  [17]=>
+  int(17)
+}
+array_intersect_assoc($a,$b,$c);
+array(1) {
+  [1]=>
+  int(2)
+}
+array_intersect($a,$b);
+array(15) {
+  [u"big"]=>
+  int(2)
+  [1]=>
+  int(2)
+  [3]=>
+  int(3)
+  [5]=>
+  int(3)
+  [6]=>
+  int(3)
+  [8]=>
+  unicode(11) "some_string"
+  [9]=>
+  int(3)
+  [10]=>
+  int(3)
+  [11]=>
+  int(3)
+  [12]=>
+  int(3)
+  [13]=>
+  int(3)
+  [14]=>
+  int(3)
+  [15]=>
+  int(3)
+  [16]=>
+  int(3)
+  [17]=>
+  int(17)
+}
+array_intersect_assoc($a,$b);
+array(10) {
+  [1]=>
+  int(2)
+  [3]=>
+  int(3)
+  [5]=>
+  int(3)
+  [6]=>
+  int(3)
+  [9]=>
+  int(3)
+  [10]=>
+  int(3)
+  [11]=>
+  int(3)
+  [12]=>
+  int(3)
+  [13]=>
+  int(3)
+  [14]=>
+  int(3)
+}
+-=-=-=-=-=-=-=-=-=-= TEST 2 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+$a=array (
+  'a' => 2,
+  'b' => 'some',
+  'c' => 'done',
+  'z' => 'foo',
+  'f' => 5,
+  'fan' => 'fen',
+  'bad' => 'bed',
+  'gate' => 'web',
+  7 => 18,
+  9 => 25,
+  11 => 42,
+  12 => 42,
+  45 => 42,
+  73 => 'foo',
+  95 => 'some',
+  'som3' => 'some',
+  'want' => 'wanna',
+);
+$b=array (
+  'a' => 7,
+  7 => 18,
+  9 => 13,
+  11 => 42,
+  45 => 46,
+  'som3' => 'some',
+  'foo' => 'some',
+  'goo' => 'foo',
+  'f' => 5,
+  'z' => 'equal',
+  'gate' => 'web',
+);
+$c=array (
+  'gate' => 'web',
+  73 => 'foo',
+  95 => 'some',
+);
+
+
+Results:
+
+array_intersect($a,$b,$c);
+array(6) {
+  [u"b"]=>
+  unicode(4) "some"
+  [u"z"]=>
+  unicode(3) "foo"
+  [u"gate"]=>
+  unicode(3) "web"
+  [73]=>
+  unicode(3) "foo"
+  [95]=>
+  unicode(4) "some"
+  [u"som3"]=>
+  unicode(4) "some"
+}
+array_intersect_assoc($a,$b,$c);
+array(1) {
+  [u"gate"]=>
+  unicode(3) "web"
+}
+array_intersect($a,$b);
+array(11) {
+  [u"b"]=>
+  unicode(4) "some"
+  [u"z"]=>
+  unicode(3) "foo"
+  [u"f"]=>
+  int(5)
+  [u"gate"]=>
+  unicode(3) "web"
+  [7]=>
+  int(18)
+  [11]=>
+  int(42)
+  [12]=>
+  int(42)
+  [45]=>
+  int(42)
+  [73]=>
+  unicode(3) "foo"
+  [95]=>
+  unicode(4) "some"
+  [u"som3"]=>
+  unicode(4) "some"
+}
+array_intersect_assoc($a,$b);
+array(5) {
+  [u"f"]=>
+  int(5)
+  [u"gate"]=>
+  unicode(3) "web"
+  [7]=>
+  int(18)
+  [11]=>
+  int(42)
+  [u"som3"]=>
+  unicode(4) "some"
+}

diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt
index 0cd1d8203adc93aa36b3c6ab2fd428a202adc313..11adce868fe8771a5ffc8cc6d1b4d672e4f3206c 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case.phpt
+++ b/ext/standard/tests/array/array_change_key_case.phpt
@@ -767,3 +767,720 @@ array(4) {
 }
 
 end
+--UEXPECT--
+array(0) {
+}
+array(0) {
+}
+array(0) {
+}
+
+array(1) {
+  [0]=>
+  int(0)
+}
+array(1) {
+  [0]=>
+  int(0)
+}
+array(1) {
+  [0]=>
+  int(0)
+}
+
+array(1) {
+  [0]=>
+  int(1)
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+
+array(1) {
+  [0]=>
+  int(-1)
+}
+array(1) {
+  [0]=>
+  int(-1)
+}
+array(1) {
+  [0]=>
+  int(-1)
+}
+
+array(5) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+array(5) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+array(5) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+
+array(5) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+array(5) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+array(5) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+}
+
+array(1) {
+  [u""]=>
+  int(1)
+}
+array(1) {
+  [u""]=>
+  int(1)
+}
+array(1) {
+  [u""]=>
+  int(1)
+}
+
+array(1) {
+  [u"a"]=>
+  int(1)
+}
+array(1) {
+  [u"A"]=>
+  int(1)
+}
+array(1) {
+  [u"a"]=>
+  int(1)
+}
+
+array(1) {
+  [u"z"]=>
+  int(1)
+}
+array(1) {
+  [u"Z"]=>
+  int(1)
+}
+array(1) {
+  [u"z"]=>
+  int(1)
+}
+
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+array(1) {
+  [u"ONE"]=>
+  int(1)
+}
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+array(1) {
+  [u"ONE"]=>
+  int(1)
+}
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+array(1) {
+  [u"ONE"]=>
+  int(1)
+}
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+array(1) {
+  [u"ONE"]=>
+  int(1)
+}
+array(1) {
+  [u"one"]=>
+  int(1)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"ONE"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+array(2) {
+  [u"one"]=>
+  int(1)
+  [0]=>
+  int(2)
+}
+
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "four"
+}
+array(4) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+  [u"THREE"]=>
+  int(3)
+  [u"FOUR"]=>
+  unicode(4) "four"
+}
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "four"
+}
+
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "FOUR"
+}
+array(4) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+  [u"THREE"]=>
+  int(3)
+  [u"FOUR"]=>
+  unicode(4) "FOUR"
+}
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "FOUR"
+}
+
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "FOUR"
+}
+array(4) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+  [u"THREE"]=>
+  int(3)
+  [u"FOUR"]=>
+  unicode(4) "FOUR"
+}
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "FOUR"
+}
+
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "four"
+}
+array(4) {
+  [u"ONE"]=>
+  int(1)
+  [u"TWO"]=>
+  int(2)
+  [u"THREE"]=>
+  int(3)
+  [u"FOUR"]=>
+  unicode(4) "four"
+}
+array(4) {
+  [u"one"]=>
+  int(1)
+  [u"two"]=>
+  int(2)
+  [u"three"]=>
+  int(3)
+  [u"four"]=>
+  unicode(4) "four"
+}
+
+end

diff --git a/ext/standard/tests/array/array_chunk.phpt b/ext/standard/tests/array/array_chunk.phpt
index 061c6994bffd9329d47d194b38566058ce07856f..8782dcfa58651d71b545b79e217e9680ec059c5e 100644 (file)
--- a/ext/standard/tests/array/array_chunk.phpt
+++ b/ext/standard/tests/array/array_chunk.phpt
@@ -5323,4 +5323,5277 @@ array(1) {
 }
 
 
+end
+--UEXPECT--
+===========================================
+array(0) {
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+
+===========================================
+array(1) {
+  [0]=>
+  int(0)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+}
+
+
+===========================================
+array(1) {
+  [0]=>
+  int(1)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+
+
+===========================================
+array(1) {
+  [0]=>
+  int(-1)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(-1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(-1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(-1)
+  }
+}
+
+
+===========================================
+array(2) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(2)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+
+[2]
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(2)
+  }
+}
+
+
+===========================================
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[2]
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [2]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[3]
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+
+
+===========================================
+array(1) {
+  [1]=>
+  int(0)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [1]=>
+    int(0)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+}
+
+
+===========================================
+array(1) {
+  [2]=>
+  int(1)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [2]=>
+    int(1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+
+
+===========================================
+array(1) {
+  [3]=>
+  int(-1)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(-1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [3]=>
+    int(-1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(-1)
+  }
+}
+
+
+===========================================
+array(2) {
+  [1]=>
+  int(0)
+  [2]=>
+  int(2)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [1]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [2]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+
+[2]
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [1]=>
+    int(0)
+    [2]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(2)
+  }
+}
+
+
+===========================================
+array(3) {
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+  [3]=>
+  int(3)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [2]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [3]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[2]
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [3]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[3]
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+
+
+===========================================
+array(2) {
+  [0]=>
+  int(0)
+  [3]=>
+  int(2)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [3]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+
+[2]
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [3]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(2)
+  }
+}
+
+
+===========================================
+array(3) {
+  [1]=>
+  int(1)
+  [5]=>
+  int(2)
+  [8]=>
+  int(3)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [5]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [8]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[2]
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [1]=>
+    int(1)
+    [5]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [8]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[3]
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [1]=>
+    int(1)
+    [5]=>
+    int(2)
+    [8]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+
+
+===========================================
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+
+[2]
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+
+
+===========================================
+array(3) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(2)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+
+[2]
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [2]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+
+[3]
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+}
+
+
+===========================================
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(3)
+  }
+}
+array(3) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[2]
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [2]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[3]
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+}
+
+
+===========================================
+array(4) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+  [3]=>
+  int(3)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(4) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(4) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [3]=>
+    int(3)
+  }
+}
+array(4) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[2]
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(2)
+    [1]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(2)
+    [1]=>
+    int(3)
+  }
+}
+
+[3]
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [3]=>
+    int(3)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+}
+
+[4]
+array(1) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+}
+array(1) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+}
+
+
+===========================================
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(4) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+array(4) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [3]=>
+    int(4)
+  }
+}
+array(4) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+
+[2]
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+}
+
+[3]
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(1) {
+    [3]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+
+[4]
+array(1) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+}
+array(1) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+}
+array(1) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+}
+
+
+===========================================
+array(5) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+  [3]=>
+  int(3)
+  [4]=>
+  int(4)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(5) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+array(5) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [3]=>
+    int(3)
+  }
+  [4]=>
+  array(1) {
+    [4]=>
+    int(4)
+  }
+}
+array(5) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+
+[2]
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(2)
+    [1]=>
+    int(3)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [2]=>
+  array(1) {
+    [4]=>
+    int(4)
+  }
+}
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(2)
+    [1]=>
+    int(3)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+
+[3]
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+}
+
+[4]
+array(2) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [1]=>
+  array(1) {
+    [4]=>
+    int(4)
+  }
+}
+array(2) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+}
+
+[5]
+array(1) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+  }
+}
+array(1) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+  }
+}
+array(1) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+  }
+}
+
+
+===========================================
+array(10) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+  [5]=>
+  int(6)
+  [6]=>
+  int(7)
+  [7]=>
+  int(8)
+  [8]=>
+  int(9)
+  [9]=>
+  int(10)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(10) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(5)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+  [6]=>
+  array(1) {
+    [0]=>
+    int(7)
+  }
+  [7]=>
+  array(1) {
+    [0]=>
+    int(8)
+  }
+  [8]=>
+  array(1) {
+    [0]=>
+    int(9)
+  }
+  [9]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+array(10) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [3]=>
+    int(4)
+  }
+  [4]=>
+  array(1) {
+    [4]=>
+    int(5)
+  }
+  [5]=>
+  array(1) {
+    [5]=>
+    int(6)
+  }
+  [6]=>
+  array(1) {
+    [6]=>
+    int(7)
+  }
+  [7]=>
+  array(1) {
+    [7]=>
+    int(8)
+  }
+  [8]=>
+  array(1) {
+    [8]=>
+    int(9)
+  }
+  [9]=>
+  array(1) {
+    [9]=>
+    int(10)
+  }
+}
+array(10) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(5)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+  [6]=>
+  array(1) {
+    [0]=>
+    int(7)
+  }
+  [7]=>
+  array(1) {
+    [0]=>
+    int(8)
+  }
+  [8]=>
+  array(1) {
+    [0]=>
+    int(9)
+  }
+  [9]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+
+[2]
+array(5) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+  }
+  [3]=>
+  array(2) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+  }
+  [4]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+array(5) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+  [2]=>
+  array(2) {
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+  }
+  [3]=>
+  array(2) {
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+  }
+  [4]=>
+  array(2) {
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(5) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+  }
+  [3]=>
+  array(2) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+  }
+  [4]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+
+[3]
+array(4) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+    [2]=>
+    int(6)
+  }
+  [2]=>
+  array(3) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+    [2]=>
+    int(9)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+array(4) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(3) {
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+  }
+  [2]=>
+  array(3) {
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+  }
+  [3]=>
+  array(1) {
+    [9]=>
+    int(10)
+  }
+}
+array(4) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+    [2]=>
+    int(6)
+  }
+  [2]=>
+  array(3) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+    [2]=>
+    int(9)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+
+[4]
+array(3) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+    [2]=>
+    int(7)
+    [3]=>
+    int(8)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+array(3) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+  [1]=>
+  array(4) {
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+  }
+  [2]=>
+  array(2) {
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(3) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+    [2]=>
+    int(7)
+    [3]=>
+    int(8)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+
+[5]
+array(2) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+  }
+  [1]=>
+  array(5) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+    [2]=>
+    int(8)
+    [3]=>
+    int(9)
+    [4]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+  }
+  [1]=>
+  array(5) {
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+  }
+  [1]=>
+  array(5) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+    [2]=>
+    int(8)
+    [3]=>
+    int(9)
+    [4]=>
+    int(10)
+  }
+}
+
+[6]
+array(2) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+    [2]=>
+    int(9)
+    [3]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+  }
+  [1]=>
+  array(4) {
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+    [2]=>
+    int(9)
+    [3]=>
+    int(10)
+  }
+}
+
+[7]
+array(2) {
+  [0]=>
+  array(7) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+    [2]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(7) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+  }
+  [1]=>
+  array(3) {
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(7) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+    [2]=>
+    int(10)
+  }
+}
+
+[8]
+array(2) {
+  [0]=>
+  array(8) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(8) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+  }
+  [1]=>
+  array(2) {
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(8) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+
+[9]
+array(2) {
+  [0]=>
+  array(9) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(9) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+  }
+  [1]=>
+  array(1) {
+    [9]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(9) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+
+[10]
+array(1) {
+  [0]=>
+  array(10) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(1) {
+  [0]=>
+  array(10) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+array(1) {
+  [0]=>
+  array(10) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+    [6]=>
+    int(7)
+    [7]=>
+    int(8)
+    [8]=>
+    int(9)
+    [9]=>
+    int(10)
+  }
+}
+
+
+===========================================
+array(11) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+  [3]=>
+  int(3)
+  [4]=>
+  int(4)
+  [5]=>
+  int(5)
+  [6]=>
+  int(6)
+  [7]=>
+  int(7)
+  [8]=>
+  int(8)
+  [9]=>
+  int(9)
+  [10]=>
+  int(10)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(11) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(5)
+  }
+  [6]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+  [7]=>
+  array(1) {
+    [0]=>
+    int(7)
+  }
+  [8]=>
+  array(1) {
+    [0]=>
+    int(8)
+  }
+  [9]=>
+  array(1) {
+    [0]=>
+    int(9)
+  }
+  [10]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+array(11) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [1]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [2]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [3]=>
+    int(3)
+  }
+  [4]=>
+  array(1) {
+    [4]=>
+    int(4)
+  }
+  [5]=>
+  array(1) {
+    [5]=>
+    int(5)
+  }
+  [6]=>
+  array(1) {
+    [6]=>
+    int(6)
+  }
+  [7]=>
+  array(1) {
+    [7]=>
+    int(7)
+  }
+  [8]=>
+  array(1) {
+    [8]=>
+    int(8)
+  }
+  [9]=>
+  array(1) {
+    [9]=>
+    int(9)
+  }
+  [10]=>
+  array(1) {
+    [10]=>
+    int(10)
+  }
+}
+array(11) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(0)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(5)
+  }
+  [6]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+  [7]=>
+  array(1) {
+    [0]=>
+    int(7)
+  }
+  [8]=>
+  array(1) {
+    [0]=>
+    int(8)
+  }
+  [9]=>
+  array(1) {
+    [0]=>
+    int(9)
+  }
+  [10]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+
+[2]
+array(6) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(2)
+    [1]=>
+    int(3)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+  }
+  [3]=>
+  array(2) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+  }
+  [4]=>
+  array(2) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+array(6) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [2]=>
+  array(2) {
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+  }
+  [3]=>
+  array(2) {
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+  }
+  [4]=>
+  array(2) {
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+  }
+  [5]=>
+  array(1) {
+    [10]=>
+    int(10)
+  }
+}
+array(6) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(2)
+    [1]=>
+    int(3)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+  }
+  [3]=>
+  array(2) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+  }
+  [4]=>
+  array(2) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+
+[3]
+array(4) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+    [2]=>
+    int(5)
+  }
+  [2]=>
+  array(3) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+    [2]=>
+    int(8)
+  }
+  [3]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+array(4) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(3) {
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+  }
+  [2]=>
+  array(3) {
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+  }
+  [3]=>
+  array(2) {
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(4) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+    [2]=>
+    int(5)
+  }
+  [2]=>
+  array(3) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+    [2]=>
+    int(8)
+  }
+  [3]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+
+[4]
+array(3) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+    [2]=>
+    int(6)
+    [3]=>
+    int(7)
+  }
+  [2]=>
+  array(3) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+    [2]=>
+    int(10)
+  }
+}
+array(3) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [1]=>
+  array(4) {
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+  }
+  [2]=>
+  array(3) {
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(3) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+    [2]=>
+    int(6)
+    [3]=>
+    int(7)
+  }
+  [2]=>
+  array(3) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+    [2]=>
+    int(10)
+  }
+}
+
+[5]
+array(3) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+  }
+  [1]=>
+  array(5) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+    [2]=>
+    int(7)
+    [3]=>
+    int(8)
+    [4]=>
+    int(9)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+array(3) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+  }
+  [1]=>
+  array(5) {
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+  }
+  [2]=>
+  array(1) {
+    [10]=>
+    int(10)
+  }
+}
+array(3) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+  }
+  [1]=>
+  array(5) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+    [2]=>
+    int(7)
+    [3]=>
+    int(8)
+    [4]=>
+    int(9)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+
+[6]
+array(2) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+  }
+  [1]=>
+  array(5) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+    [2]=>
+    int(8)
+    [3]=>
+    int(9)
+    [4]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+  }
+  [1]=>
+  array(5) {
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+  }
+  [1]=>
+  array(5) {
+    [0]=>
+    int(6)
+    [1]=>
+    int(7)
+    [2]=>
+    int(8)
+    [3]=>
+    int(9)
+    [4]=>
+    int(10)
+  }
+}
+
+[7]
+array(2) {
+  [0]=>
+  array(7) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+    [2]=>
+    int(9)
+    [3]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(7) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+  }
+  [1]=>
+  array(4) {
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(7) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+  }
+  [1]=>
+  array(4) {
+    [0]=>
+    int(7)
+    [1]=>
+    int(8)
+    [2]=>
+    int(9)
+    [3]=>
+    int(10)
+  }
+}
+
+[8]
+array(2) {
+  [0]=>
+  array(8) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+    [2]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(8) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+  }
+  [1]=>
+  array(3) {
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(8) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(8)
+    [1]=>
+    int(9)
+    [2]=>
+    int(10)
+  }
+}
+
+[9]
+array(2) {
+  [0]=>
+  array(9) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(9) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+  }
+  [1]=>
+  array(2) {
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(9) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(9)
+    [1]=>
+    int(10)
+  }
+}
+
+[10]
+array(2) {
+  [0]=>
+  array(10) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(10) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+  }
+  [1]=>
+  array(1) {
+    [10]=>
+    int(10)
+  }
+}
+array(2) {
+  [0]=>
+  array(10) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(10)
+  }
+}
+
+[11]
+array(1) {
+  [0]=>
+  array(11) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(1) {
+  [0]=>
+  array(11) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+array(1) {
+  [0]=>
+  array(11) {
+    [0]=>
+    int(0)
+    [1]=>
+    int(1)
+    [2]=>
+    int(2)
+    [3]=>
+    int(3)
+    [4]=>
+    int(4)
+    [5]=>
+    int(5)
+    [6]=>
+    int(6)
+    [7]=>
+    int(7)
+    [8]=>
+    int(8)
+    [9]=>
+    int(9)
+    [10]=>
+    int(10)
+  }
+}
+
+
+===========================================
+array(1) {
+  [u"a"]=>
+  int(1)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [u"a"]=>
+    int(1)
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+}
+
+
+===========================================
+array(2) {
+  [u"b"]=>
+  int(1)
+  [u"c"]=>
+  int(2)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [u"b"]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [u"c"]=>
+    int(2)
+  }
+}
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+}
+
+[2]
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [u"b"]=>
+    int(1)
+    [u"c"]=>
+    int(2)
+  }
+}
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+
+
+===========================================
+array(6) {
+  [u"p"]=>
+  int(1)
+  [u"q"]=>
+  int(2)
+  [u"r"]=>
+  int(3)
+  [u"s"]=>
+  int(4)
+  [u"u"]=>
+  int(5)
+  [u"v"]=>
+  int(6)
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(6) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(5)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+}
+array(6) {
+  [0]=>
+  array(1) {
+    [u"p"]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [u"q"]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [u"r"]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [u"s"]=>
+    int(4)
+  }
+  [4]=>
+  array(1) {
+    [u"u"]=>
+    int(5)
+  }
+  [5]=>
+  array(1) {
+    [u"v"]=>
+    int(6)
+  }
+}
+array(6) {
+  [0]=>
+  array(1) {
+    [0]=>
+    int(1)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(2)
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    int(3)
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    int(4)
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    int(5)
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+}
+
+[2]
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+  }
+}
+array(3) {
+  [0]=>
+  array(2) {
+    [u"p"]=>
+    int(1)
+    [u"q"]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [u"r"]=>
+    int(3)
+    [u"s"]=>
+    int(4)
+  }
+  [2]=>
+  array(2) {
+    [u"u"]=>
+    int(5)
+    [u"v"]=>
+    int(6)
+  }
+}
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+  }
+}
+
+[3]
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+    [2]=>
+    int(6)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [u"p"]=>
+    int(1)
+    [u"q"]=>
+    int(2)
+    [u"r"]=>
+    int(3)
+  }
+  [1]=>
+  array(3) {
+    [u"s"]=>
+    int(4)
+    [u"u"]=>
+    int(5)
+    [u"v"]=>
+    int(6)
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    int(4)
+    [1]=>
+    int(5)
+    [2]=>
+    int(6)
+  }
+}
+
+[4]
+array(2) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+  }
+}
+array(2) {
+  [0]=>
+  array(4) {
+    [u"p"]=>
+    int(1)
+    [u"q"]=>
+    int(2)
+    [u"r"]=>
+    int(3)
+    [u"s"]=>
+    int(4)
+  }
+  [1]=>
+  array(2) {
+    [u"u"]=>
+    int(5)
+    [u"v"]=>
+    int(6)
+  }
+}
+array(2) {
+  [0]=>
+  array(4) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+  }
+}
+
+[5]
+array(2) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+}
+array(2) {
+  [0]=>
+  array(5) {
+    [u"p"]=>
+    int(1)
+    [u"q"]=>
+    int(2)
+    [u"r"]=>
+    int(3)
+    [u"s"]=>
+    int(4)
+    [u"u"]=>
+    int(5)
+  }
+  [1]=>
+  array(1) {
+    [u"v"]=>
+    int(6)
+  }
+}
+array(2) {
+  [0]=>
+  array(5) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    int(6)
+  }
+}
+
+[6]
+array(1) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+  }
+}
+array(1) {
+  [0]=>
+  array(6) {
+    [u"p"]=>
+    int(1)
+    [u"q"]=>
+    int(2)
+    [u"r"]=>
+    int(3)
+    [u"s"]=>
+    int(4)
+    [u"u"]=>
+    int(5)
+    [u"v"]=>
+    int(6)
+  }
+}
+array(1) {
+  [0]=>
+  array(6) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+    [3]=>
+    int(4)
+    [4]=>
+    int(5)
+    [5]=>
+    int(6)
+  }
+}
+
+
+===========================================
+array(1) {
+  [u"a"]=>
+  unicode(1) "A"
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [u"a"]=>
+    unicode(1) "A"
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+}
+
+
+===========================================
+array(6) {
+  [u"p"]=>
+  unicode(1) "A"
+  [u"q"]=>
+  unicode(1) "B"
+  [u"r"]=>
+  unicode(1) "C"
+  [u"s"]=>
+  unicode(1) "D"
+  [u"u"]=>
+  unicode(1) "E"
+  [u"v"]=>
+  unicode(1) "F"
+}
+-------------------------------------------
+[0]
+NULL
+NULL
+NULL
+
+[1]
+array(6) {
+  [0]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    unicode(1) "D"
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    unicode(1) "E"
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    unicode(1) "F"
+  }
+}
+array(6) {
+  [0]=>
+  array(1) {
+    [u"p"]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(1) {
+    [u"q"]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(1) {
+    [u"r"]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  array(1) {
+    [u"s"]=>
+    unicode(1) "D"
+  }
+  [4]=>
+  array(1) {
+    [u"u"]=>
+    unicode(1) "E"
+  }
+  [5]=>
+  array(1) {
+    [u"v"]=>
+    unicode(1) "F"
+  }
+}
+array(6) {
+  [0]=>
+  array(1) {
+    [0]=>
+    unicode(1) "A"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    unicode(1) "B"
+  }
+  [2]=>
+  array(1) {
+    [0]=>
+    unicode(1) "C"
+  }
+  [3]=>
+  array(1) {
+    [0]=>
+    unicode(1) "D"
+  }
+  [4]=>
+  array(1) {
+    [0]=>
+    unicode(1) "E"
+  }
+  [5]=>
+  array(1) {
+    [0]=>
+    unicode(1) "F"
+  }
+}
+
+[2]
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(1) "C"
+    [1]=>
+    unicode(1) "D"
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    unicode(1) "E"
+    [1]=>
+    unicode(1) "F"
+  }
+}
+array(3) {
+  [0]=>
+  array(2) {
+    [u"p"]=>
+    unicode(1) "A"
+    [u"q"]=>
+    unicode(1) "B"
+  }
+  [1]=>
+  array(2) {
+    [u"r"]=>
+    unicode(1) "C"
+    [u"s"]=>
+    unicode(1) "D"
+  }
+  [2]=>
+  array(2) {
+    [u"u"]=>
+    unicode(1) "E"
+    [u"v"]=>
+    unicode(1) "F"
+  }
+}
+array(3) {
+  [0]=>
+  array(2) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(1) "C"
+    [1]=>
+    unicode(1) "D"
+  }
+  [2]=>
+  array(2) {
+    [0]=>
+    unicode(1) "E"
+    [1]=>
+    unicode(1) "F"
+  }
+}
+
+[3]
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    unicode(1) "D"
+    [1]=>
+    unicode(1) "E"
+    [2]=>
+    unicode(1) "F"
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [u"p"]=>
+    unicode(1) "A"
+    [u"q"]=>
+    unicode(1) "B"
+    [u"r"]=>
+    unicode(1) "C"
+  }
+  [1]=>
+  array(3) {
+    [u"s"]=>
+    unicode(1) "D"
+    [u"u"]=>
+    unicode(1) "E"
+    [u"v"]=>
+    unicode(1) "F"
+  }
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+  }
+  [1]=>
+  array(3) {
+    [0]=>
+    unicode(1) "D"
+    [1]=>
+    unicode(1) "E"
+    [2]=>
+    unicode(1) "F"
+  }
+}
+
+[4]
+array(2) {
+  [0]=>
+  array(4) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+    [3]=>
+    unicode(1) "D"
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(1) "E"
+    [1]=>
+    unicode(1) "F"
+  }
+}
+array(2) {
+  [0]=>
+  array(4) {
+    [u"p"]=>
+    unicode(1) "A"
+    [u"q"]=>
+    unicode(1) "B"
+    [u"r"]=>
+    unicode(1) "C"
+    [u"s"]=>
+    unicode(1) "D"
+  }
+  [1]=>
+  array(2) {
+    [u"u"]=>
+    unicode(1) "E"
+    [u"v"]=>
+    unicode(1) "F"
+  }
+}
+array(2) {
+  [0]=>
+  array(4) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+    [3]=>
+    unicode(1) "D"
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    unicode(1) "E"
+    [1]=>
+    unicode(1) "F"
+  }
+}
+
+[5]
+array(2) {
+  [0]=>
+  array(5) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+    [3]=>
+    unicode(1) "D"
+    [4]=>
+    unicode(1) "E"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    unicode(1) "F"
+  }
+}
+array(2) {
+  [0]=>
+  array(5) {
+    [u"p"]=>
+    unicode(1) "A"
+    [u"q"]=>
+    unicode(1) "B"
+    [u"r"]=>
+    unicode(1) "C"
+    [u"s"]=>
+    unicode(1) "D"
+    [u"u"]=>
+    unicode(1) "E"
+  }
+  [1]=>
+  array(1) {
+    [u"v"]=>
+    unicode(1) "F"
+  }
+}
+array(2) {
+  [0]=>
+  array(5) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+    [3]=>
+    unicode(1) "D"
+    [4]=>
+    unicode(1) "E"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    unicode(1) "F"
+  }
+}
+
+[6]
+array(1) {
+  [0]=>
+  array(6) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+    [3]=>
+    unicode(1) "D"
+    [4]=>
+    unicode(1) "E"
+    [5]=>
+    unicode(1) "F"
+  }
+}
+array(1) {
+  [0]=>
+  array(6) {
+    [u"p"]=>
+    unicode(1) "A"
+    [u"q"]=>
+    unicode(1) "B"
+    [u"r"]=>
+    unicode(1) "C"
+    [u"s"]=>
+    unicode(1) "D"
+    [u"u"]=>
+    unicode(1) "E"
+    [u"v"]=>
+    unicode(1) "F"
+  }
+}
+array(1) {
+  [0]=>
+  array(6) {
+    [0]=>
+    unicode(1) "A"
+    [1]=>
+    unicode(1) "B"
+    [2]=>
+    unicode(1) "C"
+    [3]=>
+    unicode(1) "D"
+    [4]=>
+    unicode(1) "E"
+    [5]=>
+    unicode(1) "F"
+  }
+}
+
+
 end

diff --git a/ext/standard/tests/array/array_count_values.phpt b/ext/standard/tests/array/array_count_values.phpt
index d9a3ba3d5af7d7537dc18d8a25677708e2ad5a7e..7212db28a45edccf30af9bedab5dc13c96f638d2 100644 (file)
--- a/ext/standard/tests/array/array_count_values.phpt
+++ b/ext/standard/tests/array/array_count_values.phpt
@@ -88,8 +88,77 @@ array(1) {
   int(1)
 }
 
+array(1) {
+  [1]=>
+  int(1)
+}
+--UEXPECT--
+array(0) {
+}
+
+array(1) {
+  [0]=>
+  int(1)
+}
+
 array(1) {
   [1]=>
   int(1)
 }
 
+array(1) {
+  [-1]=>
+  int(1)
+}
+
+array(1) {
+  [0]=>
+  int(2)
+}
+
+array(2) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(1)
+}
+
+array(1) {
+  [1]=>
+  int(2)
+}
+
+array(3) {
+  [1]=>
+  int(2)
+  [u"hello"]=>
+  int(2)
+  [u"world"]=>
+  int(1)
+}
+
+array(2) {
+  [u"hello"]=>
+  int(2)
+  [u"world"]=>
+  int(1)
+}
+
+array(3) {
+  [u""]=>
+  int(2)
+  [u"world"]=>
+  int(3)
+  [u"hello"]=>
+  int(4)
+}
+
+array(1) {
+  [0]=>
+  int(1)
+}
+
+array(1) {
+  [1]=>
+  int(1)
+}

diff --git a/ext/standard/tests/array/array_intersect_1.phpt b/ext/standard/tests/array/array_intersect_1.phpt
index 293ae35b381748bd6e93ce2b0997da4c1a85073c..f3eb6ec780a22bb0020497c9e577d2ca61393cd5 100644 (file)
--- a/ext/standard/tests/array/array_intersect_1.phpt
+++ b/ext/standard/tests/array/array_intersect_1.phpt
@@ -563,3 +563,480 @@ array(2) {
   }
 }
 end   ------------ array_uintersect_uassoc() with method --------
+--UEXPECTF--
+begin ------------ array_intersect() ----------------------------
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_intersect($a, $b);
+array(0) {
+}
+end   ------------ array_intersect() ----------------------------
+begin ------------ array_uintersect() ---------------------------
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_uintersect($a, $b, "comp_func_cr"));
+array(3) {
+  [u"0.1"]=>
+  object(cr)#1 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(9)
+    [u"public_member"]=>
+    int(9)
+  }
+  [1]=>
+  object(cr)#4 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(4)
+    [u"public_member"]=>
+    int(4)
+  }
+  [2]=>
+  object(cr)#5 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(-15)
+    [u"public_member"]=>
+    int(-15)
+  }
+}
+end   ------------ array_uintersect() ---------------------------
+begin ------------ array_intersect_assoc() ----------------------
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_intersect_assoc($a, $b));
+array(0) {
+}
+end   ------------ array_intersect_assoc() ----------------------
+begin ------------ array_uintersect_assoc() ---------------------
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));
+array(2) {
+  [1]=>
+  object(cr)#4 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(4)
+    [u"public_member"]=>
+    int(4)
+  }
+  [2]=>
+  object(cr)#5 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(-15)
+    [u"public_member"]=>
+    int(-15)
+  }
+}
+end   ------------ array_uintersect_assoc() ---------------------
+begin ------------ array_intersect_uassoc() ---------------------
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_intersect_uassoc($a, $b, "comp_func"));
+array(0) {
+}
+end   ------------ array_intersect_uassoc() ---------------------
+begin ------------ array_uintersect_uassoc() with ordinary func -
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_uintersect_uassoc($a, $b, "comp_func_cr", "comp_func"));
+array(2) {
+  [1]=>
+  object(cr)#4 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(4)
+    [u"public_member"]=>
+    int(4)
+  }
+  [2]=>
+  object(cr)#5 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(-15)
+    [u"public_member"]=>
+    int(-15)
+  }
+}
+end   ------------ array_uintersect_uassoc() with ordinary func -
+begin ------------ array_uintersect_uassoc() with method --------
+$a=array (
+  '0.1' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 12;
+    public $public_member = 12;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 23;
+    public $public_member = 23;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+$b=array (
+  '0.2' => 
+  class cr {
+    private $priv_member = 9;
+    public $public_member = 9;
+  },
+  '0.5' => 
+  class cr {
+    private $priv_member = 22;
+    public $public_member = 22;
+  },
+  0 => 
+  class cr {
+    private $priv_member = 3;
+    public $public_member = 3;
+  },
+  1 => 
+  class cr {
+    private $priv_member = 4;
+    public $public_member = 4;
+  },
+  2 => 
+  class cr {
+    private $priv_member = -15;
+    public $public_member = -15;
+  },
+);
+var_dump(array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
+array(2) {
+  [1]=>
+  object(cr)#4 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(4)
+    [u"public_member"]=>
+    int(4)
+  }
+  [2]=>
+  object(cr)#5 (2) {
+    [u"priv_member":u"cr":private]=>
+    int(-15)
+    [u"public_member"]=>
+    int(-15)
+  }
+}
+end   ------------ array_uintersect_uassoc() with method --------

diff --git a/ext/standard/tests/array/bug20381.phpt b/ext/standard/tests/array/bug20381.phpt
index 1adaa863b7460361ac432e96999539e488c40288..da06da0e383d6ac213e80f376920c00be7b73c69 100644 (file)
--- a/ext/standard/tests/array/bug20381.phpt
+++ b/ext/standard/tests/array/bug20381.phpt
@@ -77,3 +77,58 @@ array(3) {
     string(1) "b"
   }
 }
+--UEXPECT--
+array(3) {
+  [u"a1"]=>
+  int(1)
+  [u"a2"]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [u"a3"]=>
+  array(2) {
+    [u"a"]=>
+    array(3) {
+      [0]=>
+      int(10)
+      [1]=>
+      int(20)
+      [2]=>
+      int(30)
+    }
+    [u"b"]=>
+    unicode(1) "b"
+  }
+}
+array(3) {
+  [u"a1"]=>
+  int(1)
+  [u"a2"]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [u"a3"]=>
+  array(2) {
+    [u"a"]=>
+    array(3) {
+      [0]=>
+      int(10)
+      [1]=>
+      int(20)
+      [2]=>
+      int(30)
+    }
+    [u"b"]=>
+    unicode(1) "b"
+  }
+}

diff --git a/ext/standard/tests/array/bug21182.phpt b/ext/standard/tests/array/bug21182.phpt
index af4602ab748717246340636b2d186456e17c90d4..11ff76a5ce11658af7ab07d49193bf2ab2264340 100644 (file)
--- a/ext/standard/tests/array/bug21182.phpt
+++ b/ext/standard/tests/array/bug21182.phpt
@@ -10,3 +10,6 @@ echo "a2: $a : type : " . gettype($a) . "\n";
 --EXPECT--
 a1: 20
 a2: 20 : type : string
+--UEXPECT--
+a1: 20
+a2: 20 : type : unicode

diff --git a/ext/standard/tests/array/bug21918.phpt b/ext/standard/tests/array/bug21918.phpt
index 1c9d746fdf69df24f8e4bbd3231fb226ffba6a40..9288dd1520bf538cc25c5cc9f9c7f1719b759b72 100755 (executable)
--- a/ext/standard/tests/array/bug21918.phpt
+++ b/ext/standard/tests/array/bug21918.phpt
@@ -53,3 +53,26 @@ string(1) "a"
 int(-2)
 string(1) "a"
 ==Done==
+--UEXPECT--
+==Mixed==
+int(-1)
+unicode(1) "a"
+int(-2)
+unicode(1) "b"
+int(3)
+unicode(1) "c"
+int(4)
+unicode(1) "d"
+int(5)
+unicode(1) "e"
+int(6001)
+unicode(1) "f"
+unicode(2) "07"
+unicode(1) "g"
+==Normal==
+int(0)
+unicode(1) "a"
+==Negative==
+int(-2)
+unicode(1) "a"
+==Done==

diff --git a/ext/standard/tests/array/bug21998.phpt b/ext/standard/tests/array/bug21998.phpt
index aa52dc590a16f19db5809934ed839815347f1218..b5fe8675c998fc883c43d73f92e4f4cab0197b49 100644 (file)
--- a/ext/standard/tests/array/bug21998.phpt
+++ b/ext/standard/tests/array/bug21998.phpt
@@ -22,3 +22,11 @@ string(1) "b"
 int(0)
 string(1) "a"
 NULL
+--UEXPECT--
+int(0)
+unicode(1) "c"
+int(0)
+unicode(1) "b"
+int(0)
+unicode(1) "a"
+NULL

diff --git a/ext/standard/tests/array/bug22088.phpt b/ext/standard/tests/array/bug22088.phpt
index 4352cff91425db8a9dee8ed83c0ae37144474124..24f815ce9002841f6c15b082939102c647faea82 100644 (file)
--- a/ext/standard/tests/array/bug22088.phpt
+++ b/ext/standard/tests/array/bug22088.phpt
@@ -31,3 +31,20 @@ array(3) {
   [0]=>
   string(1) "a"
 }
+--UEXPECT--
+array(3) {
+  [0]=>
+  unicode(1) "b"
+  [1]=>
+  unicode(1) "c"
+  [2]=>
+  unicode(1) "a"
+}
+array(3) {
+  [u"b"]=>
+  int(2)
+  [u"c"]=>
+  int(3)
+  [0]=>
+  unicode(1) "a"
+}

diff --git a/ext/standard/tests/array/bug24198.phpt b/ext/standard/tests/array/bug24198.phpt
index b1cd523026748a7152935145de90a8de209d8df5..abfde36e759a94d9589c4df1d2394e67f91cb225 100644 (file)
--- a/ext/standard/tests/array/bug24198.phpt
+++ b/ext/standard/tests/array/bug24198.phpt
@@ -23,3 +23,20 @@ array(2) {
     string(2) "bb"
   }
 }
+--UEXPECT--
+array(2) {
+  [u"a"]=>
+  array(2) {
+    [0]=>
+    unicode(2) "aa"
+    [1]=>
+    unicode(2) "aa"
+  }
+  [u"b"]=>
+  array(2) {
+    [0]=>
+    unicode(2) "bb"
+    [1]=>
+    unicode(2) "bb"
+  }
+}

diff --git a/ext/standard/tests/array/bug24220.phpt b/ext/standard/tests/array/bug24220.phpt
index c8e25709e9cc6b22346668bbcb438d4ef390dfb4..4a280d68d20d94e6d22f1d40341672e87ec12d40 100644 (file)
--- a/ext/standard/tests/array/bug24220.phpt
+++ b/ext/standard/tests/array/bug24220.phpt
@@ -89,3 +89,86 @@ array(10) {
   [9]=>
   int(10)
 }
+--UEXPECT--
+array(2) {
+  [0]=>
+  int(2003)
+  [1]=>
+  int(2004)
+}
+array(26) {
+  [0]=>
+  unicode(1) "a"
+  [1]=>
+  unicode(1) "b"
+  [2]=>
+  unicode(1) "c"
+  [3]=>
+  unicode(1) "d"
+  [4]=>
+  unicode(1) "e"
+  [5]=>
+  unicode(1) "f"
+  [6]=>
+  unicode(1) "g"
+  [7]=>
+  unicode(1) "h"
+  [8]=>
+  unicode(1) "i"
+  [9]=>
+  unicode(1) "j"
+  [10]=>
+  unicode(1) "k"
+  [11]=>
+  unicode(1) "l"
+  [12]=>
+  unicode(1) "m"
+  [13]=>
+  unicode(1) "n"
+  [14]=>
+  unicode(1) "o"
+  [15]=>
+  unicode(1) "p"
+  [16]=>
+  unicode(1) "q"
+  [17]=>
+  unicode(1) "r"
+  [18]=>
+  unicode(1) "s"
+  [19]=>
+  unicode(1) "t"
+  [20]=>
+  unicode(1) "u"
+  [21]=>
+  unicode(1) "v"
+  [22]=>
+  unicode(1) "w"
+  [23]=>
+  unicode(1) "x"
+  [24]=>
+  unicode(1) "y"
+  [25]=>
+  unicode(1) "z"
+}
+array(10) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+  [5]=>
+  int(6)
+  [6]=>
+  int(7)
+  [7]=>
+  int(8)
+  [8]=>
+  int(9)
+  [9]=>
+  int(10)
+}

diff --git a/ext/standard/tests/array/bug24980.phpt b/ext/standard/tests/array/bug24980.phpt
index b9e04fd67f3add5d1f4b0162ab1a8e16ebeaa333..0e481a7af7a7896b80196de82a1d6806b0ab429c 100644 (file)
--- a/ext/standard/tests/array/bug24980.phpt
+++ b/ext/standard/tests/array/bug24980.phpt
@@ -51,3 +51,13 @@ string(3) "abc"
 int(15)
 int(1200)
 int(1)
+--UEXPECT--
+running_total is 0, current_value is 2
+running_total is 4, current_value is 3
+running_total is 13, current_value is 5
+running_total is 38, current_value is 7
+Total is 87
+unicode(3) "abc"
+int(15)
+int(1200)
+int(1)

diff --git a/ext/standard/tests/array/bug25359.phpt b/ext/standard/tests/array/bug25359.phpt
index 0b9b89a70ed517f60b5c6058ad8eef99ddae5bbb..8ad36c2cfede602f9ba4a235dd63b2512aeb55b1 100644 (file)
--- a/ext/standard/tests/array/bug25359.phpt
+++ b/ext/standard/tests/array/bug25359.phpt
@@ -30,3 +30,16 @@ array(5) {
   [4]=>
   string(5) "fifth"
 }
+--UEXPECT--
+array(5) {
+  [0]=>
+  unicode(5) "first"
+  [1]=>
+  unicode(6) "second"
+  [2]=>
+  unicode(5) "third"
+  [3]=>
+  unicode(5) "forth"
+  [4]=>
+  unicode(5) "fifth"
+}

diff --git a/ext/standard/tests/array/bug25708.phpt b/ext/standard/tests/array/bug25708.phpt
index d3da3e3399bf1486e4a98435eab0ee0eedd5735f..954c5a5d5bc39d10f0ba74f721837cd38004830a 100644 (file)
--- a/ext/standard/tests/array/bug25708.phpt
+++ b/ext/standard/tests/array/bug25708.phpt
@@ -221,3 +221,158 @@ long(2) refcount(2)
 ----r
 string(2) "ok" refcount(2)
 string(2) "ok" refcount(2)
+--UEXPECT--
+NULL refcount(2)
+NULL refcount(2)
+long(1) refcount(3)
+long(2) refcount(3)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(3) refcount(1)
+long(1) refcount(1)
+long(3) refcount(1)
+--
+long(4) refcount(1)
+long(3) refcount(1)
+long(4) refcount(1)
+long(3) refcount(1)
+--
+long(3) refcount(1)
+long(3) refcount(1)
+long(3) refcount(2)
+--
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(3) refcount(2)
+--
+long(1) refcount(2)
+long(2) refcount(2)
+----a
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(3) refcount(1)
+long(1) refcount(1)
+long(3) refcount(1)
+--
+long(4) refcount(1)
+long(3) refcount(1)
+long(4) refcount(1)
+long(3) refcount(1)
+--
+long(3) refcount(1)
+long(3) refcount(1)
+long(3) refcount(2)
+--
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(3) refcount(2)
+--
+long(1) refcount(2)
+long(2) refcount(2)
+----ra
+NULL refcount(2)
+NULL refcount(2)
+long(1) refcount(3)
+long(2) refcount(3)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(3) refcount(1)
+long(1) refcount(1)
+long(3) refcount(1)
+--
+long(4) refcount(1)
+long(3) refcount(1)
+long(4) refcount(1)
+long(3) refcount(1)
+--
+long(3) refcount(1)
+long(3) refcount(1)
+long(3) refcount(2)
+--
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(3) refcount(2)
+--
+long(1) refcount(2)
+long(2) refcount(2)
+----
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(2) refcount(1)
+long(1) refcount(1)
+long(2) refcount(1)
+--
+long(1) refcount(1)
+long(3) refcount(1)
+long(1) refcount(1)
+long(3) refcount(1)
+--
+long(4) refcount(1)
+long(3) refcount(1)
+long(4) refcount(1)
+long(3) refcount(1)
+--
+long(3) refcount(1)
+long(3) refcount(1)
+long(3) refcount(2)
+--
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(4) refcount(1)
+unicode(1) "x" refcount(1)
+long(3) refcount(2)
+--
+long(1) refcount(2)
+long(2) refcount(2)
+----r
+unicode(2) "ok" refcount(2)
+unicode(2) "ok" refcount(2)

diff --git a/ext/standard/tests/array/bug28739.phpt b/ext/standard/tests/array/bug28739.phpt
index af888918c51fe7aec52e486d01b9f429f3fcac72..418ae9f77e38f1dcbe8d635fe1f76234a0a27ff9 100644 (file)
--- a/ext/standard/tests/array/bug28739.phpt
+++ b/ext/standard/tests/array/bug28739.phpt
@@ -55,4 +55,43 @@ Array
             [x] => 1
         )
 
+)
+--UEXPECT--
+unicode(1) "a"
+unicode(1) "a"
+Array
+(
+    [2] => p Object
+        (
+            [x] => 0
+        )
+
+    [1] => p Object
+        (
+            [x] => 1
+        )
+
+    [0] => p Object
+        (
+            [x] => 2
+        )
+
+)
+Now diffing:
+unicode(1) "b"
+unicode(1) "b"
+unicode(1) "b"
+unicode(1) "b"
+unicode(1) "b"
+unicode(1) "b"
+unicode(1) "b"
+unicode(1) "b"
+unicode(1) "b"
+Array
+(
+    [1] => p Object
+        (
+            [x] => 1
+        )
+
 )
\ No newline at end of file

diff --git a/ext/standard/tests/array/bug29253.phpt b/ext/standard/tests/array/bug29253.phpt
index a495d65cfcfe3cbf60751a5a291fd957eeb9a284..4b7aa9f275977957d3eb0aa65f3cfb628630b830 100755 (executable)
--- a/ext/standard/tests/array/bug29253.phpt
+++ b/ext/standard/tests/array/bug29253.phpt
@@ -11,3 +11,7 @@ var_dump($gg);
 array(0) {
 }
 string(4) "afad"
+--UEXPECT--
+array(0) {
+}
+unicode(4) "afad"

diff --git a/ext/standard/tests/array/bug29493.phpt b/ext/standard/tests/array/bug29493.phpt
index 0cfe45910bede56dd789d3a58d3406da1b92d9bb..adcb7065cec53a8f18c6149684ebd02cc0ba687f 100644 (file)
--- a/ext/standard/tests/array/bug29493.phpt
+++ b/ext/standard/tests/array/bug29493.phpt
@@ -113,3 +113,44 @@ array(1) {
   ["foo"]=>
   &string(3) "noo"
 }
+--UEXPECT--
+array(1) {
+  [u"foo"]=>
+  unicode(3) "aaa"
+}
+array(1) {
+  [u"foo"]=>
+  unicode(3) "bbb"
+}
+array(1) {
+  [u"foo"]=>
+  &unicode(3) "noo"
+}
+array(1) {
+  [u"foo"]=>
+  unicode(3) "bbb"
+}
+array(1) {
+  [u"foo"]=>
+  unicode(3) "bbb"
+}
+array(1) {
+  [u"foo"]=>
+  unicode(3) "bbb"
+}
+array(1) {
+  [u"foo"]=>
+  &unicode(3) "noo"
+}
+array(1) {
+  [u"foo"]=>
+  &unicode(3) "noo"
+}
+array(1) {
+  [u"foo"]=>
+  unicode(3) "aaa"
+}
+array(1) {
+  [u"foo"]=>
+  &unicode(3) "noo"
+}

diff --git a/ext/standard/tests/array/bug30833.phpt b/ext/standard/tests/array/bug30833.phpt
index 61701a532ff0c2af8452f0910f592c5a5a0ce09b..641b6a30765d20bda853a6f2400355a61542b9b5 100644 (file)
--- a/ext/standard/tests/array/bug30833.phpt
+++ b/ext/standard/tests/array/bug30833.phpt
@@ -33,3 +33,23 @@ array(2) {
   string(4) "0000"
 }
 Done
+--UEXPECT--    
+array(2) {
+  [0]=>
+  unicode(3) "abc"
+  [1]=>
+  unicode(4) "0000"
+}
+array(2) {
+  [u"abc"]=>
+  int(1)
+  [0]=>
+  int(1)
+}
+array(2) {
+  [0]=>
+  unicode(3) "abc"
+  [1]=>
+  unicode(4) "0000"
+}
+Done

diff --git a/ext/standard/tests/array/bug31213.phpt b/ext/standard/tests/array/bug31213.phpt
index 6aa31d5e0ef09840fc00d664a34c18ece939a881..02fafca52e577086bf5c660c587d8cc28a67f0ae 100644 (file)
--- a/ext/standard/tests/array/bug31213.phpt
+++ b/ext/standard/tests/array/bug31213.phpt
@@ -55,3 +55,28 @@ array(2) {
   ["_b"]=>
   &int(2)
 }
+--UEXPECT--
+int(1)
+int(1)
+int(1)
+int(2)
+int(2)
+int(2)
+array(2) {
+  [u"_a"]=>
+  &int(2)
+  [u"_b"]=>
+  &int(2)
+}
+int(1)
+int(1)
+int(1)
+int(2)
+int(2)
+int(2)
+array(2) {
+  [u"_a"]=>
+  &int(2)
+  [u"_b"]=>
+  &int(2)
+}

diff --git a/ext/standard/tests/general_functions/getopt.phpt b/ext/standard/tests/general_functions/getopt.phpt
index e861268459a0a3f815ef92fa6bf7b866382f0a41..0c48b9b6615c5ce4282ec281cfa6a7166bf035b9 100644 (file)
--- a/ext/standard/tests/general_functions/getopt.phpt
+++ b/ext/standard/tests/general_functions/getopt.phpt
@@ -28,3 +28,16 @@ array(5) {
   ["t"]=>
   bool(false)
 }
+--UEXPECT--
+array(5) {
+  [u"v"]=>
+  bool(false)
+  [u"h"]=>
+  bool(false)
+  [u"d"]=>
+  unicode(4) "test"
+  [u"m"]=>
+  unicode(4) "1234"
+  [u"t"]=>
+  bool(false)
+}

diff --git a/ext/standard/tests/strings/bug24208.phpt b/ext/standard/tests/strings/bug24208.phpt
index bed28d95c599bf5cae6d538ec6669f04c1b6f4b4..f3226e4fd32537dc0baf8ab19d930560cb6eba79 100644 (file)
--- a/ext/standard/tests/strings/bug24208.phpt
+++ b/ext/standard/tests/strings/bug24208.phpt
@@ -10,3 +10,7 @@ var_dump($a, $b, $c);
 string(1) "1"
 string(1) "2"
 string(1) "3"
+--UEXPECT--
+unicode(1) "1"
+unicode(1) "2"
+unicode(1) "3"

diff --git a/ext/standard/tests/strings/bug27278.phpt b/ext/standard/tests/strings/bug27278.phpt
index 1a94692d190e0be03380e65b4c407a494c394a39..512fe64c924d269254c5a38680883ecb28941175 100644 (file)
--- a/ext/standard/tests/strings/bug27278.phpt
+++ b/ext/standard/tests/strings/bug27278.phpt
@@ -19,3 +19,7 @@ var_dump($x);
 string(2) "02"
 string(2) "02"
 string(2) "02"
+--UEXPECT--
+unicode(2) "02"
+unicode(2) "02"
+unicode(2) "02"

diff --git a/run-tests.php b/run-tests.php
index 136deb745bed18e62a577a895d312721a0d14cf4..6e02feefccd457da974084919ee81d8d142df13b 100755 (executable)
--- a/run-tests.php
+++ b/run-tests.php
@@ -142,17 +142,6 @@ if (getenv('TEST_PHP_USER')) {
        $user_tests = array();
 }
 
-// Get info from php
-$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
-@unlink($info_file);
-$php_info = '<?php echo "
-PHP_SAPI    : " . PHP_SAPI . "
-PHP_VERSION : " . phpversion() . "
-ZEND_VERSION: " . zend_version() . "
-PHP_OS      : " . PHP_OS . " - " . php_uname() . "
-INI actual  : " . realpath(get_cfg_var("cfg_file_path")) . "
-More .INIs  : " . (function_exists(\'php_ini_scanned_files\') ? str_replace("\n","", php_ini_scanned_files()) : "** not determined **"); ?>';
-save_text($info_file, $php_info);
 $ini_overwrites = array(
                'output_handler=',
                'open_basedir=',
@@ -174,17 +163,36 @@ $ini_overwrites = array(
                'auto_append_file=',
                'magic_quotes_runtime=0',
        );
+
+function write_information()
+{
+       global $cwd, $php, $php_info, $user_tests, $ini_overwrites, $pass_options;
+
+// Get info from php
+$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
+@unlink($info_file);
+$php_info = '<?php echo "
+PHP_SAPI    : " . PHP_SAPI . "
+PHP_VERSION : " . phpversion() . "
+ZEND_VERSION: " . zend_version() . "
+PHP_OS      : " . PHP_OS . " - " . php_uname() . "
+INI actual  : " . realpath(get_cfg_var("cfg_file_path")) . "
+More .INIs  : " . (function_exists(\'php_ini_scanned_files\') ? str_replace("\n","", php_ini_scanned_files()) : "** not determined **"); ?>';
+save_text($info_file, $php_info);
 $info_params = array();
 settings2array($ini_overwrites,$info_params);
 settings2params($info_params);
-$php_info = `$php $info_params $info_file`;
+$php_info = `$php $pass_options $info_params $info_file`;
 @unlink($info_file);
 define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`);
 
+$unicode = `$php $pass_options $info_params -r 'echo ini_get("unicode_semantics");'`;
+define('TESTED_UNICODE', strcasecmp($unicode,"on") == 0 || $unicode == 1);
+
 // check for extensions that need special handling and regenerate
 $php_extensions = '<?php echo join(",",get_loaded_extensions()); ?>'; 
 save_text($info_file, $php_extensions);
-$php_extensions = explode(',',`$php $info_params $info_file`);
+$php_extensions = explode(',',`$php $pass_options $info_params $info_file`);
 $info_params_ex = array(
                'session' => array('session.auto_start=0'),
                'zlib' => array('zlib.output_compression=Off'),
@@ -198,10 +206,6 @@ foreach($info_params_ex as $ext => $ini_overwrites_ex) {
 @unlink($info_file);
 
 // Write test context information.
-function write_information()
-{
-       global $cwd, $php, $php_info, $user_tests;
-
 echo "
 =====================================================================
 CWD         : $cwd
@@ -750,6 +754,11 @@ TEST $file
                        $borked = true;
                        print_r($section_text);
                }
+               if ((@count($section_text['UEXPECT']) + @count($section_text['UEXPECTF']) + @count($section_text['UEXPECTREGEX'])) > 1) {
+                       $bork_info = "missing section --UEXPECT--, --UEXPECTF-- or --UEXPECTREGEX-- [$file]";
+                       $borked = true;
+                       print_r($section_text);
+               }
        }
        fclose($fp);
 
@@ -920,7 +929,37 @@ TEST $file
        // these may overwrite the test defaults...
        if (array_key_exists('INI', $section_text)) {
                settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings);
+               if (isset($ini_settings["unicode_semantics"])) {
+                       $unicode_test = strcasecmp($ini_settings["unicode_semantics"],"on") == 0 || $ini_settings["unicode_semantics"] == 1;
+               } else {
+                       $unicode_test = TESTED_UNICODE;
+               }
+       } else {
+               $unicode_test = TESTED_UNICODE;
        }
+
+       if ($unicode_test) {
+               if (isset($section_text['UEXPECT'])) {
+                       unset($section_text['EXPECT']);
+                       unset($section_text['EXPECTF']);
+                       unset($section_text['EXPECTREGEX']);
+                       $section_text['EXPECT'] = $section_text['UEXPECT'];
+                       unset($section_text['UEXPECT']);
+               } else if (isset($section_text['UEXPECTF'])) {
+                       unset($section_text['EXPECT']);
+                       unset($section_text['EXPECTF']);
+                       unset($section_text['EXPECTREGEX']);
+                       $section_text['EXPECTF'] = $section_text['UEXPECTF'];
+                       unset($section_text['UEXPECTF']);
+               } else if (isset($section_text['UEXPECTREGEX'])) {
+                       unset($section_text['EXPECT']);
+                       unset($section_text['EXPECTF']);
+                       unset($section_text['EXPECTREGEX']);
+                       $section_text['EXPECTREGEX'] = $section_text['UEXPECTREGEX'];
+                       unset($section_text['UEXPECTREGEX']);
+               }
+       }
+
        settings2params($ini_settings);
 
        // We've satisfied the preconditions - run the test!

diff --git a/tests/classes/__call_001.phpt b/tests/classes/__call_001.phpt
index f9708e04f1cc7b6f60eb8e8cf96b07c818e2b6d6..ecc98744bfcb09da3fc0fcf450359fbc54fbb1b9 100644 (file)
--- a/tests/classes/__call_001.phpt
+++ b/tests/classes/__call_001.phpt
@@ -40,3 +40,23 @@ array(3) {
   [2]=>
   int(3)
 }
+--UEXPECT--
+Method test called:
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  unicode(1) "2"
+  [2]=>
+  float(3.4)
+  [3]=>
+  bool(true)
+}
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}

diff --git a/tests/classes/__set__get_001.phpt b/tests/classes/__set__get_001.phpt
index beb688c2229a4aa3af52e6b0f3e17e3bc26d9bca..105419e33e43dad3b1ce39541e788ca222f706ee 100644 (file)
--- a/tests/classes/__set__get_001.phpt
+++ b/tests/classes/__set__get_001.phpt
@@ -70,3 +70,27 @@ object(setter)#%d (2) {
     int(3)
   }
 }
+--UEXPECTF--
+Setting [a] to 100
+OK!
+Getting [a]
+Returning: 100
+Setting [a] to 101
+OK!
+Getting [z]
+Nothing!
+Setting [z] to 1
+Not OK!
+object(setter)#%d (2) {
+  [u"n"]=>
+  int(1)
+  [u"x"]=>
+  array(3) {
+    [u"a"]=>
+    int(101)
+    [u"b"]=>
+    int(2)
+    [u"c"]=>
+    int(3)
+  }
+}

diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt
index e3061da4f06b171b531eacbab4609f6be76558f6..b739428f33b3ab5b67932c6d3b21d66be30449a2 100755 (executable)
--- a/tests/classes/__set__get_004.phpt
+++ b/tests/classes/__set__get_004.phpt
@@ -33,7 +33,11 @@ var_dump($foo->bar->baz);
 
 ?>
 ===DONE===
---EXPECTF--
+--EXPECT--
 string(5) "Check"
 string(5) "Check"
 ===DONE===
+--UEXPECT--
+unicode(5) "Check"
+unicode(5) "Check"
+===DONE===

diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt
index d8bbad3d458c61dd2fc1ad65a1d03faf94118919..34fd567bfd7db76fd80af9892816727cee50017c 100755 (executable)
--- a/tests/classes/__set__get_005.phpt
+++ b/tests/classes/__set__get_005.phpt
@@ -66,3 +66,18 @@ AutoGen::__get
 Test::__get
 string(5) "Check"
 ===DONE===
+--UEXPECTF--
+AutoGen::__get
+Test::__set
+AutoGen::__get
+object(Test)#%d (1) {
+  [u"x":protected]=>
+  array(1) {
+    [u"baz"]=>
+    unicode(5) "Check"
+  }
+}
+AutoGen::__get
+Test::__get
+unicode(5) "Check"
+===DONE===

diff --git a/tests/classes/array_access_001.phpt b/tests/classes/array_access_001.phpt
index 82f96d5239f108e81b9c1732e227ef5e80222c50..76eb9a676f8426e49fc01375c191da5014ca56bf 100644 (file)
--- a/tests/classes/array_access_001.phpt
+++ b/tests/classes/array_access_001.phpt
@@ -196,3 +196,116 @@ array(4) {
   string(9) "changed 6"
 }
 ===DONE===
+--UEXPECTF--
+array(4) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  int(1)
+  [2]=>
+  unicode(3) "3rd"
+  [u"4th"]=>
+  int(4)
+}
+===EMPTY===
+object::offsetExists(0)
+object::offsetGet(0)
+bool(false)
+object::offsetExists(1)
+object::offsetGet(1)
+bool(false)
+object::offsetExists(2)
+object::offsetGet(2)
+bool(false)
+object::offsetExists(4th)
+object::offsetGet(4th)
+bool(false)
+object::offsetExists(5th)
+bool(true)
+object::offsetExists(6)
+bool(true)
+===isset===
+object::offsetExists(0)
+bool(true)
+object::offsetExists(1)
+bool(true)
+object::offsetExists(2)
+bool(true)
+object::offsetExists(4th)
+bool(true)
+object::offsetExists(5th)
+bool(false)
+object::offsetExists(6)
+bool(false)
+===offsetGet===
+object::offsetGet(0)
+unicode(3) "1st"
+object::offsetGet(1)
+int(1)
+object::offsetGet(2)
+unicode(3) "3rd"
+object::offsetGet(4th)
+int(4)
+object::offsetGet(5th)
+
+Notice: Undefined index:  5th in %sarray_access_001.php on line %d
+NULL
+object::offsetGet(6)
+
+Notice: Undefined offset:  6 in %sarray_access_001.php on line %d
+NULL
+===offsetSet===
+WRITE 1
+object::offsetSet(1,Changed 1)
+object::offsetGet(1)
+unicode(9) "Changed 1"
+WRITE 2
+object::offsetSet(4th,Changed 4th)
+object::offsetGet(4th)
+unicode(11) "Changed 4th"
+WRITE 3
+object::offsetSet(5th,Added 5th)
+object::offsetGet(5th)
+unicode(9) "Added 5th"
+WRITE 4
+object::offsetSet(6,Added 6)
+object::offsetGet(6)
+unicode(7) "Added 6"
+object::offsetGet(0)
+unicode(3) "1st"
+object::offsetGet(2)
+unicode(3) "3rd"
+object::offsetSet(6,changed 6)
+object::offsetGet(6)
+unicode(9) "changed 6"
+unicode(9) "changed 6"
+===unset===
+array(6) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  unicode(9) "Changed 1"
+  [2]=>
+  unicode(3) "3rd"
+  [u"4th"]=>
+  unicode(11) "Changed 4th"
+  [u"5th"]=>
+  unicode(9) "Added 5th"
+  [6]=>
+  unicode(9) "changed 6"
+}
+object::offsetUnset(2)
+object::offsetUnset(4th)
+object::offsetUnset(7)
+object::offsetUnset(8th)
+array(4) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  unicode(9) "Changed 1"
+  [u"5th"]=>
+  unicode(9) "Added 5th"
+  [6]=>
+  unicode(9) "changed 6"
+}
+===DONE===

diff --git a/tests/classes/array_access_002.phpt b/tests/classes/array_access_002.phpt
index fd08eb39465a9b0e92dd830c34723f5dbce93e93..c4048068313849bdd9d689f04a4d2fc303fec192 100644 (file)
--- a/tests/classes/array_access_002.phpt
+++ b/tests/classes/array_access_002.phpt
@@ -196,3 +196,116 @@ array(4) {
   string(9) "changed 6"
 }
 ===DONE===
+--UEXPECTF--
+array(4) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  int(1)
+  [2]=>
+  unicode(3) "3rd"
+  [u"4th"]=>
+  int(4)
+}
+===EMPTY===
+object::offsetExists(0)
+object::offsetGet(0)
+bool(false)
+object::offsetExists(1)
+object::offsetGet(1)
+bool(false)
+object::offsetExists(2)
+object::offsetGet(2)
+bool(false)
+object::offsetExists(4th)
+object::offsetGet(4th)
+bool(false)
+object::offsetExists(5th)
+bool(true)
+object::offsetExists(6)
+bool(true)
+===isset===
+object::offsetExists(0)
+bool(true)
+object::offsetExists(1)
+bool(true)
+object::offsetExists(2)
+bool(true)
+object::offsetExists(4th)
+bool(true)
+object::offsetExists(5th)
+bool(false)
+object::offsetExists(6)
+bool(false)
+===offsetGet===
+object::offsetGet(0)
+unicode(3) "1st"
+object::offsetGet(1)
+int(1)
+object::offsetGet(2)
+unicode(3) "3rd"
+object::offsetGet(4th)
+int(4)
+object::offsetGet(5th)
+
+Notice: Undefined index:  5th in %sarray_access_002.php on line %d
+NULL
+object::offsetGet(6)
+
+Notice: Undefined offset:  6 in %sarray_access_002.php on line %d
+NULL
+===offsetSet===
+WRITE 1
+object::offsetSet(1,Changed 1)
+object::offsetGet(1)
+unicode(9) "Changed 1"
+WRITE 2
+object::offsetSet(4th,Changed 4th)
+object::offsetGet(4th)
+unicode(11) "Changed 4th"
+WRITE 3
+object::offsetSet(5th,Added 5th)
+object::offsetGet(5th)
+unicode(9) "Added 5th"
+WRITE 4
+object::offsetSet(6,Added 6)
+object::offsetGet(6)
+unicode(7) "Added 6"
+object::offsetGet(0)
+unicode(3) "1st"
+object::offsetGet(2)
+unicode(3) "3rd"
+object::offsetSet(6,changed 6)
+object::offsetGet(6)
+unicode(9) "changed 6"
+unicode(9) "changed 6"
+===unset===
+array(6) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  unicode(9) "Changed 1"
+  [2]=>
+  unicode(3) "3rd"
+  [u"4th"]=>
+  unicode(11) "Changed 4th"
+  [u"5th"]=>
+  unicode(9) "Added 5th"
+  [6]=>
+  unicode(9) "changed 6"
+}
+object::offsetUnset(2)
+object::offsetUnset(4th)
+object::offsetUnset(7)
+object::offsetUnset(8th)
+array(4) {
+  [0]=>
+  unicode(3) "1st"
+  [1]=>
+  unicode(9) "Changed 1"
+  [u"5th"]=>
+  unicode(9) "Added 5th"
+  [6]=>
+  unicode(9) "changed 6"
+}
+===DONE===

diff --git a/tests/classes/array_access_003.phpt b/tests/classes/array_access_003.phpt
index 2d42665fc69b781628c40755f9fd6001432157dc..7c65bedaf6ec9bb2439964a76b61021ce2c64343 100644 (file)
--- a/tests/classes/array_access_003.phpt
+++ b/tests/classes/array_access_003.phpt
@@ -54,3 +54,11 @@ int(1)
 object::offsetGet(2)
 
 Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_003.php on line %d
+--UEXPECTF--
+object::offsetGet(1)
+unicode(6) "fooBar"
+object::offsetGet(2)
+int(1)
+object::offsetGet(2)
+
+Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_003.php on line %d

diff --git a/tests/classes/array_access_004.phpt b/tests/classes/array_access_004.phpt
index 17f5b7c404051c5854b98cacd4db18e957cee1b6..30f179966a0a509f38fcae8b87d51396a90b9862 100644 (file)
--- a/tests/classes/array_access_004.phpt
+++ b/tests/classes/array_access_004.phpt
@@ -52,3 +52,11 @@ int(1)
 object::offsetGet(2)
 
 Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_004.php on line %d
+--UEXPECTF--
+object::offsetGet(1)
+unicode(6) "fooBar"
+object::offsetGet(2)
+int(1)
+object::offsetGet(2)
+
+Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_004.php on line %d

diff --git a/tests/classes/array_access_005.phpt b/tests/classes/array_access_005.phpt
index f248f2172c8a5de701610b13509e09864ef880fb..bd12d94c88f8a8c5f253e10cb847af1ea2d6c469 100755 (executable)
--- a/tests/classes/array_access_005.phpt
+++ b/tests/classes/array_access_005.phpt
@@ -70,3 +70,20 @@ array(1) {
 }
 
 Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_005.php on line %d
+--UEXPECTF--
+unicode(3) "Joe"
+unicode(6) "JoeFoo"
+unicode(9) "JoeFooBar"
+---ArrayOverloading---
+array(1) {
+  [u"name"]=>
+  unicode(3) "Joe"
+}
+unicode(3) "Joe"
+unicode(6) "JoeFoo"
+array(1) {
+  [u"name"]=>
+  unicode(6) "JoeFoo"
+}
+
+Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_005.php on line %d

diff --git a/tests/classes/array_access_008.phpt b/tests/classes/array_access_008.phpt
index 01303882453b8f7106332481b781bc15e43682ec..61479f705d650adb2c3c5195aa19589b7e12f471 100755 (executable)
--- a/tests/classes/array_access_008.phpt
+++ b/tests/classes/array_access_008.phpt
@@ -57,3 +57,11 @@ string(9) "FooBarBaz"
 string(3) "Foo"
 
 Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_008.php on line %d
+--UEXPECTF--
+unicode(3) "Foo"
+unicode(6) "FooBar"
+unicode(9) "FooBarBaz"
+===ArrayOverloading===
+unicode(3) "Foo"
+
+Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_008.php on line %d

diff --git a/tests/classes/array_access_009.phpt b/tests/classes/array_access_009.phpt
index f77dd7bfc5cd3c1edc17c4941403711f511949f3..681fc7a8cd00ceaddd83b1f2b5bf79560b73f1f6 100755 (executable)
--- a/tests/classes/array_access_009.phpt
+++ b/tests/classes/array_access_009.phpt
@@ -188,3 +188,68 @@ ArrayProxy::__construct(0)
 ArrayProxy::offsetGet(0, name)
 string(6) "BlaBla"
 ===DONE===
+--UEXPECTF--
+unicode(3) "Foo"
+unicode(6) "FooBar"
+unicode(9) "FooBarBaz"
+===ArrayOverloading===
+ArrayProxy::__construct(0)
+object(ArrayProxy)#1 (2) {
+  [u"object":u"ArrayProxy":private]=>
+  object(Peoples)#2 (1) {
+    [u"person"]=>
+    array(1) {
+      [0]=>
+      array(1) {
+        [u"name"]=>
+        unicode(3) "Foo"
+      }
+    }
+  }
+  [u"element":u"ArrayProxy":private]=>
+  int(0)
+}
+ArrayProxy::__construct(0)
+ArrayProxy::offsetGet(0, name)
+unicode(3) "Foo"
+ArrayProxy::__construct(0)
+ArrayProxy::offsetSet(0, name, FooBar)
+ArrayProxy::__construct(0)
+ArrayProxy::offsetGet(0, name)
+unicode(6) "FooBar"
+ArrayProxy::__construct(0)
+ArrayProxy::offsetSet(0, name, FooBarBar)
+ArrayProxy::__construct(0)
+ArrayProxy::offsetGet(0, name)
+unicode(9) "FooBarBar"
+ArrayProxy::__construct(0)
+ArrayProxy::offsetGet(0, name)
+ArrayProxy::offsetSet(0, name, FooBarBarBaz)
+ArrayProxy::__construct(0)
+ArrayProxy::offsetGet(0, name)
+unicode(12) "FooBarBarBaz"
+ArrayProxy::__construct(0)
+ArrayProxy::offsetUnset(0, name)
+ArrayProxy::__construct(0)
+object(ArrayProxy)#1 (2) {
+  [u"object":u"ArrayProxy":private]=>
+  object(Peoples)#2 (1) {
+    [u"person"]=>
+    array(1) {
+      [0]=>
+      array(0) {
+      }
+    }
+  }
+  [u"element":u"ArrayProxy":private]=>
+  int(0)
+}
+ArrayProxy::__construct(0)
+ArrayProxy::offsetGet(0, name)
+NULL
+ArrayProxy::__construct(0)
+ArrayProxy::offsetSet(0, name, BlaBla)
+ArrayProxy::__construct(0)
+ArrayProxy::offsetGet(0, name)
+unicode(6) "BlaBla"
+===DONE===

diff --git a/tests/classes/array_access_010.phpt b/tests/classes/array_access_010.phpt
index f655217953b6079bd5b70349d264b37426ddd7f4..71865b5fe78b1cf915756790c827cb6c654ef548 100755 (executable)
--- a/tests/classes/array_access_010.phpt
+++ b/tests/classes/array_access_010.phpt
@@ -166,3 +166,72 @@ ArrayReferenceProxy::__construct(Array)
 ArrayReferenceProxy::offsetGet(Array, name)
 string(6) "BlaBla"
 ===DONE===
+--UEXPECTF--
+unicode(3) "Foo"
+unicode(6) "FooBar"
+unicode(9) "FooBarBaz"
+===ArrayOverloading===
+ArrayReferenceProxy::__construct(Array)
+object(ArrayReferenceProxy)#1 (2) {
+  [u"object":u"ArrayReferenceProxy":private]=>
+  object(Peoples)#2 (1) {
+    [u"person"]=>
+    array(1) {
+      [0]=>
+      &array(1) {
+        [u"name"]=>
+        unicode(3) "Foo"
+      }
+    }
+  }
+  [u"element":u"ArrayReferenceProxy":private]=>
+  &array(1) {
+    [u"name"]=>
+    unicode(3) "Foo"
+  }
+}
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetGet(Array, name)
+unicode(3) "Foo"
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetSet(Array, name, FooBar)
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetGet(Array, name)
+unicode(6) "FooBar"
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetSet(Array, name, FooBarBar)
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetGet(Array, name)
+unicode(9) "FooBarBar"
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetGet(Array, name)
+ArrayReferenceProxy::offsetSet(Array, name, FooBarBarBaz)
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetGet(Array, name)
+unicode(12) "FooBarBarBaz"
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetUnset(Array, name)
+ArrayReferenceProxy::__construct(Array)
+object(ArrayReferenceProxy)#1 (2) {
+  [u"object":u"ArrayReferenceProxy":private]=>
+  object(Peoples)#2 (1) {
+    [u"person"]=>
+    array(1) {
+      [0]=>
+      &array(0) {
+      }
+    }
+  }
+  [u"element":u"ArrayReferenceProxy":private]=>
+  &array(0) {
+  }
+}
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetGet(Array, name)
+NULL
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetSet(Array, name, BlaBla)
+ArrayReferenceProxy::__construct(Array)
+ArrayReferenceProxy::offsetGet(Array, name)
+unicode(6) "BlaBla"
+===DONE===

diff --git a/tests/classes/array_access_011.phpt b/tests/classes/array_access_011.phpt
index 1242edb8afa2efb21ddc33c03cb9630bc39d1ceb..393814cd2e9b39c8195de0560da1c55dbe308d22 100755 (executable)
--- a/tests/classes/array_access_011.phpt
+++ b/tests/classes/array_access_011.phpt
@@ -185,3 +185,82 @@ ArrayAccessReferenceProxy::__construct(0)
 ArrayAccessReferenceProxy::offsetGet(0, name)
 string(6) "BlaBla"
 ===DONE===
+--UEXPECTF--
+unicode(3) "Foo"
+unicode(6) "FooBar"
+unicode(9) "FooBarBaz"
+===ArrayOverloading===
+ArrayAccessReferenceProxy::__construct(0)
+object(ArrayAccessReferenceProxy)#1 (3) {
+  [u"object":u"ArrayAccessReferenceProxy":private]=>
+  object(Peoples)#2 (1) {
+    [u"person"]=>
+    &array(1) {
+      [0]=>
+      array(1) {
+        [u"name"]=>
+        unicode(3) "Foo"
+      }
+    }
+  }
+  [u"oarray":u"ArrayAccessReferenceProxy":private]=>
+  &array(1) {
+    [0]=>
+    array(1) {
+      [u"name"]=>
+      unicode(3) "Foo"
+    }
+  }
+  [u"element":u"ArrayAccessReferenceProxy":private]=>
+  int(0)
+}
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetGet(0, name)
+unicode(3) "Foo"
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetSet(0, name, FooBar)
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetGet(0, name)
+unicode(6) "FooBar"
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBar)
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetGet(0, name)
+unicode(9) "FooBarBar"
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetGet(0, name)
+ArrayAccessReferenceProxy::offsetSet(0, name, FooBarBarBaz)
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetGet(0, name)
+unicode(12) "FooBarBarBaz"
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetUnset(0, name)
+ArrayAccessReferenceProxy::__construct(0)
+object(ArrayAccessReferenceProxy)#1 (3) {
+  [u"object":u"ArrayAccessReferenceProxy":private]=>
+  object(Peoples)#2 (1) {
+    [u"person"]=>
+    &array(1) {
+      [0]=>
+      array(0) {
+      }
+    }
+  }
+  [u"oarray":u"ArrayAccessReferenceProxy":private]=>
+  &array(1) {
+    [0]=>
+    array(0) {
+    }
+  }
+  [u"element":u"ArrayAccessReferenceProxy":private]=>
+  int(0)
+}
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetGet(0, name)
+NULL
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetSet(0, name, BlaBla)
+ArrayAccessReferenceProxy::__construct(0)
+ArrayAccessReferenceProxy::offsetGet(0, name)
+unicode(6) "BlaBla"
+===DONE===

diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt
index 27dea0f9d4f82a35d4f6a85426bc95f8ae608b37..dd2a3324a2c68d0c1fb01574ba08d69403cdf690 100755 (executable)
--- a/tests/classes/autoload_002.phpt
+++ b/tests/classes/autoload_002.phpt
@@ -25,3 +25,10 @@ array(1) {
   string(12) "testFunction"
 }
 ===DONE===
+--UEXPECT--
+__autoload(autoload_root)
+array(1) {
+  [0]=>
+  unicode(12) "testFunction"
+}
+===DONE===

diff --git a/tests/classes/clone_001.phpt b/tests/classes/clone_001.phpt
index eb06c1f5206a2563a8a128e5201cf9be39669e85..b4554dc30de5b2e5f033265ac5d7b611f8446dfa 100755 (executable)
--- a/tests/classes/clone_001.phpt
+++ b/tests/classes/clone_001.phpt
@@ -41,3 +41,23 @@ object(test)#2 (3) {
   string(1) "C"
 }
 Done
+--UEXPECT--
+Object
+object(test)#1 (3) {
+  [u"p1"]=>
+  int(1)
+  [u"p2"]=>
+  unicode(1) "A"
+  [u"p3"]=>
+  unicode(1) "B"
+}
+Clown
+object(test)#2 (3) {
+  [u"p1"]=>
+  int(1)
+  [u"p2"]=>
+  unicode(1) "A"
+  [u"p3"]=>
+  unicode(1) "C"
+}
+Done

diff --git a/tests/classes/clone_002.phpt b/tests/classes/clone_002.phpt
index 4430a2cab4d5699a27baf1dce16f6cb37dcee150..2c319ed3d27dfbaab1924c50a7f3d4a6981fce69 100755 (executable)
--- a/tests/classes/clone_002.phpt
+++ b/tests/classes/clone_002.phpt
@@ -43,3 +43,23 @@ object(test)#2 (3) {
   string(1) "C"
 }
 Done
+--UEXPECT--
+Object
+object(test)#1 (3) {
+  [u"p1"]=>
+  int(1)
+  [u"p2"]=>
+  unicode(1) "A"
+  [u"p3"]=>
+  unicode(1) "B"
+}
+Clown
+object(test)#2 (3) {
+  [u"p1"]=>
+  int(1)
+  [u"p2"]=>
+  unicode(1) "A"
+  [u"p3"]=>
+  unicode(1) "C"
+}
+Done

diff --git a/tests/classes/clone_004.phpt b/tests/classes/clone_004.phpt
index 2059103bc5aa0d93a228270e75b559ba9d63d85f..1116aa62d331983ca35625c665e5226605d2b0b6 100755 (executable)
--- a/tests/classes/clone_004.phpt
+++ b/tests/classes/clone_004.phpt
@@ -80,3 +80,46 @@ object(test)#2 (2) {
   int(5)
 }
 Done
+--UEXPECT--
+Original
+object(test)#1 (2) {
+  [u"b"]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+  [u"a"]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+Clone
+object(test)#2 (2) {
+  [u"b"]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(4)
+  }
+  [u"a"]=>
+  array(2) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+  }
+}
+Modify
+object(test)#2 (2) {
+  [u"b"]=>
+  int(6)
+  [u"a"]=>
+  int(5)
+}
+Done

diff --git a/tests/classes/inheritance_002.phpt b/tests/classes/inheritance_002.phpt
index cca528e29c89fa27d670640aea67e7b09064f328..185a9132801630540e3dde8c124da1cf0011c52d 100755 (executable)
--- a/tests/classes/inheritance_002.phpt
+++ b/tests/classes/inheritance_002.phpt
@@ -69,3 +69,16 @@ string(16) "Base constructor"
 ### Mixed style 2
 string(17) "Child constructor"
 string(16) "Base constructor"
+--UEXPECT--
+### PHP 4 style
+unicode(17) "Child constructor"
+unicode(16) "Base constructor"
+### PHP 5 style
+unicode(17) "Child constructor"
+unicode(16) "Base constructor"
+### Mixed style 1
+unicode(17) "Child constructor"
+unicode(16) "Base constructor"
+### Mixed style 2
+unicode(17) "Child constructor"
+unicode(16) "Base constructor"

diff --git a/tests/lang/038.phpt b/tests/lang/038.phpt
index 195050b2fbc087680521876c921ed586521bf333..ef510d22374fa8a422551b4b70492d99f7564a2b 100755 (executable)
--- a/tests/lang/038.phpt
+++ b/tests/lang/038.phpt
@@ -39,3 +39,7 @@ catch (Exception $e)
 string(15) "Error2Exception"
 string(5) "fopen"
 ===DONE===
+--UEXPECTF--
+unicode(15) "Error2Exception"
+unicode(5) "fopen"
+===DONE===

diff --git a/tests/lang/bug19943.phpt b/tests/lang/bug19943.phpt
index 3be703fb1d1732f97436cfe0c39e5871e888b134..dae06c9c72977c3998fdd1665fb48b1bd38c3c5a 100644 (file)
--- a/tests/lang/bug19943.phpt
+++ b/tests/lang/bug19943.phpt
@@ -27,3 +27,15 @@ Bug #19943 (memleaks)
 8 -- 8
 9 -- 9
 string(10) "0123456780"
+--UEXPECT--
+0 -- 0
+1 -- 1
+2 -- 2
+3 -- 3
+4 -- 4
+5 -- 5
+6 -- 6
+7 -- 7
+8 -- 8
+9 -- 9
+unicode(10) "0123456780"

diff --git a/tests/lang/bug21600.phpt b/tests/lang/bug21600.phpt
index 6ecf69a11f7f8816e280ffce3d1f611a18bf32fe..835daaf97a42315ec4b5157926e35ce557d367aa 100644 (file)
--- a/tests/lang/bug21600.phpt
+++ b/tests/lang/bug21600.phpt
@@ -37,3 +37,15 @@ array(1) {
   ["foo"]=>
   string(4) "test"
 }
+--UEXPECTF--
+Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 4
+array(1) {
+  [u"foo"]=>
+  unicode(4) "test"
+}
+
+Strict Standards: Only variables should be assigned by reference in %sbug21600.php on line 11
+array(1) {
+  [u"foo"]=>
+  unicode(4) "test"
+}

diff --git a/tests/lang/bug21961.phpt b/tests/lang/bug21961.phpt
index 24581d663e8c24205536a10fe9c2fff48fb1da43..75677c7473c73a71113402cfb9a6071a094d591f 100644 (file)
--- a/tests/lang/bug21961.phpt
+++ b/tests/lang/bug21961.phpt
@@ -56,3 +56,5 @@ var_dump($x->bars[0]->whosdrunk());
 ?>
 --EXPECT--
 string(14) "The old Tavern"
+--UEXPECT--
+unicode(14) "The old Tavern"

diff --git a/tests/lang/bug22231.phpt b/tests/lang/bug22231.phpt
index b6842c7cf6a61bd57c9c39e9207aa98a83c94d12..4e225afc9e43f686b0edd0a22c7929fd734b264f 100644 (file)
--- a/tests/lang/bug22231.phpt
+++ b/tests/lang/bug22231.phpt
@@ -40,3 +40,17 @@ object(foo)#%d (1) {
 }
 string(5) "fubar"
 string(5) "fubar"
+--UEXPECTF--
+Strict Standards: Assigning the return value of new by reference is deprecated in %s on line %d
+object(foo)#%d (1) {
+  [u"fubar"]=>
+  unicode(5) "fubar"
+}
+unicode(5) "fubar"
+unicode(5) "fubar"
+object(foo)#%d (1) {
+  [u"fubar"]=>
+  unicode(5) "fubar"
+}
+unicode(5) "fubar"
+unicode(5) "fubar"

diff --git a/tests/lang/bug22592.phpt b/tests/lang/bug22592.phpt
index e4e68b1184c23dc6886137b878bf661e0c9274d6..90043f4d024bd628d3c4c2b5d4aa984843ebc42d 100644 (file)
--- a/tests/lang/bug22592.phpt
+++ b/tests/lang/bug22592.phpt
@@ -51,3 +51,20 @@ int(4)
 int(5)
 string(1) "5"
 [Illegal string offset:  -1]
+--UEXPECT--
+unicode(5) "* *-*"
+unicode(7) "* *-* *"
+unicode(7) "*4*-* *"
+unicode(7) "*4*s* *"
+unicode(8) "*4*s* *0"
+unicode(8) "*-*-* *0"
+unicode(8) "*-*s*s*0"
+unicode(8) "4-4s4s*0"
+unicode(9) "4-4s4s505"
+unicode(9) "454s4s505"
+unicode(1) "-"
+unicode(6) "string"
+int(4)
+int(5)
+unicode(1) "5"
+[Illegal string offset:  -1]

diff --git a/tests/lang/bug23624.phpt b/tests/lang/bug23624.phpt
index 4ddb82e8c688571678d88ad84a7e969954b2f263..ae9abbd2a4707562ceb8fd2af817cd4ef96e35f2 100644 (file)
--- a/tests/lang/bug23624.phpt
+++ b/tests/lang/bug23624.phpt
@@ -10,3 +10,6 @@ Bug #23624 (foreach leaves current array key as null)
 --EXPECT--
 string(3) "one"
 bool(false)
+--UEXPECT--
+unicode(3) "one"
+bool(false)

diff --git a/tests/strings/bug22592.phpt b/tests/strings/bug22592.phpt
index 0c13e50164f2e40fc75038028d4d1efca1693dec..2af793ab59866e37a3a5768b1afa4fa3137a8e3e 100755 (executable)
--- a/tests/strings/bug22592.phpt
+++ b/tests/strings/bug22592.phpt
@@ -25,3 +25,8 @@ string(6) "abcdef"
 string(6) "abcdef"
 string(6) "a*c*e*"
 string(6) "a*c*e*"
+--UEXPECT--
+unicode(6) "abcdef"
+unicode(6) "abcdef"
+unicode(6) "a*c*e*"
+unicode(6) "a*c*e*"