bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Bugfixing AutomaticInstallation test

Browse source
This commit is contained in:
Philipp Holzer 2019-02-04 00:04:16 +01:00
parent bc73d4bd2b
commit 90e88d6c35
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
9 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Core/Console/AutomaticInstallation.php
View file

@ -100,10 +100,10 @@ HELP;
}
}
$db_host = Config::getConfigValue('database', 'hostname');
$db_user = Config::getConfigValue('database', 'username');
$db_pass = Config::getConfigValue('database', 'password');
$db_data = Config::getConfigValue('database', 'database');
$db_host = $a->getConfig()->get('database', 'hostname');
$db_user = $a->getConfig()->get('database', 'username');
$db_pass = $a->getConfig()->get('database', 'password');
$db_data = $a->getConfig()->get('database', 'database');
} else {
// Creating config file
$this->out("Creating config file...\n");

6
src/Core/Console/Config.php
View file

@ -124,9 +124,9 @@ HELP;
$cat = $this->getArgument(0);
Core\Config::load($cat);
if (Core\Config::getConfigValue($cat) !== null) {
if ($a->getConfig()->get($cat) !== null) {
$this->out("[{$cat}]");
$catVal = Core\Config::getConfigValue($cat);
$catVal = $a->getConfig()->get($cat);
foreach ($catVal as $key => $value) {
if (is_array($value)) {
foreach ($value as $k => $v) {
@ -148,7 +148,7 @@ HELP;
$this->out('Warning: The JIT (Just In Time) Config adapter doesn\'t support loading the entire configuration, showing file config only');
}
$config = Core\Config::getAll();
$config = $a->getConfig()->getAll();
foreach ($config as $cat => $section) {
if (is_array($section)) {
foreach ($section as $key => $value) {

4
src/Core/Console/Typo.php
View file

@ -2,6 +2,8 @@
namespace Friendica\Core\Console;
use Friendica\BaseObject;
/**
* Tired of chasing typos and finding them after a commit.
* Run this and quickly see if we've got any parse errors in our application files.
@ -41,7 +43,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
$php_path = \Friendica\Core\Config::getConfigValue('config', 'php_path', 'php');
$php_path = BaseObject::getApp()->getConfig()->get('config', 'php_path', 'php');
if ($this->getOption('v')) {
$this->out('Directory: src');

24
tests/Util/AppMockTrait.php
View file

@ -4,6 +4,7 @@ namespace Friendica\Test\Util;
use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Config\ConfigCache;
use Friendica\Render\FriendicaSmartyEngine;
use Mockery\MockInterface;
use org\bovigo\vfs\vfsStreamDirectory;
@ -24,8 +25,9 @@ trait AppMockTrait
* Mock the App
*
* @param vfsStreamDirectory $root The root directory
* @param MockInterface|ConfigCache $config The config cache
*/
public function mockApp($root)
public function mockApp($root, $config)
{
$this->mockConfigGet('system', 'theme', 'testtheme');
@ -35,22 +37,26 @@ trait AppMockTrait
->shouldReceive('getBasePath')
->andReturn($root->url());
$this->app
->shouldReceive('getConfigValue')
$config
->shouldReceive('get')
->with('database', 'hostname')
->andReturn(getenv('MYSQL_HOST'));
$this->app
->shouldReceive('getConfigValue')
$config
->shouldReceive('get')
->with('database', 'username')
->andReturn(getenv('MYSQL_USERNAME'));
$this->app
->shouldReceive('getConfigValue')
$config
->shouldReceive('get')
->with('database', 'password')
->andReturn(getenv('MYSQL_PASSWORD'));
$this->app
->shouldReceive('getConfigValue')
$config
->shouldReceive('get')
->with('database', 'database')
->andReturn(getenv('MYSQL_DATABASE'));
$this->app
->shouldReceive('getConfig')
->andReturn($config);
$this->app
->shouldReceive('getTemplateEngine')
->andReturn(new FriendicaSmartyEngine());

3
tests/src/BaseObjectTest.php
View file

@ -32,7 +32,8 @@ class BaseObjectTest extends TestCase
protected function setUp()
{
$this->setUpVfsDir();
$this->mockApp($this->root);
$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
$this->mockApp($this->root, $configMock);
$this->baseObject = new BaseObject();
}

3
tests/src/Core/Cache/CacheTest.php
View file

@ -69,7 +69,8 @@ abstract class CacheTest extends MockedTest
protected function setUp()
{
$this->setUpVfsDir();
$this->mockApp($this->root);
$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
$this->mockApp($this->root, $configMock);
$this->app
->shouldReceive('getHostname')
->andReturn('friendica.local');

8
tests/src/Core/Console/AutomaticInstallationConsoleTest.php
View file

@ -181,7 +181,7 @@ FIN;
$this->mockConnect(true, 1);
$this->mockConnected(true, 1);
$this->mockExistsTable('user', false, 1);
$this->mockUpdate([false, true, true], null, 1);
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$config = <<<CONF
<?php
@ -241,7 +241,7 @@ CONF;
$this->mockConnect(true, 1);
$this->mockConnected(true, 1);
$this->mockExistsTable('user', false, 1);
$this->mockUpdate([false, true, true], null, 1);
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
$this->mockReplaceMacros('testTemplate', $this->createArgumentsForMacro(true), '', 1);
@ -267,7 +267,7 @@ CONF;
$this->mockConnect(true, 1);
$this->mockConnected(true, 1);
$this->mockExistsTable('user', false, 1);
$this->mockUpdate([false, true, true], null, 1);
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
$this->mockReplaceMacros('testTemplate', $this->createArgumentsForMacro(false), '', 1);
@ -292,7 +292,7 @@ CONF;
$this->mockConnect(true, 1);
$this->mockConnected(true, 1);
$this->mockExistsTable('user', false, 1);
$this->mockUpdate([false, true, true], null, 1);
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
$this->mockReplaceMacros('testTemplate', $this->createArgumentsForMacro(true), '', 1);

3
tests/src/Core/Console/ConsoleTest.php
View file

@ -29,7 +29,8 @@ abstract class ConsoleTest extends MockedTest
Intercept::setUp();
$this->setUpVfsDir();
$this->mockApp($this->root);
$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
$this->mockApp($this->root, $configMock);
}
/**

3
tests/src/Core/Lock/LockTest.php
View file

@ -31,7 +31,8 @@ abstract class LockTest extends MockedTest
// Reusable App object
$this->setUpVfsDir();
$this->mockApp($this->root);
$configMock = \Mockery::mock('Friendica\Core\Config\ConfigCache');
$this->mockApp($this->root, $configMock);
$this->app
->shouldReceive('getHostname')
->andReturn('friendica.local');