Ocramius · Ocramius · Feb 11, 2014 · Feb 11, 2014 · Feb 12, 2014 · Feb 13, 2014
diff --git a/hphp/runtime/base/object-data.cpp b/hphp/runtime/base/object-data.cpp
@@ -709,11 +709,13 @@ void ObjectData::serializeImpl(VariableSerializer* serializer) const {
       auto thiz = const_cast<ObjectData*>(this);
       Array wanted = Array::Create();
       Array props = ret.toArray();
+      Array vals = nullptr;
+      bool hasInaccessibleProperties = false;
       for (ArrayIter iter(props); iter; ++iter) {
         String name = iter.second().toString();
         bool visible, accessible, unset;
         thiz->getProp(m_cls, name.get(), visible, accessible, unset);
-        if (accessible && !unset) {
+        if (!unset) {
           String propName = name;
           Slot propInd = m_cls->getDeclPropIndex(m_cls, name.get(), accessible);
           if (accessible && propInd != kInvalidSlot) {
@@ -724,8 +726,21 @@ void ObjectData::serializeImpl(VariableSerializer* serializer) const {
               propName = concat4(s_zero, s_star, s_zero, name);
             }
           }
-          wanted.set(propName, const_cast<ObjectData*>(this)->
-              o_getImpl(name, RealPropUnchecked, true, o_getClassName()));
+          if (accessible) {
+            wanted.set(propName, const_cast<ObjectData*>(this)->
+                o_getImpl(name, RealPropUnchecked, true, o_getClassName()));
+          } else {
+            if (!hasInaccessibleProperties) {
+              hasInaccessibleProperties = true;
+              vals = o_toArray();
+            }
+            if (vals.exists(propName)) {
+              wanted.set(propName, vals.lvalAt(propName));
+            } else {
+              raise_warning("\"%s\" returned as member variable from "
+                  "__sleep() but does not exist", name.data());
+            }
+          }
         } else {
           raise_warning("\"%s\" returned as member variable from "
               "__sleep() but does not exist", name.data());

diff --git a/...classes/private_members_serialization.php → ...classes/private_members_serialization.php b/...classes/private_members_serialization.php → ...classes/private_members_serialization.php
diff --git a/...private_members_serialization.php.expectf → ...private_members_serialization.php.expectf b/...private_members_serialization.php.expectf → ...private_members_serialization.php.expectf
diff --git a/hphp/test/zend/good/tests/classes/private_own_members_serialization.php b/hphp/test/zend/good/tests/classes/private_own_members_serialization.php
@@ -0,0 +1,15 @@
+<?php
+class foo
+{
+	private $private = 'private';
+	protected $protected = 'protected';
+	public $public = 'public';
+
+    public function __sleep()
+    {
+        return array("\0foo\0private", "\0*\0protected", 'public');
+    }
+}
+
+var_dump(str_replace("\0", '\0', serialize(new foo())));
+?>
diff --git a/hphp/test/zend/good/tests/classes/private_own_members_serialization.php.expectf b/hphp/test/zend/good/tests/classes/private_own_members_serialization.php.expectf
@@ -0,0 +1 @@
+string(114) "O:3:"foo":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		string(114) "O:3:"foo":3:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";}"