clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,495 Commits 494 Branches 1,367 Tags 801 MiB
3d1fa4cb17
Commit Graph

891 Commits

Author SHA1 Message Date
Lars Strojny
5dd3ba5da9 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-02 19:51:51 +01:00
Marco Pivetta
627eb9e3d9 Adding tests for private and protected properties 2012-12-02 19:47:18 +01:00
Marco Pivetta
12f451c771 Fixing test according to @jpauli's suggestions 2012-12-02 19:47:13 +01:00
Marco Pivetta
1377942b69 Adding regression test for behavior of magic methods with unset public properties 
Verifies that after having unset a public property, any access to it, be it read or write, causes calls to public magic methods

Signed-off-by: Marco Pivetta <ocramius@gmail.com>
 2012-12-02 19:47:09 +01:00
Xinchen Hui
ff6c9e2726 Fixed bug #63377 (Segfault on output buffer) 2012-11-30 14:48:51 +08:00
Xinchen Hui
093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Michael Wallner
575790e842 fix bug #61272 ob_start callback get passed empty string 2012-11-28 10:19:44 +01:00
Johannes Schlüter
eb943fbc93 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-15 12:29:58 +01:00
Johannes Schlüter
2a59f1d06c Merge branch 'PHP-5.3' into PHP-5.4 2012-11-15 12:29:38 +01:00
Johannes Schlüter
7468fc0e37 Skip test if directory does not exist 
Would be good to run this using a directory which is existing
everywhere.
 2012-11-15 12:28:19 +01: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
Stanislav Malyshev
bf064112b7 fix test and move to proper place 2012-09-30 19:24:42 -07:00
husman
ad570991cf synergy ftl. Removed duplicate fields. 2012-09-30 19:20:51 -07:00
husman
6ec6b208e8 adding test phpt 2012-09-30 19:20:44 -07: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
Nikita Popov
1b5b839312 Drop obsolete test 2012-09-01 20:10:12 +02:00
Gustavo Lopes
53351d087d Merge branch 'generators' 
* generators: (70 commits)
  Fix typos
  Fix segfault when traversing a by-ref generator twice
  Make sure that exception is thrown on rewind() after closing too
  Remove implementation stubs for yield delegation
  Fix several issues and allow rewind only at/before first yield
  Run finally if generator is closed before finishing
  Finally with return now works in generators too
  Add dedicated opcode for returns from a generator
  Disallow serialization and unserialization
  Fix zts build (typo)
  Drop Generator::close() method
  Forgot to add test
  Support trivial finally in generators (no yield, no return)
  Fix implementation of Iterator interface
  Add T_YIELD in tokenizer_data.c
  Throw error also for return occuring before yield
  Fix throwing of exceptions within a generator
  Remove reference restrictions from foreach
  Require parenthesis around yield expressions
  Add some more tests
  ...
 2012-09-01 19:07:20 +02:00
Xinchen Hui
b5d2c3174f Merge branch 'PHP-5.4' 2012-08-31 11:25:21 +08:00
Xinchen Hui
66fad45724 Merge branch 'PHP-5.3' into PHP-5.4 2012-08-31 11:24:10 +08:00
Xinchen Hui
5dc2cef370 Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes) 2012-08-31 11:22:43 +08:00
Nikita Popov
d60e3c6ef5 Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 
Conflicts:
	Zend/zend_language_parser.y
	Zend/zend_vm_execute.skl
 2012-08-26 13:03:55 +02:00
Xinchen Hui
35951d4be0 Support list in foreach 
RFC: https://wiki.php.net/rfc/foreachlist
 2012-08-25 22:23:57 +08:00
Nikita Popov
f4ce364628 Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport 
This is just an intial merge. It does not yet make generators and finally
work together.

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	Zend/zend_vm_execute.skl
	Zend/zend_vm_opcodes.h
 2012-08-13 16:54:53 +02:00
Stanislav Malyshev
c9eb64127e Merge branch 'pull-request/132' 
* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
 2012-08-05 21:15:53 -07:00
Xinchen Hui
689fda310a Merge branch 'PHP-5.4' 2012-07-29 13:26:29 +08:00
Xinchen Hui
c6ad98975e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Skip test while zend mm is disabled
 2012-07-29 13:26:05 +08:00
Xinchen Hui
880a6cee00 Skip test while zend mm is disabled 2012-07-29 13:25:31 +08:00
Nikita Popov
de80e3ce4b Remove reference restrictions from foreach 
foreach only allowed variables to be traversed by reference. This never
really made sense because

    a) Expressions like array(&$a, &$b) can be meaningfully iterated by-ref
    b) Function calls can return by-ref (so they can also be meaningfully
       iterated)
    c) Iterators could at least in theory also be iterated by-ref (not
       sure if any iterator makes use of this)

