Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #71447 (Quotes inside comments not properly handled)
  Fixed a few PDO tests to conform to PDO Common standards
  news entry #69537
  Fix #69537: __debugInfo with empty string for key gives error

Conflicts:
	Zend/zend_compile.c

diff --cc NEWS
index 44979e8dbfee7988268b88b6efe18a00f78f278b,0f9594ec8a943477152b85465e14e1f347719138..5ff99faf5d80db649ee804e501d08c4283118a33
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -39,11 -21,9 +39,13 @@@ PH
  - PDO:
    . Fixed bug #52098 (Own PDOStatement implementation ignore __call()).
      (Daniel kalaspuffar, Julien)
+   . Fixed bug #71447 (Quotes inside comments not properly handled).
+     (Matteo)
  
 +- PDO_DBlib:
 +  . Fixed bug #71943 (dblib_handle_quoter needs to allocate an extra byte).
 +    (Adam Baratz)
 +
  - Postgres:
    . Fixed bug #71820 (pg_fetch_object binds parameters before call
      constructor). (Anatol)

diff --cc ext/pdo/pdo_sql_parser.c
index 84f6ac3c6e5aa3e6c7bff15b33d624d58e9bc129,5a419782b53be3db3bc7c6daf1bc49fb2eccb33a..0095c3d8dc162fc5786bca40942069cc72af1744
--- 1/ext/pdo/pdo_sql_parser.c
--- 2/ext/pdo/pdo_sql_parser.c
+++ b/ext/pdo/pdo_sql_parser.c
@@@ -418,10 -374,10 +374,10 @@@ yy39
        ++YYCURSOR;
  #line 58 "ext/pdo/pdo_sql_parser.re"
        { RET(PDO_PARSER_TEXT); }
- #line 422 "ext/pdo/pdo_sql_parser.c"
+ #line 378 "ext/pdo/pdo_sql_parser.c"
  }
  #line 66 "ext/pdo/pdo_sql_parser.re"
 -      
 +
  }
  
  struct placeholder {

diff --cc ext/pdo/pdo_sql_parser.re
Simple merge

diff --cc ext/pdo/tests/bug_47769.phpt
Simple merge

diff --cc ext/pdo/tests/bug_65946.phpt
Simple merge