Merge branch 'PHP-7.2' into PHP-7.3

Author: cjbj

ext/oci8/package.xml

@@ -52,12 +52,12 @@ Interoperability Support" (ID 207303.1) for details.
   <active>no</active>
  </lead>
 
- <date>2017-08-15</date>
+ <date>2018-12-11</date>
  <time>12:00:00</time>
 
   <version>
-   <release>2.10.0</release>
-   <api>2.10.0</api>
+   <release>2.2.0</release>
+   <api>2.2.0</api>
   </version>
   <stability>
    <release>stable</release>
@@ -69,7 +69,7 @@ This version is for PHP 7 only.
 Added oci_set_call_timeout() for call timeouts. (Requires Oracle client libraries 18c or later)
 Added oci_set_db_operation() for the Oracle Database 'DBOP' end-to-end-tracing attribute. (Requires Oracle 12.2 or later)
 Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind)
-Fixed installation on 7.3.
+Fixed installation on PHP 7.3.
 Internal change: Convert some parameter parsing to the Fast Parameter Parsing API.
   </notes>
  <contents>

ext/oci8/php_oci8.h

@@ -43,7 +43,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.10.0"
+#define PHP_OCI8_VERSION "2.2.0"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry

ext/oci8/tests/driver_name.phpt

@@ -57,11 +57,11 @@ function get_attr($conn)
 ?>
 --EXPECT--
 **Test 1.1 - Default values for the attribute **************
-The value of DRIVER_NAME is PHP OCI8 : 2.10.0
+The value of DRIVER_NAME is PHP OCI8 : 2.2.0
 
 ***Test 1.2 - Get the values from different connections **************
 Testing with oci_pconnect()
-The value of DRIVER_NAME is PHP OCI8 : 2.10.0
+The value of DRIVER_NAME is PHP OCI8 : 2.2.0
 Testing with oci_new_connect()
-The value of DRIVER_NAME is PHP OCI8 : 2.10.0
+The value of DRIVER_NAME is PHP OCI8 : 2.2.0
 Done