Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-01 19:04:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'friendica/stable' into develop

Browse source 
# Conflicts:
#	composer.lock
This commit is contained in:
Hypolite Petovan 2020-09-20 15:32:58 -04:00
commit a852455d0e
154 changed files with 26577 additions and 25630 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/src/Util/Emailer/MailBuilderTest.php
View file

@ -61,7 +61,7 @@ class MailBuilderTest extends MockedTest
$this->baseUrl->shouldReceive('getHostname')->andReturn('friendica.local');
$this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
$this->defaultHeaders = "";
$this->defaultHeaders = [];
}
public function assertEmail(IEmail $email, array $asserts)

4
tests/src/Util/Emailer/SystemMailBuilderTest.php
View file

@ -41,7 +41,7 @@ class SystemMailBuilderTest extends MockedTest
/** @var BaseURL */
private $baseUrl;
/** @var string */
/** @var string[] */
private $defaultHeaders;
public function setUp()
@ -60,7 +60,7 @@ class SystemMailBuilderTest extends MockedTest
$this->baseUrl->shouldReceive('getHostname')->andReturn('friendica.local');
$this->baseUrl->shouldReceive('get')->andReturn('http://friendica.local');
$this->defaultHeaders = "";
$this->defaultHeaders = [];
}
/**

0
tests/src/Util/JSonLDTest.php → tests/src/Util/JsonLDTest.php
View file