mirror of
https://github.com/friendica/friendica
synced 2024-12-02 20:15:22 +01:00
Fixing Installer - ReplaceMacro
This commit is contained in:
parent
f1c044e3b6
commit
79fe3c92c7
3 changed files with 12 additions and 21 deletions
|
@ -156,7 +156,7 @@ class Installer
|
|||
'$basepath' => $basepath,
|
||||
'$timezone' => $configCache->get('system', 'default_timezone'),
|
||||
'$language' => $configCache->get('system', 'language'),
|
||||
], false);
|
||||
]);
|
||||
|
||||
$result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt);
|
||||
|
||||
|
|
|
@ -37,11 +37,10 @@ trait RendererMockTrait
|
|||
*
|
||||
* @param string $template The template to use (normally, it is the mock result of 'mockGetMarkupTemplate()'
|
||||
* @param array|\Closure|null $args The arguments to pass to the macro
|
||||
* @param bool $overwriteURL if the URL should get overwritten
|
||||
* @param string $return the return value of the mock
|
||||
* @param null|int $times How often the method will get used
|
||||
*/
|
||||
public function mockReplaceMacros($template, $args = null, $overwriteURL = true, $return = '', $times = null)
|
||||
public function mockReplaceMacros($template, $args = null, $return = '', $times = null)
|
||||
{
|
||||
if (!isset($this->rendererMock)) {
|
||||
$this->rendererMock = \Mockery::mock('alias:' . Renderer::class);
|
||||
|
@ -51,18 +50,10 @@ trait RendererMockTrait
|
|||
$args = [];
|
||||
}
|
||||
|
||||
if ($overwriteURL) {
|
||||
$this->rendererMock
|
||||
->shouldReceive('replaceMacros')
|
||||
->with($template, $args)
|
||||
->times($times)
|
||||
->andReturn($return);
|
||||
} else {
|
||||
$this->rendererMock
|
||||
->shouldReceive('replaceMacros')
|
||||
->with($template, $args, false)
|
||||
->times($times)
|
||||
->andReturn($return);
|
||||
}
|
||||
$this->rendererMock
|
||||
->shouldReceive('replaceMacros')
|
||||
->with($template, $args)
|
||||
->times($times)
|
||||
->andReturn($return);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -356,7 +356,7 @@ FIN;
|
|||
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
|
||||
|
||||
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
|
||||
|
||||
$console = new AutomaticInstallation($this->consoleArgv);
|
||||
$console->setOption('url', 'http://friendica.local');
|
||||
|
@ -458,7 +458,7 @@ CONF;
|
|||
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
|
||||
|
||||
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
|
||||
|
||||
$this->assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname']));
|
||||
$this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
|
||||
|
@ -496,7 +496,7 @@ CONF;
|
|||
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
|
||||
|
||||
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
|
||||
|
||||
$this->assertTrue(putenv('MYSQL_HOST=' . $data['database']['hostname']));
|
||||
$this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
|
||||
|
@ -532,7 +532,7 @@ CONF;
|
|||
$this->mockUpdate([$this->root->url(), false, true, true], null, 1);
|
||||
|
||||
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
|
||||
|
||||
$console = new AutomaticInstallation($this->consoleArgv);
|
||||
|
||||
|
@ -567,7 +567,7 @@ CONF;
|
|||
$this->mockConnect(false, 1);
|
||||
|
||||
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), false, '', 1);
|
||||
$this->mockReplaceMacros('testTemplate', \Mockery::any(), '', 1);
|
||||
|
||||
$console = new AutomaticInstallation($this->consoleArgv);
|
||||
$console->setOption('url', 'http://friendica.local');
|
||||
|
|
Loading…
Reference in a new issue