Fixed tests affect by local ini
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Add __debugInfo() to UPGRADING.

RMs: this is an UPGRADING only change, and should be safe for RCs.

Developers: please remember to update UPGRADING, otherwise there's a good
chance your shiny new feature won't be documented! (As has happened here.)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Add __debugInfo() to UPGRADING.
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Merge branch 'master' of git://github.com/php/php-src