From: Matteo Beccati <mbeccati@php.net>
Date: Mon, 4 Apr 2016 22:07:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.6RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4090e709aa3505e414243d4e19e18804ea8371e4;p=php

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
---

4090e709aa3505e414243d4e19e18804ea8371e4
diff --cc NEWS
index 44979e8dbf,0f9594ec8a..5ff99faf5d
--- a/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 84f6ac3c6e,5a419782b5..0095c3d8dc
--- a/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 {