mirror of
https://github.com/friendica/friendica
synced 2025-02-22 01:26:47 +00:00
Fix code style
This commit is contained in:
parent
a006aba9d4
commit
86516d8b28
10 changed files with 92 additions and 104 deletions
|
@ -46,7 +46,7 @@ final class AddonProxy implements AddonHelper
|
||||||
public function getAvailableAddons(): array
|
public function getAvailableAddons(): array
|
||||||
{
|
{
|
||||||
return array_map(
|
return array_map(
|
||||||
function(array $item) {
|
function (array $item) {
|
||||||
return $item[0];
|
return $item[0];
|
||||||
},
|
},
|
||||||
Addon::getAvailableList()
|
Addon::getAvailableList()
|
||||||
|
|
|
@ -123,7 +123,7 @@ class ConfigFileManager
|
||||||
|
|
||||||
if (file_exists($configName)) {
|
if (file_exists($configName)) {
|
||||||
return $this->loadConfigFile($configName);
|
return $this->loadConfigFile($configName);
|
||||||
} else if (file_exists($iniName)) {
|
} elseif (file_exists($iniName)) {
|
||||||
return $this->loadINIConfigFile($iniName);
|
return $this->loadINIConfigFile($iniName);
|
||||||
} else {
|
} else {
|
||||||
return [];
|
return [];
|
||||||
|
|
|
@ -15,8 +15,6 @@ use Friendica\Database\Definition\DbaDefinition;
|
||||||
use Friendica\Database\Definition\ViewDefinition;
|
use Friendica\Database\Definition\ViewDefinition;
|
||||||
use Friendica\Test\DatabaseTestTrait;
|
use Friendica\Test\DatabaseTestTrait;
|
||||||
use Friendica\Test\Util\Database\StaticDatabase;
|
use Friendica\Test\Util\Database\StaticDatabase;
|
||||||
use Friendica\Util\Profiler;
|
|
||||||
use Psr\Log\NullLogger;
|
|
||||||
|
|
||||||
trait CreateDatabaseTrait
|
trait CreateDatabaseTrait
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,7 +16,6 @@ use Friendica\Core\Config\ValueObject\Cache;
|
||||||
use Friendica\Test\DatabaseTestCase;
|
use Friendica\Test\DatabaseTestCase;
|
||||||
use Friendica\Test\Util\CreateDatabaseTrait;
|
use Friendica\Test\Util\CreateDatabaseTrait;
|
||||||
use Friendica\Test\Util\VFSTrait;
|
use Friendica\Test\Util\VFSTrait;
|
||||||
use org\bovigo\vfs\vfsStream;
|
|
||||||
|
|
||||||
class ConfigTest extends DatabaseTestCase
|
class ConfigTest extends DatabaseTestCase
|
||||||
{
|
{
|
||||||
|
@ -178,7 +177,7 @@ class ConfigTest extends DatabaseTestCase
|
||||||
*/
|
*/
|
||||||
public function testSetUp(array $data)
|
public function testSetUp(array $data)
|
||||||
{
|
{
|
||||||
$this->loadDirectFixture($this->configToDbArray($data) , $this->getDbInstance());
|
$this->loadDirectFixture($this->configToDbArray($data), $this->getDbInstance());
|
||||||
|
|
||||||
$this->testedConfig = $this->getInstance();
|
$this->testedConfig = $this->getInstance();
|
||||||
self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
|
self::assertInstanceOf(Cache::class, $this->testedConfig->getCache());
|
||||||
|
|
|
@ -9,16 +9,11 @@ namespace Friendica\Test\src\Core\Config;
|
||||||
|
|
||||||
use Friendica\Core\Config\Capability\ISetConfigValuesTransactionally;
|
use Friendica\Core\Config\Capability\ISetConfigValuesTransactionally;
|
||||||
use Friendica\Core\Config\Model\DatabaseConfig;
|
use Friendica\Core\Config\Model\DatabaseConfig;
|
||||||
use Friendica\Core\Config\Model\ReadOnlyFileConfig;
|
|
||||||
use Friendica\Core\Config\Model\ConfigTransaction;
|
use Friendica\Core\Config\Model\ConfigTransaction;
|
||||||
use Friendica\Core\Config\Util\ConfigFileManager;
|
use Friendica\Core\Config\Util\ConfigFileManager;
|
||||||
use Friendica\Core\Config\ValueObject\Cache;
|
use Friendica\Core\Config\ValueObject\Cache;
|
||||||
use Friendica\Database\Database;
|
use Friendica\Database\Database;
|
||||||
use Friendica\Test\DatabaseTestCase;
|
|
||||||
use Friendica\Test\FixtureTestCase;
|
use Friendica\Test\FixtureTestCase;
|
||||||
use Friendica\Test\MockedTest;
|
|
||||||
use Friendica\Test\Util\Database\StaticDatabase;
|
|
||||||
use Friendica\Test\Util\VFSTrait;
|
|
||||||
use Mockery\Exception\InvalidCountException;
|
use Mockery\Exception\InvalidCountException;
|
||||||
|
|
||||||
class ConfigTransactionTest extends FixtureTestCase
|
class ConfigTransactionTest extends FixtureTestCase
|
||||||
|
|
|
@ -21,16 +21,12 @@ use Friendica\Core\Storage\Repository\StorageManager;
|
||||||
use Friendica\Core\Storage\Type\Filesystem;
|
use Friendica\Core\Storage\Type\Filesystem;
|
||||||
use Friendica\Core\Storage\Type\SystemResource;
|
use Friendica\Core\Storage\Type\SystemResource;
|
||||||
use Friendica\Database\Database;
|
use Friendica\Database\Database;
|
||||||
use Friendica\Database\Definition\DbaDefinition;
|
|
||||||
use Friendica\Database\Definition\ViewDefinition;
|
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
use Friendica\Core\Config\Factory\Config;
|
use Friendica\Core\Config\Factory\Config;
|
||||||
use Friendica\Core\Storage\Type;
|
use Friendica\Core\Storage\Type;
|
||||||
use Friendica\Test\DatabaseTestCase;
|
use Friendica\Test\DatabaseTestCase;
|
||||||
use Friendica\Test\Util\CreateDatabaseTrait;
|
use Friendica\Test\Util\CreateDatabaseTrait;
|
||||||
use Friendica\Test\Util\Database\StaticDatabase;
|
use Friendica\Test\Util\Database\StaticDatabase;
|
||||||
use Friendica\Test\Util\VFSTrait;
|
|
||||||
use Friendica\Util\Profiler;
|
|
||||||
use org\bovigo\vfs\vfsStream;
|
use org\bovigo\vfs\vfsStream;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
use Psr\Log\NullLogger;
|
use Psr\Log\NullLogger;
|
||||||
|
|
Loading…
Add table
Reference in a new issue