With by-ref generators the restriction makes even less sense, so I removed
it altogether.
 2012-07-22 14:33:25 +02:00
Andrew Faulds
d12f8d6790 Removed Logo GUIDs and replaced with Data URIs and div hidden with JS 
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
 2012-07-14 21:44:21 +01:00
Anatoliy Belsky
621fddab93 Fix bug #62109 tests\basic\bug46313-win.phpt fails 2012-05-22 18:41:03 +02:00
Stanislav Malyshev
910a4696e1 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Revert "Update test to fix breakage caused by the previous commit."
  fix test
  to 5.4.5-dev
 2012-05-15 23:30:34 -07:00
Stanislav Malyshev
e36a5a1197 fix test 2012-05-15 23:09:46 -07:00
Anatoliy Belsky
7dda0d5f8d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61716 tests\basic\021.phpt fails
 2012-04-16 15:16:43 +02:00
Anatoliy Belsky
9f42c1890b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61716 tests\basic\021.phpt fails
 2012-04-16 15:16:06 +02:00
Anatoliy Belsky
4fa1743009 Fix bug 61716 tests\basic\021.phpt fails 2012-04-16 15:14:26 +02:00
Anatoliy Belsky
a6d8919a89 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug 61683 tests\basic\bug20539.phpt fails
 2012-04-16 14:40:18 +02:00
Anatoliy Belsky
45977c6aae Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug 61683 tests\basic\bug20539.phpt fails
 2012-04-16 14:39:39 +02:00
Anatoliy Belsky
aaed0af418 Fix bug 61683 tests\basic\bug20539.phpt fails 2012-04-16 14:38:16 +02:00
Ferenc Kovacs
15a98ece9f Revert "making the test fail for testing jenkins report mail. I will revert this soon." 
This reverts commit b8fe28f455.
 2012-03-31 11:23:26 +02:00
Ferenc Kovacs
b8fe28f455 making the test fail for testing jenkins report mail. I will revert this soon. 2012-03-31 11:22:16 +02:00
Xinchen Hui
1904cf696b Merge branch 'PHP-5.4' 
* PHP-5.4:
  trivial change try to ci a "fake" merge
  Fix test,  parameter signatures was introduced only into 5.4
  fix makedist for new tags
 2012-03-30 20:57:55 +08:00
Xinchen Hui
14fdb8bf0a trivial change try to ci a "fake" merge 
seems now a empty merge will not be accepted by pre-receive-hook
  "remote: We cannot figure out what you comitted!"
 2012-03-30 20:50:45 +08:00
Xinchen Hui
6b4112c98a Fix test, parameter signatures was introduced only into 5.4 2012-03-30 20:37:48 +08:00
reeze
abd2b2ee43 - fix bug #61541, Segfault when using ob_* in output_callback 2012-03-29 06:23:05 +09:00
Gustavo André dos Santos Lopes
2d2995f343 Fixed bug #61043: Regression in magic_quotes_gpc fix (CVE-2012-0831) 
Merge commit 'refs/pull/12/head' of git://github.com/php/php-src into 5.3

Signed-off-by: Gustavo André dos Santos Lopes <cataphract@php.net>
 2012-03-21 21:12:31 +00:00
Ondřej Surý
d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Pierre Joye
baeaafd395 - add test for bug #55000 and #54374 2012-03-21 07:00:22 +01:00
Nikita Popov
be202d3d35 Deprecate /e modifier 
See https://wiki.php.net/rfc/remove_preg_replace_eval_modifier.
 2012-03-04 13:39:12 +00:00
Rasmus Lerdorf
bc8e8b3467 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Rasmus Lerdorf
f564921c15 Fix tests that break if filter.default isn't set to unsafe_raw 2012-03-02 05:04:40 +00:00
Xinchen Hui
2e5e82a8ca MFH: Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars) 2012-03-02 03:18:04 +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
Rasmus Lerdorf
f2e420a70e Weird, what happened here? 2012-02-16 17:48:30 +00:00
Rasmus Lerdorf
4dd55d47ad Weird, what happened here? 2012-02-16 17:48:30 +00:00
Rasmus Lerdorf
2a2af1bffc These tests fail unless max_input_vars and/or max_file_uploads is set high enough 2012-02-14 09:47:32 +00:00
Rasmus Lerdorf
346e88ae69 These tests fail unless max_input_vars and/or max_file_uploads is set high enough 2012-02-14 09:47:32 +00:00
Rasmus Lerdorf
e80cbef15b These tests fail unless max_input_vars and/or max_file_uploads is set high enough 2012-02-14 09:47:32 +00:00
Xinchen Hui
3f23b11151 Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars). 2012-02-08 14:07:27 +00:00
Xinchen Hui
6672171672 Fixed bug #61000 (Exceeding max nesting level doesn't delete numerical vars). 2012-02-08 14:07:27 +00:00
Michael Wallner
6b31413b13 Fix bug #60768 Output buffer not discarded 
in php_output_handler_op():
  * if appending to buffer succeeds, just return HANDLER_NO_DATA
    and do nothing else
  * if a zero sized string or true is returned from the handler
    function, reset the context as well as the handler's buffer
 2012-01-16 17:51:35 +00:00
