Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Note that PECL install now works on PHP 7.3
  Don't skip with 18c DB

Author: cjbj

ext/oci8/package.xml

@@ -67,6 +67,7 @@ Interoperability Support" (ID 207303.1) for details.
   <notes>
 This version is for PHP 7 only.
 Fixed bug #76804 (oci_pconnect with OCI_CRED_EXT not working). (KoenigsKind)
+Fixed installation on 7.3.
   </notes>
  <contents>
   <dir name="/">

ext/oci8/tests/driver_name.phpt

@@ -8,9 +8,9 @@ if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to
 if ($test_drcp) die("skip as Output might vary with DRCP");
 
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
-if (!(isset($matches[0]) &&
+if (!(isset($matches[0]) && ($matches[1] > 12 ||
      ($matches[1] == 12 && $matches[2] == 1 && $matches[3] >= 0
-     && $matches[4] >= 2) || ($matches[1] == 12 && $matches[2] > 1))) {
+         && $matches[4] >= 2) || ($matches[1] == 12 && $matches[2] > 1)))) {
     die("skip test expected to work only with Oracle 12.1.0.2 database or its later patchsets");
 }
 
@@ -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.1.8
+The value of DRIVER_NAME is PHP OCI8 : 2.1.9
 
 ***Test 1.2 - Get the values from different connections **************
 Testing with oci_pconnect()
-The value of DRIVER_NAME is PHP OCI8 : 2.1.8
+The value of DRIVER_NAME is PHP OCI8 : 2.1.9
 Testing with oci_new_connect()
-The value of DRIVER_NAME is PHP OCI8 : 2.1.8
+The value of DRIVER_NAME is PHP OCI8 : 2.1.9
 Done