From: Anthony Ferrara <ircmaxell@gmail.com>
Date: Tue, 4 Sep 2012 14:29:22 +0000 (-0400)
Subject: Merge remote branch 'upstream/master' into hash_password
X-Git-Tag: php-5.5.0alpha1~18^2~17^2~2^2~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=824f1f45818096eff0e022ba2a1cbc2071343c9a;p=php

Merge remote branch 'upstream/master' into hash_password

* upstream/master: (393 commits)
  forked two tests for windows
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice).
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
  Fixed bug #50997 (SOAP Error when trying to submit 2nd Element of a choice)
  Bug #49510: Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
  Implemented ReflectionFunction::isGenerator()
  Allow null as a default value for length in mb_substr() and mb_strcut()
  Allow null as a default value for length in mb_substr() and mb_strcut()
  folder
  Initializing optional argument description in assert()
  Initializing optional argument description in assert()
  Fix test failed due to new Token T_YIELD
  fix NEWS
  Fix leak when yielding array as key
  Drop obsolete test
  Remove extra blank in notice message, should act as same as vm
  Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables)
  assert() user message
  ...
---

824f1f45818096eff0e022ba2a1cbc2071343c9a