php: fiexed unpacker

php/ChangeLog

@@ -1,5 +1,9 @@
 msgpack extension changelog
 
+Version 0.3.1
+-------------
+	* Fix class MessagePackUnpacker.
+
 Version 0.3.0
 -------------
 	* Change msgpack_unpack.c (used template)

php/msgpack.c

@@ -113,7 +113,7 @@ zend_module_entry msgpack_module_entry = {
     NULL,
     ZEND_MINFO(msgpack),
 #if ZEND_MODULE_API_NO >= 20010901
-    MSGPACK_VERSION,
+    MSGPACK_EXTENSION_VERSION,
 #endif
     STANDARD_MODULE_PROPERTIES
 };

php/msgpack_class.c

@@ -19,6 +19,7 @@ typedef struct {
     msgpack_unpack_t mp;
     php_unserialize_data_t var_hash;
     long php_only;
+    zend_bool finished;
 } php_msgpack_unpacker_t;
 
 #if ZEND_MODULE_API_NO >= 20060613
@@ -348,6 +349,7 @@ static ZEND_METHOD(msgpack_unpacker, __construct)
     unpacker->buffer.a = 0;
     unpacker->retval = NULL;
     unpacker->offset = 0;
+    unpacker->finished = 0;
 
     template_init(&unpacker->mp);
 
@@ -460,6 +462,22 @@ static ZEND_METHOD(msgpack_unpacker, execute)
     {
         ALLOC_INIT_ZVAL(unpacker->retval);
     }
+    else if (unpacker->finished)
+    {
+        zval_ptr_dtor(&unpacker->retval);
+
+        msgpack_unserialize_var_destroy(&unpacker->var_hash);
+
+
+        ALLOC_INIT_ZVAL(unpacker->retval);
+
+        template_init(&unpacker->mp);
+
+        msgpack_unserialize_var_init(&unpacker->var_hash);
+
+        (&unpacker->mp)->user.var_hash =
+            (php_unserialize_data_t *)&unpacker->var_hash;
+    }
     (&unpacker->mp)->user.retval = (zval *)unpacker->retval;
 
     MSGPACK_G(error_display) = 0;
