Merge branch 'PHP-7.1'

* PHP-7.1:
  Clean up FR #72633
  Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.

ext/oci8/php_oci8.h

@@ -45,7 +45,7 @@
  */
 #undef PHP_OCI8_VERSION
 #endif
-#define PHP_OCI8_VERSION "2.1.1"
+#define PHP_OCI8_VERSION "2.1.2"
 
 extern zend_module_entry oci8_module_entry;
 #define phpext_oci8_ptr &oci8_module_entry

ext/pdo_pgsql/pgsql_driver.c

@@ -363,12 +363,13 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, size_t *
 	char *id = NULL;
 	PGresult *res;
 	ExecStatusType status;
+
+	if (name == NULL) {
+		res = PQexec(H->server, "SELECT LASTVAL()");
+	} else {
 		const char *q[1];
 		q[0] = name;
 
-	if (PHP_PDO_PGSQL_LASTVAL_PG_VERSION <= PQserverVersion(H->server) && name == NULL) {
-		res = PQexec(H->server, "SELECT LASTVAL()");
-	} else {
 		res = PQexecParams(H->server, "SELECT CURRVAL($1)", 1, NULL, q, NULL, NULL, 0);
 	}
 	status = PQresultStatus(res);

ext/pdo_pgsql/php_pdo_pgsql_int.h

@@ -29,8 +29,6 @@
 
 #define PHP_PDO_PGSQL_CONNECTION_FAILURE_SQLSTATE "08006"
 
-#define PHP_PDO_PGSQL_LASTVAL_PG_VERSION 80100
-
 typedef struct {
 	const char *file;
 	int line;

ext/pdo_pgsql/tests/bug72633.phpt

@@ -1,5 +1,5 @@
 --TEST--
-currval() vs lastval() - PDO PgSQL Bug #1134 [BUG] New record, PostgreSQL and the Primary key https://github.com/phalcon/cphalcon/issues/1134
+PDO PgSQL Bug #72633 (Postgres PDO lastInsertId() should work without specifying a sequence)
 --SKIPIF--
 <?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');