Nikita Popov
4b930e156f
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-13 16:25:21 +01:00
Nikita Popov
a9d73f0646
Fixed bug #69221
...
A generator iterator can be created from different zvals - use
the object handle to manage references instead.
2015-03-13 16:23:53 +01:00
Xinchen Hui
d4f727d0f8
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-11 08:20:03 +08:00
Xinchen Hui
675606f1a6
Improve test script for #69212
2015-03-11 08:19:34 +08:00
Nikita Popov
49bd45a2c1
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 18:19:27 +01:00
Nikita Popov
bc9f2fb8df
Fixed bug #69212
2015-03-10 18:17:56 +01:00
Xinchen Hui
b5589d3fb4
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 17:06:05 +08:00
Xinchen Hui
6f4af2da29
Fixed test
2015-03-10 17:05:47 +08:00
Xinchen Hui
abb09693ac
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-10 15:37:14 +08:00
Xinchen Hui
6a6c273893
Fixed bug #66609 (php crashes with __get() and ++ operator in some cases)
2015-03-10 15:36:42 +08:00
Stanislav Malyshev
b0d1e23646
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add missing value for error_reporting directive
2015-03-08 17:05:51 -07:00
Stanislav Malyshev
d7931f8f66
Merge branch 'pull-request/1130' into PHP-5.5
...
* pull-request/1130:
Add missing value for error_reporting directive
2015-03-08 17:05:37 -07:00
Xinchen Hui
168be6f250
Merge branch 'PHP-5.5' into PHP-5.6
2015-03-05 18:40:06 +08:00
Xinchen Hui
f039225597
Fixed bug #69174 (leaks when unused inner class use traits precedence)
2015-03-05 18:39:50 +08:00
Lior Kaplan
1a35c959a9
Add missing value for error_reporting directive
2015-03-01 15:16:53 +02:00
Xinchen Hui
3ae88e023c
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-12 11:28:30 +08:00
Xinchen Hui
c2062ca470
Added test for #69017
2015-02-12 11:28:16 +08:00
Xinchen Hui
3d1ec33f96
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-09 11:32:32 +08:00
Reeze Xia
4d034b1a1e
Improve tests for bug 67436
...
I always use a.php or b.php for local testing,
this diff makes the test more stable
2015-02-07 14:11:09 +08:00
Nikita Popov
87ccf50bad
Merge branch 'PHP-5.5' into PHP-5.6
2014-12-19 21:46:38 +01:00
Nikita Popov
aa394e70ff
Fix bug #67111
...
Loop variables need to be freed for both "break" and "continue".
I'm adding the test to Zend/ because it's good to have a test for
this even without opcache.
2014-12-19 21:42:42 +01:00
Julien Pauli
d5dd29ce5c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Conflicts:
Zend/zend_compile.c
2014-12-12 16:11:26 +01:00
Kévin Dunglas
ee226b961c
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
2014-12-12 14:58:23 +01:00
Julien Pauli
b248a7a95c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fix #65419 - Inside trait, self::class != __CLASS__
2014-11-28 13:26:53 +01:00
Julien Pauli
7c77ca38b1
Fix #65419 - Inside trait, self::class != __CLASS__
2014-11-28 13:24:25 +01:00
Ferenc Kovacs
543ad4b2d3
#68446 is fixed
2014-11-26 23:12:49 +01:00
Anatol Belski
4576b4d58a
fix dir separator in test
2014-11-25 18:16:26 +01:00
Bob Weinand
0ca47ba8d8
Revert NEWS and set test to XFAIL
2014-11-25 12:27:17 +01:00
Bob Weinand
aba95c2399
Revert "Fix bug #68446 (bug with constant defaults and type hints)"
...
This reverts commit 5ef138b0c7
2014-11-25 12:24:29 +01:00
Bob Weinand
dd70a2c7ae
Added NEWS entry and test for bug 68446
2014-11-24 00:08:45 +01:00
Bob Weinand
5ef138b0c7
Fix bug #68446 (bug with constant defaults and type hints)
2014-11-23 21:10:41 +01:00
Xinchen Hui
b9e44888c0
Merge branch 'PHP-5.5' into PHP-5.6
2014-11-10 13:47:14 +08:00
Xinchen Hui
ab84939254
Fixed bug #68370 ("unset($this)" can make the program crash)
2014-11-10 13:46:47 +08:00
Nikita Popov
8617f2fa8d
Merge branch 'PHP-5.5' into PHP-5.6
2014-10-03 21:27:07 +02:00
Nikita Popov
93288d0095
Fix bug #68188
2014-10-03 21:26:39 +02:00
Nikita Popov
308c0a727e
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-20 21:47:59 +02:00
Nikita Popov
5e977e69e1
Fixed bug #67633
2014-09-20 21:46:25 +02:00
Tjerk Meesters
7e9daf60c1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed #67985 - Incorrect last used array index copied to new array after unset
2014-09-09 18:03:10 +08:00
Tjerk Meesters
aca474fa14
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed #67985 - Incorrect last used array index copied to new array after unset
2014-09-09 18:00:49 +08:00
Tjerk Meesters
99f0760bfb
Fixed #67985 - Incorrect last used array index copied to new array after unset
...
In master zend_array_dup() is used to do this properly; this is a workaround.
2014-09-09 17:58:45 +08:00
Nikita Popov
d7368c2531
Fix bug #67938 : Segfault when extending interface method with variadic
...
We only want to check extra optional args if the proto function is
variadic, not when we're adding extra variadic args.
2014-08-30 20:43:34 +02:00
Bob Weinand
d5ddd2dbb2
Disable restrictions regarding arrays in constants at run-time.
...
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html
2014-07-30 17:57:07 +02:00
Dmitry Stogov
d909b6330e
Fixed crash on self-referencing constant expression (part of a constant AST)
2014-07-24 00:37:15 +04:00
Xinchen Hui
1d2f232bd2
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-19 17:19:39 +08:00
Xinchen Hui
8ff00e6e85
Improve fix for #66608
2014-07-19 17:19:01 +08:00
Xinchen Hui
9ce1a36af2
Fixed segfault with empty break
2014-07-19 15:30:50 +08:00
Xinchen Hui
550b3e4306
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2014-07-18 15:48:56 +08:00
Xinchen Hui
de433d4c47
Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
2014-07-18 15:45:31 +08:00
Nikita Popov
1ea4b17af2
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-02 17:36:27 +02:00
Nikita Popov
d9ebd0f3d6
Fix bug #67497 : eval with parse error causes segfault in generator
2014-07-02 17:33:31 +02:00