@@ -483,6 +501,7 @@ static ZEND_METHOD(msgpack_unpacker, execute)
     {
         case MSGPACK_UNPACK_EXTRA_BYTES:
         case MSGPACK_UNPACK_SUCCESS:
+            unpacker->finished = 1;
             RETURN_TRUE;
         default:
             RETURN_FALSE;
@@ -493,7 +512,16 @@ static ZEND_METHOD(msgpack_unpacker, data)
 {
     MSGPACK_UNPACKER_OBJECT;
 
-    RETURN_ZVAL(unpacker->retval, 1, 1);
+    if (unpacker->retval != NULL)
+    {
+        ZVAL_ZVAL(return_value, unpacker->retval, 1, 0);
+
+        MSGPACK_METHOD(msgpack_unpacker, reset, NULL, getThis());
+
+        return;
+    }
+
+    RETURN_FALSE;
 }
 
 static ZEND_METHOD(msgpack_unpacker, reset)
@@ -513,6 +541,7 @@ static ZEND_METHOD(msgpack_unpacker, reset)
     unpacker->buffer.len = 0;
     unpacker->buffer.a = 0;
     unpacker->offset = 0;
+    unpacker->finished = 0;
 
     if (buffer.len > 0)
     {
@@ -530,12 +559,12 @@ static ZEND_METHOD(msgpack_unpacker, reset)
     msgpack_unserialize_var_destroy(&unpacker->var_hash);
 
 
+    template_init(&unpacker->mp);
+
     msgpack_unserialize_var_init(&unpacker->var_hash);
 
     (&unpacker->mp)->user.var_hash =
         (php_unserialize_data_t *)&unpacker->var_hash;
-
-    msgpack_unserialize_init(&((&unpacker->mp)->user));
 }
 
 void msgpack_init_class()

php/package.xml

@@ -10,11 +10,11 @@
     <email>advect@gmail.com</email>
     <active>yes</active>
   </lead>
-  <date>2010-09-28</date>
+  <date>2010-10-26</date>
-  <time>17:40:09</time>
+  <time>13:44:47</time>
   <version>
-    <release>0.3.0</release>
+    <release>0.3.1</release>
-    <api>0.3.0</api>
+    <api>0.3.1</api>
   </version>
   <stability>
     <release>beta</release>
@@ -27,14 +27,14 @@
       <file md5sum="12b9d8867e5fde4af426c134283e2082" name="LICENSE" role="doc" />
       <file md5sum="8daeb22744f11b57da9d0966608e2fc1" name="README" role="doc" />
       <file md5sum="52329b794aab67446540c4c2b5537076" name="config.m4" role="src" />
-      <file md5sum="4f27f70df327b81e9392cdbb9ddcb03b" name="msgpack.c" role="src" />
+      <file md5sum="dc485aa81a31fc9f42b2b42b3554b41b" name="msgpack.c" role="src" />
-      <file md5sum="f6c6a226db5fb12064e89626220fed62" name="msgpack_class.c" role="src" />
+      <file md5sum="2a27ea5a6c13c65802dcd715e00c4646" name="msgpack_class.c" role="src" />
       <file md5sum="f58d228c0b7ace35fc85178f1aa2fb22" name="msgpack_class.h" role="src" />
       <file md5sum="177fdfa077b5d23bc22553ad6e051ec2" name="msgpack_pack.c" role="src" />
       <file md5sum="eae6797621ca53f8a7b0c2d9cb8a4d21" name="msgpack_pack.h" role="src" />
       <file md5sum="1a832b3cbc1d41a2ec1a68584339c868" name="msgpack_unpack.c" role="src" />
       <file md5sum="ed466f04f0608165701a5273a587de1c" name="msgpack_unpack.h" role="src" />
-      <file md5sum="896b8986bbdfe2af7f6898efd2b82f90" name="php_msgpack.h" role="src" />
+      <file md5sum="61bcd8356b18d070efae7c490d00ded5" name="php_msgpack.h" role="src" />
       <file md5sum="82079e9a298ecdda2122757ddfbf576e" name="msgpack/pack_define.h" role="src" />
       <file md5sum="3f77e3df310b5c40a11ce7fee9cd6424" name="msgpack/pack_template.h" role="src" />
       <file md5sum="09510085da29090ea0f3919c2e708f46" name="msgpack/unpack_define.h" role="src" />
@@ -49,8 +49,8 @@
       <file md5sum="e0488f07f26c74d1c918634c39555d6e" name="tests/006.phpt" role="test" />
       <file md5sum="9574605f18eef124b55ede353d255511" name="tests/007.phpt" role="test" />
       <file md5sum="dc3584b04311da2a627c6a271a782d2c" name="tests/008.phpt" role="test" />
-      <file md5sum="7804070722539804a91d0bd2c831d802" name="tests/009.phpt" role="test" />
+      <file md5sum="72fdd3007ec537174e1a0418c2e289d9" name="tests/009.phpt" role="test" />
-      <file md5sum="2621e92078703654fc414fb084816c9d" name="tests/009b.phpt" role="test" />
+      <file md5sum="1fad34de86c39785c2928f93db79fee6" name="tests/009b.phpt" role="test" />
       <file md5sum="ddb421cd083baaca3ce3a5263f731dcd" name="tests/010.phpt" role="test" />
       <file md5sum="6a24b3b12778e2935722c97c95c9e393" name="tests/012.phpt" role="test" />
       <file md5sum="377f261d48b4f7fc78689aae481ac952" name="tests/013.phpt" role="test" />
@@ -65,14 +65,14 @@
       <file md5sum="40e429c52cbff763df7a7cdc27c2df2c" name="tests/021.phpt" role="test" />
       <file md5sum="23a30dd1eca67eaaf5b640d2153c8c5f" name="tests/022.phpt" role="test" />
       <file md5sum="2ccb3302060dbd9395879e215c9b2072" name="tests/023.phpt" role="test" />
-      <file md5sum="ff8767e0976fcfee9c885d5a737d0f7c" name="tests/024.phpt" role="test" />
+      <file md5sum="9c8a79da44818eb545aeec7e37e208b3" name="tests/024.phpt" role="test" />
-      <file md5sum="b2705eb1bbbe1c08e20f4b7217756248" name="tests/024b.phpt" role="test" />
+      <file md5sum="44e691093efc5f4dd93e512bf15df9f5" name="tests/024b.phpt" role="test" />
       <file md5sum="5c2921e615f38d922cff04689aa61b7d" name="tests/025.phpt" role="test" />
-      <file md5sum="7dd1ec82dfe82ee44f60ec520c7fd0e1" name="tests/026.phpt" role="test" />
+      <file md5sum="1af2f7e41cee1553b2bdecbccf6dd574" name="tests/026.phpt" role="test" />
-      <file md5sum="225e04ca20c5db3becdb0f7577bcfd18" name="tests/026b.phpt" role="test" />
+      <file md5sum="0d4bbab97b4b6a288c5d140ab6ba5b4c" name="tests/026b.phpt" role="test" />
       <file md5sum="445c65386d71ed17e1180a3fd6e608d7" name="tests/027.phpt" role="test" />
-      <file md5sum="c10653ad3dcf8256d3c10fe717b2ad04" name="tests/028.phpt" role="test" />
+      <file md5sum="f9a2b53540d751f8d2e918758e964968" name="tests/028.phpt" role="test" />
-      <file md5sum="b090a261b6539d4ba2d4275d0ba57c3f" name="tests/028b.phpt" role="test" />
+      <file md5sum="355cbc6cebfdd4dbd4c47ae1a8947826" name="tests/028b.phpt" role="test" />
       <file md5sum="f380a42cf429a8fb72c50f9d38228109" name="tests/029.phpt" role="test" />
       <file md5sum="7de90bedec2c170da12144bb3399dfe5" name="tests/030.phpt" role="test" />
       <file md5sum="7ca67b854f69837658cc741ce42b8ed8" name="tests/031.phpt" role="test" />
@@ -82,22 +82,28 @@
       <file md5sum="661553a8ccd9b83c95772dd9ad68d82b" name="tests/035.phpt" role="test" />
       <file md5sum="2418498403672bfce1087c4b4d277d1d" name="tests/040.phpt" role="test" />
       <file md5sum="011672f35987ed8e52b7c9afde98bb8d" name="tests/041.phpt" role="test" />
-      <file md5sum="ac28799e22762ff27e331aa060a792ad" name="tests/042.phpt" role="test" />
+      <file md5sum="1073706e82b72a1c845d09273d95b256" name="tests/042.phpt" role="test" />
       <file md5sum="57478f4e95bd000bf73a8331e9e19cba" name="tests/050.phpt" role="test" />
-      <file md5sum="c34e0f1af0f9b79dc045d9839d36603c" name="tests/060.phpt" role="test" />
+      <file md5sum="3067fa10e2d27c2823b648d0452c8c46" name="tests/060.phpt" role="test" />
-      <file md5sum="591715d0a8437e44e02af2ec55a82a34" name="tests/060b.phpt" role="test" />
+      <file md5sum="b42eb220260d4fe1e840d314b53a1add" name="tests/060b.phpt" role="test" />
-      <file md5sum="e42dba2b4d02b74dad7f776a44c8e2fe" name="tests/061.phpt" role="test" />
+      <file md5sum="c1e8716a879b568185e7eb38ee7dc76c" name="tests/061.phpt" role="test" />
-      <file md5sum="75ca37fe17423cddac6ddde324d6b1ec" name="tests/061b.phpt" role="test" />
+      <file md5sum="0d9597d63ca6fcb5040e0994049766b1" name="tests/061b.phpt" role="test" />
       <file md5sum="187689f3d1d8fe3636ea7d6188e7e559" name="tests/062.phpt" role="test" />
       <file md5sum="9c91266595d01080b813fb2a056fca82" name="tests/063.phpt" role="test" />
-      <file md5sum="18c088d2ee24af0caa758ffbe92321c9" name="tests/070.phpt" role="test" />
+      <file md5sum="3bd5fc0384a9628064ae34886de6dcab" name="tests/064.phpt" role="test" />
-      <file md5sum="2f89e6a4efe59bc9491aa77af31e65fd" name="tests/070b.phpt" role="test" />
+      <file md5sum="7077fa1fbf3290e8fdf8d963fd2c7d97" name="tests/064b.phpt" role="test" />
-      <file md5sum="c82b42c39192fd9dcc6ddcf61e7c6c63" name="tests/071.phpt" role="test" />
+      <file md5sum="c0ba5f5b4d8c7751a4643cd9946fe9da" name="tests/065.phpt" role="test" />
-      <file md5sum="a2f836fa16af5f01819fd2529a783803" name="tests/071b.phpt" role="test" />
+      <file md5sum="1b3763cd9ed063eb733c5e18d726273e" name="tests/065b.phpt" role="test" />
-      <file md5sum="ca1f561229e54efd2bebc99378d1dac1" name="tests/072.phpt" role="test" />
+      <file md5sum="bad0c2dee56d9f7a8dd0161ed863915e" name="tests/066.phpt" role="test" />
-      <file md5sum="02c2644ba84bb1d78fa66e7706460edc" name="tests/072b.phpt" role="test" />
+      <file md5sum="d15e923a2bca68f5fb7e285da725c248" name="tests/067.phpt" role="test" />
-      <file md5sum="e725faa855f9760fce4815944d439c0b" name="tests/073.phpt" role="test" />
+      <file md5sum="337d4cd9d5fe8f903ab093131028a7e7" name="tests/070.phpt" role="test" />
-      <file md5sum="96b234f889dd6d391db24a21eac55cf6" name="tests/073b.phpt" role="test" />
+      <file md5sum="39fcd79bf09d3edb0c66c301ec5c9095" name="tests/070b.phpt" role="test" />
+      <file md5sum="f36922baf1228fbb306b1a1104d5b1d2" name="tests/071.phpt" role="test" />
+      <file md5sum="c75ab77ffcd25d21d31a3889b2f6fa3f" name="tests/071b.phpt" role="test" />
+      <file md5sum="0ffca7b01df0131c7093c870f30afd60" name="tests/072.phpt" role="test" />
+      <file md5sum="82c166252f9b775316b22e0082b6354e" name="tests/072b.phpt" role="test" />
+      <file md5sum="4050391dae2825de90a836828ac21ea9" name="tests/073.phpt" role="test" />
+      <file md5sum="0dc3daedec3e152ec08db132e28c6015" name="tests/073b.phpt" role="test" />
       <file md5sum="50ef1b19cea2b81bcb7cf3f3ff1d040b" name="tests/080.phpt" role="test" />
       <file md5sum="5ee3dfab84acdee232622aae101ec146" name="tests/081.phpt" role="test" />
       <file md5sum="c7f9bb84e313d1d675318373938c026a" name="tests/082.phpt" role="test" />

php/php-msgpack.spec

@@ -12,7 +12,6 @@ Packager: advect <advect@gmail.com>
 Provides: php-pecl-msgpack
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: php-devel
-Requires: msgpack
 %if 0%{?php_zend_api}
 Requires: php(zend-abi) = %{php_zend_api}
 Requires: php(api) = %{php_core_api}

php/php_msgpack.h

@@ -2,7 +2,7 @@
 #ifndef PHP_MSGPACK_H
 #define PHP_MSGPACK_H
 
-#define MSGPACK_EXTENSION_VERSION "0.3.0"
+#define MSGPACK_EXTENSION_VERSION "0.3.1"
 
 #include "ext/standard/php_smart_str.h"
 

php/tests/009.phpt

@@ -2,8 +2,8 @@
 Check for reference serialization
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -69,10 +69,6 @@ OK
 cyclic
 810082c0010082c0010082c0020002
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -82,14 +78,8 @@ array(1) {
     }
   }
 }
