Merge branch 'master' of sapi/phpdbg into PHP-5.6

Including phpdbg.

diff --cc sapi/phpdbg/.gdbinit
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..401a4bb88c067eb57657897a934313760c02fdbf
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sapi/phpdbg/.gdbinit
@@@ -1,0 -1,0 +1,10 @@@
++define ____phpdbg_globals
++      if basic_functions_module.zts
++              if !$tsrm_ls
++                      set $tsrm_ls = ts_resource_ex(0, 0)
++              end
++              set $phpdbg = ((zend_phpdbg_globals*) (*((void ***) $tsrm_ls))[phpdbg_globals_id-1])
++      else
++              set $phpdbg = phpdbg_globals
++      end
++end

diff --cc sapi/phpdbg/.gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..297efcbc420ea23282dbcc04087b73ae693e27c8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sapi/phpdbg/.gitignore
@@@ -1,0 -1,0 +1,5 @@@
++.libs/
++./phpdbg
++*.lo
++*.o
++build

diff --cc sapi/phpdbg/.phpdbginit
index 0000000000000000000000000000000000000000,1ad35218eded92c06f12b2c3bf35bbf90c8e7fae..1ad35218eded92c06f12b2c3bf35bbf90c8e7fae
mode 000000,100644..100644
--- /dev/null
--- 2/.phpdbginit
+++ b/sapi/phpdbg/.phpdbginit

diff --cc sapi/phpdbg/.travis.yml
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..353402858e05fda4855f167380427e9688a13823
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sapi/phpdbg/.travis.yml
@@@ -1,0 -1,0 +1,3 @@@
++language: c
++
++script: ./travis/ci.sh

diff --cc sapi/phpdbg/Changelog.md
index 0000000000000000000000000000000000000000,c5d8b51514b377cf7839e8f6568fa3510686b7a3..c5d8b51514b377cf7839e8f6568fa3510686b7a3
mode 000000,100644..100644
--- /dev/null
--- 2/Changelog.md
+++ b/sapi/phpdbg/Changelog.md

diff --cc sapi/phpdbg/Makefile.frag
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5be6d5b00f4f3af44945fc74d001d29a26ad6f4e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sapi/phpdbg/Makefile.frag
@@@ -1,0 -1,0 +1,28 @@@
++phpdbg: $(BUILD_BINARY)
++
++phpdbg-shared: $(BUILD_SHARED)
++
++$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++      $(BUILD_PHPDBG_SHARED)
++
++$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
++      $(BUILD_PHPDBG)
++
++install-phpdbg: $(BUILD_BINARY)
++      @echo "Installing phpdbg binary:         $(INSTALL_ROOT)$(bindir)/"
++      @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
++      @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
++      @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
++      @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
++
++clean-phpdbg:
++      @echo "Cleaning phpdbg object files ..."
++      find sapi/phpdbg/ -name *.lo -o -name *.o | xargs rm -f
++
++test-phpdbg:
++      @echo "Running phpdbg tests ..."
++      @$(top_builddir)/sapi/cli/php sapi/phpdbg/tests/run-tests.php --phpdbg sapi/phpdbg/phpdbg
++
++.PHONY: clean-phpdbg test-phpdbg
++
++

