From e2329bc70495adfaf8070fc6194aaefa2c5999c1 Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 23 Sep 2014 13:04:53 +0200
Subject: [PATCH 1/2] Add notification at script end

---
 phpdbg_prompt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index d91ef3f3f5c..ed60e99c468 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -645,6 +645,7 @@ PHPDBG_COMMAND(run) /* {{{ */
 			zend_execute(EG(active_op_array) TSRMLS_CC);
 			PHPDBG_G(flags) ^= PHPDBG_IS_INTERACTIVE;
 			php_output_deactivate(TSRMLS_C);
+			phpdbg_notice("Script ended normally");
 		} zend_catch {
 			EG(active_op_array) = orig_op_array;
 			EG(opline_ptr) = orig_opline;

From 92fe2d0a85ab831b01e2de9802da1753c144b808 Mon Sep 17 00:00:00 2001
From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 23 Sep 2014 16:48:37 +0200
Subject: [PATCH 2/2] Add info globals command

---
 phpdbg_help.c |  1 +
 phpdbg_info.c | 57 +++++++++++++++++++++++++++++++++++++--------------
 phpdbg_info.h |  1 +
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/phpdbg_help.c b/phpdbg_help.c
index 3244b653ef9..57d70c3581b 100644
--- a/phpdbg_help.c
+++ b/phpdbg_help.c
@@ -646,6 +646,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 "  **funcs**    **f**      show loaded classes" CR
 "  **error**    **e**      show last error" CR
 "  **vars**     **v**      show active variables" CR
+"  **globals**  **g**      show superglobal variables" CR
 "  **literal**  **l**      show active literal constants" CR
 "  **memory**   **m**      show memory manager stats"
 },
diff --git a/phpdbg_info.c b/phpdbg_info.c
index 97f88bfa1ec..a783bf44fcd 100644
--- a/phpdbg_info.c
+++ b/phpdbg_info.c
@@ -37,6 +37,7 @@ const phpdbg_command_t phpdbg_info_commands[] = {
 	PHPDBG_INFO_COMMAND_D(funcs,    "show loaded classes",           'f', info_funcs,   NULL, 0),
 	PHPDBG_INFO_COMMAND_D(error,    "show last error",               'e', info_error,   NULL, 0),
 	PHPDBG_INFO_COMMAND_D(vars,     "show active variables",         'v', info_vars,    NULL, 0),
+	PHPDBG_INFO_COMMAND_D(globals,  "show superglobals",             'g', info_globals, NULL, 0),
 	PHPDBG_INFO_COMMAND_D(literal,  "show active literal constants", 'l', info_literal, NULL, 0),
 	PHPDBG_INFO_COMMAND_D(memory,   "show memory manager stats",     'm', info_memory,  NULL, 0),
 	PHPDBG_END_COMMAND
@@ -86,9 +87,16 @@ PHPDBG_INFO(error) /* {{{ */
 	return SUCCESS;
 } /* }}} */
 
-PHPDBG_INFO(vars) /* {{{ */
-{
-	HashTable vars;
+static int phpdbg_arm_auto_global(zend_auto_global *auto_global TSRMLS_DC) {
+	if (auto_global->armed) {
+		auto_global->armed = auto_global->auto_global_callback(auto_global->name, auto_global->name_len TSRMLS_CC);
+	}
+
+	return 0;
+}
+
+static int phpdbg_print_symbols(zend_bool show_globals TSRMLS_DC) {
+	HashTable vars, *symtable;
 	HashPosition pos;
 	char *var;
 	zval **data;
@@ -107,22 +115,31 @@ PHPDBG_INFO(vars) /* {{{ */
 		}
 	}
 
-	zend_hash_init(&vars, 8, NULL, NULL, 0);
 
-	zend_hash_internal_pointer_reset_ex(EG(active_symbol_table), &pos);
-	while (zend_hash_get_current_key_ex(EG(active_symbol_table), &var,
-		NULL, NULL, 0, &pos) == HASH_KEY_IS_STRING) {
-		zend_hash_get_current_data_ex(EG(active_symbol_table), (void **)&data, &pos);
-		if (*var != '_') {
-			zend_hash_update(
-				&vars, var, strlen(var)+1, (void**)data, sizeof(zval*), NULL);
-		}
-		zend_hash_move_forward_ex(EG(active_symbol_table), &pos);
+	if (show_globals) {
+		zend_hash_apply(CG(auto_globals), (apply_func_t) phpdbg_arm_auto_global TSRMLS_CC);
+		symtable = &EG(symbol_table);
+	} else {
+		symtable = EG(active_symbol_table);
 	}
 
-	{
+	zend_hash_init(&vars, 8, NULL, NULL, 0);
+
+	zend_hash_internal_pointer_reset_ex(symtable, &pos);
+	while (zend_hash_get_current_key_ex(symtable, &var,
+		NULL, NULL, 0, &pos) == HASH_KEY_IS_STRING) {
+		zend_hash_get_current_data_ex(symtable, (void **)&data, &pos);
+		if (zend_is_auto_global(var, strlen(var) TSRMLS_CC) ^ !show_globals) {
+			zend_hash_update(&vars, var, strlen(var)+1, (void**)data, sizeof(zval*), NULL);
+		}
+		zend_hash_move_forward_ex(symtable, &pos);
+	}
+
+	if (show_globals) {
+		phpdbg_notice("Superglobal variables (%d)", zend_hash_num_elements(&vars));
+	} else {
 		zend_op_array *ops = EG(active_op_array);
-		
+
 		if (ops->function_name) {
 			if (ops->scope) {
 				phpdbg_notice(
@@ -204,6 +221,16 @@ PHPDBG_INFO(vars) /* {{{ */
 	return SUCCESS;
 } /* }}} */
 
+PHPDBG_INFO(vars) /* {{{ */
+{
+	return phpdbg_print_symbols(0 TSRMLS_CC);
+}
+
+PHPDBG_INFO(globals) /* {{{ */
+{
+	return phpdbg_print_symbols(1 TSRMLS_CC);
+}
+
 PHPDBG_INFO(literal) /* {{{ */
 {
 	if ((EG(in_execution) && EG(active_op_array)) || PHPDBG_G(ops)) {
diff --git a/phpdbg_info.h b/phpdbg_info.h
index c36e6bebd65..6930cdd8244 100644
--- a/phpdbg_info.h
+++ b/phpdbg_info.h
@@ -31,6 +31,7 @@ PHPDBG_INFO(classes);
 PHPDBG_INFO(funcs);
 PHPDBG_INFO(error);
 PHPDBG_INFO(vars);
+PHPDBG_INFO(globals);
 PHPDBG_INFO(literal);
 PHPDBG_INFO(memory);