Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1

W0rma · W0rma · commit 870ea00ef544 · 2021-10-07T14:27:04.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php
@@ -41,6 +41,10 @@ public static function checkIp($requestIp, $ips)
             $ips = [$ips];
         }
 
+        if (null === $requestIp) {
+            return false;
+        }
+
         $method = substr_count($requestIp, ':') > 1 ? 'checkIp6' : 'checkIp4';
 
         foreach ($ips as $ip) {
diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php
@@ -39,6 +39,8 @@ public function getIpv4Data()
             [true, '1.2.3.4', '192.168.1.0/0'],
             [false, '1.2.3.4', '256.256.256/0'], // invalid CIDR notation
             [false, 'an_invalid_ip', '192.168.1.0/24'],
+            [false, '', '1.2.3.4/1'],
+            [false, null, '1.2.3.4/1'],
         ];
     }
 
@@ -69,6 +71,8 @@ public function getIpv6Data()
             [false, '2a01:198:603:0:396e:4789:8e99:890f', ['::1', '1a01:198:603:0::/65']],
             [false, '}__test|O:21:&quot;JDatabaseDriverMysqli&quot;:3:{s:2', '::1'],
             [false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'],
+            [false, '', '::1'],
+            [false, null, '::1'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,10 @@ public static function checkIp($requestIp, $ips)`
`41`	`41`	`$ips = [$ips];`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ if (null === $requestIp) {`
	`45`	`+ return false;`
	`46`	`+ }`
	`47`	`+`
`44`	`48`	`$method = substr_count($requestIp, ':') > 1 ? 'checkIp6' : 'checkIp4';`
`45`	`49`
`46`	`50`	`foreach ($ips as $ip) {`