clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
81,180 Commits 494 Branches 1,367 Tags 797 MiB
316f72ce28
Commit Graph

1509 Commits

Author SHA1 Message Date
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
Bob Weinand
1163a7ce24 Mark test as XFAIL until fixed 2014-07-02 17:25:47 +02:00
Bob Weinand
33699a4dab Messed up syntax of tests 2014-07-02 12:43:27 +02:00
Bob Weinand
09d1a8aaab Add tests for constant expression arrays 
Adding one failing (!) test for now about circular constant references embedded in a constant AST, must be fixed before PHP 5.6 release.
 2014-07-02 12:33:46 +02:00
Xinchen Hui
9d49492fd6 Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant) 2014-06-24 13:53:05 +08:00
Ferenc Kovacs
53158f2c32 testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql) 2014-06-23 10:10:17 +02:00
Bob Weinand
7cef3a57ad Merge branch 'PHP-5.5' into PHP-5.6 2014-06-16 00:42:50 +02:00
Bob Weinand
03ee0ddc5f Merge branch 'PHP-5.4' into PHP-5.5 2014-06-16 00:41:46 +02:00
Levi Morrison
6c9c44905e Added tests for bug 67436 2014-06-15 16:31:39 -06:00
Boro Sitnikovski
cfccdc6362 Bug 64744 
Show the type of the non-object for more descriptive errors
 2014-06-08 19:14:58 -07:00
Stanislav Malyshev
8f527fbf14 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug 666222
  Fix bug 666222
 2014-06-08 19:02:24 -07:00
Levi Morrison
f47976dd9b Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.
 2014-06-08 18:59:44 -07:00
Levi Morrison
e030efa4f6 Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2014-06-08 18:59:23 -07:00
Nikita Popov
69b5ee61d0 Fixed bug #67169: []= after_array_splice incorrect 
This fixes a regression I introduced in beta 1.
 2014-05-02 12:49:51 +02:00
Anatol Belski
cfd20c90a5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  refixed the test related to bug #67072
  Improved the fix for bug #67072, thanks Nikita
 2014-04-18 15:17:12 +02:00
Anatol Belski
d963cf94a5 refixed the test related to bug #67072 2014-04-18 15:16:09 +02:00
Stanislav Malyshev
ce4c78dd07 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test case for 5328d42
 2014-04-17 17:36:26 -07:00
Tjerk Meesters
5e988a888a Fixed test case for 5328d42 2014-04-17 17:36:03 -07:00
Ferenc Kovacs
20036525e2 Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly 2014-04-13 10:45:46 +02:00
Bob Weinand
ee2a7c7d41 Fixed disallowal of array usage in constants at run-time 
Added at the same time the possibility of array dereferencing
to complete the set of features (useful application of arrays in constants)
 2014-04-11 18:21:46 +02:00