From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 30 Oct 2017 07:44:25 +0000 (+0300)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1159^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f5c0fad21e84af36c833a935693a357636d2a2d;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed type inference
---

1f5c0fad21e84af36c833a935693a357636d2a2d