* upstream/master:
Generators & UPGRADING
Capitalize the warning message
Rearrange the codes, remove empty lines
Provide a specific error message if date.timezone value is invalid.
regenerate patch, and save a strlen
Fix the wrong use of snprintf which is introduced in 1d2f619049
Fixed unintendent clearance of PHP_OUTPUT_ACTIVATED flag
Fix doc bug #63032 (Number of release in documentation).
fixed test for bug #52944 also for darwin
-enable VC11 (vc2012)
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
year++
correct PHP version & year++
Correct PHP version
year++
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
- fix build, declarations must be 1st in a contextgit checkout -f master
Fixed bug #62907 (Double free when use traits)
Fixed bug #62991 (Segfault with generator and closure)
* PHP-5.4:
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
* upstream/master: (393 commits)
forked two tests for windows
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
Implemented ReflectionFunction::isGenerator()
Allow null as a default value for length in mb_substr() and mb_strcut()
Allow null as a default value for length in mb_substr() and mb_strcut()
folder
Initializing optional argument description in assert()
Initializing optional argument description in assert()
Fix test failed due to new Token T_YIELD
fix NEWS
Fix leak when yielding array as key
Drop obsolete test
Remove extra blank in notice message, should act as same as vm
Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
assert() user message
...