|
 |
7b75198 |
From e24c5e54098958a1acc65b8830bc245c7d0662e6 Mon Sep 17 00:00:00 2001
|
|
|
7b75198 |
From: Remi Collet <remi@php.net>
|
|
|
7b75198 |
Date: Fri, 11 Jun 2021 08:54:44 +0200
|
|
|
7b75198 |
Subject: [PATCH] don't test NULL raising deprecation in 8.1 (and will be
|
|
|
7b75198 |
removed later)
|
|
|
7b75198 |
|
|
|
7b75198 |
---
|
|
|
7b75198 |
tests/014.phpt | 8 ++------
|
|
|
7b75198 |
tests/016.phpt | 8 --------
|
|
|
7b75198 |
2 files changed, 2 insertions(+), 14 deletions(-)
|
|
|
7b75198 |
|
|
|
7b75198 |
diff --git a/tests/014.phpt b/tests/014.phpt
|
|
|
7b75198 |
index 40f3ef8..93bc1f7 100644
|
|
|
7b75198 |
--- a/tests/014.phpt
|
|
|
7b75198 |
+++ b/tests/014.phpt
|
|
|
7b75198 |
@@ -8,10 +8,9 @@ Checking timezone info with (some) empty fields
|
|
|
7b75198 |
|
|
|
7b75198 |
|
|
|
7b75198 |
var_dump(geoip_time_zone_by_country_and_region('US','MA'));
|
|
|
7b75198 |
-var_dump(geoip_time_zone_by_country_and_region('US',NULL));
|
|
|
7b75198 |
+var_dump(geoip_time_zone_by_country_and_region('US',''));
|
|
|
7b75198 |
var_dump(geoip_time_zone_by_country_and_region('DE'));
|
|
|
7b75198 |
-var_dump(geoip_time_zone_by_country_and_region(NULL,''));
|
|
|
7b75198 |
-var_dump(geoip_time_zone_by_country_and_region(NULL,NULL));
|
|
|
7b75198 |
+var_dump(geoip_time_zone_by_country_and_region('',''));
|
|
|
7b75198 |
|
|
|
7b75198 |
?>
|
|
|
7b75198 |
--EXPECTF--
|
|
|
7b75198 |
@@ -21,6 +20,3 @@ string(%d) "Europe/%s"
|
|
|
7b75198 |
|
|
|
7b75198 |
Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
|
|
|
7b75198 |
bool(false)
|
|
|
7b75198 |
-
|
|
|
7b75198 |
-Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
|
|
|
7b75198 |
-bool(false)
|
|
|
7b75198 |
diff --git a/tests/016.phpt b/tests/016.phpt
|
|
|
7b75198 |
index 83c5250..9b2f056 100644
|
|
|
7b75198 |
--- a/tests/016.phpt
|
|
|
7b75198 |
+++ b/tests/016.phpt
|
|
|
7b75198 |
@@ -8,10 +8,8 @@ Checking geoip_region_name_by_code with (some) empty fields
|
|
|
7b75198 |
|
|
|
7b75198 |
|
|
|
7b75198 |
var_dump(geoip_region_name_by_code('CA',''));
|
|
|
7b75198 |
-var_dump(geoip_region_name_by_code('CA',NULL));
|
|
|
7b75198 |
var_dump(geoip_region_name_by_code('CA',1));
|
|
|
7b75198 |
var_dump(geoip_region_name_by_code('','QC'));
|
|
|
7b75198 |
-var_dump(geoip_region_name_by_code(NULL,'QC'));
|
|
|
7b75198 |
var_dump(geoip_region_name_by_code(1,'QC'));
|
|
|
7b75198 |
|
|
|
7b75198 |
?>
|
|
|
7b75198 |
@@ -19,12 +17,6 @@ var_dump(geoip_region_name_by_code(1,'QC'));
|
|
|
7b75198 |
|
|
|
7b75198 |
Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
|
|
|
7b75198 |
bool(false)
|
|
|
7b75198 |
-
|
|
|
7b75198 |
-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
|
|
|
7b75198 |
-bool(false)
|
|
|
7b75198 |
-bool(false)
|
|
|
7b75198 |
-
|
|
|
7b75198 |
-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
|
|
|
7b75198 |
bool(false)
|
|
|
7b75198 |
|
|
|
7b75198 |
Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
|