-  }
-}
 OK
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -99,13 +89,7 @@ array(1) {
     }
   }
 }
-  }
-}
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -115,5 +99,3 @@ array(1) {
     }
   }
 }
-  }
-}

php/tests/009b.phpt

@@ -2,8 +2,8 @@
 Check for reference serialization
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -69,6 +69,10 @@ OK
 cyclic
 810082c0010082c0010082c0020002
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -78,8 +82,14 @@ array(1) {
         }
       }
     }
+  }
+}
 OK
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -89,7 +99,13 @@ array(1) {
         }
       }
     }
+  }
+}
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -99,3 +115,5 @@ array(1) {
         }
       }
     }
+  }
+}

php/tests/024.phpt

@@ -2,8 +2,8 @@
 Recursive objects
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -156,15 +156,10 @@ object(Obj3)#%d (1) {
 OK
 objectselfrec
 83c0a44f626a34a7004f626a34006164a9004f626a34006f626a82c0020001
-object(Obj4)#%d (2) {
-  [%r"?a"?:("Obj4":)?private"?%r]=>
-  int(100)
-  [%r"?obj"?:("Obj4":)?private"?%r]=>
 object(Obj4)#%d (2) {
   [%r"?a"?:("Obj4":)?private"?%r]=>
   int(100)
   [%r"?obj"?:("Obj4":)?private"?%r]=>
   *RECURSION*
 }
-}
 OK

php/tests/024b.phpt

@@ -2,8 +2,8 @@
 Recursive objects
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -156,10 +156,15 @@ object(Obj3)#%d (1) {
 OK
 objectselfrec
 83c0a44f626a34a7004f626a34006164a9004f626a34006f626a82c0020001
+object(Obj4)#%d (2) {
+  [%r"?a"?:("Obj4":)?private"?%r]=>
+  int(100)
+  [%r"?obj"?:("Obj4":)?private"?%r]=>
   object(Obj4)#%d (2) {
     [%r"?a"?:("Obj4":)?private"?%r]=>
     int(100)
     [%r"?obj"?:("Obj4":)?private"?%r]=>
     *RECURSION*
   }
+}
 OK

php/tests/026.phpt

@@ -3,8 +3,8 @@ Cyclic array test
 --INI--
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -53,15 +53,6 @@ array(2) {
     string(1) "e"
   }
   ["f"]=>
-  &array(2) {
-    ["a"]=>
-    array(2) {
-      ["b"]=>
-      string(1) "c"
-      ["d"]=>
-      string(1) "e"
-    }
-    ["f"]=>
   &array(2) {
     ["a"]=>
     array(2) {
@@ -74,16 +65,7 @@ array(2) {
     *RECURSION*
   }
 }
-}
 OK
-array(1) {
-  ["foo"]=>
-  &array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
 array(1) {
   ["foo"]=>
   &array(3) {
@@ -95,16 +77,6 @@ array(1) {
     *RECURSION*
   }
 }
-  }
-}
-array(1) {
-  ["foo"]=>
-  &array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
 array(1) {
   ["foo"]=>
   &array(3) {
@@ -119,16 +91,6 @@ array(1) {
     }
   }
 }
-  }
-}
-array(1) {
-  ["foo"]=>
-  &array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    string(1) "b"
-    [2]=>
 array(1) {
   ["foo"]=>
   &array(3) {
@@ -143,5 +105,3 @@ array(1) {
     }
   }
 }
-  }
-}

php/tests/026b.phpt

@@ -3,8 +3,8 @@ Cyclic array test
 --INI--
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -53,6 +53,15 @@ array(2) {
     string(1) "e"
   }
   ["f"]=>
+  &array(2) {
+    ["a"]=>
+    array(2) {
+      ["b"]=>
+      string(1) "c"
+      ["d"]=>
+      string(1) "e"
+    }
+    ["f"]=>
     &array(2) {
       ["a"]=>
       array(2) {
@@ -65,7 +74,16 @@ array(2) {
       *RECURSION*
     }
   }
+}
 OK
+array(1) {
+  ["foo"]=>
+  &array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
     array(1) {
       ["foo"]=>
       &array(3) {
@@ -77,6 +95,16 @@ array(1) {
         *RECURSION*
       }
     }
+  }
+}
+array(1) {
+  ["foo"]=>
+  &array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
     array(1) {
       ["foo"]=>
       &array(3) {
@@ -91,6 +119,16 @@ array(1) {
         }
       }
     }
+  }
+}
+array(1) {
+  ["foo"]=>
+  &array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    string(1) "b"
+    [2]=>
     array(1) {
       ["foo"]=>
       &array(3) {
@@ -105,3 +143,5 @@ array(1) {
         }
       }
     }
+  }
+}

php/tests/028.phpt

@@ -2,8 +2,8 @@
 Serialize object into session, full set
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -103,10 +103,6 @@ read
 write: 84c001a36f6c6484c0a3466f6fa700466f6f00643184c0a3426172a2643182c0020002a70042617200643282c0020002a5002a00643382c0020002a5002a00643282c0020003a2643382c0020003a474657374a6666f6f626172a36e657784c0a3426172a2643184c0a3466f6fa700466f6f00643182c002000aa5002a00643282c002000aa2643382c002000aa70042617200643282c002000ba5002a00643382c002000b
 array(3) {
   ["old"]=>
-  object(Foo)#3 (3) {
-    [%r"?d1"?:("Foo":)?private"?%r]=>
-    object(Bar)#4 (3) {
-      ["d1"]=>
   object(Foo)#3 (3) {
     [%r"?d1"?:("Foo":)?private"?%r]=>
     object(Bar)#4 (3) {
@@ -136,321 +132,9 @@ array(3) {
       *RECURSION*
     }
   }
-      [%r"?d2"?:("Bar":)?private"?%r]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d3"?:protected"?%r]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-    }
-    [%r"?d2"?:protected"?%r]=>
-    object(Bar)#4 (3) {
-      ["d1"]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d2"?:("Bar":)?private"?%r]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d3"?:protected"?%r]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-    }
-    ["d3"]=>
-    object(Bar)#4 (3) {
-      ["d1"]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d2"?:("Bar":)?private"?%r]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d3"?:protected"?%r]=>
-      object(Foo)#3 (3) {
-        [%r"?d1"?:("Foo":)?private"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:protected"?%r]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-        ["d3"]=>
-        object(Bar)#4 (3) {
-          ["d1"]=>
-          *RECURSION*
-          [%r"?d2"?:("Bar":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d3"?:protected"?%r]=>
-          *RECURSION*
-        }
-      }
-    }
-  }
   ["test"]=>
   string(6) "foobar"
   ["new"]=>
