Nikita Popov
000b504b51
Merge branch 'PHP-7.1'
2017-02-03 18:42:33 +01:00
Nikita Popov
f3b1ecb6c8
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-03 18:42:28 +01:00
Nikita Popov
dcaf4da8a6
Revert "Merge branch 'pull-request/2344' into PHP-7.0"
...
This reverts commit 6988d070ea75ad2b301a
2017-02-03 18:42:10 +01:00
Nikita Popov
6303dd1ea4
Merge branch 'PHP-7.1'
2017-02-03 18:30:40 +01:00
Nikita Popov
57817eb72f
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-03 18:30:32 +01:00
andrewnester
9ffc6ca62f
Fixed bug #74035
2017-02-03 18:29:39 +01:00
Nikita Popov
5537a4e2b8
Merge branch 'PHP-7.1'
2017-02-03 17:55:08 +01:00
Nikita Popov
8660e95b4c
Fixed bug #74041
2017-02-03 17:54:39 +01:00
Dmitry Stogov
a082824725
Replace redundand checks with ZEND_ASSERT. We shouldn't get IS_OBJECTs without object_storage.
2017-02-03 18:31:25 +03:00
Dmitry Stogov
d0b15f8371
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Remove unused variable
2017-02-03 17:38:45 +03:00
Dmitry Stogov
7aff166e57
Arguments array can't make cycles
2017-02-03 17:38:03 +03:00
Sara Golemon
1a84ecaca5
Remove unused variable
2017-02-03 06:17:37 -08:00
Joe Watkins
984a6312e4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
2017-02-03 06:13:40 +00:00
Joe Watkins
611952cd98
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
2017-02-03 06:12:42 +00:00
Joe Watkins
6988d070ea
Merge branch 'pull-request/2344' into PHP-7.0
...
* pull-request/2344:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
2017-02-03 06:12:05 +00:00
somedaysummer
4df993d89d
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
2017-02-03 06:08:42 +00:00
Joe Watkins
6400ce5017
Merge branch 'PHP-7.1'
...
* PHP-7.1:
increase wait time in timeout_variation_9.phpt by 1 second
2017-02-03 06:01:10 +00:00
Joe Watkins
e9209e15a2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
increase wait time in timeout_variation_9.phpt by 1 second
2017-02-03 06:00:53 +00:00
Joe Watkins
75ad2b301a
Merge branch 'pull-request/2359' into PHP-7.0
...
* pull-request/2359:
increase wait time in timeout_variation_9.phpt by 1 second
2017-02-03 06:00:34 +00:00
Rodrigo Prado
0b56ba51d0
increase wait time in timeout_variation_9.phpt by 1 second
2017-02-03 05:57:26 +00:00
Joe Watkins
309d3daa39
Merge branch 'PHP-7.1'
...
* PHP-7.1:
increase wait time in timeout_variation_10.phpt by 1 second
2017-02-03 05:55:29 +00:00
Joe Watkins
a52afd27ab
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
increase wait time in timeout_variation_10.phpt by 1 second
2017-02-03 05:55:16 +00:00
Joe Watkins
25271feeb0
Merge branch 'pull-request/2360' into PHP-7.0
...
* pull-request/2360:
increase wait time in timeout_variation_10.phpt by 1 second
2017-02-03 05:54:50 +00:00
Rodrigo Prado
8faf5f979c
increase wait time in timeout_variation_10.phpt by 1 second
2017-02-03 05:53:28 +00:00
Nikita Popov
795a4c1bb3
Merge branch 'PHP-7.1'
2017-02-02 18:35:35 +01:00
Nikita Popov
e81f30ad1d
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-02 18:33:42 +01:00
Mitch Hagstrand
dd9cf23457
BUG #73998 : Numeric properties are not accessible from get_object_vars
2017-02-02 18:33:10 +01:00
Nikita Popov
b2a4af7b58
Merge branch 'PHP-7.1'
2017-02-02 18:15:11 +01:00
Nikita Popov
2d1955796e
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-02 18:14:50 +01:00
Matěj Humpál
acda2563ce
Fix bug #74031
...
Fix incorrect parameter count for imagepng function
2017-02-02 18:13:53 +01:00
Nikita Popov
7ae4fa8a03
Merge branch 'PHP-7.1'
2017-02-02 18:07:27 +01:00
Nikita Popov
d2658287fa
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-02 18:07:05 +01:00
Nikita Popov
a15bffd105
Fix bug #73807
2017-02-02 18:06:15 +01:00
Anatol Belski
ac219438b8
Merge branch 'PHP-7.1'
...
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
2017-02-02 14:22:43 +01:00
Anatol Belski
89f2dd2879
[ci skip] update NEWS
2017-02-02 14:21:31 +01:00
Anatol Belski
e16d357e27
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
[ci skip] update NEWS
2017-02-02 14:20:53 +01:00
Anatol Belski
570a273807
[ci skip] update NEWS
2017-02-02 14:19:35 +01:00
Anatol Belski
2bff68a2f0
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
2017-02-02 13:07:48 +01:00
Anatol Belski
9b9080e85d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
2017-02-02 13:06:31 +01:00
Anatol Belski
6fc0ae638a
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.
2017-02-02 12:48:12 +01:00
Anatol Belski
3488cc91e4
Merge branch 'PHP-7.1'
...
* PHP-7.1:
[ci skip] update NEWS
update NEWS
2017-02-02 01:36:29 +01:00
Anatol Belski
0260d42f6d
[ci skip] update NEWS
2017-02-02 01:35:22 +01:00
Anatol Belski
79d3a35ede
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
2017-02-02 01:34:48 +01:00
Anatol Belski
1d7f8eb693
update NEWS
2017-02-02 01:33:41 +01:00
Nikita Popov
fb008bf60e
Remove obsolete version checks from tests
2017-02-02 00:58:04 +01:00
Anatol Belski
ac16d944bb
Merge branch 'PHP-7.1'
...
* PHP-7.1:
remove the reverted NEWS entry
sync NEWS with the reverted stuff
Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454 )"
2017-02-01 20:07:07 +01:00
Joe Watkins
11a1670cff
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Revert "Inheritance checks should not ignore parents if these implement an interface"
Revert "Added tests demonstrating the same effect with abstracts"
2017-02-01 19:05:50 +00:00
Anatol Belski
dcc8ecad00
remove the reverted NEWS entry
2017-02-01 20:02:20 +01:00
Anatol Belski
3bc7ea9a0a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
sync NEWS with the reverted stuff
Revert "fixed bug #50989 (DOM support for LIBXML_NOXMLDECL)"
Revert "fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454 )"
2017-02-01 20:01:40 +01:00
Anatol Belski
74c95fb3fb
sync NEWS with the reverted stuff
2017-02-01 20:00:32 +01:00
