From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 15 Sep 2014 03:48:09 +0000 (+0200)
Subject: Merge phpdbg into PHP-5.6
X-Git-Tag: php-5.6.4RC1~59^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cb365fb98ef5d314418b7987f05530e686c0e08;p=php

Merge phpdbg into PHP-5.6
---

0cb365fb98ef5d314418b7987f05530e686c0e08
diff --cc sapi/phpdbg/.travis.yml
index d5b492e7cf,0000000000..2e777fbe13
mode 100644,000000..100644
--- a/sapi/phpdbg/.travis.yml
+++ b/sapi/phpdbg/.travis.yml
@@@ -1,12 -1,0 +1,11 @@@
 +language: c
 +
 +env:
 +- PHP="PHP-5.4"
 +- PHP="PHP-5.5"
 +- PHP="PHP-5.6"
- - PHP="master"
 +
 +before_script: ./travis/ci.sh
 +
 +script:
 +- ./php-src/sapi/cli/php php-src/sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg php-src/sapi/phpdbg/phpdbg
diff --cc sapi/phpdbg/README.md
index e7e5c731a8,0000000000..a2a84deb7b
mode 100644,000000..100644
--- a/sapi/phpdbg/README.md
+++ b/sapi/phpdbg/README.md
@@@ -1,83 -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.
++Implemented as a SAPI module, phpdbg can exert 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