Merge branch '3.3.x'

marc1706 · Sep 29, 2024 · 8de3234 · 8de3234
2 parents d25e5f6 + 13b267c
commit 8de3234
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php
@@ -60,7 +60,7 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6
 	 * @param string    $host            File host
 	 * @param string    $directory       Directory file is in
 	 * @param string    $filename        Filename of file to retrieve
-	 * @param int       $port            Port to connect to; default: 80
+	 * @param int       $port            Port to connect to; default: 443
 	 * @param int       $timeout         Connection timeout in seconds; default: 6
 	 *
 	 * @return false|string File data as string if file can be read and there is no

diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php
@@ -47,7 +47,7 @@ protected function setUp(): void
 
 		$this->cache->expects($this->any())
 			->method('get')
-			->with($this->anything())
+			->withAnyParameters()
 			->will($this->returnValue(false));
 
 		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')