-  object(Bar)#5 (3) {
-    ["d1"]=>
-    object(Foo)#6 (3) {
-      [%r"?d1"?:("Foo":)?private"?%r]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d2"?:protected"?%r]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-      ["d3"]=>
   object(Bar)#5 (3) {
     ["d1"]=>
     object(Foo)#6 (3) {
@@ -481,191 +165,3 @@ array(3) {
     }
   }
 }
-    [%r"?d2"?:("Bar":)?private"?%r]=>
-    object(Foo)#6 (3) {
-      [%r"?d1"?:("Foo":)?private"?%r]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d2"?:protected"?%r]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-      ["d3"]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-    }
-    [%r"?d3"?:protected"?%r]=>
-    object(Foo)#6 (3) {
-      [%r"?d1"?:("Foo":)?private"?%r]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-      [%r"?d2"?:protected"?%r]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-      ["d3"]=>
-      object(Bar)#5 (3) {
-        ["d1"]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d2"?:("Bar":)?private"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-        [%r"?d3"?:protected"?%r]=>
-        object(Foo)#6 (3) {
-          [%r"?d1"?:("Foo":)?private"?%r]=>
-          *RECURSION*
-          [%r"?d2"?:protected"?%r]=>
-          *RECURSION*
-          ["d3"]=>
-          *RECURSION*
-        }
-      }
-    }
-  }
-}

php/tests/028b.phpt

@@ -2,8 +2,8 @@
 Serialize object into session, full set
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -103,6 +103,10 @@ read
 write: 84c001a36f6c6484c0a3466f6fa700466f6f00643184c0a3426172a2643182c0020002a70042617200643282c0020002a5002a00643382c0020002a5002a00643282c0020003a2643382c0020003a474657374a6666f6f626172a36e657784c0a3426172a2643184c0a3466f6fa700466f6f00643182c002000aa5002a00643282c002000aa2643382c002000aa70042617200643282c002000ba5002a00643382c002000b
 array(3) {
   ["old"]=>
+  object(Foo)#3 (3) {
+    [%r"?d1"?:("Foo":)?private"?%r]=>
+    object(Bar)#4 (3) {
+      ["d1"]=>
       object(Foo)#3 (3) {
         [%r"?d1"?:("Foo":)?private"?%r]=>
         object(Bar)#4 (3) {
@@ -132,9 +136,321 @@ array(3) {
           *RECURSION*
         }
       }
+      [%r"?d2"?:("Bar":)?private"?%r]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d3"?:protected"?%r]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+    }
+    [%r"?d2"?:protected"?%r]=>
+    object(Bar)#4 (3) {
+      ["d1"]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d2"?:("Bar":)?private"?%r]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d3"?:protected"?%r]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+    }
+    ["d3"]=>
+    object(Bar)#4 (3) {
+      ["d1"]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d2"?:("Bar":)?private"?%r]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d3"?:protected"?%r]=>
+      object(Foo)#3 (3) {
+        [%r"?d1"?:("Foo":)?private"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:protected"?%r]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+        ["d3"]=>
+        object(Bar)#4 (3) {
+          ["d1"]=>
+          *RECURSION*
+          [%r"?d2"?:("Bar":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d3"?:protected"?%r]=>
+          *RECURSION*
+        }
+      }
+    }
+  }
   ["test"]=>
   string(6) "foobar"
   ["new"]=>
+  object(Bar)#5 (3) {
+    ["d1"]=>
+    object(Foo)#6 (3) {
+      [%r"?d1"?:("Foo":)?private"?%r]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d2"?:protected"?%r]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+      ["d3"]=>
       object(Bar)#5 (3) {
         ["d1"]=>
         object(Foo)#6 (3) {
@@ -165,3 +481,191 @@ array(3) {
         }
       }
     }
+    [%r"?d2"?:("Bar":)?private"?%r]=>
+    object(Foo)#6 (3) {
+      [%r"?d1"?:("Foo":)?private"?%r]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d2"?:protected"?%r]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+      ["d3"]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+    }
+    [%r"?d3"?:protected"?%r]=>
+    object(Foo)#6 (3) {
+      [%r"?d1"?:("Foo":)?private"?%r]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+      [%r"?d2"?:protected"?%r]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+      ["d3"]=>
+      object(Bar)#5 (3) {
+        ["d1"]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d2"?:("Bar":)?private"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+        [%r"?d3"?:protected"?%r]=>
+        object(Foo)#6 (3) {
+          [%r"?d1"?:("Foo":)?private"?%r]=>
+          *RECURSION*
+          [%r"?d2"?:protected"?%r]=>
+          *RECURSION*
+          ["d3"]=>
+          *RECURSION*
+        }
+      }
+    }
+  }
+}

php/tests/042.phpt

@@ -3,7 +3,7 @@ Closure
 --SKIPIF--
 <?php
 if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-    echo "skip closures only for PHP 5.3.0+";
+    echo "skip closures only for PHP 5.3.0 or newer";
 }
 --FILE--
 <?php

php/tests/060.phpt

