From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 14 Jun 2017 02:42:37 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha2~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e6c0b7826815c633f6d3158da155009fe370763;p=php

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

* 'master' of git.php.net:/php-src:
  Change PHP_OS_FAMILY to "Darwin" instead of "Mac" for Darwin based systems (as suggested by Davey)
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY
  Avoid run-time checks performed at compile-time.
  Fixed performance degradaton introduced in f6ac96b
  NEWS
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
  NEWS
  NEWS
  Fixes bug #74708 reflection signatures for random_bytes+random_int
---

3e6c0b7826815c633f6d3158da155009fe370763