PHPC-1151: Add Session to Cursor debug output

Author: jmikola

src/MongoDB/Cursor.c

@@ -490,6 +490,18 @@ static HashTable *php_phongo_cursor_get_debug_info(zval *object, int *is_temp TS
 		ADD_ASSOC_NULL_EX(&retval, "readPreference");
 	}
 
+	if (!Z_ISUNDEF(intern->session)) {
+#if PHP_VERSION_ID >= 70000
+		ADD_ASSOC_ZVAL_EX(&retval, "session", &intern->session);
+		Z_ADDREF(intern->session);
+#else
+		ADD_ASSOC_ZVAL_EX(&retval, "session", intern->session);
+		Z_ADDREF_P(intern->session);
+#endif
+	} else {
+		ADD_ASSOC_NULL_EX(&retval, "session");
+	}
+
 	ADD_ASSOC_BOOL_EX(&retval, "isDead", !mongoc_cursor_is_alive(intern->cursor));
 
 	ADD_ASSOC_LONG_EX(&retval, "currentIndex", intern->current);

tests/manager/manager-executeCommand-001.phpt

@@ -54,6 +54,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   }
   ["readPreference"]=>
   NULL
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(false)
   ["currentIndex"]=>

tests/manager/manager-executeQuery-001.phpt

@@ -64,6 +64,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   NULL
   ["readPreference"]=>
   NULL
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(false)
   ["currentIndex"]=>

tests/manager/manager-executeQuery-002.phpt

@@ -64,6 +64,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   NULL
   ["readPreference"]=>
   NULL
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(false)
   ["currentIndex"]=>

tests/readPreference/bug0146-001.phpt

@@ -58,6 +58,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(7) "primary"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -96,6 +98,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(16) "primaryPreferred"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -134,6 +138,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(9) "secondary"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -172,6 +178,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(18) "secondaryPreferred"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -210,6 +218,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(7) "nearest"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>

tests/readPreference/bug0146-002.phpt

@@ -58,6 +58,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(7) "primary"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -96,6 +98,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(16) "primaryPreferred"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -134,6 +138,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(9) "secondary"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -172,6 +178,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(18) "secondaryPreferred"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>
@@ -210,6 +218,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
     ["mode"]=>
     string(7) "nearest"
   }
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(true)
   ["currentIndex"]=>

tests/server/server-executeCommand-001.phpt

@@ -43,6 +43,8 @@ object(MongoDB\Driver\Cursor)#%d (%d) {
   }
   ["readPreference"]=>
   NULL
+  ["session"]=>
+  NULL
   ["isDead"]=>
   bool(false)
   ["currentIndex"]=>