@@ -2,8 +2,8 @@
 Check for buffered streaming unserialization
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -235,10 +235,6 @@ array(2) {
 }
 OK
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -248,8 +244,6 @@ array(1) {
     }
   }
 }
-  }
-}
 OK
 array(2) {
   ["a"]=>

php/tests/060b.phpt

@@ -2,8 +2,8 @@
 Check for buffered streaming unserialization
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -235,6 +235,10 @@ array(2) {
 }
 OK
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -244,6 +248,8 @@ array(1) {
         }
       }
     }
+  }
+}
 OK
 array(2) {
   ["a"]=>

php/tests/061.phpt

@@ -2,8 +2,8 @@
 Check for unbuffered streaming unserialization
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -240,10 +240,6 @@ array(2) {
 }
 OK
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -253,8 +249,6 @@ array(1) {
     }
   }
 }
-  }
-}
 OK
 array(2) {
   ["a"]=>

php/tests/061b.phpt

@@ -2,8 +2,8 @@
 Check for unbuffered streaming unserialization
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -240,6 +240,10 @@ array(2) {
 }
 OK
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -249,6 +253,8 @@ array(1) {
         }
       }
     }
+  }
+}
 OK
 array(2) {
   ["a"]=>

php/tests/064.phpt

@@ -0,0 +1,315 @@
+--TEST--
+Check for buffered streaming unserialization (single)
+--SKIPIF--
+<?php
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+    echo "skip tests in PHP 5.3.3 or newer";
+}
+--FILE--
+<?php
+if(!extension_loaded('msgpack')) {
+    dl('msgpack.' . PHP_SHLIB_SUFFIX);
+}
+
+$unpacker = new MessagePackUnpacker();
+
+function test($type, $variable, $test = null) {
+    $serialized = msgpack_serialize($variable);
+
+    global $unpacker;
+
+    $length = strlen($serialized);
+
+    for ($i = 0; $i < $length;) {
+        $len = rand(1, 10);
+        $str = substr($serialized, $i, $len);
+
+        $unpacker->feed($str);
+        if ($unpacker->execute())
+        {
+            $unserialized = $unpacker->data();
+            var_dump($unserialized);
+            $unpacker->reset();
+        }
+
+        $i += $len;
+    }
+
+    if (!is_bool($test))
+    {
+        echo $unserialized === $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+    else
+    {
+        echo $test || $unserialized == $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+}
+
+test('null', null);
+
+test('bool: true', true);
+test('bool: false', false);
+
+test('zero: 0', 0);
+test('small: 1', 1);
+test('small: -1', -1);
+test('medium: 1000', 1000);
+test('medium: -1000', -1000);
+test('large: 100000', 100000);
+test('large: -100000', -100000);
+
+test('double: 123.456', 123.456);
+
+test('empty: ""', "");
+test('string: "foobar"', "foobar");
+
+test('array', array(), false);
+test('array(1, 2, 3)', array(1, 2, 3), false);
+test('array(array(1, 2, 3), arr...', array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)), false);
+
+test('array("foo", "foo", "foo")', array("foo", "foo", "foo"), false);
+test('array("one" => 1, "two" => 2))', array("one" => 1, "two" => 2), false);
+test('array("kek" => "lol", "lol" => "kek")', array("kek" => "lol", "lol" => "kek"), false);
+test('array("" => "empty")', array("" => "empty"), false);
+
+$a = array('foo');
+test('array($a, $a)', array($a, $a), false);
+test('array(&$a, &$a)', array(&$a, &$a), false);
+
+$a = array(null);
+$b = array(&$a);
+$a[0] = &$b;
+
+test('cyclic', $a, true);
+
+$a = array(
+    'a' => array(
+        'b' => 'c',
+        'd' => 'e'
+        ),
+    'f' => array(
+        'g' => 'h'
+        )
+    );
+
+test('array', $a, false);
+
+class Obj {
+    public $a;
+    protected $b;
+    private $c;
+
+    function __construct($a, $b, $c) {
+        $this->a = $a;
+        $this->b = $b;
+        $this->c = $c;
+    }
+}
+
+test('object', new Obj(1, 2, 3), false);
+
+test('object', array(new Obj(1, 2, 3), new Obj(4, 5, 6)), false);
+
+$o = new Obj(1, 2, 3);
+
+test('object', array(&$o, &$o), false);
+--EXPECTF--
+NULL
+OK
+bool(true)
+OK
+bool(false)
+OK
+int(0)
+OK
+int(1)
+OK
+int(-1)
+OK
+int(1000)
+OK
+int(-1000)
+OK
+int(100000)
+OK
+int(-100000)
+OK
+float(123.456)
+OK
+string(0) ""
+OK
+string(6) "foobar"
+OK
+array(0) {
+}
+OK
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+OK
+array(3) {
+  [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)
+  }
+}
+OK
+array(3) {
+  [0]=>
+  string(3) "foo"
+  [1]=>
+  string(3) "foo"
+  [2]=>
+  string(3) "foo"
+}
+OK
+array(2) {
+  ["one"]=>
+  int(1)
+  ["two"]=>
+  int(2)
+}
+OK
+array(2) {
+  ["kek"]=>
+  string(3) "lol"
+  ["lol"]=>
+  string(3) "kek"
+}
+OK
+array(1) {
+  [""]=>
+  string(5) "empty"
+}
+OK
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
+      [0]=>
+      *RECURSION*
+    }
+  }
+}
+OK
+array(2) {
+  ["a"]=>
+  array(2) {
+    ["b"]=>
+    string(1) "c"
+    ["d"]=>
+    string(1) "e"
+  }
+  ["f"]=>
+  array(1) {
+    ["g"]=>
+    string(1) "h"
+  }
+}
+OK
+object(Obj)#%d (3) {
+  ["a"]=>
+  int(1)
+  [%r"?b"?:protected"?%r]=>
+  int(2)
+  [%r"?c"?:("Obj":)?private"?%r]=>
+  int(3)
+}
+OK
+array(2) {
+  [0]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(4)
+    [%r"?b"?:protected"?%r]=>
+    int(5)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(6)
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+}
+OK

php/tests/064b.phpt

@@ -0,0 +1,321 @@
+--TEST--
+Check for buffered streaming unserialization (single)
+--SKIPIF--
+<?php
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+    echo "skip tests in PHP 5.3.2 or older";
+}
+--FILE--
+<?php
+if(!extension_loaded('msgpack')) {
+    dl('msgpack.' . PHP_SHLIB_SUFFIX);
+}
+
+$unpacker = new MessagePackUnpacker();
+
+function test($type, $variable, $test = null) {
+    $serialized = msgpack_serialize($variable);
+
+    global $unpacker;
+
+    $length = strlen($serialized);
+
+    for ($i = 0; $i < $length;) {
+        $len = rand(1, 10);
+        $str = substr($serialized, $i, $len);
+
+        $unpacker->feed($str);
+        if ($unpacker->execute())
+        {
+            $unserialized = $unpacker->data();
+            var_dump($unserialized);
+            $unpacker->reset();
+        }
+
+        $i += $len;
+    }
+
+    if (!is_bool($test))
+    {
+        echo $unserialized === $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+    else
+    {
+        echo $test || $unserialized == $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+}
+
+test('null', null);
+
+test('bool: true', true);
+test('bool: false', false);
+
+test('zero: 0', 0);
+test('small: 1', 1);
+test('small: -1', -1);
+test('medium: 1000', 1000);
+test('medium: -1000', -1000);
+test('large: 100000', 100000);
+test('large: -100000', -100000);
+
+test('double: 123.456', 123.456);
+
+test('empty: ""', "");
+test('string: "foobar"', "foobar");
+
+test('array', array(), false);
+test('array(1, 2, 3)', array(1, 2, 3), false);
+test('array(array(1, 2, 3), arr...', array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)), false);
+
+test('array("foo", "foo", "foo")', array("foo", "foo", "foo"), false);
+test('array("one" => 1, "two" => 2))', array("one" => 1, "two" => 2), false);
+test('array("kek" => "lol", "lol" => "kek")', array("kek" => "lol", "lol" => "kek"), false);
+test('array("" => "empty")', array("" => "empty"), false);
+
+$a = array('foo');
+test('array($a, $a)', array($a, $a), false);
+test('array(&$a, &$a)', array(&$a, &$a), false);
+
+$a = array(null);
+$b = array(&$a);
+$a[0] = &$b;
+
+test('cyclic', $a, true);
+
+$a = array(
+    'a' => array(
+        'b' => 'c',
+        'd' => 'e'
+        ),
+    'f' => array(
+        'g' => 'h'
+        )
+    );
+
+test('array', $a, false);
+
+class Obj {
+    public $a;
+    protected $b;
+    private $c;
+
+    function __construct($a, $b, $c) {
+        $this->a = $a;
+        $this->b = $b;
+        $this->c = $c;
+    }
+}
+
+test('object', new Obj(1, 2, 3), false);
+
+test('object', array(new Obj(1, 2, 3), new Obj(4, 5, 6)), false);
+
+$o = new Obj(1, 2, 3);
+
+test('object', array(&$o, &$o), false);
+--EXPECTF--
+NULL
+OK
+bool(true)
+OK
+bool(false)
+OK
+int(0)
+OK
+int(1)
+OK
+int(-1)
+OK
+int(1000)
+OK
+int(-1000)
+OK
+int(100000)
+OK
+int(-100000)
+OK
+float(123.456)
+OK
+string(0) ""
+OK
+string(6) "foobar"
+OK
+array(0) {
+}
+OK
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+OK
+array(3) {
+  [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)
+  }
+}
+OK
+array(3) {
+  [0]=>
+  string(3) "foo"
+  [1]=>
+  string(3) "foo"
+  [2]=>
+  string(3) "foo"
+}
+OK
+array(2) {
+  ["one"]=>
+  int(1)
+  ["two"]=>
+  int(2)
+}
+OK
+array(2) {
+  ["kek"]=>
+  string(3) "lol"
+  ["lol"]=>
+  string(3) "kek"
+}
+OK
+array(1) {
+  [""]=>
+  string(5) "empty"
+}
+OK
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
+      [0]=>
+      &array(1) {
+        [0]=>
+        &array(1) {
+          [0]=>
+          *RECURSION*
+        }
+      }
+    }
+  }
+}
+OK
+array(2) {
+  ["a"]=>
+  array(2) {
+    ["b"]=>
+    string(1) "c"
+    ["d"]=>
+    string(1) "e"
+  }
+  ["f"]=>
+  array(1) {
+    ["g"]=>
+    string(1) "h"
+  }
+}
+OK
+object(Obj)#%d (3) {
+  ["a"]=>
+  int(1)
+  [%r"?b"?:protected"?%r]=>
+  int(2)
+  [%r"?c"?:("Obj":)?private"?%r]=>
+  int(3)
+}
+OK
+array(2) {
+  [0]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(4)
+    [%r"?b"?:protected"?%r]=>
+    int(5)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(6)
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+}
+OK

php/tests/065.phpt

@@ -0,0 +1,320 @@
+--TEST--
+Check for unbuffered streaming unserialization (single)
+--SKIPIF--
+<?php
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+    echo "skip tests in PHP 5.3.3 or newer";
+}
+--FILE--
+<?php
+if(!extension_loaded('msgpack')) {
+    dl('msgpack.' . PHP_SHLIB_SUFFIX);
+}
+
+$unpacker = new MessagePackUnpacker();
+
+function test($type, $variable, $test = null) {
+    $serialized = msgpack_serialize($variable);
+
+    global $unpacker;
+
+    $length = strlen($serialized);
+
+    $str = "";
+    $offset = 0;
+
+    for ($i = 0; $i < $length;) {
+        $len = rand(1, 10);
+        $str .= substr($serialized, $i, $len);
+
+        if ($unpacker->execute($str, $offset))
+        {
+            $unserialized = $unpacker->data();
+            var_dump($unserialized);
+
+            $unpacker->reset();
+            $str = "";
+            $offset = 0;
+        }
+
+        $i += $len;
+    }
+
+    if (!is_bool($test))
+    {
+        echo $unserialized === $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+    else
+    {
+        echo $test || $unserialized == $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+}
+
+test('null', null);
+
+test('boo:l true', true);
+test('bool: true', false);
+
+test('zero: 0', 0);
+test('small: 1', 1);
+test('small: -1', -1);
+test('medium: 1000', 1000);
+test('medium: -1000', -1000);
+test('large: 100000', 100000);
+test('large: -100000', -100000);
+
+test('double: 123.456', 123.456);
+
+test('empty: ""', "");
+test('string: "foobar"', "foobar");
+
+test('empty: array', array(), false);
+test('empty: array(1, 2, 3)', array(1, 2, 3), false);
+test('empty: array(array(1, 2, 3), arr...', array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)), false);
+
+test('array("foo", "foo", "foo")', array("foo", "foo", "foo"), false);
+test('array("one" => 1, "two" => 2))', array("one" => 1, "two" => 2), false);
+test('array("kek" => "lol", "lol" => "kek")', array("kek" => "lol", "lol" => "kek"), false);
+test('array("" => "empty")', array("" => "empty"), false);
+
+$a = array('foo');
+test('array($a, $a)', array($a, $a), false);
+test('array(&$a, &$a)', array(&$a, &$a), false);
+
+$a = array(null);
+$b = array(&$a);
+$a[0] = &$b;
+
+test('cyclic', $a, true);
+
+$a = array(
+    'a' => array(
+        'b' => 'c',
+        'd' => 'e'
+        ),
+    'f' => array(
+        'g' => 'h'
+        )
+    );
+
+test('array', $a, false);
+
+class Obj {
+    public $a;
+    protected $b;
+    private $c;
+
+    function __construct($a, $b, $c) {
+        $this->a = $a;
+        $this->b = $b;
+        $this->c = $c;
+    }
+}
+
+test('object', new Obj(1, 2, 3), false);
+
+test('object', array(new Obj(1, 2, 3), new Obj(4, 5, 6)), false);
+
+$o = new Obj(1, 2, 3);
+
+test('object', array(&$o, &$o), false);
+--EXPECTF--
+NULL
+OK
+bool(true)
+OK
+bool(false)
+OK
+int(0)
+OK
+int(1)
+OK
+int(-1)
+OK
+int(1000)
+OK
+int(-1000)
+OK
+int(100000)
+OK
+int(-100000)
+OK
+float(123.456)
+OK
+string(0) ""
+OK
+string(6) "foobar"
+OK
+array(0) {
+}
+OK
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+OK
+array(3) {
+  [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)
+  }
+}
+OK
+array(3) {
+  [0]=>
+  string(3) "foo"
+  [1]=>
+  string(3) "foo"
+  [2]=>
+  string(3) "foo"
+}
+OK
+array(2) {
+  ["one"]=>
+  int(1)
+  ["two"]=>
+  int(2)
+}
+OK
+array(2) {
+  ["kek"]=>
+  string(3) "lol"
+  ["lol"]=>
+  string(3) "kek"
+}
+OK
+array(1) {
+  [""]=>
+  string(5) "empty"
+}
+OK
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
+      [0]=>
+      *RECURSION*
+    }
+  }
+}
+OK
+array(2) {
+  ["a"]=>
+  array(2) {
+    ["b"]=>
+    string(1) "c"
+    ["d"]=>
+    string(1) "e"
+  }
+  ["f"]=>
+  array(1) {
+    ["g"]=>
+    string(1) "h"
+  }
+}
+OK
+object(Obj)#%d (3) {
+  ["a"]=>
+  int(1)
+  [%r"?b"?:protected"?%r]=>
+  int(2)
+  [%r"?c"?:("Obj":)?private"?%r]=>
+  int(3)
+}
+OK
+array(2) {
+  [0]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(4)
+    [%r"?b"?:protected"?%r]=>
+    int(5)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(6)
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+}
+OK

php/tests/065b.phpt

@@ -0,0 +1,326 @@
+--TEST--
+Check for unbuffered streaming unserialization (single)
+--SKIPIF--
+<?php
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+    echo "skip tests in PHP 5.3.2 or older";
+}
+--FILE--
+<?php
+if(!extension_loaded('msgpack')) {
+    dl('msgpack.' . PHP_SHLIB_SUFFIX);
+}
+
+$unpacker = new MessagePackUnpacker();
+
+function test($type, $variable, $test = null) {
+    $serialized = msgpack_serialize($variable);
+
+    global $unpacker;
+
+    $length = strlen($serialized);
+
+    $str = "";
+    $offset = 0;
+
+    for ($i = 0; $i < $length;) {
+        $len = rand(1, 10);
+        $str .= substr($serialized, $i, $len);
+
+        if ($unpacker->execute($str, $offset))
+        {
+            $unserialized = $unpacker->data();
+            var_dump($unserialized);
+
+            $unpacker->reset();
+            $str = "";
+            $offset = 0;
+        }
+
+        $i += $len;
+    }
+
+    if (!is_bool($test))
+    {
+        echo $unserialized === $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+    else
+    {
+        echo $test || $unserialized == $variable ? 'OK' : 'ERROR', PHP_EOL;
+    }
+}
+
+test('null', null);
+
+test('boo:l true', true);
+test('bool: true', false);
+
+test('zero: 0', 0);
+test('small: 1', 1);
+test('small: -1', -1);
+test('medium: 1000', 1000);
+test('medium: -1000', -1000);
+test('large: 100000', 100000);
+test('large: -100000', -100000);
+
+test('double: 123.456', 123.456);
+
+test('empty: ""', "");
+test('string: "foobar"', "foobar");
+
+test('empty: array', array(), false);
+test('empty: array(1, 2, 3)', array(1, 2, 3), false);
+test('empty: array(array(1, 2, 3), arr...', array(array(1, 2, 3), array(4, 5, 6), array(7, 8, 9)), false);
+
+test('array("foo", "foo", "foo")', array("foo", "foo", "foo"), false);
+test('array("one" => 1, "two" => 2))', array("one" => 1, "two" => 2), false);
+test('array("kek" => "lol", "lol" => "kek")', array("kek" => "lol", "lol" => "kek"), false);
+test('array("" => "empty")', array("" => "empty"), false);
+
+$a = array('foo');
+test('array($a, $a)', array($a, $a), false);
+test('array(&$a, &$a)', array(&$a, &$a), false);
+
+$a = array(null);
+$b = array(&$a);
+$a[0] = &$b;
+
+test('cyclic', $a, true);
+
+$a = array(
+    'a' => array(
+        'b' => 'c',
+        'd' => 'e'
+        ),
+    'f' => array(
+        'g' => 'h'
+        )
+    );
+
+test('array', $a, false);
+
+class Obj {
+    public $a;
+    protected $b;
+    private $c;
+
+    function __construct($a, $b, $c) {
+        $this->a = $a;
+        $this->b = $b;
+        $this->c = $c;
+    }
+}
+
+test('object', new Obj(1, 2, 3), false);
+
+test('object', array(new Obj(1, 2, 3), new Obj(4, 5, 6)), false);
+
+$o = new Obj(1, 2, 3);
+
+test('object', array(&$o, &$o), false);
+--EXPECTF--
+NULL
+OK
+bool(true)
+OK
+bool(false)
+OK
+int(0)
+OK
+int(1)
+OK
+int(-1)
+OK
+int(1000)
+OK
+int(-1000)
+OK
+int(100000)
+OK
+int(-100000)
+OK
+float(123.456)
+OK
+string(0) ""
+OK
+string(6) "foobar"
+OK
+array(0) {
+}
+OK
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+OK
+array(3) {
+  [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)
+  }
+}
+OK
+array(3) {
+  [0]=>
+  string(3) "foo"
+  [1]=>
+  string(3) "foo"
+  [2]=>
+  string(3) "foo"
+}
+OK
+array(2) {
+  ["one"]=>
+  int(1)
+  ["two"]=>
+  int(2)
+}
+OK
+array(2) {
+  ["kek"]=>
+  string(3) "lol"
+  ["lol"]=>
+  string(3) "kek"
+}
+OK
+array(1) {
+  [""]=>
+  string(5) "empty"
+}
+OK
+array(2) {
+  [0]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+  [1]=>
+  &array(1) {
+    [0]=>
+    string(3) "foo"
+  }
+}
+OK
+array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
+      [0]=>
+      &array(1) {
+        [0]=>
+        &array(1) {
+          [0]=>
+          *RECURSION*
+        }
+      }
+    }
+  }
+}
+OK
+array(2) {
+  ["a"]=>
+  array(2) {
+    ["b"]=>
+    string(1) "c"
+    ["d"]=>
+    string(1) "e"
+  }
+  ["f"]=>
+  array(1) {
+    ["g"]=>
+    string(1) "h"
+  }
+}
+OK
+object(Obj)#%d (3) {
+  ["a"]=>
+  int(1)
+  [%r"?b"?:protected"?%r]=>
+  int(2)
+  [%r"?c"?:("Obj":)?private"?%r]=>
+  int(3)
+}
+OK
+array(2) {
+  [0]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  object(Obj)#%d (3) {
+    ["a"]=>
+    int(4)
+    [%r"?b"?:protected"?%r]=>
+    int(5)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(6)
+  }
+}
+OK
+array(2) {
+  [0]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+  [1]=>
+  &object(Obj)#%d (3) {
+    ["a"]=>
+    int(1)
+    [%r"?b"?:protected"?%r]=>
+    int(2)
+    [%r"?c"?:("Obj":)?private"?%r]=>
+    int(3)
+  }
+}
+OK

php/tests/066.phpt

@@ -0,0 +1,70 @@
+--TEST--
+Extra bytes buffered streaming unserialization (single)
+--SKIPIF--
+--FILE--
+<?php
+if(!extension_loaded('msgpack')) {
+    dl('msgpack.' . PHP_SHLIB_SUFFIX);
+}
+
+$unpacker = new MessagePackUnpacker();
+
+function test($type, $variable, $test = null) {
+    global $unpacker;
+
+    foreach ($variable as $var)
+    {
+        $serialized = pack('H*', $var);
+
+        $length = strlen($serialized);
+
+        for ($i = 0; $i < $length;) {
+            $len = rand(1, 10);
+            $str = substr($serialized, $i, $len);
+
+            $unpacker->feed($str);
+
+            while (true) {
+                if ($unpacker->execute()) {
+                    $unserialized = $unpacker->data();
+                    var_dump($unserialized);
+                    $unpacker->reset();
+                } else {
+                    break;
+                }
+            }
+            $i += $len;
+        }
+    }
+}
+
+test('array(1, 2, 3)', array('9301020392'));
+test('array(1, 2, 3), array(3, 9), 4', array('9301020392', '030904'));
+--EXPECTF--
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(9)
+  }
+}
+int(4)

