Merge branch 'PHP-5.6'

* PHP-5.6:
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing

ext/oci8/tests/array_bind_001.phpt

@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_001_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_001_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_001_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_001_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_001_pkg.iobind(:c1); END;");
 
 $array = "";
 

ext/oci8/tests/array_bind_002.phpt

@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_002_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_002_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_002_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_002_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_002_pkg.iobind(:c1); END;");
 
 $array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17","05-NOV-05");
 

ext/oci8/tests/array_bind_003.phpt

@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_003_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_003_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_003_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_003_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_003_pkg.iobind(:c1); END;");
 
 $array = Array("06-DEC-05","10-DEC-80","21-AUG-91","26-OCT-17");
 
@@ -63,7 +63,7 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 Warning: oci_execute(): ORA-01403: %s
-ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d
+ORA-06512: at "SYSTEM.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

@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_004_PKG AS 
   TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_004_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_004_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_004_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_004_pkg.iobind(:c1); END;");
 
 $array = Array();
 
@@ -63,7 +63,7 @@ echo "Done\n";
 ?>
 --EXPECTF--	
 Warning: oci_execute(): ORA-01403: %s
-ORA-06512: at "SYSTEM.ARRAYBINDPKG1", line %d
+ORA-06512: at "SYSTEM.ARRAY_BIND_004_PKG", line %d
 ORA-06512: at line %d in %sarray_bind_004.php on line %d
 array(0) {
 }

ext/oci8/tests/array_bind_005.phpt

@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_005_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_005_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_005_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_005_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_005_pkg.iobind(:c1); END;");
 
 $array = Array("", "", "", "", "");
 

ext/oci8/tests/array_bind_006.phpt

@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_006_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_006_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_006_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_006_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_006_pkg.iobind(:c1); END;");
 
 $array = array("one", "two", "three", "four", "five");
 

ext/oci8/tests/array_bind_007.phpt

@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_007_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_007_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_007_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_007_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_007_pkg.iobind(:c1); END;");
 
 $array = Array(1,2,3,4,5);
 

ext/oci8/tests/array_bind_008.phpt

@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_008_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_008_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_008_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -45,11 +45,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_008_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_008_pkg.iobind(:c1); END;");
 
 $array = Array(1,2,3,4,5);
 

ext/oci8/tests/array_bind_011.phpt

@@ -16,15 +16,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_011_PKG AS 
   TYPE ARRTYPE IS TABLE OF VARCHAR(20) INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_011_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_011_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,11 +42,11 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_011_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_011_pkg.iobind(:c1); END;");
 
 $array = array();
 

ext/oci8/tests/array_bind_014.phpt

@@ -19,15 +19,15 @@ $statement = oci_parse($c, $create);
 oci_execute($statement);
 
 $create_pkg = "
-CREATE OR REPLACE PACKAGE ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE ARRAY_BIND_014_PKG AS 
   TYPE ARRTYPE IS TABLE OF NUMBER INDEX BY BINARY_INTEGER; 
   PROCEDURE iobind(c1 IN OUT ARRTYPE); 
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_014_PKG;";
 $statement = oci_parse($c, $create_pkg);
 oci_execute($statement);
 
 $create_pkg_body = "
-CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS 
+CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_014_PKG AS 
   CURSOR CUR IS SELECT name FROM bind_test;
   PROCEDURE iobind(c1 IN OUT ARRTYPE) IS
     BEGIN
@@ -42,7 +42,7 @@ CREATE OR REPLACE PACKAGE BODY ARRAYBINDPKG1 AS
       END IF;
     END LOOP;
   END iobind;
-END ARRAYBINDPKG1;";
+END ARRAY_BIND_014_PKG;";
 $statement = oci_parse($c, $create_pkg_body);
 oci_execute($statement);
 
@@ -51,7 +51,7 @@ for ($i = 1; $i < 6; $i++) {
 	oci_execute($statement);
 }
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_014_pkg.iobind(:c1); END;");
 $array = Array();
 oci_bind_array_by_name($statement, ":c1", $array, 5, -1, SQLT_INT);
 oci_execute($statement);

ext/oci8/tests/array_bind_bdouble.phpt

@@ -11,7 +11,7 @@ if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older
 
 require dirname(__FILE__).'/connect.inc';
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_bdouble_pkg.iobind(:c1); END;");
 $array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
 oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_BDOUBLE);
 

ext/oci8/tests/array_bind_bfloat.phpt

@@ -11,7 +11,7 @@ if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older O
 
 require dirname(__FILE__).'/connect.inc';
 
-$statement = oci_parse($c, "BEGIN ARRAYBINDPKG1.iobind(:c1); END;");
+$statement = oci_parse($c, "BEGIN array_bind_bfloat_pkg.iobind(:c1); END;");
 $array = Array(1.243,2.5658,3.4234,4.2123,5.9999);
 oci_bind_array_by_name($statement, ":c1", $array, 5, 5, SQLT_BFLOAT);