Bob Weinand
eca0644e0a
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-13 19:25:07 +02:00
Bob Weinand
1a4a9eede5
Fix bug #67064 in a BC safe way
...
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().
2014-04-13 19:24:12 +02:00
Eric Stenson
330168a247
Fix tests expecting specific resource IDs
...
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself. As a
result, these tests become false positives.
On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently. This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines. Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-15 16:51:21 +08:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Xinchen Hui
c7b58e4967
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 21:07:27 +08:00
Xinchen Hui
3380de9774
Fixed bug #65304 (Use of max int in array_sum)
2013-07-21 21:07:19 +08:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Ben Ramsey
d1c261d7f8
array_column: Changing integer in test output to use %d
2013-07-06 20:50:34 +00:00
Felipe Pena
32f11e4ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed test
2013-06-26 13:36:41 -03:00
Felipe Pena
f477ad22c2
- Fixed test
2013-06-26 13:36:36 -03:00
Andrey Hristov
781be5f1d7
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-06-26 16:50:08 +02:00
Andrey Hristov
b34e8d2e3e
add new test
2013-06-26 16:44:26 +02:00
Anatol Belski
a0cb61b292
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure the error_reporting level to get expected notice
2013-06-12 13:15:18 +02:00
Anatol Belski
ed2690477c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
ensure the error_reporting level to get expected notice
2013-06-12 13:14:53 +02:00
Anatol Belski
cd1b44c4b6
ensure the error_reporting level to get expected notice
2013-06-12 13:13:48 +02:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Sara Golemon
734e165d4e
array_column() - Use entire subject array when NULL passed for second param.
...
This starts to look like array_values(), except that you can reindex the arrays
using the third parameter.
2013-04-22 16:19:21 -07:00
Sara Golemon
1a03bd5dee
Allow array_column() to take -1 as a valid value in third param
...
Also do some cleanup and simplification to make this code more
readable in the long term.
2013-04-22 15:54:21 -07:00
Sara Golemon
f63db963c4
Harden array_column_basic.phpt against resource renumbering.
...
We don't care what resource number it is, so long as there's a
stream resource returned.
2013-04-22 13:36:40 -07:00
Sara Golemon
7b34324f84
Fix handling of double keys in array_column
...
Also fix resource test to not localize __FILE__ to cwd.
2013-04-21 22:35:04 -07:00
Xinchen Hui
d8a5f41a60
Fixed bug parameter is casted to string of array_column
2013-04-01 19:11:45 +08: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
Carson McDonald
0c11cab919
Typo fix: recieved to received
2013-03-07 23:05:05 +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
20ab30339d
array_column: Adding test for IS_OBJECT and converting object to string
2013-01-11 14:16:19 -06:00
Ben Ramsey
5f6b20a44d
array_column: Improved tests
2013-01-11 14:16:19 -06:00
Ben Ramsey
10da6f00b8
Fixing typo in test for array_column()
2013-01-11 14:16:19 -06:00
Ben Ramsey
dc4dfe8ae0
Adding test for columns not present in all rows for array_column().
2013-01-11 14:16:19 -06:00
Ben Ramsey
a811e5b6f7
Adding tests for the negative results of array_column()
2013-01-11 14:16:19 -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
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Nuno Lopes
af2d6a63bf
remove remaining traces of unicode.* ini settings
2012-05-27 19:57:34 -04:00
Xinchen Hui
376635cde8
Merge branch 'PHP-5.3' into PHP-5.4
2012-05-06 20:32:15 +08:00
Xinchen Hui
99076bc24f
Change the test folder
2012-05-06 20:31:40 +08:00
Nikita Popov
37d7df72a6
Fix bug #52719 : array_walk_recursive crashes if third param of the function is by reference
2012-03-02 18:05:38 +00:00
Nikita Popov
e7810c1f1e
Fix bug #52719 : array_walk_recursive crashes if third param of the function is by reference
2012-03-02 18:05:38 +00:00
Xinchen Hui
fda8d2fe68
MFH: Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX)
2012-03-02 03:40:40 +00:00
Rasmus Lerdorf
fdd1977ea7
Unbreak these tests - please be careful with your Windows-based editors that
...
seem to mess up ^M's here.
2012-02-12 08:01:25 +00:00
Xinchen Hui
33125e2312
Improved fix for #61058 , and add test script
2012-02-12 05:32:24 +00:00
Adam Harvey
98f5e51a7e
Fix bug #60933 on PHP_5_4 (approved by Stas).
2012-02-03 04:17:11 +00:00
Adam Harvey
479c22523c
Fix bug #60933 (Testing asort with SORT_LOCALE_STRING fails on Mac OS X 10.6) on PHP_5_3 and trunk.
2012-02-03 01:21:24 +00:00