php/tests/067.phpt

@@ -0,0 +1,74 @@
+--TEST--
+Extra bytes unbuffered streaming unserialization (single)
+--SKIPIF--
+--FILE--
+<?php
+if(!extension_loaded('msgpack')) {
+    dl('msgpack.' . PHP_SHLIB_SUFFIX);
+}
+
+$unpacker = new MessagePackUnpacker();
+
+function test($type, $variable, $test = null) {
+    global $unpacker;
+
+    $str = "";
+    $offset = 0;
+
+    foreach ($variable as $var)
+    {
+        $serialized = pack('H*', $var);
+
+        $length = strlen($serialized);
+
+        for ($i = 0; $i < $length;) {
+            $len = rand(1, 10);
+            $str .= substr($serialized, $i, $len);
+
+            while (true) {
+                if ($unpacker->execute($str, $offset)) {
+                    $unserialized = $unpacker->data();
+                    var_dump($unserialized);
+
+                    $unpacker->reset();
+                    $str = substr($str, $offset);
+                    $offset = 0;
+                } else {
+                    break;
+                }
+            }
+            $i += $len;
+        }
+    }
+}
+
+test('array(1, 2, 3)', array('9301020392'));
+test('array(1, 2, 3), array(3, 9), 4', array('9301020392', '030904'));
+--EXPECTF--
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+array(2) {
+  [0]=>
+  array(3) {
+    [0]=>
+    int(1)
+    [1]=>
+    int(2)
+    [2]=>
+    int(3)
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(3)
+    [1]=>
+    int(9)
+  }
+}
+int(4)

