1
0
mirror of https://github.com/php/php-src.git synced 2026-03-26 17:22:15 +01:00
Commit Graph

663 Commits

Author SHA1 Message Date
Bob Weinand
b22caa81ee Remove useless date warning 2015-02-27 23:27:09 +01:00
Anatol Belski
5aec067b34 fix dir separator in tests 2015-02-27 16:48:09 +01:00
Mariano Iglesias
d20da1d92e Renaming test to match Bug #69089 2015-02-20 14:17:11 -03:00
Mariano Iglesias
e6819794eb Adding 'v' formatting to DateTime::format(), and adding constant DateTime::RFC3339_EXTENDED to output datetime using the RFC3339 extended format (aka ISO8601 extended format) 2015-02-20 09:21:14 -03:00
Stanislav Malyshev
625ab10f99 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 07:02:20 +01:00
Derick Rethans
a3a529411e Merge branch 'PHP-5.6' 2015-01-20 21:44:36 +00:00
Derick Rethans
1d09926e33 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-20 21:44:25 +00:00
Derick Rethans
8e19705a93 Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat) 2015-01-20 21:44:19 +00:00
Derick Rethans
1ee7845f57 Merge branch 'PHP-5.6' 2015-01-19 22:59:41 +00:00
Derick Rethans
6f2f2ce5cf Merge branch 'PHP-5.5' into PHP-5.6 2015-01-19 22:59:31 +00:00
Derick Rethans
b0159431e3 Fixed bug #45081 (strtotime incorrectly interprets SGT time zone). 2015-01-19 22:59:24 +00:00
Nikita Popov
9c5eaac18b Remove mktime() and gmmktime() $is_dst parameter 2015-01-17 18:26:45 +01:00
Sara Golemon
365f428d46 Allow the third arg to DateTime(Immutable)::createFromFormat() to be null.
Permit the same meaning as not passing the arg at all.
2014-12-30 13:58:59 -08:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Andrea Faulds
0ea0b591d7 Merge branch 'zppFailOnOverflow'
* zppFailOnOverflow:
  Fix MySQLi tests
  Fixed gd test
  Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG()
  Fixed copy-and-paste error
  Fix more 32-bit tests
  Skip buncha tests on 32-bit
  skip simplexml
  skip posix 32-bit
  skip tests on 32-bit
  Fixes simplexml test
  Fixes posix tests
  Fixes iconv tests
  Marked tests as 32-bit
  Fixed more 32-bit tests
  Fixed some 32-bit tests
  Mark said ext/date tests as 32-bit only
  Fixed ext/date tests broken by zpp error on overflow
  Fixed broken tests
  Make zpp fail if NaN passed for int, or out-of-range float for non-capping int

Conflicts:
	ext/date/tests/getdate_variation7.phpt
	ext/date/tests/localtime_variation3.phpt
2014-12-13 18:38:15 +00:00
Derick Rethans
eb6fb71e55 Merge branch 'PHP-5.6' 2014-12-08 11:07:00 +00:00
Derick Rethans
9d4f4483cb Merge branch 'PHP-5.5' into PHP-5.6 2014-12-08 11:06:50 +00:00
Derick Rethans
5f9a68d3ef Fixed day_of_week function as it could sometimes return negative values internally. 2014-12-08 11:06:12 +00:00
m.bennewitz
4675b79e65 Conflicts:
ext/date/php_date.c
2014-11-30 20:49:18 -08:00
Stanislav Malyshev
9924a08558 Merge branch 'pull-request/878'
* pull-request/878:
  #68268: DatePeriod: Getter for start date, end date and interval
2014-11-30 20:37:37 -08:00
Andrea Faulds
01554bf3e4 Merge branch 'master' into zppFailOnOverflow 2014-11-29 01:45:54 +00:00
Stanislav Malyshev
f782d6710d Merge branch 'PHP-5.6'
* PHP-5.6:
  test to function addcslashes
  test
  Test PHP Init Fail Without Params
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get
2014-11-23 17:26:35 -08:00
Stanislav Malyshev
a8dfb33db8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add my information to this test
  Add a test for the exception cases of readline_read_history
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
  teste basico da funcao timezone_version_get
2014-11-23 17:26:28 -08:00
Stanislav Malyshev
1330491994 Merge branch 'pull-request/854' into PHP-5.5
* pull-request/854:
  teste basico da funcao timezone_version_get
2014-11-23 17:23:34 -08:00
Stanislav Malyshev
9d7206dcea Merge branch 'pull-request/855' into PHP-5.5
* pull-request/855:
  added some tests to datetime and dateinterval functions
  added various tests for XSLTProcessor and one test for iconv extension
