Anatoliy Belsky
baea290b6c
fix windows build
2012-08-13 19:44:45 +02:00
Nikita Popov
f3192ea6e4
Fix 64bit JSON test
2012-08-13 18:43:03 +02:00
Xinchen Hui
80d5ae3cea
Implemented 'finally' keywords for php
...
RFC: https://wiki.php.net/rfc/finally
FR: https://bugs.php.net/bug.php?id=32100
and I have got some improvment ideas(performance), will implemented
later. thanks
2012-08-13 21:48:39 +08:00
Xinchen Hui
e51acee43d
Merge branch 'PHP-5.4'
2012-08-13 11:04:05 +08:00
Xinchen Hui
212cfb95d1
more test script for #62328
2012-08-13 11:03:35 +08:00
Xinchen Hui
253760bb6b
Merge branch 'PHP-5.4'
2012-08-12 21:00:01 +08:00
Xinchen Hui
be818e7ea7
Update NEWS
2012-08-12 20:59:33 +08:00
Xinchen Hui
dda0565b53
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45
Fixed bug #62763 (register_shutdown_function and extending class)
2012-08-12 20:58:09 +08:00
Xinchen Hui
9787e7af44
Merge branch 'PHP-5.4'
2012-08-12 12:02:17 +08:00
Xinchen Hui
75f6c8d42c
Revert "zend_make_printable_zval choses cast_object over __toString"
...
This reverts commit a5dfd41494
.
2012-08-12 12:02:06 +08:00
Xinchen Hui
32c1c5a19f
Revert "Test for bug 62328"
...
This reverts commit 222ab9da1a
.
2012-08-12 12:02:02 +08:00
Xinchen Hui
786670f536
Update NEWS
2012-08-12 12:00:16 +08:00
Xinchen Hui
7b307fb930
Fixed bug #62328 (implementing __toString and a cast to string fails)
...
__toString should has a high priority
2012-08-12 11:50:28 +08:00
Xinchen Hui
d11fa44d62
Merge branch 'Bug-62328' of https://github.com/leight/php-src
2012-08-12 10:40:41 +08:00
Xinchen Hui
66a6d1b97b
Merge branch 'PHP-5.4'
2012-08-11 16:00:30 +08:00
Xinchen Hui
d4f9bbfae2
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-11 16:00:00 +08:00
Xinchen Hui
e1180b4f1a
Fixed bug #62795 (Zip extension version not defined)
2012-08-11 15:59:06 +08:00
Xinchen Hui
e904f9f4b2
Merge branch 'PHP-5.4'
2012-08-11 00:25:54 +08:00
Xinchen Hui
5ae7540abd
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-11 00:24:12 +08:00
Xinchen Hui
7130887719
Fix test, from PR 158
2012-08-11 00:22:52 +08:00
Leigh
222ab9da1a
Test for bug 62328
2012-08-10 11:43:53 +01:00
Leigh
a5dfd41494
zend_make_printable_zval choses cast_object over __toString
...
https://bugs.php.net/bug.php?id=62328
Added a check to see if the object implements a __toString magic
method. This should be called instead of the cast_object method of
built-in classes when defined.
2012-08-10 11:09:25 +01:00
Rob Richards
6209632ca1
Merge branch 'PHP-5.4'
...
# By Daniel Veillard
* PHP-5.4:
Update to work with libxml 2.9.0
2012-08-09 14:25:46 -04:00
Rob Richards
c5a611b257
Merge branch 'PHP-5.3' into PHP-5.4
...
# By Daniel Veillard
* PHP-5.3:
Update to work with libxml 2.9.0
2012-08-09 14:24:50 -04:00
Daniel Veillard
c4b26cc1b0
Update to work with libxml 2.9.0
2012-08-09 14:02:33 -04:00
Stanislav Malyshev
054e41f4ae
Merge branch 'PHP-5.4'
...
* PHP-5.4:
News for bug#40459
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:12:22 -07:00
Stanislav Malyshev
c98a51a169
Merge branch 'bug40459' into PHP-5.4
...
* bug40459:
News for bug#40459
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-09 00:10:31 -07:00
Stanislav Malyshev
128a4bbb0d
News for bug#40459
2012-08-07 23:03:33 -07:00
Stanislav Malyshev
4db70fd406
fix bug #40459 - make all stream funcs that create object call ctor
2012-08-07 22:59:12 -07:00
Stanislav Malyshev
1190bc440b
bug #54254
2012-08-07 01:48:32 -07:00
Stanislav Malyshev
a15459b291
text fixes from emosenkis
2012-08-07 01:48:32 -07:00
Stanislav Malyshev
0826d39370
some fixes for bug#54254
2012-08-07 01:48:31 -07:00
Eitan Mosenkis
dedc8f2682
Add test for interoperability of jdtojewish and cal_days_in_month
2012-08-07 01:48:31 -07:00
Eitan Mosenkis
e1489c5793
Update documentation to reflect fix of 54254
2012-08-07 01:48:31 -07:00
Stanislav Malyshev
ad545949d0
fix for display of Jewish month names
2012-08-07 01:48:31 -07:00
Anatoliy Belsky
7e2d550e88
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:13:25 +02:00
Anatoliy Belsky
55b82abe00
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:12:04 +02:00
Matt Ficken
ed793b2a3f
Added the intl tests extracted from Symfony. These are making the intl ext crash with ICU at least 4.6, but probably with earlier versions too.
2012-08-06 14:07:42 +02:00
Stanislav Malyshev
c9eb64127e
Merge branch 'pull-request/132'
...
* pull-request/132:
OK, bye bye JavaScript, let's just include credits before license
Nicer (JSLint-compliant!) credits reveal JavaScript
Removed now-unnecessary expose_php checks for logo
Fixed small misalignment in prev commit
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
2012-08-05 21:15:53 -07:00
Stanislav Malyshev
1a41607d46
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Add #51363
2012-08-05 21:00:16 -07:00
Stanislav Malyshev
01e414bb6f
Add #51363
2012-08-05 21:00:04 -07:00
Stanislav Malyshev
13763c76db
Merge branch 'PHP-5.4'
...
* PHP-5.4:
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:58:46 -07:00
Lonny Kapelushnik
45f3322905
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:56:06 -07:00
Stanislav Malyshev
04ac5065e0
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Added Bison 2.5.1 to bison_version_list
2012-08-05 20:48:47 -07:00
Ryusuke SEKIYAMA
81c6a060a2
Added Bison 2.5.1 to bison_version_list
2012-08-05 20:48:42 -07:00
Stanislav Malyshev
e7ca5bb3a1
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Minor spelling corrections
2012-08-05 20:43:53 -07:00
Brett Bieber
82bc8821f9
Minor spelling corrections
2012-08-05 20:43:22 -07:00
Stanislav Malyshev
4a2d41a5bb
add note for mcrypt_ecb
2012-08-05 20:41:14 -07:00
Stanislav Malyshev
233e4d3418
Merge branch 'pull-request/141'
...
* pull-request/141:
Fixes mcrypt_ecb not issuing an E_DEPRECATED level notice, despite having been deprecated for some time. Please reference bug #62374 as well.
2012-08-05 20:39:45 -07:00