<?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
// this is in the same namespace as Install for mocking 'function_exists'
namespace Friendica\Core;
use Dice\Dice;
-use Friendica\BaseObject;
-use Friendica\Core\Config\Cache\ConfigCache;
+use Friendica\Core\Config\Cache;
+use Friendica\DI;
use Friendica\Network\CurlResult;
-use Friendica\Object\Image;
use Friendica\Test\MockedTest;
use Friendica\Test\Util\VFSTrait;
use Friendica\Util\Network;
use VFSTrait;
/**
- * @var \Friendica\Core\L10n\L10n|MockInterface
+ * @var \Friendica\Core\L10n|MockInterface
*/
private $l10nMock;
$this->setUpVfsDir();
- $this->l10nMock = \Mockery::mock(\Friendica\Core\L10n\L10n::class);
+ $this->l10nMock = \Mockery::mock(\Friendica\Core\L10n::class);
/** @var Dice|MockInterface $dice */
$dice = \Mockery::mock(Dice::class)->makePartial();
$dice = $dice->addRules(include __DIR__ . '/../../../static/dependencies.config.php');
$dice->shouldReceive('create')
- ->with(\Friendica\Core\L10n\L10n::class)
+ ->with(\Friendica\Core\L10n::class)
->andReturn($this->l10nMock);
- BaseObject::setDependencyInjection($dice);
+ DI::init($dice);
}
private function mockL10nT(string $text, $times = null)
}
/**
- * Mocking the L10n::t() calls for the function checks
+ * Mocking the DI::l10n()->t() calls for the function checks
*/
private function mockFunctionL10TCalls()
{
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));
}
/**
$this->assertTrue($install->checkImagick());
$this->assertCheckExist(1,
- L10n::t('ImageMagick supports GIF'),
+ $this->l10nMock->t('ImageMagick supports GIF'),
'',
true,
false,
// 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,
$this->l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
$install = new Installer();
- $configCache = \Mockery::mock(ConfigCache::class);
+ $configCache = \Mockery::mock(Cache::class);
$configCache->shouldReceive('set')->with('config', 'php_path', \Mockery::any())->once();
$configCache->shouldReceive('set')->with('system', 'basepath', '/test/')->once();