Commit Graph

37699 Commits

Author SHA1 Message Date
Xinchen Hui
5f285482ea zend_get_parameters_ex is deprecated 2015-02-13 11:26:40 +08:00
Xinchen Hui
309e90638d Cleanup globals initialization 2015-02-13 10:58:35 +08:00
Nikita Popov
240fbd36f1 Add test to ensure ReflectionClass works correctly with traits
Some of these were not working correctly before Guilherme's patch.
Another was broken by it and is fixed in this commit as well.
2015-02-12 23:25:09 +01:00
Guilherme Blanco
8c81d80e10 Made ZEND_ACC_TRAIT a saner value
CC_TRAIT valued as 0x120 is too magical to be comprehensible by others.
2015-02-12 23:20:19 +01:00
Anatol Belski
07fdc1c78b fix data types 2015-02-12 18:39:40 +01:00
Anatol Belski
08c739c78e fix int to pointer cast 2015-02-12 18:39:39 +01:00
Dmitry Stogov
61a1e8d157 Fixed initialization of global variables in ZTS (this caused valgrind reports on few PHPT tests) 2015-02-12 16:51:07 +03:00
Dmitry Stogov
97fe15db43 Fix "forech" statemt behaviour according to https://wiki.php.net/rfc/php7_foreach
Squashed commit of the following:

commit 1e41295097
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Sat Jan 31 07:28:58 2015 +0300

    Generalize HashTableIterator API to allows its usage without involvement of HashTable.nInternalPonter

commit 5406f21b11
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:43 2015 +0300

    Reduced alghorithms complexity

commit b37f1d58d2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:30 2015 +0300

    Fixed test name

commit fb2d079645
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 18:08:05 2015 +0300

    API cleanup

commit 08302c0d6d
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 14:20:46 2015 +0300

    Make array_splice() to preserve foreach hash position

commit cc4b7be41e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 12:24:31 2015 +0300

    Make internal function, operation on array passed by reference, to preserve foreach hash position

commit 5aa9712b0a
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 09:49:35 2015 +0300

    Implement consistent behavior for foreach by value over plain object

commit 4c5b385ff5
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Jan 30 07:56:37 2015 +0300

    More careful iterators update.

commit 721fc9e80d
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:43:28 2015 +0300

    Added new test

commit 15a23b1218
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:05:02 2015 +0300

    Reimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc/php7_foreach#implementation_details)

commit 10a3260b1f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Jan 29 21:04:44 2015 +0300

    New test

commit eef80c5837
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 16:52:21 2015 +0300

    Fixed foreach by reference iteration over constant array

commit 61e7391873
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 14:59:54 2015 +0300

    Fixed temporary variable re-allocation pass

commit 92e90c09f0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 12:44:57 2015 +0300

    Fixed operand destruction in case of exceptions in iterator

commit dd2a36a207
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 10:02:34 2015 +0300

    Use GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE)

commit 4638f7b914
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Wed Jan 28 07:43:28 2015 +0300

    Change "foreach" statement behavior (this is just a PoC yet)

    - "foreach by value" don't relay on internal array/object pointer and doesnt perform array duplication. It just locks it incrementing reference counter. If the original array is modified by some code, the copy on write is performed and "foreach" still work with the old copy.

    - it makes no difference if array given to "foreach by value" is reference itself

    - "foreach by reference" still use internal array/object pointer and should work similar to PHP-5. (This id not completely implemented)
2015-02-12 13:57:12 +03:00
Yasuo Ohgaki
741b5952c6 Pass maxlifetime to save handlers 2015-02-12 13:07:27 +09:00
Anatol Belski
2895912756 fix dir separator in test 2015-02-11 15:10:48 +01:00
Anatol Belski
52f5cb914e fix incompatible pointer type 2015-02-11 12:03:35 +01:00
Anatol Belski
67d94d1465 fix uninitialized value warn 2015-02-11 11:46:28 +01:00
Dmitry Stogov
0053b4e899 Fixed possible memory leak 2015-02-11 09:39:38 +03:00
Bob Weinand
4cd3995475 Add a constant of type CONST_PERSISTENT to test 2015-02-10 22:53:50 +01:00
Bob Weinand
2b3bebfa4c Revert removal of two ReflectionParameter functions
Rather fix them for now by exempting function parameter defaults from *any* (non-ct) constant substitution (also from persistent constant substitution, which was already broken before)
2015-02-10 22:20:53 +01:00
Dmitry Stogov
087102c6d3 Don't convert options in-place. They may be elements of constant array. 2015-02-11 00:02:45 +03:00
Anatol Belski
993727031f Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in test
2015-02-10 16:59:48 +01:00
Anatol Belski
4d8db154ad Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in test
2015-02-10 16:59:22 +01:00
Anatol Belski
bc3e88b9af fix dir separator in test 2015-02-10 16:58:59 +01:00
Anatol Belski
ca9ab1c993 better alignment + support size_t 2015-02-10 16:02:55 +01:00
Bob Weinand
830d3d79b3 Revert "Revert "Improve and generalize class constant substitution""
This reverts commit 400e65e955.

