Merge branch 'PHP-5.5'
Fix bug #64023 (__toString() & SplFileInfo)

Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().

Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
Merge branch 'bug64023' into PHP-5.4

* bug64023:
  Fix bug #64023 (__toString() & SplFileInfo)

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
fix valgrind warning
Merge branch 'PHP-5.5'
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64023 (__toString() & SplFileInfo)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #64023 (__toString() & SplFileInfo)
NEWS for bug #64023 (see aa0adce)
fix tests
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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
fix tests
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix tests
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix tests
  fix tests
now we have also an xz archive
Fix missing parameter
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix missing parameter
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix missing parameter
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #60833 - self, parent, static behave inconsistently case-sensitive

Conflicts:
	UPGRADING