Commit Graph

860 Commits

Author SHA1 Message Date
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Stanislav Malyshev
7272e3e722 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays
2013-06-23 13:54:50 -07:00
Marco Pivetta
f1e37d03c1 Adding test to verify that __sleep can handle parent classes' private members 2013-06-23 13:53:46 -07:00
Marco Pivetta
61fb822d1a Adding test to stabelize keys used when converting objects to arrays 2013-06-23 13:53:37 -07:00
Stanislav Malyshev
e74776266f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test for bug #60322
2013-06-13 10:30:18 -07:00
Stanislav Malyshev
10b9579395 fix test for bug #60322 2013-06-13 10:30:00 -07:00
Matt Ficken
4941e3fe44 Adding sys_get_temp_dir() test specific for Windows.
sys_get_temp_dir() returns a Windows-style path (\\ instead of /) on
Windows. This is why a Windows specific test is required.

Skipping req60524.phpt on Windows. Adding -win32 fork for use only on
Windows.

Fixes test bug #64396.
2013-04-25 14:52:48 -07:00
Michael Moravec
70668fd88a Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348) 2013-04-10 13:36:47 +08:00
Dejan Marjanovic
05016b7e96 Added XOR support for expressions in INI parser 2013-03-27 21:28:53 +01:00
Dmitry Stogov
e9641141aa Made test compatible with O+ 2013-03-16 16:11:00 +04:00
Stanislav Malyshev
dc6f073ce9 fix tests 2013-02-18 23:01:42 -08:00
ALeX Kazik
475a644bd8 Implemented Feature #60524 (sys_temp_dir)
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.

This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.

(see https://bugs.php.net/bug.php?id=60524)
2013-01-28 22:37:43 -08:00
Stanislav Malyshev
122570443b fix tests 2013-01-23 10:44:53 -08:00
Stanislav Malyshev
d78f5ababe fix tests 2013-01-22 00:36:07 -08:00
Lars Strojny
853ef3c9cb Merge branch 'PHP-5.4' into PHP-5.5 2013-01-06 14:54:40 +01:00
Lars Strojny
bdc1e2302c Adding test for bug #63462 2013-01-06 14:46:49 +01:00
Anatoliy Belsky
7d7ff76659 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Two tests deactivated until #63688 was fixed
2012-12-05 09:58:04 +01:00
Anatoliy Belsky
73e66ff1bd Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Two tests deactivated until #63688 was fixed
2012-12-05 09:57:36 +01:00
Anatoliy Belsky
94cbd6374a Two tests deactivated until #63688 was fixed 2012-12-05 09:55:49 +01:00
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