php/tests/070.phpt

@@ -2,8 +2,8 @@
 Check for alias functions
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -219,10 +219,6 @@ array(2) {
 }
 OK
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -232,8 +228,6 @@ array(1) {
     }
   }
 }
-  }
-}
 OK
 array(2) {
   ["a"]=>

php/tests/070b.phpt

@@ -2,8 +2,8 @@
 Check for alias functions
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -219,6 +219,10 @@ array(2) {
 }
 OK
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -228,6 +232,8 @@ array(1) {
         }
       }
     }
+  }
+}
 OK
 array(2) {
   ["a"]=>

php/tests/071.phpt

@@ -2,8 +2,8 @@
 Check for class methods
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -221,10 +221,6 @@ array(2) {
 }
 OK
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -234,8 +230,6 @@ array(1) {
     }
   }
 }
-  }
-}
 OK
 array(2) {
   ["a"]=>

php/tests/071b.phpt

@@ -2,8 +2,8 @@
 Check for class methods
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -221,6 +221,10 @@ array(2) {
 }
 OK
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -230,6 +234,8 @@ array(1) {
         }
       }
     }
+  }
+}
 OK
 array(2) {
   ["a"]=>

php/tests/072.phpt

@@ -2,8 +2,8 @@
 Check for class methods unpacker
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -261,10 +261,6 @@ array(2) {
 }
 OK
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -274,8 +270,6 @@ array(1) {
     }
   }
 }
