From: Joe Watkins <krakjoe@php.net>
Date: Mon, 2 Jan 2017 09:42:03 +0000 (+0000)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha1~689
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8b291d2885c7b9a92d6a1af9f630ad619e4c875;p=php

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Switch reflection to use smart_str
  Add smart_str_append_printf
  Make printf_to_smart_str(ing) the primitive printf operation
  Export zend_s(tr)pprintf
  Sync smart_string implementation with smart_str
  Move smart_string to Zend
  Fixed bug #73154
  Flush stderr on win32 in cli_log_message
  Fixed bug #73154
---

f8b291d2885c7b9a92d6a1af9f630ad619e4c875