Rasmus Lerdorf
4f4a7f89ae
These tests rely on gc being enabled
2017-01-10 11:57:59 -05:00
Rasmus Lerdorf
47fcb75a90
These tests expect gc to be enabled
2017-01-10 11:54:49 -05:00
Anatol Belski
1f22daeb0f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
[ast] Fix exporting **= in expansion of assign op
2017-01-08 18:54:28 +01:00
Sara Golemon
5df97b339e
[ast] Fix exporting **= in expansion of assign op
...
(cherry picked from commit 9c3865eb6a
)
2017-01-08 18:43:47 +01:00
Joe Watkins
90c5c295a1
Merge branch 'PHP-7.1'
...
* PHP-7.1:
remove duplicate test
2017-01-04 14:51:41 +00:00
Joe Watkins
26b7e2e044
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
remove duplicate test
2017-01-04 14:51:21 +00:00
Joe Watkins
0d09b98ac4
remove duplicate test
2017-01-04 14:50:59 +00:00
Joe Watkins
a3c2abd530
Merge branch 'PHP-7.1'
...
* PHP-7.1:
fix test
2017-01-04 14:36:51 +00:00
Joe Watkins
d514f23573
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test
2017-01-04 14:36:37 +00:00
Joe Watkins
b39310c715
fix test
2017-01-04 14:36:18 +00:00
Nikita Popov
d719ac929e
Merge branch 'PHP-7.1'
2016-12-29 21:41:28 +01:00
Nikita Popov
12922f2a58
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-29 21:41:21 +01:00
Nikita Popov
432660f73f
Another try at making concat_003 more reliable
...
Use array_fill() for the array population loop -- this isn't the
part that is being tested and on PHP 7.0 w/o opcache this duplicates
the inner array a lot.
2016-12-29 21:39:40 +01:00
Nikita Popov
114b526649
Merge branch 'PHP-7.1'
2016-12-21 21:28:36 +01:00
Nikita Popov
06699abffb
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 21:28:29 +01:00
Nikita Popov
c41826d1e6
Increase timing quota for small string concat test
...
Test is regularly failing on Travis.
2016-12-21 21:27:47 +01:00
Nikita Popov
a1fd1053f5
Merge branch 'PHP-7.1'
2016-12-21 21:19:28 +01:00
Nikita Popov
9afc61c214
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-21 21:19:10 +01:00
David Walker
5733fd1caf
Fix #73753 - Unpacked Arrays and Duplication
2016-12-21 21:18:20 +01:00
Xinchen Hui
b6553d422d
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
2016-12-21 14:27:13 +08:00
Xinchen Hui
82988d3e41
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
...
This reverts commit a12f43ee2c
.
2016-12-21 14:24:14 +08:00
Dmitry Stogov
088dd88eeb
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #73792 (invalid foreach loop hangs script)
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
2016-12-20 16:54:28 +03:00
Dmitry Stogov
43cc3d7d92
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73792 (invalid foreach loop hangs script)
2016-12-20 16:53:06 +03:00
Dmitry Stogov
3c6a2fb08c
Fixed bug #73792 (invalid foreach loop hangs script)
2016-12-20 16:48:57 +03:00
Xinchen Hui
adf0256c4a
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Reorder the oplines
2016-12-17 20:09:49 +08:00
Xinchen Hui
a12f43ee2c
Reorder the oplines
...
1. we should only do the return type checking when it is really about to
return
2. for 029.php, actually, the exception threw should be discard while it
jmp into finally(it could be observed by change the return to return an array)
3. after this fix, the test 029.phpt behavior consistently with 7.0
4. good for optimizer too
2016-12-17 20:06:18 +08:00
Nikita Popov
fe98ff94bb
Merge branch 'PHP-7.1'
2016-12-11 13:34:28 +01:00
Nikita Popov
2c70581338
Fix T_NUM_STRING negation
...
T_NUM_STRING follows the rules of symtable numeric string
conversion. If the offset isn't an integer under those rules, it
is treated as a string. This should apply to negated T_NUM_STRINGs
as well.
2016-12-11 13:33:25 +01:00
Dmitry Stogov
c2bc94f5a5
Fixed memory leaks caused by exceptions thrown from destructors (fixed test).
2016-12-07 14:20:43 +03:00
Dmitry Stogov
e8109e09aa
Fixed memory leaks caused by exceptions thrown from destructors.
2016-12-07 00:41:07 +03:00
Xinchen Hui
1113d589dc
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Update NEWS
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
2016-12-06 17:33:27 +08:00
Xinchen Hui
d7a759916d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
2016-12-06 17:32:48 +08:00
Xinchen Hui
358bd77b23
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
2016-12-06 17:32:32 +08:00
Dmitry Stogov
7d86ed1852
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-05 21:50:06 +03:00
Dmitry Stogov
2f0e61f4b7
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-05 21:49:09 +03:00
Dmitry Stogov
a983b728a7
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-05 21:45:08 +03:00
Bob Weinand
f74890bcf5
Merge branch 'PHP-7.1'
2016-12-03 18:29:11 +01:00
Bob Weinand
146b68e022
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-03 18:28:47 +01:00
Bob Weinand
ffc1ef1eed
Fix leak when using $this outside of object context
2016-12-03 18:28:08 +01:00
Anatol Belski
c5af4b2585
Improve multiplication on x64.
...
Thanks Bob for the spot.
2016-12-03 15:50:21 +01:00
Bob Weinand
1635fe659c
Merge branch 'PHP-7.1'
2016-12-02 15:42:31 +01:00
Bob Weinand
7b5e89de82
Merge branch 'PHP-7.0' into PHP-7.1
2016-12-02 15:42:19 +01:00
Bob Weinand
3c1a0d75bf
Fix test of wrong operator in self_xor.phpt
2016-12-02 15:41:47 +01:00
Dmitry Stogov
e319504517
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-02 15:14:48 +03:00
Dmitry Stogov
b3a4de65cd
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-02 15:14:37 +03:00
Dmitry Stogov
2b70d44b57
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
2016-12-02 15:13:55 +03:00
Dmitry Stogov
0314958a43
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed behavior of failing compound assignments (they shouldn't change the source value).
2016-12-02 14:00:50 +03:00
Dmitry Stogov
5a57b3d6e0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed behavior of failing compound assignments (they shouldn't change the source value).
2016-12-02 14:00:29 +03:00
Dmitry Stogov
dbf39cddd9
Fixed behavior of failing compound assignments (they shouldn't change the source value).
2016-12-02 13:58:44 +03:00
Dmitry Stogov
0ce5f99caf
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed possible memory leak in &=, |=, ^=.
2016-12-02 12:36:02 +03:00