diff --cc sapi/phpdbg/README.md
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e7e5c731a805ceb4cdb68d03fba4cdc66fcaab53
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/sapi/phpdbg/README.md
@@@ -1,0 -1,0 +1,83 @@@
++The interactive PHP debugger
++============================
++
++Implemented as a SAPI module, phpdbg can excert complete control over the environment without impacting the functionality or performance of your code.
++
++phpdbg aims to be a lightweight, powerful, easy to use debugging platform for PHP 5.4+
++
++[![phpdbg on travis-ci](https://travis-ci.org/krakjoe/phpdbg.png?branch=master)](https://travis-ci.org/krakjoe/phpdbg)
++
++Features
++========
++
++ - Stepthrough Debugging
++ - Flexible Breakpoints (Class Method, Function, File:Line, Address, Opcode)
++ - Easy Access to PHP with built-in eval()
++ - Easy Access to Currently Executing Code
++ - Userland API
++ - SAPI Agnostic - Easily Integrated
++ - PHP Configuration File Support
++ - JIT Super Globals - Set Your Own!!
++ - Optional readline Support - Comfortable Terminal Operation
++ - Remote Debugging Support - Bundled Java GUI
++ - Easy Operation - See Help :)
++
++Planned
++=======
++
++ - Improve Everything :)
++
++Installation
++============
++
++To install **phpdbg**, you must compile the source against your PHP installation sources, and enable the SAPI with the configure command.
++
++```
++cd /usr/src/php-src/sapi
++git clone https://github.com/krakjoe/phpdbg
++cd ../
++./buildconf --force
++./configure --enable-phpdbg
++make -j8
++make install-phpdbg
++```
++
++Where the source directory has been used previously to build PHP, there exists a file named *config.nice* which can be used to invoke configure with the same
++parameters as were used by the last execution of *configure*.
++
++**Note:** PHP must be configured with the switch --with-readline for phpdbg to support history, autocompletion, tab-listing etc.
++
++Command Line Options
++====================
++
++The following switches are implemented (just like cli SAPI):
++
++ - -n ignore php ini
++ - -c search for php ini in path
++ - -z load zend extension
++ - -d define php ini entry
++
++The following switches change the default behaviour of phpdbg:
++
++ - -v disables quietness
++ - -s enabled stepping
++ - -e sets execution context
++ - -b boring - disables use of colour on the console
++ - -I ignore .phpdbginit (default init file)
++ - -i override .phpgdbinit location (implies -I)
++ - -O set oplog output file
++ - -q do not print banner on startup
++ - -r jump straight to run
++ - -E enable step through eval()
++ - -l listen ports for remote mode
++ - -a listen address for remote mode
++ - -S override SAPI name
++
++**Note:** Passing -rr will cause phpdbg to quit after execution, rather than returning to the console.
++
++Getting Started
++===============
++
++See the website for tutorials/documentation
++
++http://phpdbg.com

diff --cc sapi/phpdbg/config.m4
index 0000000000000000000000000000000000000000,274e6409d04e488f7e39e3a2f6492b6ae3bcf2fe..274e6409d04e488f7e39e3a2f6492b6ae3bcf2fe
mode 000000,100644..100644
--- /dev/null
--- 2/config.m4
+++ b/sapi/phpdbg/config.m4

diff --cc sapi/phpdbg/config.w32
index 0000000000000000000000000000000000000000,29031507b31a7763c53c80a899b8a4153920d13c..29031507b31a7763c53c80a899b8a4153920d13c
mode 000000,100644..100644
--- /dev/null
--- 2/config.w32
+++ b/sapi/phpdbg/config.w32

diff --cc sapi/phpdbg/phpdbg.c
index 0000000000000000000000000000000000000000,17193ed244cec37d8d66e0a351f8124487ff8b73..17193ed244cec37d8d66e0a351f8124487ff8b73
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c

diff --cc sapi/phpdbg/phpdbg.h
index 0000000000000000000000000000000000000000,f0a59ce4731df8b8f422ede7f7a3561f90feae62..f0a59ce4731df8b8f422ede7f7a3561f90feae62
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg.h
+++ b/sapi/phpdbg/phpdbg.h

diff --cc sapi/phpdbg/phpdbg.init.d
index 0000000000000000000000000000000000000000,99a1ab328b8973d651e0c0634069121fe83fce37..99a1ab328b8973d651e0c0634069121fe83fce37
mode 000000,100755..100755
--- /dev/null
--- 2/phpdbg.init.d
+++ b/sapi/phpdbg/phpdbg.init.d

diff --cc sapi/phpdbg/phpdbg_bp.c
index 0000000000000000000000000000000000000000,69e0fa7086df729fd4e3011bab9d6b6a0ccc4b03..69e0fa7086df729fd4e3011bab9d6b6a0ccc4b03
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_bp.c
+++ b/sapi/phpdbg/phpdbg_bp.c

