From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 25 Sep 2017 09:04:13 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.0RC3~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=801cdb8945a377b7c556835651407dbd96b448b7;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed type inference
---

801cdb8945a377b7c556835651407dbd96b448b7