PHPC-431: Segfault when using Manager through singleton class

Author: bjori

phongo_compat.h

@@ -156,7 +156,7 @@
 # define SUPPRESS_UNUSED_WARNING(x)
 # define DECLARE_RETURN_VALUE_USED int return_value_used = 1;
 # define EXCEPTION_P(_ex, _zp) ZVAL_OBJ(&_zp, _ex)
-# define PHONGO_STREAM_ID(stream) stream->res->handle
+# define PHONGO_STREAM_ID(stream) stream->res ? stream->res->handle : -1
 # define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRL(_key), _value);
 # define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRL(_key), _value, _len);
 # define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRL(_key), _value);

php_phongo.c

@@ -732,7 +732,9 @@ void phongo_stream_failed(mongoc_stream_t *stream_wrap) /* {{{ */
 	php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream_wrap;
 
 	if (base_stream->stream) {
+#if PHP_VERSION_ID < 70000
 		PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
+#endif
 
 		MONGOC_DEBUG("Destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
 		php_stream_free(base_stream->stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
@@ -748,7 +750,9 @@ int phongo_stream_close(mongoc_stream_t *stream_wrap) /* {{{ */
 
 	MONGOC_DEBUG("Closing RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
 	if (base_stream->stream) {
+#if PHP_VERSION_ID < 70000
 		TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
+#endif
 
 		MONGOC_DEBUG("Destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
 		php_stream_free(base_stream->stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);