2014-11-23 17:22:54 -08:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
2014-11-23 14:33:43 -08:00
Andrea Faulds
71566b994f Merge branch 'master' into zppFailOnOverflow 2014-11-01 22:49:53 +00:00
m.bennewitz
846a72a73a #68268: DatePeriod: Getter for start date, end date and interval 2014-10-20 08:27:56 +00:00
Tjerk Meesters
82523c0752 Merge branch 'pr/647'
* pr/647: (33 commits)
  zend_uint -> uint32_t
  Fix nesting for *non*-compile-time-resolveable functions See a1a4ba9511 (commitcomment-7414223)
  Add tests for calls to nested, *non*-compile-time-resolveable functions See a1a4ba9511 (commitcomment-7414362)
  Make list of opcodes used for nesting calculation consistent   with `zend_do_convert_call_user_func()` in Zend/zend_compile.c
  Rewrite code to use ZEND_VM_JMP() instead of repeated ZEND_VM_INC_OPCODE() calls
  QA: Simplify code to find matching ZEND_DO_FCALL_BY_NAME CG(context).nested_calls is stored inside the initializer's result.num and inside the finalizer's op2.num, by comparing these we don't need to count manually, and are thus safer from future expansion with specialized opcodes e.g.
  Fix expected fatal error, now is catchable fatal
  Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master
  Check for memory leaks when not using return value
  Adjust expected fatal error message Now also includes "on [TYPE]" after merge from master
  Add tests with arrays as parameters
  Handle ZEND_NEW nesting
  Also verify nesting with dynamically called static methods
  Handle ZEND_INIT_NS_FCALL_BY_NAME nesting
  QA: Refactor: Split tests a bit to make them more comprehendable
  Support nested static calls
  Handle ZEND_EXT_FCALL_END, skipping if necessary Verified with running tests with new "-e" run-tests arg: $ make test TESTS=Zend/tests/*-on-non-objects-*phpt TEST_PHP_ARGS=-e # Tests passed    :   11 (100.0%)
  Add support for PHP's 'extended information for debugger/profiler' mode
  Verify non-CV-operands also work See discussion https://github.com/php/php-src/pull/647#issuecomment-48050551
  Only allocate NULL return value if it's actually used
  ...

Conflicts:
	ext/date/tests/bug67118.phpt
2014-10-06 05:52:43 +08:00
Florian MARGAINE
9680829389 DateTimeZone::getOffset() now accepts a DateTimeInterface
Fixes #68062

Should be backported to PHP-5.6 and PHP-5.5.

Conflicts:
	ext/date/tests/bug67118.phpt
2014-10-04 16:06:04 +01:00
Derick Rethans
0e5f475f5e Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 15:59:17 +01:00
Derick Rethans
0874ef624c Merge branch 'PHP-5.4' into PHP-5.5 2014-10-04 15:58:40 +01:00
Florian MARGAINE
046c345de5 DateTimeZone::getOffset() now accepts a DateTimeInterface
Fixes #68062
2014-10-04 15:58:24 +01:00
Nikita Popov
4e33f40445 Fix two date tests
New behavior seems much more reasonable - nothing should be able
to touch the $this value like that.
2014-10-03 22:02:02 +02:00
Rodrigo Prado de Jesus
d89b1dad8a added some tests to datetime and dateinterval functions 2014-09-28 20:30:52 -03:00
Rodrigo Wanderley de Melo Cardoso
c0b83ba2be teste basico da funcao timezone_version_get 2014-09-28 19:03:32 -03:00
Timm Friebe
e83580c1f0 Merge branch 'master' into catchable-fatals/methods-on-non-objects 2014-09-25 19:45:05 +02:00
Andrea Faulds
820a464f1d Mark said ext/date tests as 32-bit only 2014-09-22 23:01:08 +01:00
Andrea Faulds
a401db2272 Fixed ext/date tests broken by zpp error on overflow 2014-09-22 22:47:28 +01:00
Stanislav Malyshev
6da2a977fc fix test 2014-08-20 14:44:25 -07:00
Stanislav Malyshev
557a6d8c6f Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test
2014-08-20 14:44:02 -07:00
Stanislav Malyshev
2dfabd8b51 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2014-08-20 14:43:22 -07:00
Stanislav Malyshev
6424bf659d fix test 2014-08-20 14:42:48 -07:00
Derick Rethans
919b6447a2 Merge branch 'PHP-5.6' 2014-08-18 20:27:51 +01:00
Derick Rethans
77cc6aabb7 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-18 20:27:44 +01:00
Derick Rethans
36d05d75c8 Fixed bug #67109: First uppercase letter breaks date string parsing. 2014-08-18 18:41:50 +01:00
Derick Rethans
2b9af967fb Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10. 2014-08-18 18:41:50 +01:00
Timm Friebe
c3d214aa08 MFH 2014-08-16 17:38:20 +02:00
Tjerk Meesters
4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00