Michael Wallner
f32760bd40 Fix bug #60768 Output buffer not discarded 
in php_output_handler_op():
  * if appending to buffer succeeds, just return HANDLER_NO_DATA
    and do nothing else
  * if a zero sized string or true is returned from the handler
    function, reset the context as well as the handler's buffer
 2012-01-16 17:51:35 +00:00
Pierre Joye
b63c6f6f20 - rm 2012-01-09 14:29:06 +00:00
Pierre Joye
c5b02759c4 - rm 2012-01-09 14:29:06 +00:00
Xinchen Hui
5d2dba81a1 fix test 2012-01-04 08:13:58 +00:00
Xinchen Hui
dd943bcb1b fix test 2012-01-04 08:13:58 +00:00
Shein Alexey
4e5b5d29e3 Fixed broken test (different error message wording in 5.3 branch) 2012-01-02 20:02:21 +00:00
Stanislav Malyshev
7c3177e5ab fix bug #54374, bug #55500 - filter file names better, no dangling [s 2012-01-01 23:54:25 +00:00
Stanislav Malyshev
2a687aed1a fix bug #54374, bug #55500 - filter file names better, no dangling [s 2012-01-01 23:54:25 +00:00
Nuno Lopes
bac57c94fb fix memory leak in compile_string when there's a parse error (used e.g. in eval or assert) 2012-01-01 22:45:58 +00:00
Nuno Lopes
a542baa720 fix memory leak in compile_string when there's a parse error (used e.g. in eval or assert) 2012-01-01 22:45:58 +00:00
Nuno Lopes
8b23cae172 fix memory leak in compile_string when there's a parse error (used e.g. in eval or assert) 2012-01-01 22:45:58 +00:00
Stanislav Malyshev
3805e0a2c4 fix test 2011-12-26 05:08:09 +00:00
Stanislav Malyshev
f863d486d1 fix test 2011-12-26 05:08:09 +00:00
Stanislav Malyshev
63e5f97da4 fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist) 2011-12-26 05:01:46 +00:00
Stanislav Malyshev
87b9f7bb3a fix bug #60322 (ob_get_clean() now raises an E_NOTICE if no buffers exist) 2011-12-26 05:01:46 +00:00
Stanislav Malyshev
15210d561a fix test - paths may be expressed in different way 2011-12-26 03:55:29 +00:00
Stanislav Malyshev
36d4585996 fix test - paths may be expressed in different way 2011-12-26 03:55:29 +00:00
Stanislav Malyshev
d36263b7bb fix tests 2011-12-26 01:08:47 +00:00
Stanislav Malyshev
e4f40a3375 fix tests 2011-12-26 01:08:47 +00:00
Xinchen Hui
8e0358d2b4 Fix tests 2011-12-19 16:57:36 +00:00
Xinchen Hui
2fe9f37026 Fix tests 2011-12-19 16:57:36 +00:00
Xinchen Hui
b5766cdcac Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Xinchen Hui
5aa1fb6074 Implemented FR #54514 (Get php binary path during script execution). 2011-12-07 10:33:13 +00:00
Ferenc Kovacs
6f8518fbf5 adding some tests for string offsets 2011-11-26 18:41:45 +00:00
Ferenc Kovacs
745409b7f4 adding some tests for string offsets 2011-11-26 18:41:45 +00:00
Ferenc Kovacs
52ddf31284 adding some tests for string offsets 2011-11-26 18:41:45 +00:00
Felipe Pena
06bc6bdc29 - Fix test 2011-11-26 17:35:19 +00:00
Felipe Pena
1c0eaee6fd - Fix test 2011-11-26 17:35:19 +00:00
Felipe Pena
1bd15bbd7d - Fix test 2011-11-26 17:35:19 +00:00
Pierrick Charron
52ca90428d Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty). 2011-11-18 00:16:58 +00:00
Pierrick Charron
8e2dcfd8b6 Fixed bug #60321 (ob_get_status(true) no longer returns an array when buffer is empty). 2011-11-18 00:16:58 +00:00
Lars Strojny
c2ad166fd5 Reverting r319136 2011-11-17 09:24:15 +00:00
Lars Strojny
7d0fe66ebe Adjusting error messages 2011-11-14 00:26:37 +00:00
Xinchen Hui
b6fd6cd649 add skipif 2011-11-13 14:31:30 +00:00
Xinchen Hui
9b091f8c34 add skipif 2011-11-13 14:31:30 +00:00