Merge branch 'PHP-5.6'

Tyrael · Tyrael · commit 956fa034e3b9 · 2015-04-02T00:07:20.000+02:00
* PHP-5.6:
  sigh, can't even copypaste without screwing up
diff --git a/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt b/ext/pdo_mysql/tests/pdo_mysql_pconnect.phpt
@@ -88,7 +88,7 @@ MySQLPDOTest::skip();
 		printf("[001] %s, [%s] %s [%s] %s\n",
 			$e->getMessage(),
 			(is_object($db1)) ? $db1->errorCode() : 'n/a',
-			(is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a');
+			(is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a',
 			(is_object($db2)) ? $db2->errorCode() : 'n/a',
 			(is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a');
 	}

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ MySQLPDOTest::skip();`
`88`	`88`	`printf("[001] %s, [%s] %s [%s] %s\n",`
`89`	`89`	`$e->getMessage(),`
`90`	`90`	`(is_object($db1)) ? $db1->errorCode() : 'n/a',`
`91`		`- (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a');`
	`91`	`+ (is_object($db1)) ? implode(' ', $db1->errorInfo()) : 'n/a',`
`92`	`92`	`(is_object($db2)) ? $db2->errorCode() : 'n/a',`
`93`	`93`	`(is_object($db2)) ? implode(' ', $db2->errorInfo()) : 'n/a');`
`94`	`94`	`}`