diff --cc sapi/phpdbg/phpdbg_bp.h
index 0000000000000000000000000000000000000000,ed1b413f6d3dcc698b92867fc34caf5a5ccf8c28..ed1b413f6d3dcc698b92867fc34caf5a5ccf8c28
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_bp.h
+++ b/sapi/phpdbg/phpdbg_bp.h

diff --cc sapi/phpdbg/phpdbg_break.c
index 0000000000000000000000000000000000000000,1423b960e66e3afcf4ea6f2be74dde36e10cb284..1423b960e66e3afcf4ea6f2be74dde36e10cb284
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_break.c
+++ b/sapi/phpdbg/phpdbg_break.c

diff --cc sapi/phpdbg/phpdbg_break.h
index 0000000000000000000000000000000000000000,04abeb6805fb0a3b03f12f47754c3a0d1884260c..04abeb6805fb0a3b03f12f47754c3a0d1884260c
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_break.h
+++ b/sapi/phpdbg/phpdbg_break.h

diff --cc sapi/phpdbg/phpdbg_cmd.c
index 0000000000000000000000000000000000000000,9f052d6f6f38529e2b04b3b675122f193e54efa6..9f052d6f6f38529e2b04b3b675122f193e54efa6
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_cmd.c
+++ b/sapi/phpdbg/phpdbg_cmd.c

diff --cc sapi/phpdbg/phpdbg_cmd.h
index 0000000000000000000000000000000000000000,e779fd4b55d7d2e1d688e88e257abae37144a1d0..e779fd4b55d7d2e1d688e88e257abae37144a1d0
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_cmd.h
+++ b/sapi/phpdbg/phpdbg_cmd.h

diff --cc sapi/phpdbg/phpdbg_frame.c
index 0000000000000000000000000000000000000000,24aff59dd92d808664c34b64721cfbc53cb38c1a..24aff59dd92d808664c34b64721cfbc53cb38c1a
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_frame.c
+++ b/sapi/phpdbg/phpdbg_frame.c

diff --cc sapi/phpdbg/phpdbg_frame.h
index 0000000000000000000000000000000000000000,fbccd5404f5b9601b58cbb22192a05031a151c4c..fbccd5404f5b9601b58cbb22192a05031a151c4c
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_frame.h
+++ b/sapi/phpdbg/phpdbg_frame.h

diff --cc sapi/phpdbg/phpdbg_help.c
index 0000000000000000000000000000000000000000,edb12659554d1cf034cc1490d7fd483902aaa710..edb12659554d1cf034cc1490d7fd483902aaa710
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_help.c
+++ b/sapi/phpdbg/phpdbg_help.c

diff --cc sapi/phpdbg/phpdbg_help.h
index 0000000000000000000000000000000000000000,012a1b49e735b493a57f7f1428507827cb1c3f1f..012a1b49e735b493a57f7f1428507827cb1c3f1f
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_help.h
+++ b/sapi/phpdbg/phpdbg_help.h

diff --cc sapi/phpdbg/phpdbg_info.c
index 0000000000000000000000000000000000000000,1744f59215b4da042642b4ca993660247f32471e..1744f59215b4da042642b4ca993660247f32471e
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_info.c
+++ b/sapi/phpdbg/phpdbg_info.c

diff --cc sapi/phpdbg/phpdbg_info.h
index 0000000000000000000000000000000000000000,5d53812370790a3ea8e87b35ff05371bce9083ef..5d53812370790a3ea8e87b35ff05371bce9083ef
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_info.h
+++ b/sapi/phpdbg/phpdbg_info.h

diff --cc sapi/phpdbg/phpdbg_list.c
index 0000000000000000000000000000000000000000,b49be857efa35bbbd4b7b0b03d6bb8297aa30332..b49be857efa35bbbd4b7b0b03d6bb8297aa30332
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_list.c
+++ b/sapi/phpdbg/phpdbg_list.c

