fix tests
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests
fix tests
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  fix valgrind warning
  Fix bug #64023 (__toString() & SplFileInfo)
  Fix test related to change for #bug64007 and also fix in newInstanceArgs
  NEWS: Start PHP 5.5.0 Beta 1 section
  NEWS for PHP 5.5.0alpha4
  Fix NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests