Commit Graph

167 Commits

Author SHA1 Message Date
Kalle Sommer Nielsen
f9959ee7c2 Change PHP_OS_FAMILY slightly
* PHP_OS_FAMILY is now a macro, to allow extensions to take advantage of it, it is defined in php.h
* Values are not upper-case-first, not always uppercase. Windows is no longer just "Win", if we want the short version for testing then PHP_OS is always WINNT anyway
2017-02-22 12:31:06 +01:00
Joe Watkins
6400ce5017
Merge branch 'PHP-7.1'
* PHP-7.1:
  increase wait time in timeout_variation_9.phpt by 1 second
2017-02-03 06:01:10 +00:00
Joe Watkins
e9209e15a2
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  increase wait time in timeout_variation_9.phpt by 1 second
2017-02-03 06:00:53 +00:00
Rodrigo Prado
0b56ba51d0
increase wait time in timeout_variation_9.phpt by 1 second 2017-02-03 05:57:26 +00:00
Joe Watkins
309d3daa39
Merge branch 'PHP-7.1'
* PHP-7.1:
  increase wait time in timeout_variation_10.phpt by 1 second
2017-02-03 05:55:29 +00:00
Joe Watkins
a52afd27ab
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  increase wait time in timeout_variation_10.phpt by 1 second
2017-02-03 05:55:16 +00:00
Rodrigo Prado
8faf5f979c
increase wait time in timeout_variation_10.phpt by 1 second 2017-02-03 05:53:28 +00:00
Stricted
bb059fe0a7
add PHP_OS_FAMILY constant to determine on which os we are 2017-01-25 20:50:14 +00:00
Joe Watkins
8782e847b4
Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed #73969 - Fixed segmentation fault when debug_print_backtrace called
2017-01-22 16:12:27 +00:00
Joe Watkins
8bda542064
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed #73969 - Fixed segmentation fault when debug_print_backtrace called
2017-01-22 16:11:57 +00:00
andrewnester
6f912f7c04
Fixed #73969 - Fixed segmentation fault when debug_print_backtrace called 2017-01-22 16:11:25 +00:00
Joe Watkins
d83828540e
Merge branch 'PHP-7.1'
* PHP-7.1:
  get_defined_functions additional parameter to exclude disabled functions
  news entry for PR #1312
2017-01-04 13:37:06 +00:00
Joe Watkins
6c9164047e
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  get_defined_functions additional parameter to exclude disabled functions
  news entry for PR #1312
2017-01-04 13:36:04 +00:00
Joe Watkins
63d116e571
Merge branch 'pull-request/1312' into PHP-7.0
* pull-request/1312:
  get_defined_functions extra parameter to exclude disabled functions
  news entry for PR #1312
2017-01-04 13:34:31 +00:00
Nikita Popov
5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Nikita Popov
45f7b2bcc8 Fix CRLF line-endings in tests
Also fix a single instance of CRLF in ibase_query.c.
2016-11-20 22:31:24 +01:00
Nikita Popov
37b0dcc8e0 Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG
Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.
2016-08-19 00:34:13 +02:00
Jakub Zelenka
71774c241e Add decimal point in double serialization 2016-06-26 13:26:43 +01:00
Yasuo Ohgaki
b509b24e35 Add better value to test 2016-06-26 13:26:43 +01:00
Yasuo Ohgaki
a160b518d0 Remove unneeded output from test 2016-06-26 13:26:43 +01:00
Yasuo Ohgaki
c71550472a Fix mode when precision=0. Add test 2016-06-26 13:26:43 +01:00
Anatol Belski
9a07245b72 Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash 2016-01-05 18:54:46 +01:00
Xinchen Hui
b5adfee320 Fixed bug memleak in header_register_callback 2015-12-11 17:26:31 +08:00
Steven Hilder
24bb5698af Ensure timeout tests wait for the entire specified duration 2015-09-29 13:04:05 +02:00
Niklas Keller
91712c35f8 Fix Typos: exteption -> exception 2015-08-26 07:30:56 +02:00
Willian Gustavo Veiga
33721742a5 Added "exclude_disabled" argument to "get_defined_functions". 2015-06-02 21:42:18 -03:00
Willian Gustavo Veiga
978832331a Fix bug #31875 - get_defined_functions() should not list disabled functions. 2015-05-30 12:29:27 -03:00
Bob Weinand
886cbea94f Merge context sensitive lexer RFC 2015-05-25 18:38:40 +02:00
Nikita Popov
3ae995f03c Tweak uncaught exception message display
This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
2015-05-17 18:47:06 +02:00
Márcio Almada
a54e1237ec add tests for semi reserved words and remove obsolete ones 2015-04-30 03:03:29 -03:00
Anatol Belski
b9bc84e29e use default test timeout 2015-03-16 23:07:33 +01:00
Anatol Belski
fd51bd4a9e test fixes + added skipif for slow tests 2015-03-16 13:55:40 -07:00
Anatol Belski
042dd8602e use busy sleep instead of sleep() for timeout tests 2015-03-16 13:21:33 -07:00
Anatol Belski
cab21b9347 test timeout with shutdown function, variation 2015-03-16 19:37:07 +01:00
Anatol Belski
1d6f94eeef test timeout with shutdown function 2015-03-16 19:35:36 +01:00
Anatol Belski
33d832bd45 test timeout with foreach loop 2015-03-16 19:30:04 +01:00
Anatol Belski
b05635ade9 test timeout with for loop 2015-03-16 19:28:01 +01:00
Anatol Belski
eab7da4bc9 test timeout with exception variation 2015-03-16 19:26:17 +01:00
Anatol Belski
1c0fce922e test timeout with exception 2015-03-16 19:21:58 +01:00
Anatol Belski
8f1fa842cd fix timeout with cal_user_func 2015-03-16 19:16:09 +01:00
Anatol Belski
7a7d8b9f9d test timeout within eval() 2015-03-16 19:12:55 +01:00
Anatol Belski
82d3a13983 test timeout with array_walk 2015-03-16 19:05:21 +01:00
Anatol Belski
f591c0dff8 test timeout within function 2015-03-16 19:01:23 +01:00
Anatol Belski
394bd2ab41 test timeout within while loop 2015-03-16 18:58:32 +01:00
Yasuo Ohgaki
feef180e6c Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.

Conflicts:
	main/main.c
	tests/basic/encoding.phpt
2015-02-03 19:00:13 +09:00
Yasuo Ohgaki
436ba1c488 Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set. 2015-02-03 18:52:46 +09:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Rasmus Lerdorf
5d391be285 The test output is dependent on expose_php ini 2014-07-14 07:17:59 -07:00
Rasmus Lerdorf
e6fae4ca4f The test output is dependent on expose_php ini 2014-07-11 09:12:32 -07:00
Michael Wallner
416cc83f4e XFAIL-- for bug #67198 2014-05-06 12:22:09 +02:00