From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 4 Dec 2017 14:22:28 +0000 (+0300)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.1RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3503dc7482674ed16e72c09135dc0c0f5d19245f;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75608 ("Narrowing occurred during type inference" error)
---

3503dc7482674ed16e72c09135dc0c0f5d19245f
diff --cc NEWS
index 101d7b73b7,fa23892481..51cc66dd08
--- a/NEWS
+++ b/NEWS
@@@ -18,9 -19,10 +18,11 @@@ PH
      requests). (Remi)
  
  - Opcache:
+   . Fixed bug #75608 ("Narrowing occurred during type inference" error).
+     (Laruence, Dmitry)
    . Fixed bug #75570 ("Narrowing occurred during type inference" error).
      (Dmitry)
 +  . Fixed bug #75556 (Invalid opcode 138/1/1). (Laruence)
  
  - PCRE:
    . Fixed bug #74183 (preg_last_error not returning error code after error).