1
0
mirror of https://github.com/php/php-src.git synced 2026-04-18 05:21:02 +02:00
Commit Graph

2609 Commits

Author SHA1 Message Date
Nikita Popov
2bba4a0d7f Fix bug #69676 2017-03-15 19:49:02 +01:00
Nikita Popov
280e8dafe4 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-10 18:20:58 +01:00
Nikita Popov
29ee3e3c49 Fixed bug #73960 2017-03-10 18:20:32 +01:00
Sara Golemon
c5727a30cf Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix potential crash when setting invalid declare value
2017-02-28 17:17:41 -08:00
Sara Golemon
868930e079 Fix potential crash when setting invalid declare value
Using a non-literal expression in a declare value can cause the
compiler to crash trying to turn that AST node into a usable zval.

There was an existing test for such values using 'encoding',
but that didn't crash because it's handled by the lexer
rather than being compiled.

Trying to use a non-literal with ticks reproduces the crash.
2017-02-28 17:08:23 -08:00
Remi Collet
3006d1de5b make test slower again 2017-02-28 11:36:24 +01:00
Xinchen Hui
6a584cf318 Fixed bug #74157 (Segfault with nested generators) 2017-02-26 12:05:56 +08:00
Xinchen Hui
36fcc4cb5d Fixed bug #74164 (PHP hangs when an invalid value is dynamically passed to typehinted by-ref arg) 2017-02-25 12:00:42 +08:00
Anatol Belski
8ad75bec97 skip test
The code path not available on Windows.
2017-02-15 16:12:34 +01:00
Xinchen Hui
f53ea4cd60 Fixed test in travis 2017-02-15 17:31:27 +08:00
Xinchen Hui
8d94d5d942 Make it slower 2017-02-15 15:27:21 +08:00
Xinchen Hui
dad5281a89 Fixed test 2017-02-15 14:49:02 +08:00
Xinchen Hui
6767ef05a5 Add a test for hard_timeout(bug #74093) 2017-02-15 13:51:45 +08:00
Xinchen Hui
9df7cc3e68 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug  #73989 (PHP 7.1 Segfaults within Symfony test suite)
2017-02-13 19:17:09 +08:00
Xinchen Hui
3917350531 Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite) 2017-02-13 19:16:17 +08:00
Xinchen Hui
b56114e8fb Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)

Conflicts:
	Zend/zend_operators.c
2017-02-12 20:36:18 +08:00
Xinchen Hui
26fdebc63b Fixed bug #74084 (Out of bound read - zend_mm_alloc_small) 2017-02-12 20:34:08 +08:00
Anatol Belski
189ea77101 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  use some dynamically generated NAN as well
2017-02-07 13:18:38 +01:00
Anatol Belski
044dd30440 use some dynamically generated NAN as well 2017-02-07 13:16:30 +01:00
Andrea Faulds
b87e399393 Merge branch 'PHP-7.0' into PHP-7.1 2017-02-05 01:31:42 +00:00
Andrea Faulds
21d7878690 Fix bug #73954 2017-02-05 01:30:20 +00: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
Joe Watkins
46de334452 Revert "Inheritance checks should not ignore parents if these implement an interface"
This reverts commit b67eb3440b.
2017-02-01 18:34:14 +00:00
Joe Watkins
648238da5c Revert "Added tests demonstrating the same effect with abstracts"
This reverts commit c11b2b809d.
2017-02-01 18:33:47 +00:00
Pedro Magalhães
c11b2b809d Added tests demonstrating the same effect with abstracts 2017-01-28 06:28:14 +00:00
Pedro Magalhães
b67eb3440b Inheritance checks should not ignore parents if these implement an interface 2017-01-28 06:28:10 +00:00
Xinchen Hui
18f4ff4131 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference)
2017-01-13 13:04:53 +08:00
Xinchen Hui
04379bcb1d Fixed bug #73916 (zend_print_flat_zval_r doesn't consider reference) 2017-01-13 13:04:37 +08:00
Rasmus Lerdorf
08c7ff0df4 Ok, maybe Nikita is right. We should default this on. 2017-01-10 12:16:45 -05:00
Rasmus Lerdorf
ffd870f63d Missed one. This needs gc as well 2017-01-10 12:07:47 -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
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
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
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
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
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
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
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
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
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
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