Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

Conflicts:
	Zend/zend_object_handlers.c

diff --cc Zend/zend_object_handlers.c
index 1f9d5f24d0520c62d33c05912c262c2e54d798f4,98b19f6b44a55f6babc5ead90e0420c594260bf0..48f1bc641a407dba70e159e7e09089ca6dce928c
--- 1/Zend/zend_object_handlers.c
--- 2/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@@ -100,7 -102,7 +102,7 @@@ ZEND_API void rebuild_object_properties
                                            prop_info->offset >= 0 &&
                                                Z_TYPE(zobj->properties_table[prop_info->offset]) != IS_UNDEF) {
                                                zval *zv = zend_hash_add(zobj->properties, prop_info->name, &zobj->properties_table[prop_info->offset]);
-                                               if (zv) {
 -                                              if (EXPECTED(zv)) {
++                                              if (EXPECTED(zv != NULL)) {
                                                        ZVAL_INDIRECT(&zobj->properties_table[prop_info->offset], zv);
                                                }
                                        }

diff --cc Zend/zend_operators.c
Simple merge