Ferenc Kovacs
03dcdf5742
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Fix bug #66568 : the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
2014-07-25 13:16:31 +02:00
Ferenc Kovacs
a68ef0a117
Revert "Fix bug #66568 : the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
...
This reverts commit aefc8f22b3 .
Conflicts:
NEWS
2014-07-25 13:15:27 +02:00
Tjerk Meesters
7de82eaeef
Merge branch 'PHP-5.6'
2014-07-12 11:15:03 +08:00
Tjerk Meesters
18feaf9416
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 11:10:15 +08:00
Tjerk Meesters
8757e2cab8
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-12 11:08:50 +08:00
Tjerk Meesters
4fc0d46ae7
Fix for bug #34407 - ucwords and title case
...
Added support for ranges like trim() has
2014-07-12 10:44:11 +08:00
Ferenc Kovacs
ec974c4397
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Add optional second arg to unserialize()"
2014-06-11 14:59:39 +02:00
Ferenc Kovacs
c38ab260fe
Revert "Add optional second arg to unserialize()"
...
This reverts commit cfd1045822 .
2014-06-11 14:43:09 +02:00
Stanislav Malyshev
b060880c87
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:44 -07:00
Stanislav Malyshev
336b5f59b6
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:04 -07:00
Stanislav Malyshev
4b0b032676
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:31 -07:00
Stanislav Malyshev
62857998c5
Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:09:09 -07:00
Ferenc Kovacs
fdbf467d2e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66568 : the second arg for unserialize is optional.
2014-04-13 02:50:03 +02:00
Ferenc Kovacs
aefc8f22b3
Fix bug #66568 : the second arg for unserialize is optional.
2014-04-13 02:49:35 +02:00
Bob Weinand
ccf863c8ce
Merge branch 'PHP-5.6'
2014-04-11 19:35:11 +02:00
Bob Weinand
99d1a1bb3f
Shut up, my lovely compiler; I do not like your warnings
2014-04-11 19:33:56 +02:00
Kalle Sommer Nielsen
91aa9fbb47
Remove call_user_method() and call_user_method_array() from master, long time deprecated in favour of call_user_func*().
2014-04-05 06:43:41 +02:00
Nikita Popov
1aa6f95651
Merge branch 'PHP-5.6'
2014-02-16 00:08:17 +01:00
Rouven Weßling
417dbfbacc
Declare a number of functions as variadic.
2014-02-16 00:07:55 +01:00
Will Fitch
4e5195f82c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:57:34 -05:00
Will Fitch
a540c57331
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:56:22 -05:00
Will Fitch
767e6d2e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66509 : copy() arginfo incorrect since 5.4
Conflicts:
NEWS
2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb
Fix bug #66509 : copy() arginfo incorrect since 5.4
...
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
2014-01-18 11:25:53 -05:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Kalle Sommer Nielsen
aed4b086ac
Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook
2013-12-18 09:32:26 +01:00
Xinchen Hui
140a42f779
Merge branch 'PHP-5.5' into PHP-5.6
2013-11-17 17:20:13 +08:00
Xinchen Hui
5a282136a3
Merge branch 'PHP-5.5'
2013-11-17 17:11:20 +08:00
Xinchen Hui
de79c51555
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
2013-11-17 17:04:37 +08:00
Sherif Ramadan
98c9e56ef0
Merge branch 'pull-request/287'
...
Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.
2013-10-30 09:36:19 -04:00
Antony Dovgal
605b3c2ca1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #65936 (dangling context pointer causes crash)
2013-10-21 15:10:15 +04:00
Antony Dovgal
b636c03426
fix bug #65936 (dangling context pointer causes crash)
...
reported by Leon Sorokin
2013-10-21 15:09:29 +04:00
datibbaw
6442e49b22
forgot introspection changes
2013-09-28 00:06:03 +08:00
Nikita Popov
0d7a638866
Implement variadic function syntax
...
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
Stanislav Malyshev
03b2603ce0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
code related typo fixes
Fix duplicated 5.5.2 NEWS in my tree
2013-08-18 13:47:00 -07:00
Veres Lajos
144eab0889
code related typo fixes
2013-08-18 13:46:32 -07:00
Sara Golemon
cfd1045822
Add optional second arg to unserialize()
...
Returns the number of bytes consumed by reference for
streaming unserialization.
Actual unserialization behavior is not modified at all.
The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
2013-05-16 15:18:35 -07:00
Pierrick Charron
b79e65f268
Remove curl wrappers
2013-04-23 17:01:17 -04:00
David Soria Parra
0173c4bab0
Merge branch 'pull-request/257' into PHP-5.5
...
* pull-request/257:
array_column: Fix compile-time warnings
array_column: Removed array_pluck() alias
array_column: Set array_pluck as an alias for array_column
array_column: Implement ability to specify an index column
Cleaning up a memory leak.
array_column: Adding test for IS_OBJECT and converting object to string
array_column: Using add_next_index_zval() at nikic's recommendation.
array_column: Improved tests
array_column: Cleaning up, as recommended in pull request #56 comments
Fixing typo in test for array_column()
Simplify the code and use zend_hash_next_index_insert()
Adding test for columns not present in all rows for array_column().
Adding tests for the negative results of array_column()
Implement new array function array_column()
2013-03-20 13:02:33 +01:00
Ben Ramsey
3439a098a0
array_column: Removed array_pluck() alias
2013-01-14 10:04:14 -06:00
Ben Ramsey
a1876b6846
array_column: Set array_pluck as an alias for array_column
2013-01-11 17:09:34 -06:00
Ben Ramsey
5bc2854b37
array_column: Implement ability to specify an index column
2013-01-11 16:58:31 -06:00
Ben Ramsey
9035a1ed24
Implement new array function array_column()
...
array_column() returns the values of the specified column from a
multi-dimensional array.
2013-01-11 14:16:19 -06:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Antony Dovgal
01dee2c4b0
fix bug #63369
...
(un)serialize() leaves dangling pointers, causes crashes
2012-10-26 16:42:21 +04:00