Nikita Popov
ae91084067
Remove unnecessary NULL checks from zend_hash
...
Our memory allocation functions (including the persistent ones)
are infallible, so no need to check for NULL.
2013-06-17 18:51:59 +02:00
Nikita Popov
3823321c5c
Implement internal operator overloading
...
As pre RFC https://wiki.php.net/rfc/operator_overloading_gmp
2013-06-17 17:48:13 +02:00
Stanislav Malyshev
6db7e31fa6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
2013-06-16 15:30:44 -07:00
Stanislav Malyshev
ac343d5c1f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
ws fix
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner.l
Zend/zend_language_scanner_defs.h
2013-06-16 15:29:25 -07:00
Stanislav Malyshev
2208447d42
Fix bug #64936 - clean doc comment state at the beginning and end of the scan
2013-06-16 15:22:23 -07:00
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
4427d1dcfd
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
09bc6d7cf6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:37:56 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
04145dc2aa
typo fixes (argument)
2013-06-10 13:36:17 -07:00
Xinchen Hui
1689a7fe98
Merge branch 'PHP-5.5'
2013-06-10 21:33:47 +08:00
Xinchen Hui
a9d005c04e
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_compile.c
2013-06-10 21:31:25 +08:00
Xinchen Hui
d8792d87cf
Fixed bug #64988 (Class loading order affects E_STRICT warning)
2013-06-10 21:26:11 +08:00
Dmitry Stogov
53c39e2b4e
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
...
* 'PHP-5.4' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
2013-06-10 12:59:28 +04:00
Dmitry Stogov
ed0767f5d4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Fix spelling and correct typo.
2013-06-10 12:59:09 +04:00
Dmitry Stogov
36dc1ed4b0
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
Fix spelling and correct typo.
Fix spelling and correct typo.
2013-06-10 12:57:36 +04:00
Dmitry Stogov
56c9a2f4f6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed test script
2013-06-10 12:56:33 +04:00
Dmitry Stogov
ef20fdb338
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test script
2013-06-10 12:55:51 +04:00
Dmitry Stogov
f68b8a5e74
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed test script
2013-06-10 12:54:54 +04:00
Dmitry Stogov
f5f6404260
Fixed test script
2013-06-10 12:53:19 +04:00
Carson McDonald
f4e3c7ab7c
Fix spelling and correct typo.
2013-06-10 01:42:27 -07:00
Stanislav Malyshev
8697c27000
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix spelling and correct typo.
2013-06-10 01:41:26 -07:00
Stanislav Malyshev
de1688d16e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix spelling and correct typo.
2013-06-10 01:41:16 -07:00
Carson McDonald
b8cf17635e
Fix spelling and correct typo.
2013-06-10 01:40:41 -07:00
Xinchen Hui
e14800dd46
Fixed merge wrongly
2013-06-09 14:24:05 +08:00
Xinchen Hui
4600578830
Merge branch 'PHP-5.5'
2013-06-09 13:50:06 +08:00
Xinchen Hui
f372e00332
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
2013-06-09 13:49:26 +08:00
Xinchen Hui
ab22fda7e5
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-09 13:35:45 +08:00
Xinchen Hui
e8f004d542
Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
2013-06-09 13:20:40 +08:00
Xinchen Hui
ecfc3599a7
Merge branch 'PHP-5.5'
2013-06-05 17:32:09 +08:00
Xinchen Hui
e89537f2a3
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-05 17:30:09 +08:00
Xinchen Hui
f597f5561e
Merge branch 'PHP-5.3' into PHP-5.4
2013-06-05 17:26:10 +08:00
Xinchen Hui
3c87945c95
Fixed bug #64960 (Segfault in gc_zval_possible_root)
2013-06-05 17:25:00 +08:00
Dmitry Stogov
029c1da846
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed incorrect argument number
2013-05-29 11:15:27 +04:00
Dmitry Stogov
7e00d0994f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed incorrect argument number
2013-05-29 11:14:15 +04:00
Dmitry Stogov
8b515fa00a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed incorrect argument number
Conflicts:
Zend/zend_compile.c
2013-05-29 11:12:43 +04:00
Dmitry Stogov
13e5c97ffd
Fixed incorrect argument number
2013-05-29 11:09:55 +04:00
Sara Golemon
ee366ea516
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Don't double-quote name of namespaced function.
2013-05-19 13:35:09 -07:00
Dmitry Stogov
bf146ad5b5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #64720 (SegFault on zend_deactivate)
Conflicts:
NEWS
2013-05-21 10:33:57 +04:00
Dmitry Stogov
a2d6d27458
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64720 (SegFault on zend_deactivate)
Conflicts:
NEWS
2013-05-21 10:15:37 +04:00
Dmitry Stogov
77fffff157
Fixed bug #64720 (SegFault on zend_deactivate)
2013-05-21 09:58:11 +04:00
Stanislav Malyshev
3ce366b7cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:58:12 -07:00
Stanislav Malyshev
ac0aa5737e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #64660 - yyparse can return 2, not only 1
Conflicts:
Zend/zend_language_scanner.c
2013-05-20 00:57:34 -07:00
Stanislav Malyshev
fb58e69a84
fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:52:38 -07:00
Sara Golemon
4f46a40b9d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Don't double-quote name of namespaced function.
2013-05-19 13:35:03 -07:00
Sara Golemon
2d7415a4af
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Don't double-quote name of namespaced function.
2013-05-19 13:34:57 -07:00
Sara Golemon
2d5695cbc5
Don't double-quote name of namespaced function.
...
ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info)
was resulting in a function declaration of:
ns\"zend_name"()
including the errant quotes.
This diff corrects that. There are currently no uses of ZEND_NS_NAMED_FE
in core and reason to believe that there are no uses in the wild either.
2013-05-19 13:32:17 -07:00
Dmitry Stogov
273ad58295
Improved IS_VAR operands fetching
2013-05-17 13:15:09 +04:00