Merge branch 'PHP-5.6' into PHP-7.0

Author: Christopher Jones

ext/oci8/tests/array_bind_003.phpt

@@ -63,7 +63,7 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 Warning: oci_execute(): ORA-01403: %s
-ORA-06512: at "SYSTEM.ARRAY_BIND_003_PKG", line %d
+ORA-06512: at "%s.ARRAY_BIND_003_PKG", line %d
 ORA-06512: at line %d in %sarray_bind_003.php on line %d
 array(4) {
   [0]=>

ext/oci8/tests/array_bind_004.phpt

@@ -63,7 +63,7 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 Warning: oci_execute(): ORA-01403: %s
-ORA-06512: at "SYSTEM.ARRAY_BIND_004_PKG", line %d
+ORA-06512: at "%s.ARRAY_BIND_004_PKG", line %d
 ORA-06512: at line %d in %sarray_bind_004.php on line %d
 array(0) {
 }

ext/oci8/tests/imp_res_call_error.phpt

@@ -57,5 +57,5 @@ Test 1
 Warning: oci_execute(): ORA-29478: %s
 ORA-06512: at "SYS.DBMS_SQL", line %d
 ORA-06512: at "SYS.DBMS_SQL", line %d
-ORA-06512: at "SYSTEM.IMP_RES_CALL_ERR_PROC", line %d in %simp_res_call_error.php on line %d
+ORA-06512: at "%s.IMP_RES_CALL_ERR_PROC", line %d in %simp_res_call_error.php on line %d
 ===DONE===

ext/oci8/tests/refcur_prefetch_4.phpt

@@ -157,7 +157,7 @@ echo "Done\n";
 ------Test 1 - Set Prefetch after PL/SQL fetch ----------
 
 Warning: oci_execute(): ORA-01001: %s
-ORA-06512: at "SYSTEM.REFCURPKG", line %d
+ORA-06512: at "%s.REFCURPKG", line %d
 ORA-06512: at line %d in %s on line %d
 Fetch Row from PL/SQL
 int(0)