-  }
-}
 OK
 array(2) {
   ["a"]=>

php/tests/072b.phpt

@@ -2,8 +2,8 @@
 Check for class methods unpacker
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -261,6 +261,10 @@ array(2) {
 }
 OK
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -270,6 +274,8 @@ array(1) {
         }
       }
     }
+  }
+}
 OK
 array(2) {
   ["a"]=>

php/tests/073.phpt

@@ -2,8 +2,8 @@
 Check for class unpacker
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
+if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
-    echo "skip tests in PHP 5.3.2 and lower";
+    echo "skip tests in PHP 5.3.3 or newer";
 }
 --FILE--
 <?php
@@ -262,10 +262,6 @@ array(2) {
 }
 OK
 array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    &array(1) {
   [0]=>
   &array(1) {
     [0]=>
@@ -275,8 +271,6 @@ array(1) {
     }
   }
 }
-  }
-}
 OK
 array(2) {
   ["a"]=>

php/tests/073b.phpt

@@ -2,8 +2,8 @@
 Check for class unpacker
 --SKIPIF--
 <?php
-if (version_compare(PHP_VERSION, '5.3.2') <= 0) {
+if (version_compare(PHP_VERSION, '5.3.3') >= 0) {
-    echo "skip tests in PHP 5.3.3";
+    echo "skip tests in PHP 5.3.2 or older";
 }
 --FILE--
 <?php
@@ -262,6 +262,10 @@ array(2) {
 }
 OK
 array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    &array(1) {
       [0]=>
       &array(1) {
         [0]=>
@@ -271,6 +275,8 @@ array(1) {
         }
       }
     }
+  }
+}
 OK
 array(2) {
   ["a"]=>