clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 11:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,784 Commits 493 Branches 1,366 Tags 849 MiB
b2432872c4
Commit Graph

1397 Commits

Author SHA1 Message Date
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
Levi Morrison
7f3b5b77cc Standardized usage of zpp_none and the order of the comparison zpp(...) == FAILURE 2013-10-11 10:32:40 -06: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
ca75e6f760 Merge branch 'PHP-5.5' 
* PHP-5.5:
  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:48 +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
Nikita Popov
5350b9957a Merge branch 'PHP-5.5' 2013-09-12 23:30:40 +02:00
Levi Morrison
d76959a3b9 Fixed minor bug in test. 2013-09-12 23:29:52 +02:00
Nikita Popov
64ee0cde5d Merge branch 'PHP-5.5' 2013-09-12 17:49:28 +02:00
Nikita Popov
ad976d8240 Fix bug #64782: SplFileObject constructor make $context optional 2013-09-12 17:46:14 +02:00
Christopher Jones
3c166c4758 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/gmp/gmp.c
 2013-08-14 20:47:00 -07:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
 2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Stanislav Malyshev
e4f9619fad fix compiler warning, use longs for hashes 2013-08-04 18:04:45 -07: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
Adam Harvey
f9000fde98 Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro. 
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.

Fixes the fix for bug #61697.
 2013-07-23 11:15:43 -07: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
Stanislav Malyshev
68e630b72f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
 2013-07-15 00:36:35 -07:00
sasezaki
e617679c0b fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too) 2013-07-15 00:36:29 -07:00
kazusuke sasezaki
76775a3aa7 fix invalid variable name at ext/spl/internal/multipleiterator.inc 2013-07-15 00:36:19 -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
Xinchen Hui
c2cfc242c4 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-27 12:38:13 +08:00
Xinchen Hui
fa8611c81e Fixed bug #65136 (RecursiveDirectoryIterator segfault) 2013-06-27 12:37:57 +08: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
Xinchen Hui
3f229f4364 Merge branch 'PHP-5.4' into PHP-5.5 2013-06-09 22:25:49 +08:00
Xinchen Hui
f338510c94 Merge branch 'PHP-5.3' into PHP-5.4 2013-06-09 22:25:07 +08:00
Xinchen Hui
75c57122e3 Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems) 2013-06-09 22:24:48 +08:00
Xinchen Hui
da6916a770 fix memory leak 
the value shouldn't be ref, use z_add_ref is enough
 2013-03-21 10:58:58 +08:00
Anatol Belski
b3d82845db fix C89 compat 2013-03-19 15:13:27 +01:00
Mark Baker
4257469079 Fix #48358 add() method for SplDoublyLinkedLis 2013-03-19 14:46:21 +01:00
Etienne Kneuss
b46897941a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove spurious int cast in between two longs
 2013-03-16 18:20:16 +01:00
Etienne Kneuss
5de1b08482 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove spurious int cast in between two longs
 2013-03-16 18:20:06 +01:00
Etienne Kneuss
62364e6e01 Remove spurious int cast in between two longs 2013-03-16 18:19:14 +01:00
Xinchen Hui
c1cf7538f0 Fixed test after nick previous fix 2013-03-16 23:16:32 +08:00
Nikita Popov
28634bf603 Forgot to remove some now unused variables 2013-03-12 17:39:20 +01: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
Stanislav Malyshev
0c6d903ce7 fix bug #49348 - issue notice on get_property_ptr_ptr when used for read 2013-02-18 20:56:02 -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
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
Xinchen Hui
4d2593e1be Merge branch 'PHP-5.4' into PHP-5.5 2012-12-13 10:45:33 +08:00
Xinchen Hui
1f516510b7 Merge branch 'PHP-5.3' into PHP-5.4 2012-12-13 10:44:56 +08:00
Xinchen Hui
39a3007ab2 MFH 2012-12-13 10:44:14 +08:00
Dmitry Stogov
bc7857169a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use get_gc instead of hacks of get_properties
 2012-12-05 17:59:46 +04:00
Dmitry Stogov
df97c3aa0d Use get_gc instead of hacks of get_properties 2012-12-05 17:58:36 +04: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
Ferenc Kovacs
240f8d06de commented out the HHC_LOCATION line, as there are no easy to use alternatives for 
hhc.exe on linux.
we should either run the chm build on a windows box(maybe on the replacement of oti1),
or look into running it through wine see
http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm
for details.
I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot
file cannot be found.
 2012-10-25 17:11:13 +02: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
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +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