delta/php-git.git/Zend, branch php-5.5.0RC2 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2013-05-19T20:35:03+00:00 Sara Golemon pollita@php.net 2013-05-19T20:35:03+00:00 4f46a40b9df80ef3faf498262c7a06a77ee98041 * PHP-5.4: Don't double-quote name of namespaced function. 
* PHP-5.4:
  Don't double-quote name of namespaced function.
Merge branch 'PHP-5.4' into PHP-5.5 2013-05-21T06:15:37+00:00 Dmitry Stogov dmitry@zend.com 2013-05-21T06:15:37+00:00 a2d6d274584d5df2aa9c040396066d30ffd44d82 * PHP-5.4: Fixed bug #64720 (SegFault on zend_deactivate) Conflicts: NEWS 
* PHP-5.4:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
	NEWS
Fixed bug #64720 (SegFault on zend_deactivate) 2013-05-21T05:58:11+00:00 Dmitry Stogov dmitry@zend.com 2013-05-21T05:58:11+00:00 77fffff15762137e2d8173df9b733b4cb70fc996 






Merge branch 'PHP-5.4' into PHP-5.5
2013-05-20T07:57:34+00:00

Stanislav Malyshev
stas@php.net

2013-05-20T07:55:48+00:00

ac0aa5737e6eff93d1cf83d6a6b1c8f1227775c4

* PHP-5.4:
  fix bug #64660 - yyparse can return 2, not only 1

Conflicts:
	Zend/zend_language_scanner.c





* PHP-5.4:
  fix bug #64660 - yyparse can return 2, not only 1

Conflicts:
	Zend/zend_language_scanner.c







fix bug #64660 - yyparse can return 2, not only 1
2013-05-20T07:52:38+00:00

Stanislav Malyshev
stas@php.net

2013-05-20T07:52:38+00:00

fb58e69a84f4fde603a630d2c9df2fa3be16d846












Merge branch 'PHP-5.3' into PHP-5.4
2013-05-19T20:34:57+00:00

Sara Golemon
pollita@php.net

2013-05-19T20:34:57+00:00

2d7415a4af66e0771b36a10534e304fe7af4a855

* PHP-5.3:
  Don't double-quote name of namespaced function.





* PHP-5.3:
  Don't double-quote name of namespaced function.







Don't double-quote name of namespaced function.
2013-05-19T20:32:17+00:00

Sara Golemon
pollita@php.net

2013-05-19T20:32:17+00:00

2d5695cbc5a627cb278b3ab0b1f5eed2f8be1bee

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.





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.







Merge branch 'PHP-5.4' into PHP-5.5
2013-05-12T12:09:16+00:00

Anatol Belski
ab@php.net

2013-05-12T12:09:16+00:00

2d8ce75f395f8e46133552097f9254e46fc44d1e

* PHP-5.4:
  updated NEWS
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden





* PHP-5.4:
  updated NEWS
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden







Merge branch 'PHP-5.3' into PHP-5.4
2013-05-12T12:06:59+00:00

Anatol Belski
ab@php.net

2013-05-12T12:06:59+00:00

dd188e9538a83473246d94642a7ce577fc5de33b

* PHP-5.3:
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden





* PHP-5.3:
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden







Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12T12:00:32+00:00

Anatol Belski
ab@php.net

2013-05-12T12:00:32+00:00

d6505acbf5ff6db0e9e19cdba121183d9563bad5

If user inherits Exception and overrides the properties to arbitrary data types,
or simply doesn't run parent::__construct(), here we go. Just convert everything
to the appropriate data type, like Exception::__toString() does.





If user inherits Exception and overrides the properties to arbitrary data types,
or simply doesn't run parent::__construct(), here we go. Just convert everything
to the appropriate data type, like Exception::__toString() does.