Merge branch 'master' into watchpoints

Conflicts:
	CREDITS
	phpdbg.c
	test.php

diff --cc phpdbg.c
index 891875ef85c10675ca601209e3abfe1adf5c6ee1,481a1815db18853ba700c603e47acdcc83a5705d..4955d2e1bf3b5b153c60ca9f33ac483387e4a78f
--- 1/phpdbg.c
--- 2/phpdbg.c
+++ b/phpdbg.c
@@@ -1257,6 -1274,13 +1313,12 @@@ phpdbg_out
                }
  #endif
  
 -              
+ #ifndef ZTS
+               /* force cleanup of auto and core globals */
+               zend_hash_clean(CG(auto_globals));
+               memset(
+                       &core_globals, 0, sizeof(php_core_globals));
+ #endif
                if (ini_entries) {
                        free(ini_entries);
                }

diff --cc phpdbg.h
Simple merge

diff --cc phpdbg_prompt.c
Simple merge

diff --cc phpdbg_prompt.h
Simple merge

diff --cc phpdbg_utils.c
Simple merge

diff --cc phpdbg_utils.h
Simple merge

diff --cc test.php
index 669eb3474043dfad8ce90cb37e8a17a0f664c8f1,5fdbcbe1a4544453a9d2dd99abe2ea2effb14bb7..b4b12a6e290296a9e93f64b69c83acbf310ab57c
--- 1/test.php
--- 2/test.php
+++ b/test.php
@@@ -49,19 -49,3 +49,17 @@@ function phpdbg_test_ob(
        echo 'End';
        echo $b;
  }
- 
- ?>
 +
 +$array = [
 +      1,
 +      2,
 +      [3, 4],
 +      [5, 6],
 +];
 +
 +array_walk($array, function (&$item) {
 +      if (is_array($item))
 +              $item[0] += 2;
 +      else
 +              $item -= 1;
 +});