Rename OCI8 classes to use standard names so arg stub parsing works

44 files changed, 118 insertions, 113 deletions

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 6cd21d966c..8196e90608 100644
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -291,8 +291,8 @@ PHP_MINIT_FUNCTION(oci)
 	le_descriptor = zend_register_list_destructors_ex(php_oci_descriptor_list_dtor, NULL, "oci8 descriptor", module_number);
 	le_collection = zend_register_list_destructors_ex(php_oci_collection_list_dtor, NULL, "oci8 collection", module_number);
 
-	INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI-Lob", class_OCI_Lob_methods);
-	INIT_CLASS_ENTRY(oci_coll_class_entry, "OCI-Collection", class_OCI_Collection_methods);
+	INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI_Lob", class_OCI_Lob_methods);
+	INIT_CLASS_ENTRY(oci_coll_class_entry, "OCI_Collection", class_OCI_Collection_methods);
 
 	oci_lob_class_entry_ptr = zend_register_internal_class(&oci_lob_class_entry);
 	oci_coll_class_entry_ptr = zend_register_internal_class(&oci_coll_class_entry);
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
index 7d6c28501b..930ccb2580 100644
--- a/ext/oci8/package.xml
+++ b/ext/oci8/package.xml
@@ -72,6 +72,10 @@ Oracle's standard cross-version connectivity applies.  For example, PHP OCI8 lin
 
     Removed obsolete no-op function oci_internal_debug(). (Jens de Nies)
 
+    The OCI-Lob class is now called OCI_Lob.
+
+    The OCI-Collection calls is now called OCI_Collection.
+
     Generate arginfo from function stubs. (Jens de Nies)
   </notes>
  <contents>
diff --git a/ext/oci8/tests/bug35973.phpt b/ext/oci8/tests/bug35973.phpt
index 681498b810..2eec32db83 100644
--- a/ext/oci8/tests/bug35973.phpt
+++ b/ext/oci8/tests/bug35973.phpt
@@ -36,7 +36,7 @@ echo "Done\n";
 --EXPECTF--
 array(1) {
   ["NC"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/bug44008.phpt b/ext/oci8/tests/bug44008.phpt
index faf26f472e..d8120325cf 100644
--- a/ext/oci8/tests/bug44008.phpt
+++ b/ext/oci8/tests/bug44008.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #44008 (Incorrect usage of OCI-Lob->close crashes PHP)
+Bug #44008 (Incorrect usage of OCI_Lob->close crashes PHP)
 --SKIPIF--
 <?php
 $target_dbs = array('oracledb' => true, 'timesten' => false);  // test runs on these DBs
@@ -30,7 +30,7 @@ $r = $textLob->load();
 echo "$r\n";
 
 // Incorrectly closing the lob doesn't cause a crash.
-// OCI-LOB->close() is documented for use only with OCI-Lob->writeTemporary()
+// OCI-LOB->close() is documented for use only with OCI_Lob->writeTemporary()
 $textLob->close();
 
 // Cleanup
diff --git a/ext/oci8/tests/coll_001.phpt b/ext/oci8/tests/coll_001.phpt
index 4454ecc548..fdf17f1647 100644
--- a/ext/oci8/tests/coll_001.phpt
+++ b/ext/oci8/tests/coll_001.phpt
@@ -20,7 +20,7 @@ require __DIR__."/drop_type.inc";
 
 ?>
 --EXPECTF--
-object(OCI-Collection)#%d (1) {
+object(OCI_Collection)#%d (1) {
   ["collection"]=>
   resource(%d) of type (oci8 collection)
 }
diff --git a/ext/oci8/tests/coll_002.phpt b/ext/oci8/tests/coll_002.phpt
index 05515f63ae..d466e8ee29 100644
--- a/ext/oci8/tests/coll_002.phpt
+++ b/ext/oci8/tests/coll_002.phpt
@@ -28,12 +28,12 @@ require __DIR__."/drop_type.inc";
 
 ?>
 --EXPECTF--
-object(OCI-Collection)#%d (1) {
+object(OCI_Collection)#%d (1) {
   ["collection"]=>
   resource(%d) of type (oci8 collection)
 }
 bool(true)
-string(%d) "OCI-Collection::size(): supplied resource is not a valid oci8 collection resource"
+string(%d) "OCI_Collection::size(): supplied resource is not a valid oci8 collection resource"
 
 Warning: oci_new_collection(): OCI-22303: type ""."NONEXISTENT" not found in %s on line %d
 bool(false)
