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
80,805 Commits 494 Branches 1,367 Tags 801 MiB
4d22be992c
Commit Graph

901 Commits

Author SHA1 Message Date
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
Bob Weinand
ca447a8f6f Merge branch 'PHP-5.6' 2014-04-11 20:14:44 +02:00
Bob Weinand
096e40a027 Fixed tests for recent constant array changes 2014-04-11 20:13:24 +02:00
Dmitry Stogov
6c8ac33b69 Fixed test 2014-03-13 12:42:24 +04:00
Dmitry Stogov
6fd8d0d8f6 Fixed test 2014-03-07 01:00:26 +04:00
Nikita Popov
bfd967c11f Merge branch 'PHP-5.6' 2014-02-26 16:42:55 +01:00
Nikita Popov
96d0bb7bca Update stack size in tests/func/010.phpt 
Stack size is 16K nowadays. Now the test takes a more reasonable
amount of time to run...
 2014-02-26 16:40:25 +01:00
Yasuo Ohgaki
9a5cb51ebc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
 2014-02-13 11:56:54 +09:00
Yasuo Ohgaki
cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Ferenc Kovacs
15acd4ee50 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix these tests so they properly clean up after themselves.
 2014-01-21 02:29:11 +01:00
Ferenc Kovacs
425dbe55ef Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix these tests so they properly clean up after themselves.
 2014-01-21 02:28:49 +01:00
Ferenc Kovacs
c4142f6f58 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix these tests so they properly clean up after themselves.
 2014-01-21 02:28:32 +01:00
Ferenc Kovacs
2bd68bf039 fix these tests so they properly clean up after themselves. 2014-01-20 18:04:35 +01:00
Remi Collet
a3541301eb Merge branch 'PHP-5.6' 
* PHP-5.6:
  Skip those test which fails on ARM architecture
  dos2unix
 2014-01-20 14:44:43 +01:00
Remi Collet
0290b10272 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Skip those test which fails on ARM architecture
  dos2unix
 2014-01-20 14:44:32 +01:00
Remi Collet
a93b87f988 Skip those test which fails on ARM architecture 
Add minimal tests for all arch.
 2014-01-20 14:42:28 +01:00
Remi Collet
140d2ef4f0 dos2unix 2014-01-20 14:39:05 +01:00
Michael Wallner
4797f7ad16 Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA 2013-12-30 14:28:43 +01:00
Michael Wallner
cea59a74a7 fix type; add tests for -1 2013-12-30 14:28:42 +01:00
Michael Wallner
3641507fc1 re-introduce always_populate_raw_post_data 2013-12-30 14:28:42 +01:00
Xinchen Hui
5eb8d9d700 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2013-12-15 16:55:29 +08: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
Eric Stenson
50377b5bf2 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-13 10:42:32 -08:00
Nikita Popov
66b0d17f04 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-29 23:31:13 +01:00
nikita2206
5f09944662 Fixed bug #65768: DateTimeImmutable::diff does not work 
This commit also prevents user classes from directly implementing
DateTimeInterface, because ext/date relies on classes implementing
it to support certain internal structures.
 2013-11-29 23:31:07 +01:00
Dmitry Stogov
2cb0e1e4c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added validation of class names in the autoload process

Conflicts:
	NEWS
 2013-11-29 12:55:11 +04:00
Dmitry Stogov
967abd6153 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added validation of class names in the autoload process
 2013-11-29 12:54:22 +04:00
Dmitry Stogov
2d31eadbbf Added validation of class names in the autoload process 2013-11-29 12:53:02 +04:00
Jeff Welch
72a8489a12 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:34 +09:00
Jeff Welch
101c780500 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:17:23 +09:00
Jeff Welch
b4210efe76 Fixed tests that fail with non-default serialize_precision configurations. 
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
 2013-11-20 06:14:32 +09:00
Yasuo Ohgaki
3cf2682083 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
 2013-10-29 17:30:58 +09:00
Yasuo Ohgaki
d04bcb8969 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
 2013-10-29 17:28:35 +09:00
Yasuo Ohgaki
4dc4302a30 Fixed Bug 64760 var_export() does not use full precision for floating-point numbers 2013-10-29 17:24:23 +09:00
Michael Wallner
5f41cb18be Merge branch 'issue-55736' of https://github.com/tistre/php-src 
implements FR #55736

* 'issue-55736' of https://github.com/tistre/php-src:
  run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
 2013-10-09 10:06:45 +02:00
Michael Wallner
832e2d0d8c tests 2013-09-10 13:14:02 +02:00
Tim Strehle
5ffaf95d3f run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736) 2013-09-03 14:40:43 +02:00
Michael Wallner
bb1f9d3826 slim post data 2013-08-27 13:43:22 +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
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
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