Nikita Popov
a9ba7a6779
Add tests for previous commit
2014-05-06 22:04:58 +02:00
Dmitry Stogov
cd4b4dfc4d
Merge branch 'master' into refactoring2
...
Conflicts:
Zend/zend_hash.c
ext/date/php_date.c
2014-05-05 13:02:43 +04:00
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
Anatol Belski
70fdb21d93
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
2014-04-25 17:40:33 +02:00
Anatol Belski
1c7f4d2b4b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed test
2014-04-25 17:40:19 +02:00
Anatol Belski
d3dcd61623
fixed test
2014-04-25 17:39:53 +02:00
Anatol Belski
6448916535
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:26:20 +02:00
Anatol Belski
cc9f02751b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:24:58 +02:00
Anatol Belski
c1aa9baf29
Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:23:26 +02:00
Stanislav Malyshev
d3c4292db7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66721
2014-04-13 15:55:45 -07:00
Stanislav Malyshev
733b09442d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66721
2014-04-13 15:55:07 -07:00
Boro Sitnikovski
8c88b6e81c
Fix bug #66721
...
Add NULL check to php_date_parse_tzfile's retval
2014-04-13 15:51:55 -07:00
Dmitry Stogov
7ce06ee5a7
don't keep useless objects till the end of the script (destroy them immediately)
2014-03-21 15:32:02 +04:00
Xinchen Hui
10490a1eb2
Fixed tests, reflection doesn't return reference anymore
2014-03-16 18:09:06 +08:00
Anatol Belski
adca4c355c
fix path separator
2014-03-11 16:29:30 +01:00
Derick Rethans
574f230d3c
Added DateTimeImmutable::createFromMutable.
2014-03-02 14:18:44 -05:00
Derick Rethans
d676396435
Implemented feature #45528 : Allow the DateTimeZone constructor to accept timezones per offset too.
2014-02-09 15:47:48 -05:00
Derick Rethans
7399386a20
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-26 14:02:37 +01:00
Derick Rethans
22dba2f5f3
Fixed bug #45543 : DateTime::setTimezone can not set timezones without ID.
2014-01-26 14:01:58 +01:00
Derick Rethans
93ede745bc
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/date/lib/parse_date.c
2014-01-25 16:16:23 +01:00
Derick Rethans
e6ab180394
Fixed bug #44780 : some time zone offsets not recognized by timezone_name_from_abbr.
2014-01-25 16:14:51 +01:00
Anatol Belski
4f115c0b7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL in the test
2014-01-09 15:28:09 +01:00
Anatol Belski
b8774519e2
fixed EOL in the test
2014-01-09 15:27:26 +01:00
Anatol Belski
418602adfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added testcase from bug #65371
2014-01-09 15:24:31 +01:00
Anatol Belski
e927dbd1f6
added testcase from bug #65371
2014-01-09 15:23:49 +01:00
Michael Wallner
8ee6fe9856
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-12-12 12:09:34 +01:00
Michael Wallner
c59f3184a3
fix test
2013-12-12 12:08:50 +01:00
Derick Rethans
b0d24d3d20
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-28 16:33:08 +00:00
Derick Rethans
d22cc5c816
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
2013-11-28 16:32:11 +00:00
Derick Rethans
88067b6e60
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/date/php_date.c
2013-11-28 14:30:08 +00:00
Derick Rethans
aab0b2ce3b
Marking those two as XFAIL for now.
2013-11-28 14:24:39 +00:00
Derick Rethans
582f6e529e
Fixed a few DST changeover issues.
2013-11-28 12:02:36 +00:00
Derick Rethans
aa26ace21f
Split up tests into their different categories.
2013-11-28 12:02:35 +00:00
Derick Rethans
7a0df7be34
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
2013-11-28 12:02:35 +00:00
Derick Rethans
44a9e6b484
Fixed "Forward Transition" construction of DateTime objects.
...
This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.
2013-11-28 12:02:35 +00:00
Derick Rethans
4587ef569a
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-27 22:01:03 +00:00
Derick Rethans
23ab2575e1
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-27 21:59:46 +00:00
David Soria Parra
3d6ac70e66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-16 23:36:37 +02:00
Boro Sitnikovski
a475b2c1db
Bug 64157
...
Changed error message to make sense
2013-09-16 03:42:49 +02:00
Boro Sitnikovski
165f544ae9
Fix bug #65502 : DateTimeImmutable::createFromFormat returns DateTime
...
DateTimeImmutable::createFromFormat should call
date_create_immutable_from_format instead of date_create_from_format
2013-09-12 15:21:45 +02:00
Boro Sitnikovski
d7f5f1ef35
Fix bug #65548 : Comparison for DateTimeImmutable doesn't work
2013-09-12 15:12:16 +02:00
Stanislav Malyshev
825a505494
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
Conflicts:
ext/date/lib/parse_date.c
ext/date/lib/parse_date.re
2013-08-25 15:14:17 -07:00
gron1987
e6424d89e9
Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
2013-08-25 15:09:29 -07:00
Stanislav Malyshev
c0bfccafd2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:54 -07:00
Alexander Moskalev
b378b0b081
Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:38:33 -07:00
Anatol Belski
a2b1546f3b
ensure the test doesn't fail because of tz warning
2013-08-23 16:40:28 +02: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
Anatol Belski
332e46b3aa
Extended the test for bug #65184
2013-07-03 22:52:51 +02:00
Anatol Belski
5324416b65
Fixed bug #65184 strftime() returns insufficient-length
...
string under multibyte locales
The msdn doc states 'strftime returns the number of characters', but prior
to VS2012 it seems to have returned the number of bytes. Locale independent.
The return is however \0-terminated, so strlen is just fine. The behaivor
seems to be persisting in the later VC++ versions as the corresponding
MSDN ticket is closed 'by design'.
See http://connect.microsoft.com/VisualStudio/feedback/details/766205/vs2012-strftime-has-incorrect-return-value-in-vc-11-with-multibyte-codepages#details
2013-07-03 11:12:46 +02:00