Merge branch '3.3.x'

phpBB/phpbb/file_downloader.php

@@ -60,7 +60,7 @@ class file_downloader
 	 * @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

tests/version/version_helper_remote_test.php

@@ -47,7 +47,7 @@ class version_helper_remote_test extends \phpbb_test_case
 
 		$this->cache->expects($this->any())
 			->method('get')
-			->with($this->anything())
+			->withAnyParameters()
 			->will($this->returnValue(false));
 
 		$this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client')