diff --cc sapi/phpdbg/phpdbg_list.h
index 0000000000000000000000000000000000000000,d6180271585ce382ebfe673492937e20ad119297..d6180271585ce382ebfe673492937e20ad119297
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_list.h
+++ b/sapi/phpdbg/phpdbg_list.h

diff --cc sapi/phpdbg/phpdbg_opcode.c
index 0000000000000000000000000000000000000000,025d57a08dc49dc62ea5ca7053bd43dcbad107ad..025d57a08dc49dc62ea5ca7053bd43dcbad107ad
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c

diff --cc sapi/phpdbg/phpdbg_opcode.h
index 0000000000000000000000000000000000000000,5771488e70748d8e644ecd8730148c67948251e3..5771488e70748d8e644ecd8730148c67948251e3
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_opcode.h
+++ b/sapi/phpdbg/phpdbg_opcode.h

diff --cc sapi/phpdbg/phpdbg_print.c
index 0000000000000000000000000000000000000000,51edcfbf8dab29143ced1a01dcaaa5bc670ce715..51edcfbf8dab29143ced1a01dcaaa5bc670ce715
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_print.c
+++ b/sapi/phpdbg/phpdbg_print.c

diff --cc sapi/phpdbg/phpdbg_print.h
index 0000000000000000000000000000000000000000,1232f544d297569734af65981c3bc12ff07035b5..1232f544d297569734af65981c3bc12ff07035b5
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_print.h
+++ b/sapi/phpdbg/phpdbg_print.h

diff --cc sapi/phpdbg/phpdbg_prompt.c
index 0000000000000000000000000000000000000000,f2f482b7eceff5e1e7791fa9b1fd7c70b92f37aa..f2f482b7eceff5e1e7791fa9b1fd7c70b92f37aa
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_prompt.c
+++ b/sapi/phpdbg/phpdbg_prompt.c

diff --cc sapi/phpdbg/phpdbg_prompt.h
index 0000000000000000000000000000000000000000,e6706c7d5b1eba63a7efc7b68cde8310952a156f..e6706c7d5b1eba63a7efc7b68cde8310952a156f
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_prompt.h
+++ b/sapi/phpdbg/phpdbg_prompt.h

diff --cc sapi/phpdbg/phpdbg_set.c
index 0000000000000000000000000000000000000000,2472e1868c0a291a6792cd71fdf77ea13909ba0b..2472e1868c0a291a6792cd71fdf77ea13909ba0b
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_set.c
+++ b/sapi/phpdbg/phpdbg_set.c

diff --cc sapi/phpdbg/phpdbg_set.h
index 0000000000000000000000000000000000000000,1c48786c66caded23ed54cf85708db38a9c1185b..1c48786c66caded23ed54cf85708db38a9c1185b
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_set.h
+++ b/sapi/phpdbg/phpdbg_set.h

diff --cc sapi/phpdbg/phpdbg_utils.c
index 0000000000000000000000000000000000000000,86c17a71beee402bc1610954b570a209003db6bf..86c17a71beee402bc1610954b570a209003db6bf
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_utils.c
+++ b/sapi/phpdbg/phpdbg_utils.c

diff --cc sapi/phpdbg/phpdbg_utils.h
index 0000000000000000000000000000000000000000,fbc17b78dd3471c7702d7084e413deb009859a6e..fbc17b78dd3471c7702d7084e413deb009859a6e
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_utils.h
+++ b/sapi/phpdbg/phpdbg_utils.h

diff --cc sapi/phpdbg/test.php
index 0000000000000000000000000000000000000000,5fdbcbe1a4544453a9d2dd99abe2ea2effb14bb7..5fdbcbe1a4544453a9d2dd99abe2ea2effb14bb7
mode 000000,100644..100644
--- /dev/null
--- 2/test.php
+++ b/sapi/phpdbg/test.php

