From: Joe Watkins <krakjoe@php.net>
Date: Tue, 11 Apr 2017 11:14:40 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bbdbd063ea95237fa51cb01f93829444ed0066d;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fixed bug #74413 wrong reflection on SQLite3::enableExceptions
---

8bbdbd063ea95237fa51cb01f93829444ed0066d
diff --cc NEWS
index 1b778714cb,68ba3b75aa..0044ae93b4
--- a/NEWS
+++ b/NEWS
@@@ -153,10 -132,11 +153,14 @@@ PH
  - PDO_OCI:
    . Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated). (gureedo / Oracle)
  
++- SQLite3:
++  . Fixed bug #74413 (incorrect reflection for SQLite3::enableExceptions).
++    (krakjoe)
++
  - Standard:
 -  . Fixed bug #74148 (ReflectionFunction incorrectly reports the number of
 -    arguments). (Laruence)
    . Fixed bug #74005 (mail.add_x_header causes RFC-breaking lone line feed).
      (Anatol)
 +  . Fixed bug #74041 (substr_count with length=0 broken). (Nikita)
    . Fixed bug #73118 (is_callable callable name reports misleading value for
      anonymous classes). (Adam Saponara)
    . Fixed bug #74105 (PHP on Linux should use /dev/urandom when getrandom is