1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
From e24c5e54098958a1acc65b8830bc245c7d0662e6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Fri, 11 Jun 2021 08:54:44 +0200
Subject: [PATCH] don't test NULL raising deprecation in 8.1 (and will be
removed later)
---
tests/014.phpt | 8 ++------
tests/016.phpt | 8 --------
2 files changed, 2 insertions(+), 14 deletions(-)
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
|