diff --cc sapi/phpdbg/tests/commands/0001_basic.test
index 0000000000000000000000000000000000000000,08aa9ab6644600751540b8f09f3d7a8e4f5aa7f7..08aa9ab6644600751540b8f09f3d7a8e4f5aa7f7
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0001_basic.test
+++ b/sapi/phpdbg/tests/commands/0001_basic.test

diff --cc sapi/phpdbg/tests/commands/0002_set.test
index 0000000000000000000000000000000000000000,7720f94fff61d230554403596fd16b7ee32bd826..7720f94fff61d230554403596fd16b7ee32bd826
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0002_set.test
+++ b/sapi/phpdbg/tests/commands/0002_set.test

diff --cc sapi/phpdbg/tests/commands/0101_info.test
index 0000000000000000000000000000000000000000,397a45c99275a8141f30b5f6c13401ca87f8a0f2..397a45c99275a8141f30b5f6c13401ca87f8a0f2
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0101_info.test
+++ b/sapi/phpdbg/tests/commands/0101_info.test

diff --cc sapi/phpdbg/tests/commands/0102_print.test
index 0000000000000000000000000000000000000000,de4acb7651b0c6ebe50b7aabb95db7a7829744da..de4acb7651b0c6ebe50b7aabb95db7a7829744da
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0102_print.test
+++ b/sapi/phpdbg/tests/commands/0102_print.test

diff --cc sapi/phpdbg/tests/commands/0103_register.test
index 0000000000000000000000000000000000000000,38841591caf7fe9722b51939758e502267a5ea7a..38841591caf7fe9722b51939758e502267a5ea7a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0103_register.test
+++ b/sapi/phpdbg/tests/commands/0103_register.test

diff --cc sapi/phpdbg/tests/commands/0104_clean.test
index 0000000000000000000000000000000000000000,c7a579be17926f1f8a29adf76343e4667ec0dd7c..c7a579be17926f1f8a29adf76343e4667ec0dd7c
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0104_clean.test
+++ b/sapi/phpdbg/tests/commands/0104_clean.test

diff --cc sapi/phpdbg/tests/commands/0105_clear.test
index 0000000000000000000000000000000000000000,b547b0d6ba1b1acd90a47f80020b352aa16c8d6a..b547b0d6ba1b1acd90a47f80020b352aa16c8d6a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0105_clear.test
+++ b/sapi/phpdbg/tests/commands/0105_clear.test

diff --cc sapi/phpdbg/tests/commands/0106_compile.test
index 0000000000000000000000000000000000000000,d79211ddf75d71c67052e99497fdf573c2953579..d79211ddf75d71c67052e99497fdf573c2953579
mode 000000,100644..100644
--- /dev/null
--- 2/tests/commands/0106_compile.test
+++ b/sapi/phpdbg/tests/commands/0106_compile.test

diff --cc sapi/phpdbg/tests/run-tests.php
index 0000000000000000000000000000000000000000,1fb6fa12242fa150e5c9f4822d08c71eb3f856cf..1fb6fa12242fa150e5c9f4822d08c71eb3f856cf
mode 000000,100644..100644
--- /dev/null
--- 2/tests/run-tests.php
+++ b/sapi/phpdbg/tests/run-tests.php

diff --cc sapi/phpdbg/travis/ci.sh
index 0000000000000000000000000000000000000000,44d56a01ffe86de0103fad8ef627c712ec2bda44..44d56a01ffe86de0103fad8ef627c712ec2bda44
mode 000000,100755..100755
--- /dev/null
--- 2/travis/ci.sh
+++ b/sapi/phpdbg/travis/ci.sh

diff --cc sapi/phpdbg/web-bootstrap.php
index 0000000000000000000000000000000000000000,7b8c5d30de8dc68d9c6000837710e9bbbcc7f3ca..7b8c5d30de8dc68d9c6000837710e9bbbcc7f3ca
mode 000000,100644..100644
--- /dev/null
--- 2/web-bootstrap.php
+++ b/sapi/phpdbg/web-bootstrap.php