Merge branch 'PHP-7.1'

kea · Jul 14, 2017 · b280ba8 · b280ba8
2 parents 4d684a6 + 3b60af9
commit b280ba8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml
@@ -50,8 +50,8 @@ Interoperability Support" (ID 207303.1) for details.
  <time>12:00:00</time>
 
   <version>
-   <release>2.1.5</release>
-   <api>2.1.5</api>
+   <release>2.1.6</release>
+   <api>2.1.6</api>
   </version>
   <stability>
    <release>stable</release>
@@ -60,7 +60,6 @@ Interoperability Support" (ID 207303.1) for details.
   <license uri="http://www.php.net/license">PHP</license>
   <notes>
 This version is for PHP 7 only.
-Added TAF callback support (PR #2459, KoenigsKind) 
 Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge)
   </notes>
  <contents>
@@ -471,6 +470,22 @@ Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). (Ingmar Runge)
  </extsrcrelease>
  <changelog>
 
+<release>   
+ <version>
+   <release>2.1.5</release>
+   <api>2.1.5</api>
+  </version>
+  <stability>
+   <release>stable</release>
+   <api>stable</api>
+  </stability>
+  <license uri="http://www.php.net/license">PHP</license>
+  <notes>
+This version is for PHP 7 only.
+Added TAF callback support (PR #2459, KoenigsKind) 
+  </notes>
+</release>   
+
 <release>
   <version>
    <release>2.1.4</release>

diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
@@ -43,7 +43,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.1.5"
+#define PHP_OCI8_VERSION "2.1.6"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry

diff --git a/ext/oci8/tests/driver_name.phpt b/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.1.5
+The value of DRIVER_NAME is PHP OCI8 : 2.1.6
 
 ***Test 1.2 - Get the values from different connections **************
 Testing with oci_pconnect()
-The value of DRIVER_NAME is PHP OCI8 : 2.1.5
+The value of DRIVER_NAME is PHP OCI8 : 2.1.6
 Testing with oci_new_connect()
-The value of DRIVER_NAME is PHP OCI8 : 2.1.5
+The value of DRIVER_NAME is PHP OCI8 : 2.1.6
 Done