makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2024-09-29 20:40:43 +02:00
commit 8de32341e2
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/file_downloader.php
View file

@ -60,7 +60,7 @@ class file_downloader
* @param string $host File host * @param string $host File host
* @param string $directory Directory file is in * @param string $directory Directory file is in
* @param string $filename Filename of file to retrieve * @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 * @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 * @return false|string File data as string if file can be read and there is no

2
tests/version/version_helper_remote_test.php
View file

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