Merge branch 'master' of git.php.net:php-src

Author: laruence

ext/oci8/tests/bind_char_2_11gR1.phpt

@@ -5,7 +5,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 // The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
     if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
         die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3 databases");
     }

ext/oci8/tests/bind_char_3_11gR1.phpt

@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 // The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
     if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
         die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3 databases");
     }

ext/oci8/tests/bind_char_4_11gR1.phpt

@@ -5,7 +5,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter
 if (!extension_loaded('oci8')) die ("skip no oci8 extension");
 require(dirname(__FILE__)."/connect.inc");
 // The bind buffer size edge cases seem to change each DB version.
-if (preg_match('/Release 11\.1\./', $sv, $matches) !== 1) {
+if (preg_match('/Release 11\.1\./', oci_server_version($c), $matches) !== 1) {
     if (preg_match('/Release 11\.2\.0\.3/', oci_server_version($c), $matches) !== 1) {
         die("skip expected output only valid when using Oracle 11gR1 or 11.2.0.3 databases");
     }

ext/oci8/tests/details.inc

@@ -45,31 +45,34 @@ if (file_exists(dirname(__FILE__)."/details_local.inc")) {
  * Used for creating/dropping schema objects used by a test
  */
 
-function oci8_test_sql_execute($c, $stmtarray)
-{
-	foreach ($stmtarray as $stmt) {
-		$s = oci_parse($c, $stmt);
-		if (!$s) {
-			$m = oci_error($c);
-			echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
-		}
-		else {
-			$r = @oci_execute($s);
-			if (!$r) {
-				$m = oci_error($s);
-				if (!in_array($m['code'], array(   // ignore expected errors
-								942 // table or view does not exist
-							,  1918 // user does not exist
-							,  2024 // database link not found
-							,  2289 // sequence does not exist
-							,  4080 // trigger does not exist
-							, 38802 // edition does not exist
-						))) {
-					echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
-				}
-			}
-		}
-	}
+if (!function_exists('oci8_test_sql_execute')) {
+    function oci8_test_sql_execute($c, $stmtarray)
+    {
+        foreach ($stmtarray as $stmt) {
+            $s = oci_parse($c, $stmt);
+            if (!$s) {
+                $m = oci_error($c);
+                echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
+            }
+            else {
+                $r = @oci_execute($s);
+                if (!$r) {
+                    $m = oci_error($s);
+                    if (!in_array($m['code'], array(   // ignore expected errors
+								    942 // table or view does not exist
+                                ,  1918 // user does not exist
+                                ,  2024 // database link not found
+                                ,  2289 // sequence does not exist
+                                ,  4080 // trigger does not exist
+                                , 38802 // edition does not exist
+                            ))) {
+                        echo $stmt . PHP_EOL . $m['message'] . PHP_EOL;
+                    }
+                }
+            }
+        }
+    }
+
 }
 
 ?>

ext/oci8/tests/xmltype_01.phpt

@@ -5,6 +5,7 @@ Basic XMLType test
 if (!extension_loaded("simplexml")) die("skip no simplexml extension");
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
 require(dirname(__FILE__).'/skipif.inc');
+?>
 --FILE--
 <?php