From 5e991dbb366145fa366171f00a2f21cb7dcf0749 Mon Sep 17 00:00:00 2001 From: W0rma Date: Thu, 7 Oct 2021 13:59:49 +0200 Subject: [PATCH] Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1 --- src/Symfony/Component/HttpFoundation/IpUtils.php | 4 ++++ src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/Symfony/Component/HttpFoundation/IpUtils.php b/src/Symfony/Component/HttpFoundation/IpUtils.php index b28c55b089d06..7539b45d894fd 100644 --- a/src/Symfony/Component/HttpFoundation/IpUtils.php +++ b/src/Symfony/Component/HttpFoundation/IpUtils.php @@ -37,6 +37,10 @@ private function __construct() */ public static function checkIp($requestIp, $ips) { + if (null === $requestIp) { + return false; + } + if (!\is_array($ips)) { $ips = [$ips]; } diff --git a/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php b/src/Symfony/Component/HttpFoundation/Tests/IpUtilsTest.php index 2510b830a17d1..48509f9667cd7 100644 --- 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:"JDatabaseDriverMysqli":3:{s:2', '::1'], [false, '2a01:198:603:0:396e:4789:8e99:890f', 'unknown'], + [false, '', '::1'], + [false, null, '::1'], ]; }