Remove call to undefined function, fix typing

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Aug 1, 2022 · 00b4506 · 00b4506
1 parent ead97ba
commit 00b4506
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/lib/private/Http/IpUtils.php b/lib/private/Http/IpUtils.php
@@ -16,6 +16,9 @@
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class IpUtils {
+	/**
+	* @var array<string,bool>
+	*/
 	private static $checkedIps = [];
 
 	/**
@@ -31,13 +34,7 @@ private function __construct() {
 	 *
 	 * @return bool
 	 */
-	public static function checkIp(?string $requestIp, $ips) {
-		if (null === $requestIp) {
-			trigger_deprecation('symfony/http-foundation', '5.4', 'Passing null as $requestIp to "%s()" is deprecated, pass an empty string instead.', __METHOD__);
-
-			return false;
-		}
-
+	public static function checkIp(string $requestIp, $ips) {
 		if (!\is_array($ips)) {
 			$ips = [$ips];
 		}
@@ -61,13 +58,7 @@ public static function checkIp(?string $requestIp, $ips) {
 	 *
 	 * @return bool Whether the request IP matches the IP, or whether the request IP is within the CIDR subnet
 	 */
-	public static function checkIp4(?string $requestIp, string $ip) {
-		if (null === $requestIp) {
-			trigger_deprecation('symfony/http-foundation', '5.4', 'Passing null as $requestIp to "%s()" is deprecated, pass an empty string instead.', __METHOD__);
-
-			return false;
-		}
-
+	public static function checkIp4(string $requestIp, string $ip) {
 		$cacheKey = $requestIp.'-'.$ip;
 		if (isset(self::$checkedIps[$cacheKey])) {
 			return self::$checkedIps[$cacheKey];
@@ -81,9 +72,11 @@ public static function checkIp4(?string $requestIp, string $ip) {
 			[$address, $netmask] = explode('/', $ip, 2);
 
 			if ('0' === $netmask) {
-				return self::$checkedIps[$cacheKey] = filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4);
+				return self::$checkedIps[$cacheKey] = (bool)filter_var($address, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4);
 			}
 
+			$netmask = (int)$netmask;
+
 			if ($netmask < 0 || $netmask > 32) {
 				return self::$checkedIps[$cacheKey] = false;
 			}
@@ -113,13 +106,7 @@ public static function checkIp4(?string $requestIp, string $ip) {
 	 *
 	 * @throws \RuntimeException When IPV6 support is not enabled
 	 */
-	public static function checkIp6(?string $requestIp, string $ip) {
-		if (null === $requestIp) {
-			trigger_deprecation('symfony/http-foundation', '5.4', 'Passing null as $requestIp to "%s()" is deprecated, pass an empty string instead.', __METHOD__);
-
-			return false;
-		}
-
+	public static function checkIp6(string $requestIp, string $ip) {
 		$cacheKey = $requestIp.'-'.$ip;
 		if (isset(self::$checkedIps[$cacheKey])) {
 			return self::$checkedIps[$cacheKey];
@@ -136,6 +123,8 @@ public static function checkIp6(?string $requestIp, string $ip) {
 				return (bool) unpack('n*', @inet_pton($address));
 			}
 
+			$netmask = (int)$netmask;
+
 			if ($netmask < 1 || $netmask > 128) {
 				return self::$checkedIps[$cacheKey] = false;
 			}