Fix tests for php versions > 5.3, see https://bugs.php.net/bug.php?id=64346
Fix PHPDoc