lang/php80: Update from 8.0.5 to 8.0.6

PDO_pgsql:

    Revert "Fixed bug #80892 (PDO::PARAM_INT is treated the same as PDO::PARAM_STR)"

Sponsored by:	Bounce Experts

6 files changed, 4 insertions, 129 deletions

diff --git a/databases/php80-pdo_pgsql/Makefile b/databases/php80-pdo_pgsql/Makefile
index 498e7cf41073..6d64dd6a473a 100644
--- a/databases/php80-pdo_pgsql/Makefile
+++ b/databases/php80-pdo_pgsql/Makefile
@@ -1,7 +1,5 @@
 CATEGORIES=	databases
 
-PORTREVISION=	1
-
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo_pgsql
diff --git a/databases/php80-pdo_pgsql/files/patch-pgsql__statement.c b/databases/php80-pdo_pgsql/files/patch-pgsql__statement.c
deleted file mode 100644
index 44a5391cd2a4..000000000000
--- a/databases/php80-pdo_pgsql/files/patch-pgsql__statement.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- pgsql_statement.c.orig	2021-05-05 08:26:44 UTC
-+++ pgsql_statement.c
-@@ -52,21 +52,6 @@
- #define VARCHARLABEL "varchar"
- #define VARCHAROID   1043
- 
--#define PG_INT32_MIN	(-0x7FFFFFFF-1)
--#define PG_INT32_MAX	(0x7FFFFFFF)
--
--#if defined(_MSC_VER)
--# define strtoll(s, f, b) _atoi64(s)
--#elif !defined(HAVE_STRTOLL)
--# if defined(HAVE_ATOLL)
--#  define strtoll(s, f, b) atoll(s)
--# else
--#  define strtoll(s, f, b) strtol(s, f, b)
--# endif
--#endif
--
--
--
- static int pgsql_stmt_dtor(pdo_stmt_t *stmt)
- {
- 	pdo_pgsql_stmt *S = (pdo_pgsql_stmt*)stmt->driver_data;
-@@ -401,16 +386,7 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, str
- 						S->param_formats[param->paramno] = 0;
- 					}
- 
--					if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_INT) {
--						/* we need to check if the number requires bigints */
--						long long val = strtoll(Z_STRVAL_P(parameter), NULL, 10);
--
--						if (val > PG_INT32_MAX || val < PG_INT32_MIN) {
--							S->param_types[param->paramno] = INT8OID;
--						} else {
--							S->param_types[param->paramno] = INT4OID;
--						}
--					} else if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) {
-+					if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB) {
- 						S->param_types[param->paramno] = 0;
- 						S->param_formats[param->paramno] = 1;
- 					} else {
diff --git a/databases/php80-pdo_pgsql/files/patch-tests_bug__80892.phpt b/databases/php80-pdo_pgsql/files/patch-tests_bug__80892.phpt
deleted file mode 100644
index 75fd17a53b94..000000000000
--- a/databases/php80-pdo_pgsql/files/patch-tests_bug__80892.phpt
+++ /dev/null
@@ -1,80 +0,0 @@
---- tests/bug_80892.phpt.orig	2021-05-05 08:30:53 UTC
-+++ tests/bug_80892.phpt
-@@ -1,77 +0,0 @@
----TEST--
--Bug #80892 PDO::PARAM_INT is treated the same as PDO::PARAM_STR
----SKIPIF--
--<?php
--if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
--require __DIR__ . '/config.inc';
--require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
--PDOTest::skip();
--?>
----FILE--
--<?php
--require __DIR__ . '/../../../ext/pdo/tests/pdo_test.inc';
--
--/** @var PDO $db */
--$db = PDOTest::test_factory(__DIR__ . '/common.phpt');
--$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
--$db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
--
--$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x bigint) RETURNS varchar AS $$ SELECT 'bigint' $$ LANGUAGE sql");
--$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x int) RETURNS varchar AS $$ SELECT 'int' $$ LANGUAGE sql");
--$db->exec("CREATE OR REPLACE FUNCTION bug80892 (x text) RETURNS varchar AS $$ SELECT 'text' $$ LANGUAGE sql");
--
--// Sanity check
--var_dump($db->query("SELECT bug80892(2147483648)")->fetchColumn());
--var_dump($db->query("SELECT bug80892(1)")->fetchColumn());
--var_dump($db->query("SELECT bug80892('1')")->fetchColumn());
--
--// No binding
--$stmt = $db->prepare("SELECT bug80892(?)");
--$stmt->execute([1]);
--var_dump($stmt->fetchColumn());
--
--// Bind int value as string
--$stmt = $db->prepare("SELECT bug80892(?)");
--$stmt->bindValue(1, 1, PDO::PARAM_STR);
--$stmt->execute();
--var_dump($stmt->fetchColumn());
--
--// Bind int value as int
--$stmt = $db->prepare("SELECT bug80892(?)");
--$stmt->bindValue(1, 1, PDO::PARAM_INT);
--$stmt->execute();
--var_dump($stmt->fetchColumn());
--
--// Bind string value as int
--$stmt = $db->prepare("SELECT bug80892(?)");
--$stmt->bindValue(1, '1', PDO::PARAM_INT);
--$stmt->execute();
--var_dump($stmt->fetchColumn());
--
--// Bind bigint string value as int
--$stmt = $db->prepare("SELECT bug80892(?)");
--$stmt->bindValue(1, '2147483648', PDO::PARAM_INT);
--$stmt->execute();
--var_dump($stmt->fetchColumn());
--
--// Bind negative bigint (string on 32bit) as int
--$stmt = $db->prepare("SELECT bug80892(?)");
--$stmt->bindValue(1, PHP_INT_SIZE == 4 ? '-33333333333' : -33333333333, PDO::PARAM_INT);
--$stmt->execute();
--var_dump($stmt->fetchColumn());
--
--$db->exec("DROP FUNCTION bug80892 (bigint)");
--$db->exec("DROP FUNCTION bug80892 (int)");
--$db->exec("DROP FUNCTION bug80892 (text)");
--
--?>
----EXPECT--
--string(6) "bigint"
--string(3) "int"
--string(4) "text"
--string(4) "text"
--string(4) "text"
--string(3) "int"
--string(3) "int"
--string(6) "bigint"
--string(6) "bigint"
diff --git a/devel/php80-intl/Makefile b/devel/php80-intl/Makefile
index 402bf4649be6..ac523eb118cd 100644
--- a/devel/php80-intl/Makefile
+++ b/devel/php80-intl/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
diff --git a/lang/php80/Makefile b/lang/php80/Makefile
index d7f51cf27f02..1e4c627208c8 100644
--- a/lang/php80/Makefile
+++ b/lang/php80/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	php80
-DISTVERSION=	8.0.5
+DISTVERSION=	8.0.6
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
diff --git a/lang/php80/distinfo b/lang/php80/distinfo
index 036e72a17c2e..88282d6fad96 100644
--- a/lang/php80/distinfo
+++ b/lang/php80/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619898019
-SHA256 (php-8.0.5.tar.xz) = 5dd358b35ecd5890a4f09fb68035a72fe6b45d3ead6999ea95981a107fd1f2ab
-SIZE (php-8.0.5.tar.xz) = 10666412
+TIMESTAMP = 1620427272
+SHA256 (php-8.0.6.tar.xz) = e9871d3b6c391fe9e89f86f6334852dcc10eeaaa8d5565beb8436e7f0cf30e20
+SIZE (php-8.0.6.tar.xz) = 10764932