namespace Friendica\Core;
use Dice\Dice;
-use Friendica\BaseObject;
use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\DI;
use Friendica\Network\CurlResult;
-use Friendica\Object\Image;
use Friendica\Test\MockedTest;
use Friendica\Test\Util\VFSTrait;
use Friendica\Util\Network;
->with(\Friendica\Core\L10n\L10n::class)
->andReturn($this->l10nMock);
- BaseObject::setDependencyInjection($dice);
+ DI::init($dice);
}
private function mockL10nT(string $text, $times = null)
private function assertCheckExist($position, $title, $help, $status, $required, $assertionArray)
{
- $this->assertArraySubset([$position => [
+ $subSet = [$position => [
'title' => $title,
'status' => $status,
'required' => $required,
'error_msg' => null,
'help' => $help]
- ], $assertionArray);
+ ];
+
+ $this->assertArraySubset($subSet, $assertionArray, false, "expected subset: " . PHP_EOL . print_r($subSet, true) . PHP_EOL . "current subset: " . print_r($assertionArray, true));
}
/**
// Mocking that we can use CURL
$this->setFunctions(['curl_init' => true]);
- // needed because of "normalise_link"
- require_once __DIR__ . '/../../../include/text.php';
-
$install = new Installer();
$this->assertTrue($install->checkHtAccess('https://test'));
*/
public function testImagick()
{
- $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
+ $this->markTestIncomplete('needs adapted class_exists() mock');
- $imageMock = \Mockery::mock('alias:'. Image::class);
- $imageMock
- ->shouldReceive('supportedTypes')
- ->andReturn(['image/gif' => 'gif']);
+ $this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
$this->setClasses(['Imagick' => true]);
$this->assertTrue($install->checkImagick());
$this->assertCheckExist(1,
- L10n::t('ImageMagick supports GIF'),
+ $this->l10nMock->t('ImageMagick supports GIF'),
'',
true,
false,
{
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
- $imageMock = \Mockery::mock('alias:' . Image::class);
- $imageMock
- ->shouldReceive('supportedTypes')
- ->andReturn([]);
-
$this->setClasses(['Imagick' => true]);
$install = new Installer();
// even there is no supported type, Imagick should return true (because it is not required)
$this->assertTrue($install->checkImagick());
$this->assertCheckExist(1,
- L10n::t('ImageMagick supports GIF'),
+ $this->l10nMock->t('ImageMagick supports GIF'),
'',
false,
false,