Merge branch 'PHP-5.6' into PHP-7.0

We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).

NEWS

@@ -37,6 +37,9 @@ PHP                                                                        NEWS
   . Fixed bug #73237 (Nested object in "any" element overwrites other fields).
     (Keith Smiley)
 
+- SQLite3:
+  . Fixed bug #73333 (2147483647 is fetched as string). (cmb)
+
 - Standard:
   . Fixed bug #73203 (passing additional_parameters causes mail to fail). (cmb)
 

ext/sqlite3/sqlite3.c

@@ -579,13 +579,20 @@ PHP_METHOD(sqlite3, query)
 
 static void sqlite_value_to_zval(sqlite3_stmt *stmt, int column, zval *data) /* {{{ */
 {
+	sqlite3_int64 val;
+
 	switch (sqlite3_column_type(stmt, column)) {
 		case SQLITE_INTEGER:
-			if ((sqlite3_column_int64(stmt, column)) >= INT_MAX || sqlite3_column_int64(stmt, column) <= INT_MIN) {
+			val = sqlite3_column_int64(stmt, column);
+#if LONG_MAX <= 2147483647
+			if (val > ZEND_LONG_MAX || val < ZEND_LONG_MIN) {
 				ZVAL_STRINGL(data, (char *)sqlite3_column_text(stmt, column), sqlite3_column_bytes(stmt, column));
 			} else {
-				ZVAL_LONG(data, sqlite3_column_int64(stmt, column));
+#endif
+				ZVAL_LONG(data, val);
+#if LONG_MAX <= 2147483647
 			}
+#endif
 			break;
 
 		case SQLITE_FLOAT:

ext/sqlite3/tests/bug63921-32bit.phpt

@@ -24,4 +24,4 @@ var_dump($num,$result[0]);
 ?>
 --EXPECT--
 int(2147483647)
-string(10) "2147483647"
+int(2147483647)

ext/sqlite3/tests/bug63921-64bit.phpt

@@ -24,4 +24,4 @@ var_dump($num,$result[0]);
 ?>
 --EXPECT--
 int(100004313234244)
-string(15) "100004313234244"
+int(100004313234244)

ext/sqlite3/tests/bug73333.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Bug #73333 (2147483647 is fetched as string)
+--SKIPIF--
+<?php
+if (!extension_loaded('sqlite3')) die('skip sqlite3 extension not available');
+?>
+--FILE--
+<?php
+if (!defined('PHP_INT_MIN')) define('PHP_INT_MIN', -PHP_INT_MAX-1);
+
+$db = new SQLite3(':memory:');
+$db->exec('CREATE TABLE foo (bar INT)');
+foreach ([PHP_INT_MIN, PHP_INT_MAX] as $value) {
+    $db->exec("INSERT INTO foo VALUES ($value)");
+}
+
+$res = $db->query('SELECT bar FROM foo');
+while (($row = $res->fetchArray(SQLITE3_NUM)) !== false) {
+    echo gettype($row[0]), PHP_EOL;
+}
+?>
+===DONE===
+--EXPECT--
+integer
+integer
+===DONE===