Commit Graph

72828 Commits

Author SHA1 Message Date
Derick Rethans
3f20a2dec3 Merge branch 'PHP-5.5' 2013-01-14 20:39:06 +00:00
Derick Rethans
6313fc7e10 Added NEWS item for DateTimeImmutable 2013-01-14 20:36:48 +00:00
Derick Rethans
cca1a6e344 Merge branch 'PHP-5.5' 2013-01-14 20:35:13 +00:00
Derick Rethans
c20911a850 Make DatePeriod support DateTimeImmutable as well.
If the start element is a DateTimeImmutable object, then all returned objects
are also DateTimeImmutable objects. If the start element is a DateTime object,
then all returned objects are DateTime objects.
2013-01-14 20:34:58 +00:00
Derick Rethans
a0618139c9 Fixed crash bug when the non-OO interface was used. 2013-01-14 20:34:58 +00:00
Derick Rethans
017b1f7fca Rename DateTimePoint to DateTimeImmutable. 2013-01-14 20:34:58 +00:00
Derick Rethans
a0bea9a1de Added another test to test the unmodified inherited methods. 2013-01-14 20:34:58 +00:00
Derick Rethans
3919d0adf7 Added a few missing TSRMLS_DC/TSRMLS_CC. 2013-01-14 20:34:58 +00:00
Derick Rethans
45a429200c Added a test case for DateTimePoint. 2013-01-14 20:34:57 +00:00
Derick Rethans
1cc61f0927 Implemented immutable DateTime objects as the DateTimePoint class. 2013-01-14 20:34:57 +00:00
Lars Strojny
fd72588979 Merge branch 'PHP-5.5' 2013-01-14 21:25:01 +01:00
Lars Strojny
92965b033a Bug #46408: Fix double formatting for PostgreSQL bound parameters 2013-01-14 21:23:52 +01:00
Lars Strojny
ef6ae113f1 Merge branch 'PHP-5.5' 2013-01-14 20:43:55 +01:00
Lars Strojny
785e66adb5 PR #260: Update css for 404 pages to feel more up to date and have a consistent layout across browsers 2013-01-14 20:43:14 +01:00
Lars Strojny
02d04c244f Merge branch 'PHP-5.5' 2013-01-14 18:54:08 +01:00
Lars Strojny
97157b376f Merge branch 'PHP-5.4' into PHP-5.5 2013-01-14 18:53:40 +01:00
Lars Strojny
bf9ad4e661 Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29 2013-01-14 18:52:38 +01:00
Lars Strojny
df8a9e1ecb Merge branch 'PHP-5.5' 2013-01-14 18:16:48 +01:00
Lars Strojny
3ec2281298 Merge branch 'PHP-5.4' into PHP-5.5 2013-01-14 18:00:00 +01:00
Lars Strojny
1e9a3ed234 Fix bug #63916: PDO::PARAM_INT casts to 32bit int internally even on 64bit builds in pdo_sqlite 2013-01-14 17:59:11 +01:00
Lars Strojny
0c153aeb3b Merge branch 'PHP-5.5' 2013-01-14 17:44:03 +01:00
Lars Strojny
b16463a9fb Merge branch 'PHP-5.4' into PHP-5.5 2013-01-14 17:36:07 +01:00
Lars Strojny
99d087e5d4 Fixed bug #63921: sqlite3::bindvalue and relative PHP functions aren't using sqlite3_*_int64 API 2013-01-14 17:35:07 +01:00
Xinchen Hui
7a31692253 Merge branch 'PHP-5.5' 2013-01-14 17:09:05 +08:00
Xinchen Hui
be07f815f2 Use zend_unmangle_property_name_ex to save strlen 2013-01-14 17:08:21 +08:00
Xinchen Hui
f6260b36dd Merge branch 'PHP-5.5' 2013-01-14 16:24:26 +08:00
Xinchen Hui
62059c16ee Fixed bug #63980 (object members get trimmed by zero bytes) 2013-01-14 16:23:22 +08:00
Adam Harvey
5c7ae74f10 Merge branch 'PHP-5.5'
* PHP-5.5:
  Tinker with UPGRADING's wording for the format string changes for clarity.
2013-01-14 13:56:22 +08:00
Adam Harvey
fe27146b1b Tinker with UPGRADING's wording for the format string changes for clarity. 2013-01-14 13:54:43 +08:00
Stanislav Malyshev
308d817fb6 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #63982: isset() inconsistently produces a fatal error on protected property
  different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:29:06 -08:00
Stanislav Malyshev
30fd25bb49 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix bug #63982: isset() inconsistently produces a fatal error on protected property
  different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:27:05 -08:00
Stanislav Malyshev
1a96fe0b32 fix bug #63982: isset() inconsistently produces a fatal error on protected property 2013-01-13 17:08:52 -08:00
Stanislav Malyshev
c6203da6c2 different OSes have different messages, and that's not what the test is about anyway 2013-01-13 16:58:27 -08:00
Arnaud Le Blanc
bbf1c9c4a7 Merge branch 'PHP-5.5' 2013-01-13 15:47:33 +01:00
Arnaud Le Blanc
718afb9acf Merge branch 'PHP-5.4' into PHP-5.5 2013-01-13 15:47:12 +01:00
Arnaud Le Blanc
a06313fe5a fixed alternate form for 'x' and 'X' formats
same fix exists in original code:
https://svn.apache.org/viewvc?view=revision&revision=1152309
2013-01-13 15:45:15 +01:00
Dmitry Stogov
30588d8c50 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:56 +04:00
Dmitry Stogov
52dd0d1c73 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:37 +04:00
Dmitry Stogov
046ae2f77c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:19 +04:00
Dmitry Stogov
e1410b5a70 Fixed uninitialized zval.type (Yoram) 2013-01-10 18:53:10 +04:00
ULF WENDEL
9202225f29 Merge branch 'PHP-5.5'
* PHP-5.5:
  MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:54:01 +01:00
ULF WENDEL
f787e21ef5 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:53:46 +01:00
ULF WENDEL
36e88d78e6 MySQL 5.6 EXPIRE PASSWORD flag tests 2013-01-10 14:51:14 +01:00
Remi Collet
79dc69b75f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:59 +01:00
Remi Collet
b3a934bdb3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:25 +01:00
Remi Collet
f659ec108f Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:17:53 +01:00
Remi Collet
dc9f0e70b7 Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle)
See commit c05ee74e7f
2013-01-10 11:14:38 +01:00
Andrey Hristov
1b25386175 Merge branch 'PHP-5.5' 2013-01-09 19:15:57 +01:00
Andrey Hristov
846e506a3d Merge branch 'PHP-5.4' into PHP-5.5 2013-01-09 19:15:29 +01:00
Andrey Hristov
d430b5a4eb Add mysqli support - constants and checking in mysqli_options() for the
new constant for password expriration
2013-01-09 19:14:48 +01:00