* 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
* 'master' of https://git.php.net/push/php-src: (171 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fixed EOL
added closing ?>
fix double entry
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
split the test for 32 and 64 bit
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
fixed the test
Fix a BC breach related to bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
...
* 'PHP-5.5' of https://git.php.net/push/php-src: (147 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fixed EOL
added closing ?>
fix double entry
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
split the test for 32 and 64 bit
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
fixed the test
Fix a BC breach related to bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
...
* 'PHP-5.4' of https://git.php.net/push/php-src: (76 commits)
Fixed bug #63186 (compile failure on netbsd)
fix test for bug #60322
ensure the error_reporting level to get expected notice
fixed tests
missing tests for bug #53437
fix double entry
Merge branch 'pull-request/341'
typo fixes (argument)
typo fixes (accommodate, parameter)
missing colon
Backported the fix for bug #53437
Backported the fix for bug #53437
Fixed bug #64988 (Class loading order affects E_STRICT warning)
Fixed test script
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.
Callback has to be restored in MSHUTDOWN
Update NEWs
Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
Fixed merge wrongly
...