Stanislav Malyshev
2ed66ed21c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
2014-06-10 23:20:07 -07:00
Stanislav Malyshev
f11bba4929
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Conflicts:
configure.in
main/php_version.h
2014-06-10 23:19:21 -07:00
Stanislav Malyshev
317bcb96d0
Fix bug #66127 (Segmentation fault with ArrayObject unset)
2014-06-10 23:17:30 -07:00
Xinchen Hui
91b2ddc816
Merge branch 'master' into phpng
...
Conflicts:
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/formatted_print.c
2014-06-01 22:43:06 +08:00
Xinchen Hui
c4e7c7d50e
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-01 19:42:20 +08:00
Xinchen Hui
9bb5867fad
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-01 19:41:35 +08:00
Xinchen Hui
38be99b739
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
2014-06-01 19:41:01 +08:00
Adam Harvey
b8042acdde
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
2014-05-29 17:56:32 +00:00
Adam Harvey
43e3a83d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
2014-05-29 17:53:28 +00:00
Adam Harvey
b5d9983ff4
Check for zero-length keys in spl_array_skip_protected and don't skip them.
...
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
2014-05-29 17:49:32 +00:00
Dmitry Stogov
b11a30f5ea
Merge branch 'master' into phpng
...
* master:
Support for __debugInfo (Joe Watkins)
Optimize ZEND_POW (Rouven Weßling)
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Prevent recursion in ZF2 Parameters class
adding NEWS block for beta4
5.4.30 next
enable email notifications
update NEWS
update NEWS
update NEWS
- Updated to version 2014.3 (2014c)
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
Fix bug #67252 : convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/opcache/zend_persist.c
ext/spl/spl_array.c
2014-05-18 21:17:31 +04:00
Tjerk Meesters
d4295eb26a
Prevent recursion in ZF2 Parameters class
2014-05-16 16:49:47 +08:00
Dmitry Stogov
7fcd4064c0
Merge branch 'master' into phpng
...
* master: (41 commits)
fix test - output can be chunked
fix test
fix test
Fixed test for commit 997be125eb
Add bug fix to NEWS
Update UPGRADING according to bug fix
fix test
improve CURL tests to allow testing without separate server
improve CURL tests to allow testing without separate server
Fixed bug #67199 mb_regex_encoding mishmash
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
- Move checking
- Fixed missing NULL check in SimpleXMLElement::xpath()
- Fixed missing NULL check
...
Conflicts:
ext/bz2/bz2.c
ext/gd/gd.c
ext/mbstring/php_mbregex.c
ext/session/tests/031.phpt
ext/simplexml/simplexml.c
ext/spl/spl_fixedarray.c
2014-05-13 15:24:40 +04:00
Stanislav Malyshev
f2fdeba19d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:56:32 -07:00
Stanislav Malyshev
af5cc61cf3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
2014-05-11 18:16:19 -07:00
Stanislav Malyshev
2b475eebbe
Fix bug #67247 spl_fixedarray_resize integer overflow
2014-05-11 17:54:27 -07:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Etienne Kneuss
6006a3ed51
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-09 11:36:36 +02:00
Joshua Thijssen
e8d6c6587d
fixed bug66702 : regexiterator's invert flag doesn't work as expected
2014-04-09 11:13:33 +02:00
Tjerk Meesters
5dee3c11fe
Call offsetGet() when called with isset() on ArrayObject derivatives
2014-03-25 18:15:18 +08:00
Xinchen Hui
5639a2a8ef
Reflection doesn't return ref anymore
2014-03-16 15:47:08 +08:00
Xinchen Hui
cc79496b97
Refactor Spl_Iterators to fixed default_properties change
2014-03-15 16:33:55 +08:00
Xinchen Hui
28e0a58018
Fixed fixedarray iterator fetching
2014-03-15 13:18:32 +08:00
Xinchen Hui
350260624d
Fixing SplFixedArray (this probably will be revert, just show what the problem is)
2014-03-08 19:03:38 +08:00
Tjerk Meesters
8d3f4b647b
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-07 19:24:02 +08:00
Tjerk Meesters
972935cd95
Fixed null termination
2014-03-07 19:23:46 +08:00
Tjerk Meesters
64906cdc38
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-07 18:57:36 +08:00
datibbaw
3c673fed34
Add fread(length) method
...
Fixed off-by-one write bug
Added test
2014-03-07 18:50:33 +08:00
Anatol Belski
1cb4398ac1
primitive test fixes
2014-02-28 09:43:57 +01:00
Ferenc Kovacs
42a43d4531
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests broken by 633f898f15
2014-02-27 02:32:47 +01:00
Ferenc Kovacs
fd20278fa5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests broken by 633f898f15
2014-02-27 02:32:07 +01:00
Ferenc Kovacs
bd961f3e87
fix tests broken by 633f898f15
2014-02-27 02:31:42 +01:00
Dmitry Stogov
0f39089384
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests
2013-12-02 12:05:29 +04:00
Dmitry Stogov
2f5ab04c5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests
2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c
Fixed tests
2013-12-02 11:53:35 +04:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01:00
ptarjan
9c1e1bbc05
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Christopher Jones
c439ac6c35
Cleanup temp test file
2013-11-06 10:31:35 +01:00
Sara Golemon
92fe33c570
Merge branch 'pull-request/473'
2013-09-26 13:24:08 -07: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
ptarjan
ecbe4af0de
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-09-26 00:30:23 -07:00
David Soria Parra
dc7015d4e4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:58 +02:00
David Soria Parra
94e4c4df86
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:51 +02:00
David Soria Parra
7a24ee13ec
Revert "EmptyIterator now implements Countable; fixes bug 60577"
...
This reverts commit 8a936e8eb9
.
2013-09-18 15:06:36 +02:00
Michael Wallner
6866b45a48
fix test concurrency
2013-09-18 10:52:35 +02:00
David Soria Parra
3d6ac70e66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-16 23:36:37 +02:00
Levi Morrison
8a936e8eb9
EmptyIterator now implements Countable; fixes bug 60577
...
(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
2013-09-16 04:04:53 +02:00
Levi Morrison
d76959a3b9
Fixed minor bug in test.
2013-09-12 23:29:52 +02:00
Nikita Popov
ad976d8240
Fix bug #64782 : SplFileObject constructor make $context optional
2013-09-12 17:46:14 +02: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
Rasmus Lerdorf
3d0aca80f2
Merge commit 'e55f08a' into PHP-5.5
...
* commit 'e55f08a':
This test will only work if gc is enabled
2013-08-02 12:01:12 -04:00
Rasmus Lerdorf
e55f08a5ae
This test will only work if gc is enabled
2013-08-02 12:00:48 -04:00
Xinchen Hui
9126909c08
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:44:19 +08:00
Xinchen Hui
9909c4d4c4
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 22:43:41 +08:00
Stanislav Malyshev
83ced9124e
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:47:10 -07:00
Joshua Thijssen
5027fa79d7
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:20:58 -07: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
Christopher Jones
3478ddc1f0
Cleanup temp test file
2013-07-10 11:17:52 -07:00
Adam Harvey
3becd3879f
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
...
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
2013-06-28 13:50:33 -07:00
Felipe Pena
f5bf90ef34
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
2013-06-25 21:18:34 -03:00
Felipe Pena
04db57066d
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
2013-06-25 21:18:09 -03:00
Xinchen Hui
9d9ec2a90e
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-25 13:38:50 +08:00
Xinchen Hui
38eb909d06
Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)
2013-06-25 13:38:27 +08:00
Stanislav Malyshev
af5e2eaf8d
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:20 -07:00
Stanislav Malyshev
6b896fa57f
Merge branch 'pull-request/320'
...
* pull-request/320:
this is test 5 not 6
fix race condition
more shared names that create race conditions
change to a unique filename
more shared filenames
yet another shared filename
don't share a filename to stop race conditions
fix race condition for 2-4 and normalize names for others
fix race condition when running tests in parallel
clean up after test
Fix #64572 : Clean up after the test
Fix #64572 : Clean up after the test
2013-06-17 01:06:01 -07: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
Mark Baker
4257469079
Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:46:21 +01:00
Xinchen Hui
c1cf7538f0
Fixed test after nick previous fix
2013-03-16 23:16:32 +08:00
Nikita Popov
fcc6611de9
Add support for non-scalar Iterator keys in foreach
...
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Stanislav Malyshev
207d0ee08a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:13:01 -08:00
Stanislav Malyshev
7c08232509
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Bug #52861 : unset fails with ArrayObject and deep arrays
2013-02-26 22:12:36 -08:00
Mike Willbanks
61099f8585
Bug #52861 : unset fails with ArrayObject and deep arrays
...
When checking to make into a reference write, readwrite are checked but not unset
2013-02-26 22:11:52 -08:00
Xinchen Hui
e75804c34e
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-24 12:59:10 +08:00
Xinchen Hui
d24ac6953e
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_fixedarray.c
2013-02-24 12:58:39 +08:00
Xinchen Hui
1b58bd39a6
Fixed bug #64264 (SPLFixedArray toArray problem)
2013-02-24 12:55:53 +08:00
Xinchen Hui
d3291de51a
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-17 11:06:33 +08:00
Xinchen Hui
263accb626
Merge branch 'PHP-5.3' into PHP-5.4
2013-02-17 11:05:34 +08:00
Xinchen Hui
01ae5c3c2f
Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)
2013-02-17 11:04:36 +08:00
Nikita Popov
f540e086e2
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:40:02 +01:00
Nikita Popov
bb4d11b405
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-30 20:25:59 +01:00
Nikita Popov
321f4f18e5
Fixed bug #64106 : Segfault on SplFixedArray[][x] = y when extended
2013-01-30 20:23:39 +01:00
Gustavo Lopes
fc7b054c2d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:24:50 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Stanislav Malyshev
deeacc7106
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63462 (Magic methods called twice for unset protected properties)
NEWS for bug #64011 . See 77ee200
Fix bug #64011 (get_html_translation_table())
Fix News
Update the arguments in the prototype of fpm_socket_unix_test_connect().
fixed build
NEWS for bug #63893
Fixed inconsequential bug in strtr()
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-18 13:42:04 -08:00
Adam Harvey
83864b470b
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
...
This reverts commit 0510701474
.
2013-01-15 17:37:21 +08:00
Adam Harvey
8bf937f9bf
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:50:57 +08:00
Adam Harvey
0510701474
Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:49:52 +08:00
Dmitry Stogov
274ceb3d8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
Conflicts:
NEWS
2012-12-05 17:55:21 +04:00
Dmitry Stogov
881416cda6
Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:53:26 +04:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
139ac42bec
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
2012-10-01 22:42:22 +08:00
Xinchen Hui
175a9de47f
Fix test
2012-10-01 00:15:47 +08:00
Xinchen Hui
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
a81d431068
Merge branch 'PHP-5.4'
2012-10-01 22:45:15 +08:00
Xinchen Hui
f8d1fc62fa
Merge branch 'PHP-5.4'
2012-10-01 00:17:11 +08:00
Xinchen Hui
d6ca1c9b9a
Merge branch 'PHP-5.4'
2012-09-29 14:39:59 +08:00
Xinchen Hui
36c10242cd
Remove meaningless md5 string && Attempt to fix #63184
2012-09-29 14:38:29 +08:00
Anatoliy Belsky
87df717909
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix unix/win dir separators
2012-09-27 19:54:12 +02:00
Anatoliy Belsky
6a50a8640c
fix unix/win dir separators
2012-09-27 19:52:34 +02:00
Lars Strojny
6793e09a4e
Merge branch 'PHP-5.4'
2012-09-18 23:17:31 +02:00
Lars Strojny
ee172ce3cc
Merging PR #116
2012-09-18 23:15:03 +02:00
Xinchen Hui
7b5960b085
Merge branch 'PHP-5.4'
2012-09-01 14:38:33 +08:00
Xinchen Hui
f3108b5f81
Remove extra blank in notice message, should act as same as vm
2012-09-01 14:37:45 +08:00
Xinchen Hui
59e34bad32
Merge branch 'PHP-5.4'
2012-09-01 14:27:59 +08:00
Xinchen Hui
863e7e0acb
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/spl/spl_array.c
2012-09-01 14:27:09 +08:00
Xinchen Hui
67d7d03f00
Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
...
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
2012-09-01 14:21:34 +08:00
Xinchen Hui
a3d701e11c
Merge branch 'PHP-5.4'
2012-08-23 23:28:24 +08:00
Xinchen Hui
13bcf685cb
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
2012-08-23 23:27:16 +08:00
Xinchen Hui
42f91d6ac6
Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray)
2012-08-23 23:21:25 +08:00
Xinchen Hui
546b0e4a99
Merge branch 'PHP-5.4'
2012-08-21 13:33:23 +08:00
Xinchen Hui
8722173ad5
Implemented FR #62840 (Add sort flag to ArrayObject::ksort)
2012-08-21 13:32:15 +08:00
Xinchen Hui
e51acee43d
Merge branch 'PHP-5.4'
2012-08-13 11:04:05 +08:00
Xinchen Hui
212cfb95d1
more test script for #62328
2012-08-13 11:03:35 +08:00
Xinchen Hui
777b6679a4
missed the test script
2012-07-21 23:30:32 +08:00
Xinchen Hui
a580405f38
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 22:46:14 +08:00
Xinchen Hui
0c996613c0
Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
2012-07-21 22:45:16 +08:00
Xinchen Hui
8238c6a4c8
test script for bug #61697
2012-07-18 19:19:31 +08:00
Stanislav Malyshev
e84c5be631
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
2012-07-14 22:35:47 -07:00
Stanislav Malyshev
a5d45bae85
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
2012-07-14 22:34:28 -07:00
Stanislav Malyshev
455f3de802
Merge branch 'PHP-5.4'
...
* PHP-5.4:
removed unneccesary arrat and ini settings
addition SplFileObject tests
new tests from PHP TestFest June 2012
2012-07-14 19:25:16 -07:00
donnut
53ba768ed8
removed unneccesary arrat and ini settings
2012-07-14 19:22:03 -07:00
donnut
4539d799bb
addition SplFileObject tests
2012-07-14 19:21:50 -07:00
donnut
2cb7a678a1
new tests from PHP TestFest June 2012
2012-07-14 19:21:34 -07:00
Anatoliy Belsky
ed1f5b4dae
Merge branch 'PHP-5.4'
...
* PHP-5.4:
reverted news about #62477
reverted changes for #62477
Conflicts:
NEWS
2012-07-12 11:02:33 +02:00
Anatoliy Belsky
86428169d3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
reverted changes for #62477
2012-07-12 10:57:26 +02:00
Anatoliy Belsky
ad7eeba3c1
reverted changes for #62477
2012-07-12 10:54:14 +02:00
Anatoliy Belsky
b530d6d790
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62477 LimitIterator int overflow
2012-07-11 22:30:40 +02:00
Anatoliy Belsky
40f8010a13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62477 LimitIterator int overflow
2012-07-11 22:29:45 +02:00
Anatoliy Belsky
b383ddf1e5
Fixed bug #62477 LimitIterator int overflow
2012-07-11 22:25:31 +02:00
Anatoliy Belsky
f76bb14814
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed #62433 test for win
2012-07-09 12:45:56 +02:00
Anatoliy Belsky
2032470e41
fixed #62433 test for win
2012-07-09 12:42:10 +02:00
Xinchen Hui
8d81a03e43
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files).
2012-07-02 11:34:33 +08:00
Xinchen Hui
be4053cea0
Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files).
2012-07-02 11:33:38 +08:00
Stanislav Malyshev
a3322f8927
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Nikita Popov
fed1f2d124
Fixed bug RecursiveArrayIterator does not implement Countable
...
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
2012-06-19 18:32:44 +02:00
Nikita Popov
12b252e1dd
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug RecursiveArrayIterator does not implement Countable
2012-06-19 18:13:14 +02:00
Nikita Popov
cce4764f13
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug RecursiveArrayIterator does not implement Countable
Conflicts:
ext/spl/spl_array.c
2012-06-19 18:08:22 +02:00
Nikita Popov
4cba4c6193
Fixed bug RecursiveArrayIterator does not implement Countable
...
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
2012-06-19 18:04:14 +02:00
Xinchen Hui
7c297ca31e
Merge remote-tracking branch 'origin/PHP-5.4'
...
* origin/PHP-5.4:
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-24 23:38:53 +08:00
Xinchen Hui
a10da87c6a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-24 23:34:14 +08:00
Xinchen Hui
bde86a6639
Fixed bug #62073
...
(Different ways of iterating over an SplMaxHeap result in in different keys)
2012-05-24 23:31:05 +08:00
Reeze Xia
9205c4fd62
Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
2012-05-23 20:42:06 +08:00
Anatoliy Belsky
adfb4c62b7
Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails
...
The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4
2012-04-19 11:33:12 +02:00
Anatoliy Belsky
b2f2e1d6cc
Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
2012-04-10 14:03:19 +02:00
Shein Alexey
dda95b794c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Added failing test for ArrayObject::offsetExists().
2012-03-27 19:02:01 +05:00
Shein Alexey
1b179545c2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added failing test for ArrayObject::offsetExists().
2012-03-27 19:00:28 +05:00
Shein Alexey
ddac4688e8
Added failing test for ArrayObject::offsetExists().
2012-03-27 18:59:04 +05:00
Gustavo André dos Santos Lopes
30642380de
Merge branch '5.4'
2012-03-23 22:14:56 +00:00
Gustavo André dos Santos Lopes
e018e2ae86
Merge branch '5.3' into 5.4
2012-03-23 22:14:36 +00:00
Gustavo André dos Santos Lopes
372801d94c
Fixed tests that var_dump/print_r DOM objects.
2012-03-23 22:08:33 +00:00
Gustavo André dos Santos Lopes
8609338a03
Merge branch '5.4'
2012-03-23 11:32:43 +00:00
Gustavo André dos Santos Lopes
0cf70b1a42
Merge branch '5.3' into 5.4
2012-03-23 11:32:20 +00:00
Gustavo André dos Santos Lopes
85725337d5
Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482 "
...
This reverts commit a89c4a34ee
.
2012-03-23 09:40:27 +00:00
Stanislav Malyshev
2e19cccad7
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
update for git
2012-03-22 22:31:10 -07:00
Stanislav Malyshev
bcc15b5633
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
Add initialization tests for SQLT_INT binds
Fix NEWS
2012-03-22 22:30:51 -07:00
Stanislav Malyshev
a89c4a34ee
Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
...
This reverts commit 714f1ff4b3
.
2012-03-22 22:29:50 -07:00
Gustavo André dos Santos Lopes
65a97bec88
Merge branch '5.4'
2012-03-21 13:15:52 +00:00
Gustavo André dos Santos Lopes
54f0d50d3e
Made some SplFileObject::fputcsv not pollute the working dir.
2012-03-21 13:13:17 +00:00
Gustavo André dos Santos Lopes
a19dba56d2
Merge branch '5.4'
...
Conflicts:
NEWS
2012-03-21 12:43:51 +00:00
Gustavo André dos Santos Lopes
0f001703a8
Fixed bug #61453 .
...
The "hash" function used strncpy on data that would have NUL bytes, ending the
copy prematurely and causing collisions between objects.
2012-03-21 12:42:09 +00:00
Christopher Jones
faa731f147
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Minor text changes (to try new git repo)
Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 15:19:00 -07:00
Joshua Thijssen
91f2d3809e
Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 21:48:55 +01:00
Gustavo André dos Santos Lopes
a3699726f9
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
d870a41118
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
714f1ff4b3
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
Felipe Pena
af2fc625df
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
Felipe Pena
3954743813
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
Felipe Pena
80cb6e56f6
- Fixed memory leak when calling SplFileInfo's constructor twice
2012-03-11 15:42:57 +00:00
Xinchen Hui
533d90066e
Fix test
2012-03-11 08:30:30 +00:00
Xinchen Hui
e6ec1fb166
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
Xinchen Hui
430486f0bf
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
Xinchen Hui
a7639291b4
Fixed bug #61347 (inconsist isset behavior of Arrayobject)
2012-03-11 08:27:55 +00:00
Gustavo André dos Santos Lopes
23e65a9dcc
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
Gustavo André dos Santos Lopes
88ba84fa7d
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
Gustavo André dos Santos Lopes
7bbf5fe650
- Fixed bug #61326 (ArrayObject comparison).
2012-03-10 17:19:39 +00:00
Olivier DOUCET
e613889d50
more verbose skip reason in test files with not so obvious extension requirements
2012-02-25 12:10:41 +00:00
Olivier DOUCET
bdbcc1789d
more verbose skip reason in test files with not so obvious extension requirements
2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819
more verbose skip reason in test files with not so obvious extension requirements
2012-02-25 12:10:41 +00:00
Adam Harvey
37272e46de
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
...
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
2012-02-21 10:34:42 +00:00
Etienne Kneuss
78c8b4c8ff
Fix test
2012-02-01 13:25:32 +00:00
Rasmus Lerdorf
ac5718cdd3
These tests don't work if run as root
2012-01-08 18:43:30 +00:00
Rasmus Lerdorf
cb6603ac56
These tests don't work if run as root
2012-01-08 18:43:30 +00:00
Rasmus Lerdorf
f1191166d8
These tests don't work if run as root
2012-01-08 18:43:30 +00:00
Rasmus Lerdorf
adc8c296ac
Make sure gc is enabled
2012-01-08 18:22:50 +00:00
Rasmus Lerdorf
2651a1fc39
Make sure gc is enabled
2012-01-08 18:22:50 +00:00
Rasmus Lerdorf
a7dca551f7
This test only works if gc is enabled
2012-01-08 18:21:13 +00:00
Patrick Allaert
ea25a9be03
Added tests contributions on spl_autoload and stream_context_set_option()
...
Thank you Jean-Marc Fontaine and Alter Way
2011-12-09 11:45:39 +00:00
Patrick Allaert
183493d624
Added tests contributions on spl_autoload and stream_context_set_option()
...
Thank you Jean-Marc Fontaine and Alter Way
2011-12-09 11:23:19 +00:00
Patrick Allaert
2b392c9c10
Added tests contributions on spl_autoload and stream_context_set_option()
...
Thank you Jean-Marc Fontaine and Alter Way
2011-12-09 11:15:12 +00:00
Michael Wallner
d8ca919da1
Fixed bug #60240 (invalid read/writes when unserializing specially crafted strings)
2011-12-02 11:50:22 +00:00
Michael Wallner
955cc549a0
Fixed bug #60240 (invalid read/writes when unserializing specially crafted strings)
2011-12-02 11:50:22 +00:00
Rasmus Lerdorf
3f930c10bf
functor? Where did that come from?
2011-11-14 16:23:56 +00:00
Lars Strojny
7d0fe66ebe
Adjusting error messages
2011-11-14 00:26:37 +00:00
Peter Cowburn
9b86852d6e
add 3rd parameter to arg info for splfileobject fgetcsv/setcsvcontrol (bug #60201 )
2011-11-02 13:24:46 +00:00
Peter Cowburn
ac8ece2718
add 3rd parameter to arg info for splfileobject fgetcsv/setcsvcontrol (bug #60201 )
2011-11-02 13:24:46 +00:00
Ferenc Kovacs
28faed47c4
ignore this test on FreeBSD per #60186
2011-11-01 10:25:47 +00:00
Ferenc Kovacs
bb4f96b2a1
duh
2011-11-01 10:20:39 +00:00
Ferenc Kovacs
5a2a02f655
marking ext/spl/tests/bug60082.phpt as slow test
2011-11-01 10:10:24 +00:00
Gustavo André dos Santos Lopes
32f7337bd4
- Reverted changes that required constructor overrides to invoke the parent
...
constructor in several SPL classes and applied 5.3 fixes instead.
Related bugs: #54384 , #55175 and #55300
2011-10-29 23:17:18 +00:00
Gustavo André dos Santos Lopes
41abc6d017
- Reverted changes that required constructor overrides to invoke the parent
...
constructor in several SPL classes and applied 5.3 fixes instead.
Related bugs: #54384 , #55175 and #55300
2011-10-29 23:17:18 +00:00
Stanislav Malyshev
d81ea16ef1
Changed silent conversion of array to string to produce a notice. (Patrick)
2011-10-21 06:08:47 +00:00
Stanislav Malyshev
ed12ebc79c
Changed silent conversion of array to string to produce a notice. (Patrick)
2011-10-21 06:08:47 +00:00
Xinchen Hui
d2c8d30bb9
Test for #60082
2011-10-19 02:28:53 +00:00
Hannes Magnusson
f19a112185
Test for non-string replacement, bug#54304
2011-09-12 17:20:44 +00:00
Hannes Magnusson
76d9a3fa3d
Test for non-string replacement, bug#54304
2011-09-12 17:20:44 +00:00
Hannes Magnusson
4653534643
Test for non-string replacement, bug#54304
2011-09-12 17:20:44 +00:00
Pierre Joye
4ccef0b950
- improve r316420 (SplFileObject cannot and should not accept directories)
2011-09-08 23:07:48 +00:00
Pierre Joye
38c698c062
- improve r316420 (SplFileObject cannot and should not accept directories)
2011-09-08 23:07:48 +00:00
Pierre Joye
376ba8c92e
- force LF
2011-09-08 16:10:07 +00:00
Pierre Joye
59571f6fce
- force LF
2011-09-08 16:10:07 +00:00
Etienne Kneuss
5cc7663098
SplFileObject does not accept directories. It did not check for that and blindly opened the directory, which works on linux but fails on windows. Now SplFileObject uses a stat() call to make sure it isn't a directory, if it is, it fails with an exception. Tests have been changed accordingly.
2011-09-08 15:52:59 +00:00
Etienne Kneuss
3afb143e65
SplFileObject does not accept directories. It did not check for that and blindly opened the directory, which works on linux but fails on windows. Now SplFileObject uses a stat() call to make sure it isn't a directory, if it is, it fails with an exception. Tests have been changed accordingly.
2011-09-08 15:52:59 +00:00
Hannes Magnusson
a6c07ae0d3
Fix cleanup routines
2011-09-07 12:05:19 +00:00
Hannes Magnusson
12d67c1a45
Fix cleanup routines
2011-09-07 12:05:19 +00:00
Hannes Magnusson
04044dd07e
Fix cleanup routines
2011-09-07 12:05:19 +00:00
Xinchen Hui
16d0023daf
fix skipif description
2011-09-07 00:59:10 +00:00
Xinchen Hui
b1263c4363
fix skipif description
2011-09-07 00:59:10 +00:00
Xinchen Hui
b7788089e1
fix skipif description
2011-09-07 00:59:10 +00:00
Pierre Joye
f2b8c5395c
- use a more portable name for the filename
2011-09-06 11:24:21 +00:00
Pierre Joye
efc45f8b60
- use a more portable name for the filename
2011-09-06 11:24:21 +00:00
Pierre Joye
f438a87d90
- use something we know it exists...
2011-09-06 07:26:05 +00:00
Pierre Joye
71cda5ea0a
- use something we know it exists...
2011-09-06 07:26:05 +00:00
Pierre Joye
1d22c75eb3
- use something we know it exists...
2011-09-06 07:26:05 +00:00
Pierre Joye
c97a56e77f
- skip on win, name.. name. are not valid names
2011-09-06 07:23:20 +00:00
Pierre Joye
d29a253629
- skip on win, name.. name. are not valid names
2011-09-06 07:23:20 +00:00
Pierre Joye
80a2175c37
- skip on win, name.. name. are not valid names
2011-09-06 07:23:20 +00:00
Hannes Magnusson
eba373139c
Add skipifs for bug#54971 (patch by datibbaw@)
2011-08-30 13:46:24 +00:00
Hannes Magnusson
850d865551
Add skipifs for bug#54971 (patch by datibbaw@)
2011-08-30 13:46:24 +00:00
Hannes Magnusson
d972f636c9
Add skipifs for bug#54971 (patch by datibbaw@)
2011-08-30 13:46:24 +00:00
Stefan Marr
dca6f950a9
Added forgotten tests cases for class_uses() from commit rev. 313640
2011-07-24 10:20:08 +00:00
Stefan Marr
f9cb269d59
Added forgotten tests cases for class_uses() from commit rev. 313640
2011-07-24 10:20:08 +00:00
Pierrick Charron
824726073b
Delete empty test files (old MQ tests)
2011-07-22 12:12:05 +00:00
Pierrick Charron
fb5da94c1b
Delete empty test files (old MQ tests)
2011-07-22 12:12:05 +00:00
Pierre Joye
45420bb669
- remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4
2011-07-22 11:56:20 +00:00
Pierre Joye
cc1c7af037
- remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ
2011-07-22 11:25:30 +00:00
Etienne Kneuss
c13f2c3e2c
Fix #48860 Implement Serialization for DLL
2011-07-12 21:43:17 +00:00
Etienne Kneuss
fdce66dfd2
Fix #48860 Implement Serialization for DLL
2011-07-12 21:43:17 +00:00
Pierrick Charron
1b416caeb1
Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys on true)
2011-06-28 11:09:06 +00:00
Pierrick Charron
e53ca46fc0
Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys on true)
2011-06-28 11:09:06 +00:00
Pierrick Charron
a814063804
Fixed bug #54971 (Wrong result when using iterator_to_array with use_keys on true)
2011-06-28 11:09:06 +00:00
Knut Urdalen
778edca904
fixed temp directory names in spl tests
2011-06-25 07:45:41 +00:00