Anatol Belski
80e1ca50b5
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix version checks in tests
Fix version checks in tests
2017-10-20 15:25:44 +02:00
Anatol Belski
0f7ddf0d47
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix version checks in tests
Fix version checks in tests
2017-10-20 15:25:27 +02:00
Anatol Belski
ae6d877f54
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix version checks in tests
2017-10-20 15:25:01 +02:00
Anatol Belski
2f444640b4
Fix version checks in tests
2017-10-20 15:24:43 +02:00
Anatol Belski
7240d99838
Fix version checks in tests
2017-10-20 15:23:09 +02:00
Anatol Belski
d2c9dad3e4
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Sync some tests for compat with ICU 58.1, PHP 7.1+ part
Sync some tests for compat with ICU 58.1+
2017-10-20 13:59:19 +02:00
Anatol Belski
7775f9e872
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Sync some tests for compat with ICU 58.1, PHP 7.1+ part
Sync some tests for compat with ICU 58.1+
2017-10-20 13:58:53 +02:00
Anatol Belski
e2afa00b4c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Sync some tests for compat with ICU 58.1+
2017-10-20 13:57:44 +02:00
Anatol Belski
26473523b0
Sync some tests for compat with ICU 58.1, PHP 7.1+ part
2017-10-20 13:56:58 +02:00
Anatol Belski
877e0b04bc
Sync some tests for compat with ICU 58.1+
2017-10-20 13:55:32 +02:00
Anatol Belski
a5293c1c39
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Add skip for incompatible ICU version
2017-10-20 11:30:41 +02:00
Anatol Belski
2a361b14ea
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Add skip for incompatible ICU version
2017-10-20 11:30:09 +02:00
Anatol Belski
7751ae59ae
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Add skip for incompatible ICU version
2017-10-20 11:28:51 +02:00
Anatol Belski
9071ff5c87
Add skip for incompatible ICU version
2017-10-20 11:27:54 +02:00
Sol Richardson
e161905919
Add test for strnatcmp() align left cases
2017-10-19 12:11:03 +01:00
Peter Kokot
34a7d7fa6a
Clean and sync .gitignore
2017-10-19 12:09:50 +01:00
Peter Kokot
2bc23f8028
Update filter docs and tests
...
Filter extension is better presented in the PHP manual. Some ext/filter/tests
included outdated functions or were duplicated.
2017-10-19 12:09:06 +01:00
Peter Kokot
d2754810cd
Remove tidy examples
...
PHP documentation already includes explanations and examples for most of
tidy extension. Tidy PHP functions and methods used in the examples are
also already used in the tests.
2017-10-19 12:07:02 +01:00
Peter Kokot
7f4722a42f
Remove tokenizer PHP example script
...
The tokenizer extension is best presented in the PHP manual with some
code snippets. Also the script includes old PHP dl() function.
2017-10-19 12:06:10 +01:00
Peter Kokot
842ba86c34
Remove PHP code examples from xmlreader
...
The PHP documentation can present the xmlreader extension better with
code snippets.
2017-10-19 12:05:19 +01:00
Joe Watkins
55625dd9c9
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
2017-10-19 12:03:54 +01:00
Joe Watkins
4b67943501
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
2017-10-19 12:03:19 +01:00
Joe Watkins
8eee20d876
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
2017-10-19 12:02:52 +01:00
Nester
80c3b078b8
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination
2017-10-19 12:02:22 +01:00
Peter Kokot
8d587f09c0
Refactor ext/phar License info
2017-10-19 11:59:12 +01:00
Thiago Carvalho
4c97dc099c
Add tests to XMLReader::expand error paths
2017-10-19 11:55:31 +01:00
Joe Watkins
847f070110
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Update .editorconfig with some more configs
2017-10-19 11:54:12 +01:00
Joe Watkins
cf91d81b31
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update .editorconfig with some more configs
2017-10-19 11:54:01 +01:00
Joe Watkins
85c243ef66
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update .editorconfig with some more configs
2017-10-19 11:53:50 +01:00
Peter Kokot
aa143515d6
Update .editorconfig with some more configs
...
Added support for .awk, .w32, .bat, .mk, .frag, .m4, .sh, .php, .phpt,
and Markdown files based on the current most used coding style in the
php-src repository.
2017-10-19 11:53:37 +01:00
Peter Kokot
410ae4f596
Remove CHANGES from sapi/cgi
...
All these changes are noted in the PHP manual instead that have been
removed.
2017-10-19 11:51:09 +01:00
Joe Watkins
5d2456c278
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Fix issue with zend signals in php_request_startup
2017-10-19 11:48:37 +01:00
Joe Watkins
0397b8c5c5
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix issue with zend signals in php_request_startup
2017-10-19 11:48:27 +01:00
Herman J. Radtke III
bb1814b5c3
Fix issue with zend signals in php_request_startup
...
The zend_signals_activate() function is called in php_request_startup()
even if `--disable-zend-signals` is used. This causes uninitialized
variables to be used on ZTS builds.
This was removed in 7.1 in c870633
. Removing guards from the SAPIs
should be fine, but removing the guard from main/main.c prevents anyone
using the static embedded library to integrate PHP into their programs.
For more details, see the "Additional remark" section in
https://bugs.php.net/bug.php?id=74149
2017-10-19 11:48:16 +01:00
Peter Kokot
13f3bd9172
Convert some mysqlnd file encodings to UTF-8
2017-10-19 11:46:54 +01:00
Joe Watkins
6bde306eb8
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Escape newline on curl config.m4
2017-10-19 11:40:58 +01:00
Joe Watkins
965daf4349
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Escape newline on curl config.m4
2017-10-19 11:40:48 +01:00
Joe Watkins
925d969f9e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Escape newline on curl config.m4
2017-10-19 11:40:05 +01:00
Ryan Volz
4e85dd0346
Escape newline on curl config.m4
2017-10-19 11:39:54 +01:00
Anatol Belski
f24e597c85
Constify key access for hash and formal params
...
Keys created in shared memory and won't be modified and are free'd on
restart. Otherwise, keys passed to functions should not be modified,
too.
2017-10-19 12:07:08 +02:00
Anatol Belski
efcce55360
Fix datatype
2017-10-19 10:26:39 +02:00
Dmitry Stogov
272f5a1716
Extend zend_string API to avoid reallocation in zend_string_init_interned()
2017-10-19 00:02:56 +03:00
Anatol Belski
ea915adb48
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Move to php-sdk-2.0.0beta3 for Appveyor
2017-10-18 17:47:51 +02:00
Anatol Belski
2b76520d86
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Move to php-sdk-2.0.0beta3 for Appveyor
2017-10-18 17:47:27 +02:00
Anatol Belski
3c2b087b3e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Move to php-sdk-2.0.0beta3 for Appveyor
2017-10-18 17:46:40 +02:00
Anatol Belski
5f7707cc8a
Move to php-sdk-2.0.0beta3 for Appveyor
...
Supposed to fix sporadic tool crashes on the test image
2017-10-18 17:45:33 +02:00
Dmitry Stogov
8b87b35564
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Backport 7ff13badda
into 7.0+
2017-10-18 18:27:21 +03:00
Dmitry Stogov
e87e62cc6f
Moved ZCG(function_table) back into accel_acrivate. It should be unique per thread.
2017-10-18 18:26:30 +03:00
Anatol Belski
9420bdae84
Merge branch 'PHP-7.2'
...
* PHP-7.2:
Backport 7ff13badda
into 7.0+
2017-10-18 16:30:46 +02:00
Anatol Belski
5315cea6e2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Backport 7ff13badda
into 7.0+
2017-10-18 16:27:31 +02:00