Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
This is just an intial merge. It does not yet make generators and finally work together. Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_execute.skl Zend/zend_vm_opcodes.h
- Loading branch information
Showing
787 changed files
with
20,644 additions
and
29,388 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
language: php | ||
|
||
php: | ||
# We only specify one version so we only get one worker | ||
- 5.4 | ||
|
||
notifications: | ||
email: false | ||
|
||
env: | ||
- REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE=./sapi/cli/php | ||
|
||
before_script: | ||
# Compile PHP | ||
- ./travis/compile.sh | ||
# Setup Extensions | ||
- . ./travis/ext/mysql/setup.sh | ||
- . ./travis/ext/mysqli/setup.sh | ||
- . ./travis/ext/pdo_mysql/setup.sh | ||
- . ./travis/ext/pgsql/setup.sh | ||
- . ./travis/ext/pdo_pgsql/setup.sh | ||
|
||
# Run PHPs run-tests.php | ||
script: ./sapi/cli/php run-tests.php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
The PHP Interpreter | ||
=================== | ||
|
||
This is the github mirror of the official PHP repository located at | ||
http://git.php.net. | ||
|
||
[![Build Status](https://secure.travis-ci.org/php/php-src.png?branch=master)](http://travis-ci.org/php/php-src) | ||
|
||
Pull Requests | ||
============= | ||
PHP accepts pull requests via github. Discussions are done on github, but | ||
depending on the topic can also be relayed to the official PHP developer | ||
mailinglist internals@lists.php.net. | ||
|
||
New features require an RFC and must be accepted by the developers. | ||
See https://wiki.php.net/rfc and https://wiki.php.net/rfc/voting for more | ||
information on the process. | ||
|
||
Bug fixes **do not** require an RFC, but require a bugtracker ticket. Always | ||
open a ticket at http://bugs.php.net and reference the bug id using #NNNNNN. | ||
|
||
Fix #55371: get_magic_quotes_gpc() throws deprecation warning | ||
|
||
After removing magic quotes, the get_magic_quotes_gpc function caused | ||
a deprecate warning. get_magic_quotes_gpc can be used to detected | ||
the magic_quotes behavior and therefore should not raise a warning at any | ||
time. The patch removes this warning | ||
|
||
We do not merge pull requests directly on github. All PRs will be | ||
pulled and pushed through http://git.php.net. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.