friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #7233 from nupplaphil/bug/installer_replace_macro 

Fixing Installer - ReplaceMacro
This commit is contained in:
Hypolite Petovan 2019-06-06 20:37:11 -04:00 committed by GitHub
parent d2125a2438 79fe3c92c7
commit 8c5923bb46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Installer.php
View File

@ -156,7 +156,7 @@ class Installer
'$basepath' => $basepath, '$basepath' => $basepath,
'$timezone' => $configCache->get('system', 'default_timezone'), '$timezone' => $configCache->get('system', 'default_timezone'),
'$language' => $configCache->get('system', 'language'), '$language' => $configCache->get('system', 'language'),
], false); ]);
$result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt); $result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php', $txt);

21
tests/Util/RendererMockTrait.php
View File

@ -37,11 +37,10 @@ trait RendererMockTrait
* *
* @param string $template The template to use (normally, it is the mock result of 'mockGetMarkupTemplate()' * @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 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 string $return the return value of the mock
* @param null|int $times How often the method will get used * @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)) { if (!isset($this->rendererMock)) {
$this->rendererMock = \Mockery::mock('alias:' . Renderer::class); $this->rendererMock = \Mockery::mock('alias:' . Renderer::class);
@ -51,18 +50,10 @@ trait RendererMockTrait
$args = []; $args = [];
} }
if ($overwriteURL) { $this->rendererMock
$this->rendererMock ->shouldReceive('replaceMacros')
->shouldReceive('replaceMacros') ->with($template, $args)
->with($template, $args) ->times($times)
->times($times) ->andReturn($return);
->andReturn($return);
} else {
$this->rendererMock
->shouldReceive('replaceMacros')
->with($template, $args, false)
->times($times)
->andReturn($return);
}
} }
} }

10
tests/src/Console/AutomaticInstallationConsoleTest.php
View File

@ -356,7 +356,7 @@ FIN;
$this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 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 = new AutomaticInstallation($this->consoleArgv);
$console->setOption('url', 'http://friendica.local'); $console->setOption('url', 'http://friendica.local');
@ -458,7 +458,7 @@ CONF;
$this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 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_HOST=' . $data['database']['hostname']));
$this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port'])); $this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
@ -496,7 +496,7 @@ CONF;
$this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 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_HOST=' . $data['database']['hostname']));
$this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port'])); $this->assertTrue(putenv('MYSQL_PORT=' . $data['database']['port']));
@ -532,7 +532,7 @@ CONF;
$this->mockUpdate([$this->root->url(), false, true, true], null, 1); $this->mockUpdate([$this->root->url(), false, true, true], null, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 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 = new AutomaticInstallation($this->consoleArgv);
@ -567,7 +567,7 @@ CONF;
$this->mockConnect(false, 1); $this->mockConnect(false, 1);
$this->mockGetMarkupTemplate('local.config.tpl', 'testTemplate', 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 = new AutomaticInstallation($this->consoleArgv);
$console->setOption('url', 'http://friendica.local'); $console->setOption('url', 'http://friendica.local');