Removing ReflectionParameter::getDefaultValueConstantName() and isDefaultValueConstant()
They become useless with such optimizations and already anyway are (e.g. CONSTANT?:CONSTANT ... yields the constant back without telling isDefaultValueConstant() about it etc.)
2015-02-10 15:47:17 +01:00
Dmitry Stogov
94602028f0 Get rid of old HashTable iteration API 2015-02-10 16:59:34 +03:00
Reeze Xia
2b396a8092 Update libmagic.patch to reflect changes made 2015-02-10 20:48:58 +08:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
Anatol Belski
4a875e18fd use portable strtol 2015-02-10 13:06:57 +01:00
Dmitry Stogov
4241a090ad Avoid reallocation in preg_replace() if nothing was replaced 2015-02-10 13:30:25 +03:00
Anatol Belski
293181e50e removed ext/sybase_ct 2015-02-10 08:42:37 +01:00
Anatol Belski
7568605b55 removed ext/mssql 2015-02-10 08:41:57 +01:00
Daniel Lowrey
712712e8d6 Merge branch 'PHP-5.6'
Conflicts:
	ext/openssl/xp_ssl.c
2015-02-09 15:14:47 -05:00
Dmitry Stogov
9d5d736869 Avoid repeatable calls to strstr() 2015-02-09 22:42:37 +03:00
Michael Wallner
09a3e7377a fix json globals 2015-02-09 17:57:18 +01:00
Daniel Lowrey
fb2314798e Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	ext/openssl/xp_ssl.c
2015-02-09 11:44:09 -05:00
Daniel Lowrey
1eef4f2a0c Miscellaneous cleanup 2015-02-09 11:42:17 -05:00
Daniel Lowrey
a8cb1d2b85 Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5 2015-02-09 11:40:04 -05:00
Anatol Belski
8989354130 regenerated scanner 2015-02-09 11:22:50 +01:00
Anatol Belski
ef2fd13de8 fix datatype mismatches 2015-02-09 11:06:02 +01:00
Anatol Belski
12fff5251b fix inconsistend dll linkage warn 2015-02-09 10:51:29 +01:00
Anatol Belski
fc5b349789 size_t vs int 2015-02-09 10:47:39 +01:00
Anatol Belski
a1208b4726 use size_t for str length 2015-02-09 10:43:27 +01:00
Anatol Belski
6747c166d8 generate missing json files from config.w32 2015-02-09 10:12:26 +01:00
Bob Weinand
fc444fbc70 Shut up, my lovely compiler; I do not like your warnings
Conflicts:
	Zend/zend_object_handlers.c
2015-02-09 11:23:35 +08:00
Márcio Almada
e9f99e3d71 Márcio Almada remove dead tokens: T_CHARACTER, T_BAD_CHARACTER. 2015-02-08 21:44:44 -03:00
Michael Wallner
3121116a93 fix detection of mbstate_t with clang
AC_TRY_COMPILE expexts a function body
2015-02-08 21:46:16 +01:00
Jakub Zelenka
f2825042b4 Merge branch 'master' into jsond
Conflicts:
	ext/json/json.c
2015-02-08 14:08:31 +00:00
Anatol Belski
ce9f52adcd Merge branch 'PHP-5.6'
* PHP-5.6:
  moved the part of the test into an appropriate place
2015-02-08 14:13:39 +01:00
Anatol Belski
979020fcad moved the part of the test into an appropriate place 2015-02-08 14:10:52 +01:00
Matteo Beccati
b32458f0c9 Removed unused REGISTER_PDO_CONST_LONG 2015-02-08 13:31:01 +01:00
Anatol Belski
371db55871 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix another invalid free of CG(interned_empty_string)
  add tests for #68996
  Fixed #68790 (Missing return)
  Invalid free of CG(interned_empty_string)

Conflicts:
	ext/soap/soap.c
	ext/wddx/wddx.c
	main/main.c
	sapi/litespeed/lsapi_main.c
2015-02-08 12:43:22 +01:00
Anatol Belski
ffdc2c4123 Merge branch 'pull-request/1060' into PHP-5.6 2015-02-08 12:33:15 +01:00
manuel
cc13d8696f Fix another invalid free of CG(interned_empty_string)
Fixes #68214
2015-02-07 19:17:31 +01:00