gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-php/pecl-geoip: Update PHP targets

Browse Source 
Signed-off-by: Brian Evans <grknight@gentoo.org>
This commit is contained in:
Brian Evans
2021-11-22 14:57:04 -05:00
parent 4f7f847378
commit 5f648e2097
2 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch Normal file
View File

@@ -0,0 +1,71 @@
diff --git a/tests/014.phpt b/tests/014.phpt
index 40f3ef8..93bc1f7 100644
--- a/tests/014.phpt
+++ b/tests/014.phpt
@@ -8,10 +8,9 @@ Checking timezone info with (some) empty fields
<?php
var_dump(geoip_time_zone_by_country_and_region('US','MA'));
-var_dump(geoip_time_zone_by_country_and_region('US',NULL));
+var_dump(geoip_time_zone_by_country_and_region('US',''));
var_dump(geoip_time_zone_by_country_and_region('DE'));
-var_dump(geoip_time_zone_by_country_and_region(NULL,''));
-var_dump(geoip_time_zone_by_country_and_region(NULL,NULL));
+var_dump(geoip_time_zone_by_country_and_region('',''));
?>
--EXPECTF--
@@ -21,6 +20,3 @@ string(%d) "Europe/%s"
Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
bool(false)
-
-Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
-bool(false)
diff --git a/tests/016.phpt b/tests/016.phpt
index 83c5250..9b2f056 100644
--- a/tests/016.phpt
+++ b/tests/016.phpt
@@ -8,10 +8,8 @@ Checking geoip_region_name_by_code with (some) empty fields
<?php
var_dump(geoip_region_name_by_code('CA',''));
-var_dump(geoip_region_name_by_code('CA',NULL));
var_dump(geoip_region_name_by_code('CA',1));
var_dump(geoip_region_name_by_code('','QC'));
-var_dump(geoip_region_name_by_code(NULL,'QC'));
var_dump(geoip_region_name_by_code(1,'QC'));
?>
@@ -19,12 +17,6 @@ var_dump(geoip_region_name_by_code(1,'QC'));
Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
bool(false)
-
-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
-bool(false)
-bool(false)
-
-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
bool(false)
Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
diff --git a/tests/019.phpt b/tests/019.phpt
new file mode 100644
index 0000000..9493ea3
--- /dev/null
+++ b/tests/019.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Checking geoip_country_code_by_name_v6 (if IPv6 DB installed)
+--SKIPIF--
+<?php if (!extension_loaded("geoip") || !defined("GEOIP_COUNTRY_EDITION_V6") || !geoip_db_avail(GEOIP_COUNTRY_EDITION_V6)) print "skip"; ?>
+--INI--
+--FILE--
+<?php
+
+var_dump( geoip_country_code_by_name_v6('2001:4860:4860::8888') );
+
+?>
+--EXPECT--
+string(2) "US"

7
dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
View File

@@ -1,11 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
PHP_EXT_NAME="geoip"
DOCS="README ChangeLog"
USE_PHP="php7-2 php7-3 php7-4 php8-0"
USE_PHP="php7-3 php7-4 php8-0 php8-1"
inherit php-ext-pecl-r3
@@ -22,4 +22,5 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/fix-failing-tests-1.1.1.patch"
"${FILESDIR}/php8-support-1.1.1.patch"
"${FILESDIR}/fix-failing-tests-php8-1-1.1.1.patch"
)