diff --git a/ext/oci8/tests/coll_002_func.phpt b/ext/oci8/tests/coll_002_func.phpt
index 0c09289bcd..1cd6070d76 100644
--- a/ext/oci8/tests/coll_002_func.phpt
+++ b/ext/oci8/tests/coll_002_func.phpt
@@ -27,7 +27,7 @@ require __DIR__."/drop_type.inc";
 
 ?>
 --EXPECTF--
-object(OCI-Collection)#%d (1) {
+object(OCI_Collection)#%d (1) {
   ["collection"]=>
   resource(%d) of type (oci8 collection)
 }
diff --git a/ext/oci8/tests/coll_003.phpt b/ext/oci8/tests/coll_003.phpt
index c92adecdb4..1d47681fe7 100644
--- a/ext/oci8/tests/coll_003.phpt
+++ b/ext/oci8/tests/coll_003.phpt
@@ -29,7 +29,7 @@ require __DIR__."/drop_type.inc";
 int(0)
 int(0)
 
-Warning: OCI-Collection::trim(): OCI-22167: given trim size [3] must be less than or equal to [0] in %s on line %d
+Warning: OCI_Collection::trim(): OCI-22167: given trim size [3] must be less than or equal to [0] in %s on line %d
 bool(false)
 bool(true)
 float(1)
diff --git a/ext/oci8/tests/coll_009.phpt b/ext/oci8/tests/coll_009.phpt
index 19289c5290..c293a8d64f 100644
--- a/ext/oci8/tests/coll_009.phpt
+++ b/ext/oci8/tests/coll_009.phpt
@@ -38,7 +38,7 @@ require __DIR__."/drop_type.inc";
 
 ?>
 --EXPECTF--
-Warning: OCI-Collection::append(): OCI-01861: literal does not match format string in %s on line %d
+Warning: OCI_Collection::append(): OCI-01861: literal does not match format string in %s on line %d
 bool(false)
 bool(true)
 bool(false)
diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt
index f64ac03f52..5eab7d4d23 100644
--- a/ext/oci8/tests/coll_016.phpt
+++ b/ext/oci8/tests/coll_016.phpt
@@ -40,10 +40,10 @@ require __DIR__."/drop_type.inc";
 --EXPECTF--
 bool(true)
 
-Warning: OCI-Collection::assignelem(): OCI-22165: given index [%d] must be in the range of %s to [0] in %s on line %d
+Warning: OCI_Collection::assignelem(): OCI-22165: given index [%d] must be in the range of %s to [0] in %s on line %d
 bool(false)
 
-Warning: OCI-Collection::assignelem(): OCI-22165: given index [5000] must be in the range of %s to [0] in %s on line %d
+Warning: OCI_Collection::assignelem(): OCI-22165: given index [5000] must be in the range of %s to [0] in %s on line %d
 bool(false)
 bool(false)
 bool(false)
diff --git a/ext/oci8/tests/coll_019.phpt b/ext/oci8/tests/coll_019.phpt
index 7008ead9e0..64b2bc31d6 100644
--- a/ext/oci8/tests/coll_019.phpt
+++ b/ext/oci8/tests/coll_019.phpt
@@ -75,33 +75,33 @@ echo "Done\n";
 --EXPECTF--
 Test 0
 
-Notice: OCI-Collection::append(): Unknown or unsupported type of element: 113 in %s on line %d
+Notice: OCI_Collection::append(): Unknown or unsupported type of element: 113 in %s on line %d
 bool(false)
 
-Notice: OCI-Collection::assignelem(): Unknown or unsupported type of element: 113 in %s on line %d
+Notice: OCI_Collection::assignelem(): Unknown or unsupported type of element: 113 in %s on line %d
 bool(false)
 bool(false)
 Test 1
 
-Warning: OCI-Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
+Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
 bool(false)
 bool(false)
 Test 2
 
-Warning: OCI-Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
+Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
 bool(false)
 bool(false)
 Test 3
 
-Warning: OCI-Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
+Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
 bool(false)
 bool(false)
 Test 4
 
-Warning: OCI-Collection::append(): OCI-01840: input value not long enough for date format in %s on line %d
+Warning: OCI_Collection::append(): OCI-01840: input value not long enough for date format in %s on line %d
 bool(false)
 
-Warning: OCI-Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
+Warning: OCI_Collection::assignelem(): OCI-22165: given index [1] must be in the range of %s in %s on line %d
 bool(false)
 bool(false)
 Done
