1
0
mirror of https://github.com/php/php-src.git synced 2026-04-17 04:51:03 +02:00
Commit Graph

100099 Commits

Author SHA1 Message Date
Joe Watkins
e38310a151 prepare next 2017-03-28 15:22:10 +01:00
Anatol Belski
2a5e631e31 update NEWS 2017-03-28 13:14:51 +02:00
Anatol Belski
279d1efbdb Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
  Revert "Fixed bug #61471"
2017-03-28 13:13:24 +02:00
Anatol Belski
5c93a31804 update NEWS 2017-03-28 13:12:27 +02:00
Anatol Belski
ef8632c9dc Revert "Fixed bug #61471"
This reverts commit 80c8d84af3.
2017-03-28 13:06:38 +02:00
Anatol Belski
888fd16411 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  prepare next
2017-03-28 11:49:46 +02:00
Anatol Belski
ddad991c18 prepare next 2017-03-28 11:49:04 +02:00
Anatol Belski
0c3dcabc69 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
2017-03-28 11:44:13 +02:00
Anatol Belski
6f2d33a239 update NEWS 2017-03-28 11:43:54 +02:00
Anatol Belski
5b12d08e1f update NEWS 2017-03-28 11:43:02 +02:00
Anatol Belski
6508320936 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  deps updated, cherry-pick 88642decf9
  add test for bug #74230
2017-03-27 19:42:24 +02:00
Anatol Belski
ee8b5de5a0 deps updated, cherry-pick 88642decf9 2017-03-27 19:38:20 +02:00
Anatol Belski
6da475367a add test for bug #74230 2017-03-27 19:33:51 +02:00
x-xiang
e9e860a05b Don't retain mt_rand() seeds across requests
In particular, this prevents manual seeding of mt_rand() to leak
across requests.
2017-03-27 19:02:39 +02:00
Derick Rethans
727b21c839 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-27 18:01:30 +01:00
Derick Rethans
1f8fc0fb56 Forgot to update the output in the test too 2017-03-27 18:01:22 +01:00
Anatol Belski
b8714a8b37 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  always use staging deps for CI, that's what we have a CI for as well
2017-03-27 18:49:59 +02:00
Anatol Belski
867c29caf0 always use staging deps for CI, that's what we have a CI for as well 2017-03-27 18:07:16 +02:00
Derick Rethans
f326cfc513 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-27 11:28:35 +01:00
Derick Rethans
eb5d4bcd4f Fixed test for #33415 due to data fixes. 2017-03-27 11:28:16 +01:00
Derick Rethans
1f9e5cc2bc Updated to version 2017.2 (2017b) 2017-03-24 12:25:26 +00:00
Derick Rethans
eb13003f6c Updated to version 2017.2 (2017b) 2017-03-24 12:25:25 +00:00
Derick Rethans
fe5ef147b6 Empty merge 2017-03-24 12:25:25 +00:00
Derick Rethans
ee49d4b4be Added a test case to make sure microseconds work. 2017-03-24 11:39:32 +00:00
Nikita Popov
e3e3547627 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-23 22:49:51 +01:00
Nikita Popov
d719b46222 Fix sequencing UB 2017-03-23 22:48:45 +01:00
Nikita Popov
f5951cc81b Fix lineno for AST_ZVAL nodes 2017-03-23 22:48:41 +01:00
Sara Golemon
7835e2ebc5 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug where `yield from` is captured too greedily
2017-03-23 13:38:58 -07:00
Sara Golemon
0fb640c717 Fix bug where yield from is captured too greedily
In the following piece of code:

```php
function from1234($x) {
  return $x;
}
function foo($x) {
  yield from1234($x);
}
```

The statement inside foo is taken as `yield from` `1234($x)`
which is neither the intent, nor even legal syntax for an fcall.

Do a lookahead for breaking non-label characters after the
`yield from` and only accept it if they occur.
2017-03-23 13:31:06 -07:00
Dmitry Stogov
a0331127fe Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed uninitialized data
2017-03-23 18:59:56 +03:00
Dmitry Stogov
1517fdb36c Fixed uninitialized data 2017-03-23 18:59:27 +03:00
Anatol Belski
78bacbadfb Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  adjust deps dir naming scheme
2017-03-23 13:14:17 +01:00
Anatol Belski
1dbef2e27a adjust deps dir naming scheme
not principal, just to have it same way as everywhere
2017-03-23 13:00:14 +01:00
Anatol Belski
9e3672eaef Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  explicitly ignore php.ini for proc open tests
2017-03-21 12:44:36 +01:00
Anatol Belski
bc2b500d3e explicitly ignore php.ini for proc open tests
In some cases, when an environment is unclean, tests might get stuck fe
when some incorrect ini file is loaded. As the test depends on the core
only, it is safer to explicitly ignore the ini. Any ini can be passed in
the cmd itself, if needed.
2017-03-21 12:39:40 +01:00
Derick Rethans
2b7c3831cd Fix for #73837: "new DateTime()" with a cast to double 2017-03-20 17:48:15 +00:00
Jakub Zelenka
7dd52cbcdd Merge branch 'PHP-7.0' into PHP-7.1 2017-03-20 16:08:16 +00:00
Jakub Zelenka
6d066dc421 Lower timeout in test for but #72333 2017-03-20 16:07:12 +00:00
Nikita Popov
f2c35fdda8 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 20:20:43 +01:00
Nikita Popov
2e83082605 Fix bug #74265 2017-03-17 20:19:40 +01:00
Jakub Zelenka
ebc75dab50 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 19:08:26 +00:00
Jakub Zelenka
df135ffa7a Make test 002 for bug #65538 not to use https in cafile 2017-03-17 19:07:32 +00:00
Jakub Zelenka
b0ba8c68cd Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 18:12:37 +00:00
Jakub Zelenka
53e2c9158d Consume data by server in test for bug #72333
Client should be able to write more data and prevent time out
2017-03-17 18:11:50 +00:00
Nikita Popov
893bf7ecdd Merge branch 'PHP-7.0' into PHP-7.1 2017-03-17 13:35:50 +01:00
Nikita Popov
183cd048f1 Fix AST start lineno for list nodes
If the node is initialized with children, check if a child has a
lower start lineno, similar to what we do for fixed-sized nodes
as well.
2017-03-17 13:35:24 +01:00
Nikita Popov
7ea261685f Disable block pass for large functions
This is the last fix for bug #74250.
2017-03-17 12:49:20 +01:00
Jakub Zelenka
3becfb9be4 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-16 18:12:54 +00:00
Jakub Zelenka
0c8ad36d92 Make test for bug #72333 a bit more reliable 2017-03-16 18:11:56 +00:00
Sebastian Bergmann
ccc35d1903 Fugbix typo 2017-03-16 19:10:07 +01:00