Merge branch 'v2.x' into fix_foreach

Author: danog

php_phongo.h

@@ -111,7 +111,11 @@ zend_object_handlers* phongo_get_std_object_handlers(void);
 			zend_hash_init(props, 0, NULL, ZVAL_PTR_DTOR, 0);                                                                      \
 			_intern_extractor(zobj)->php_properties = props;                                                                       \
 		}                                                                                                                          \
-		return zend_hash_find(props, member);                                                                                      \
+		zval* ret = zend_hash_find(props, member);                                                                                 \
+		if (ret) {                                                                                                                 \
+			return ret;                                                                                                            \
+		}                                                                                                                          \
+		return &EG(uninitialized_zval);                                                                                            \
 	}                                                                                                                              \
                                                                                                                                    \
 	static zval* php_phongo_##_name##_write_property(zend_object* zobj, zend_string* name, zval* value, void** cache_slot)         \

tests/bson/bug2505_2.phpt

@@ -4,6 +4,8 @@ PHPC-2505: Setting and unsetting a property may interfere with using foreach to
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
+ini_set("error_reporting", E_ALL & ~E_DEPRECATED);
+
 $tests = [
     [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
     [ 'dbpointer' => createDBPointer() ],

tests/bson/bug2505_3.phpt

@@ -4,6 +4,8 @@ PHPC-2505: Setting and unsetting a property may interfere with using foreach to
 <?php
 require_once __DIR__ . "/../utils/basic.inc";
 
+ini_set("error_reporting", E_ALL & ~E_DEPRECATED);
+
 $tests = [
     [ 'binary' => new MongoDB\BSON\Binary('foo', MongoDB\BSON\Binary::TYPE_GENERIC) ],
     [ 'dbpointer' => createDBPointer() ],