diff --git a/ext/oci8/tests/define3.phpt b/ext/oci8/tests/define3.phpt
index e70f636938..520748f3d8 100644
--- a/ext/oci8/tests/define3.phpt
+++ b/ext/oci8/tests/define3.phpt
@@ -89,12 +89,12 @@ string(32) "614fcbba1effb7caa27ef0ef25c27fcf"
 string(32) "06d4f219d946c74d748d43932cd9dcb2"
 Test 1
 bool(true)
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
 file md5:614fcbba1effb7caa27ef0ef25c27fcf
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
diff --git a/ext/oci8/tests/descriptors.phpt b/ext/oci8/tests/descriptors.phpt
index 44d4ab0a01..8a5b42e791 100644
--- a/ext/oci8/tests/descriptors.phpt
+++ b/ext/oci8/tests/descriptors.phpt
@@ -44,7 +44,7 @@ echo "Done\n";
 --EXPECTF--
 array(1) {
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/fetch_object_2.phpt b/ext/oci8/tests/fetch_object_2.phpt
index 41c648341a..27f558e4b0 100644
--- a/ext/oci8/tests/fetch_object_2.phpt
+++ b/ext/oci8/tests/fetch_object_2.phpt
@@ -69,7 +69,7 @@ object(stdClass)#%d (3) {
   ["COL1"]=>
   string(3) "123"
   ["COL2"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -80,7 +80,7 @@ object(stdClass)#%d (3) {
   ["COL1"]=>
   string(3) "456"
   ["COL2"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -91,7 +91,7 @@ object(stdClass)#%d (3) {
   ["COL1"]=>
   string(3) "789"
   ["COL2"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt
index 3e9c061ee0..51e8c07673 100644
--- a/ext/oci8/tests/lob_001.phpt
+++ b/ext/oci8/tests/lob_001.phpt
diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index 964c5f4f6e..78b10f21e0 100644
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -52,7 +52,7 @@ oci8_test_sql_execute($c, $stmtarray);
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt
index 1edb9bef06..fef078a26f 100644
--- a/ext/oci8/tests/lob_003.phpt
+++ b/ext/oci8/tests/lob_003.phpt
diff --git a/ext/oci8/tests/lob_004.phpt b/ext/oci8/tests/lob_004.phpt
index d04076fba9..4ff1a8b65e 100644
--- a/ext/oci8/tests/lob_004.phpt
+++ b/ext/oci8/tests/lob_004.phpt
@@ -57,7 +57,7 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
@@ -67,12 +67,12 @@ int(3)
 bool(true)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_005.phpt b/ext/oci8/tests/lob_005.phpt
index fa910277f1..317c8d5be9 100644
--- a/ext/oci8/tests/lob_005.phpt
+++ b/ext/oci8/tests/lob_005.phpt
@@ -41,12 +41,12 @@ echo "Done\n";
 --EXPECTF--
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_006.phpt b/ext/oci8/tests/lob_006.phpt
index 9a9b9f6844..9f2c310fef 100644
--- a/ext/oci8/tests/lob_006.phpt
+++ b/ext/oci8/tests/lob_006.phpt
diff --git a/ext/oci8/tests/lob_007.phpt b/ext/oci8/tests/lob_007.phpt
index 9b99f371e3..fcf23472da 100644
--- a/ext/oci8/tests/lob_007.phpt
+++ b/ext/oci8/tests/lob_007.phpt
@@ -45,7 +45,7 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
@@ -54,12 +54,12 @@ int(7000)
 int(7000)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_008.phpt b/ext/oci8/tests/lob_008.phpt
index 57fce95130..87257224b8 100644
--- a/ext/oci8/tests/lob_008.phpt
+++ b/ext/oci8/tests/lob_008.phpt
@@ -47,19 +47,19 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
 int(7000)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_009.phpt b/ext/oci8/tests/lob_009.phpt
index 56d2495a62..872f94d4fa 100644
--- a/ext/oci8/tests/lob_009.phpt
+++ b/ext/oci8/tests/lob_009.phpt
@@ -44,7 +44,7 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
@@ -52,12 +52,12 @@ bool(true)
 bool(true)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_016.phpt b/ext/oci8/tests/lob_016.phpt
index 098a65835e..757224e0a5 100644
--- a/ext/oci8/tests/lob_016.phpt
+++ b/ext/oci8/tests/lob_016.phpt
@@ -55,12 +55,12 @@ echo "Done\n";
 --EXPECTF--
 array(2) {
   ["LOB_1"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["LOB_2"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_017.phpt b/ext/oci8/tests/lob_017.phpt
index c555125a75..8e656f809d 100644
--- a/ext/oci8/tests/lob_017.phpt
+++ b/ext/oci8/tests/lob_017.phpt
@@ -57,12 +57,12 @@ echo "Done\n";
 --EXPECTF--
 array(2) {
   ["LOB_1"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["LOB_2"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_019.phpt b/ext/oci8/tests/lob_019.phpt
index 4977b0a6ef..b41167b4e3 100644
--- a/ext/oci8/tests/lob_019.phpt
+++ b/ext/oci8/tests/lob_019.phpt
diff --git a/ext/oci8/tests/lob_020.phpt b/ext/oci8/tests/lob_020.phpt
index f3173882a3..01db85a01f 100644
--- a/ext/oci8/tests/lob_020.phpt
+++ b/ext/oci8/tests/lob_020.phpt
diff --git a/ext/oci8/tests/lob_021.phpt b/ext/oci8/tests/lob_021.phpt
index 1f58c44e30..49dc1a7a95 100644
--- a/ext/oci8/tests/lob_021.phpt
+++ b/ext/oci8/tests/lob_021.phpt
@@ -62,7 +62,7 @@ int(4)
 bool(true)
 int(4)
 bool(true)
-string(%d) "OCI-Lob::write(): %s is not a valid oci8 descriptor resource"
+string(%d) "OCI_Lob::write(): %s is not a valid oci8 descriptor resource"
 string(%d) "oci_free_descriptor(): %s is not a valid oci8 descriptor resource"
 
 Warning: oci_free_descriptor(): Unable to find descriptor property in %s on line %d
diff --git a/ext/oci8/tests/lob_022.phpt b/ext/oci8/tests/lob_022.phpt
index 600bdfdb23..768dbe7ebf 100644
--- a/ext/oci8/tests/lob_022.phpt
+++ b/ext/oci8/tests/lob_022.phpt
@@ -67,7 +67,7 @@ echo "Done\n";
 ?>
 --EXPECTF--
 
-Warning: OCI-Lob::save(): Offset parameter must be greater than or equal to 0 in %s on line %d
+Warning: OCI_Lob::save(): Offset parameter must be greater than or equal to 0 in %s on line %d
 string(4) "data"
 string(9) "long data"
 string(9) "long data"
diff --git a/ext/oci8/tests/lob_023.phpt b/ext/oci8/tests/lob_023.phpt
index 960dba249f..6eb1b85ac9 100644
--- a/ext/oci8/tests/lob_023.phpt
+++ b/ext/oci8/tests/lob_023.phpt
@@ -47,7 +47,7 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
@@ -59,12 +59,12 @@ Warning: oci_lob_import(): Unable to find descriptor property in %s on line %d
 bool(false)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_024.phpt b/ext/oci8/tests/lob_024.phpt
index dab20a1bda..4ce0154c64 100644
--- a/ext/oci8/tests/lob_024.phpt
+++ b/ext/oci8/tests/lob_024.phpt
@@ -47,7 +47,7 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
@@ -56,12 +56,12 @@ int(7000)
 int(7000)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_025.phpt b/ext/oci8/tests/lob_025.phpt
index b87f6f7ccc..f4ee78c11b 100644
--- a/ext/oci8/tests/lob_025.phpt
+++ b/ext/oci8/tests/lob_025.phpt
@@ -52,12 +52,12 @@ int(7000)
 int(7000)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt
index e105e89dcf..e1c624124a 100644
--- a/ext/oci8/tests/lob_026.phpt
+++ b/ext/oci8/tests/lob_026.phpt
@@ -56,7 +56,7 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
@@ -66,12 +66,12 @@ int(3)
 bool(true)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_027.phpt b/ext/oci8/tests/lob_027.phpt
index ccea9b30cb..d3639ca2e4 100644
--- a/ext/oci8/tests/lob_027.phpt
+++ b/ext/oci8/tests/lob_027.phpt
@@ -67,19 +67,19 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
 int(72)
 array(2) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
   ["BLOB"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -96,11 +96,11 @@ string(10) "this is a "
 bool(true)
 string(0) ""
 
-Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
+Warning: OCI_Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
 bool(false)
 string(0) ""
 
-Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
+Warning: OCI_Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
 bool(false)
 bool(true)
 Done
diff --git a/ext/oci8/tests/lob_028.phpt b/ext/oci8/tests/lob_028.phpt
index 2c6c77bef8..b81c8179eb 100644
--- a/ext/oci8/tests/lob_028.phpt
+++ b/ext/oci8/tests/lob_028.phpt
@@ -48,27 +48,27 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
diff --git a/ext/oci8/tests/lob_032.phpt b/ext/oci8/tests/lob_032.phpt
index 989615d049..ff1a7c8407 100644
--- a/ext/oci8/tests/lob_032.phpt
+++ b/ext/oci8/tests/lob_032.phpt
@@ -32,5 +32,5 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-Warning: OCI-Lob::write(): ORA-22990: %s in %s on line 19
+Warning: OCI_Lob::write(): ORA-22990: %s in %s on line 19
 Done
diff --git a/ext/oci8/tests/lob_033.phpt b/ext/oci8/tests/lob_033.phpt
index 0fa59237e5..82fa51b6cf 100644
--- a/ext/oci8/tests/lob_033.phpt
+++ b/ext/oci8/tests/lob_033.phpt
@@ -35,7 +35,7 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-Warning: OCI-Lob::save(): OCI_INVALID_HANDLE in %s on line %d
+Warning: OCI_Lob::save(): OCI_INVALID_HANDLE in %s on line %d
 bool(true)
 bool(true)
 Done
diff --git a/ext/oci8/tests/lob_034.phpt b/ext/oci8/tests/lob_034.phpt
index da88e653d1..511750eaf5 100644
--- a/ext/oci8/tests/lob_034.phpt
+++ b/ext/oci8/tests/lob_034.phpt
@@ -48,6 +48,6 @@ bool(true)
 bool(true)
 bool(true)
 
-Warning: OCI-Lob::flush(): Invalid flag value: -1 in %s on line %d
+Warning: OCI_Lob::flush(): Invalid flag value: -1 in %s on line %d
 bool(false)
 Done
diff --git a/ext/oci8/tests/lob_038.phpt b/ext/oci8/tests/lob_038.phpt
index 48749d9143..924e776200 100644
--- a/ext/oci8/tests/lob_038.phpt
+++ b/ext/oci8/tests/lob_038.phpt
@@ -125,7 +125,7 @@ Test 1b
 bool(true)
 array(1) {
   ["CLOB"]=>
-  object(OCI-Lob)#2 (1) {
+  object(OCI_Lob)#2 (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -133,7 +133,7 @@ array(1) {
 string(11) "clob test 1"
 array(1) {
   ["CLOB"]=>
-  object(OCI-Lob)#3 (1) {
+  object(OCI_Lob)#3 (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -141,7 +141,7 @@ array(1) {
 string(11) "clob test 2"
 array(1) {
   ["CLOB"]=>
-  object(OCI-Lob)#2 (1) {
+  object(OCI_Lob)#2 (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -167,7 +167,7 @@ Test 2b
 bool(true)
 array(1) {
   ["BLOB"]=>
-  object(OCI-Lob)#3 (1) {
+  object(OCI_Lob)#3 (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -175,7 +175,7 @@ array(1) {
 string(11) "blob test 1"
 array(1) {
   ["BLOB"]=>
-  object(OCI-Lob)#4 (1) {
+  object(OCI_Lob)#4 (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
@@ -183,7 +183,7 @@ array(1) {
 string(11) "blob test 2"
 array(1) {
   ["BLOB"]=>
-  object(OCI-Lob)#3 (1) {
+  object(OCI_Lob)#3 (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_041.phpt b/ext/oci8/tests/lob_041.phpt
index e2bf5fbaa1..a81fc56da8 100644
--- a/ext/oci8/tests/lob_041.phpt
+++ b/ext/oci8/tests/lob_041.phpt
@@ -69,7 +69,7 @@ test data
 
 Test 2 - implicit statement close
 test data
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (Unknown)
 }
@@ -78,7 +78,7 @@ Test 3 - no preallocated descriptor
 test data
 array(1) {
   ["C1"]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }
diff --git a/ext/oci8/tests/lob_042.phpt b/ext/oci8/tests/lob_042.phpt
index a6d1cc9588..e0393eeafb 100644
--- a/ext/oci8/tests/lob_042.phpt
+++ b/ext/oci8/tests/lob_042.phpt
@@ -44,29 +44,29 @@ echo "Done\n";
 
 ?>
 --EXPECTF--
-object(OCI-Lob)#%d (1) {
+object(OCI_Lob)#%d (1) {
   ["descriptor"]=>
   resource(%d) of type (oci8 descriptor)
 }
 
-Warning: OCI-Lob::writetemporary(): Invalid temporary lob type: %d in %s on line %d
+Warning: OCI_Lob::writetemporary(): Invalid temporary lob type: %d in %s on line %d
 bool(false)
 int(6)
 bool(true)
 bool(true)
 
-Warning: OCI-Lob::truncate(): Size must be less than or equal to the current LOB size in %s on line %d
+Warning: OCI_Lob::truncate(): Size must be less than or equal to the current LOB size in %s on line %d
 bool(false)
 
-Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
+Warning: OCI_Lob::truncate(): Length must be greater than or equal to zero in %s on line %d
 bool(false)
 
-Warning: OCI-Lob::read(): Offset must be less than size of the LOB in %s on line %d
+Warning: OCI_Lob::read(): Offset must be less than size of the LOB in %s on line %d
 bool(false)
 
-Warning: OCI-Lob::import(): Can't open file %s in %s on line %d
+Warning: OCI_Lob::import(): Can't open file %s in %s on line %d
 bool(false)
 
-Warning: OCI-Lob::savefile(): Can't open file %s in %s on line %d
+Warning: OCI_Lob::savefile(): Can't open file %s in %s on line %d
 bool(false)
 Done
diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt
index 4a69258ea3..50cc9fb5d6 100644
--- a/ext/oci8/tests/null_byte_1.phpt
+++ b/ext/oci8/tests/null_byte_1.phpt
@@ -35,9 +35,9 @@ var_dump($r);
 --EXPECTF--
 Test 1: Import
 
-Warning: OCI-Lob::savefile(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI_Lob::savefile(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 Test 2: Export
 
-Warning: OCI-Lob::export(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI_Lob::export(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
 NULL
diff --git a/ext/oci8/tests/xmltype_01.phpt b/ext/oci8/tests/xmltype_01.phpt
index a99a39223e..593f71c225 100644
--- a/ext/oci8/tests/xmltype_01.phpt
+++ b/ext/oci8/tests/xmltype_01.phpt
@@ -83,30 +83,31 @@ echo "Done\n";
 ?>
 --EXPECT--
 Initial Data
-string(250) "<?xml version="1.0"?>
-		<Xt>
-		  <XtId>1</XtId>
-		  <Size>Big</Size>
-		  <Area>12345</Area>
-		  <Hardness>20</Hardness>
-		  <Lip>Curved</Lip>
-		  <Color>Red</Color>
-		  <Nice>N</Nice>
-		  <Compact>Tiny</Compact>
-		  <Material>Steel</Material>
-		</Xt>"
+Initial Data
+string(316) "<?xml version="1.0"?>
+        <Xt>
+          <XtId>1</XtId>
+          <Size>Big</Size>
+          <Area>12345</Area>
+          <Hardness>20</Hardness>
+          <Lip>Curved</Lip>
+          <Color>Red</Color>
+          <Nice>N</Nice>
+          <Compact>Tiny</Compact>
+          <Material>Steel</Material>
+        </Xt>"
 Verify
-string(249) "<?xml version="1.0"?>
+string(309) "<?xml version="1.0"?>
 <Xt>
-		  <XtId>1</XtId>
-		  <Size>Big</Size>
-		  <Area>12345</Area>
-		  <Hardness>19</Hardness>
-		  <Lip>Curved</Lip>
-		  <Color>Red</Color>
-		  <Nice>Y</Nice>
-		  <Compact>Tiny</Compact>
-		  <Material>Steel</Material>
-		</Xt>
+          <XtId>1</XtId>
+          <Size>Big</Size>
+          <Area>12345</Area>
+          <Hardness>19</Hardness>
+          <Lip>Curved</Lip>
+          <Color>Red</Color>
+          <Nice>Y</Nice>
+          <Compact>Tiny</Compact>
+          <Material>Steel</Material>
+        </Xt>
 "
 Done
diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt
index 6b701b0c93..6294c17831 100644
--- a/ext/oci8/tests/xmltype_02.phpt
+++ b/ext/oci8/tests/xmltype_02.phpt
@@ -111,7 +111,7 @@ oci8_test_sql_execute($c, $stmtarray);
 Test 1 Insert new XML data using a temporary CLOB
 array(1) {
   [0]=>
-  object(OCI-Lob)#%d (1) {
+  object(OCI_Lob)#%d (1) {
     ["descriptor"]=>
     resource(%d) of type (oci8 descriptor)
   }