Merge pull request #34847 from nextcloud/refactor/local-address-checker-method-capitalization

Rename LocalAddressChecker methods to lower case

lib/private/Http/Client/Client.php

@@ -181,7 +181,7 @@ class Client implements IClient {
 			return;
 		}
 
-		$this->localAddressChecker->ThrowIfLocalAddress($uri);
+		$this->localAddressChecker->throwIfLocalAddress($uri);
 	}
 
 	/**

lib/private/Http/Client/DnsPinMiddleware.php

@@ -133,7 +133,7 @@ class DnsPinMiddleware {
 					$curlResolves["$hostName:$port"] = [];
 
 					foreach ($targetIps as $ip) {
-						$this->localAddressChecker->ThrowIfLocalIp($ip);
+						$this->localAddressChecker->throwIfLocalIp($ip);
 						$curlResolves["$hostName:$port"][] = $ip;
 					}
 				}

lib/private/Http/Client/LocalAddressChecker.php

@@ -39,7 +39,7 @@ class LocalAddressChecker {
 		$this->logger = $logger;
 	}
 
-	public function ThrowIfLocalIp(string $ip) : void {
+	public function throwIfLocalIp(string $ip) : void {
 		$parsedIp = Factory::parseAddressString(
 			$ip,
 			ParseStringFlag::IPV4_MAYBE_NON_DECIMAL | ParseStringFlag::IPV4ADDRESS_MAYBE_NON_QUAD_DOTTED
@@ -70,7 +70,7 @@ class LocalAddressChecker {
 		}
 	}
 
-	public function ThrowIfLocalAddress(string $uri) : void {
+	public function throwIfLocalAddress(string $uri) : void {
 		$host = parse_url($uri, PHP_URL_HOST);
 		if ($host === false || $host === null) {
 			$this->logger->warning("Could not detect any host in $uri");
@@ -97,6 +97,6 @@ class LocalAddressChecker {
 			throw new LocalServerException('Host violates local access rules');
 		}
 
-		$this->ThrowIfLocalIp($host);
+		$this->throwIfLocalIp($host);
 	}
 }

tests/lib/Http/Client/ClientTest.php

@@ -203,7 +203,7 @@ class ClientTest extends \Test\TestCase {
 		$this->expectException(LocalServerException::class);
 		$this->localAddressChecker
 			->expects($this->once())
-			->method('ThrowIfLocalAddress')
+			->method('throwIfLocalAddress')
 			->with('http://' . $uri)
 			->will($this->throwException(new LocalServerException()));
 
@@ -218,7 +218,7 @@ class ClientTest extends \Test\TestCase {
 		$this->expectException(LocalServerException::class);
 		$this->localAddressChecker
 			->expects($this->once())
-			->method('ThrowIfLocalAddress')
+			->method('throwIfLocalAddress')
 			->with('http://' . $uri)
 			->will($this->throwException(new LocalServerException()));
 
@@ -233,7 +233,7 @@ class ClientTest extends \Test\TestCase {
 		$this->expectException(LocalServerException::class);
 		$this->localAddressChecker
 		->expects($this->once())
-		->method('ThrowIfLocalAddress')
+		->method('throwIfLocalAddress')
 		->with('http://' . $uri)
 		->will($this->throwException(new LocalServerException()));
 
@@ -248,7 +248,7 @@ class ClientTest extends \Test\TestCase {
 		$this->expectException(LocalServerException::class);
 		$this->localAddressChecker
 			->expects($this->once())
-			->method('ThrowIfLocalAddress')
+			->method('throwIfLocalAddress')
 			->with('http://' . $uri)
 			->will($this->throwException(new LocalServerException()));
 
@@ -263,7 +263,7 @@ class ClientTest extends \Test\TestCase {
 		$this->expectException(LocalServerException::class);
 		$this->localAddressChecker
 			->expects($this->once())
-			->method('ThrowIfLocalAddress')
+			->method('throwIfLocalAddress')
 			->with('http://' . $uri)
 			->will($this->throwException(new LocalServerException()));
 

tests/lib/Http/Client/LocalAddressCheckerTest.php

@@ -47,7 +47,7 @@ class LocalAddressCheckerTest extends \Test\TestCase {
 	 */
 	public function testThrowIfLocalAddress($uri) : void {
 		$this->expectException(LocalServerException::class);
-		$this->localAddressChecker->ThrowIfLocalAddress('http://' . $uri);
+		$this->localAddressChecker->throwIfLocalAddress('http://' . $uri);
 	}
 
 	/**
@@ -55,7 +55,7 @@ class LocalAddressCheckerTest extends \Test\TestCase {
 	 * @param string $uri
 	 */
 	public function testThrowIfLocalAddressGood($uri) : void {
-		$this->localAddressChecker->ThrowIfLocalAddress('http://' . $uri);
+		$this->localAddressChecker->throwIfLocalAddress('http://' . $uri);
 		$this->assertTrue(true);
 	}
 
@@ -66,7 +66,7 @@ class LocalAddressCheckerTest extends \Test\TestCase {
 	 */
 	public function testThrowIfLocalIpBad($ip) : void {
 		$this->expectException(LocalServerException::class);
-		$this->localAddressChecker->ThrowIfLocalIp($ip);
+		$this->localAddressChecker->throwIfLocalIp($ip);
 	}
 
 	/**
@@ -74,7 +74,7 @@ class LocalAddressCheckerTest extends \Test\TestCase {
 	 * @param string $ip
 	 */
 	public function testThrowIfLocalIpGood($ip) : void {
-		$this->localAddressChecker->ThrowIfLocalIp($ip);
+		$this->localAddressChecker->throwIfLocalIp($ip);
 		$this->assertTrue(true);
 	}