PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1

cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
Merge branch 'pull-request/656' into PHP-5.5

* pull-request/656:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
Merge branch 'PHP-5.6'

* PHP-5.6:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME

Currently when you use RecursiveDirectoryIterator with the
CURRENT_AS_PATHNAME flag PHP will throw an UnexpectedValueException with
message 'Objects returned by RecursiveIterator::getChildren() must implement
RecursiveIterator'.This happend because getChildren() will return the
current directory name instead of an Iterator (or subclass of) as required
by the RecursiveIterator interface.

This commit changes getChildren() to return annother
RecursiveDirectoryIterator but current() still returns the path name when
CURRENT_AS_PATHNAME is used. A PHPT test case (bug66405.phpt) that
reproduces the bug is included.

This fix was originally against the PHP-5.4 branch, but it was not merged
before 5.4 reached EOL. I am hoping to get it applied to 5.5, 5.6, and
master.
Updated NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Updated NEWS
  SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME
Updated NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS
  Updated NEWS
  SPL: Fix for bug 66405 RecursiveDirectoryIterator with CURRENT_AS_PATHNAME

Conflicts:
	ext/spl/spl_directory.c
Updated NEWS