Fixing Installer - ReplaceMacro

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 782a139e14c0bff3100eb1415c5081ef6698bcab..046b34ea6f7e3e87d495e7ff23908d4b848c5ca6 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -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);
 

diff --git a/tests/Util/RendererMockTrait.php b/tests/Util/RendererMockTrait.php
index 403f25f14dcf5f195f1c5fab200b22407239c2fc..57fd9dc445b22baf19e668612912904c6bd87a91 100644 (file)
--- a/tests/Util/RendererMockTrait.php
+++ b/tests/Util/RendererMockTrait.php
@@ -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);
        }
 }

diff --git a/tests/src/Console/AutomaticInstallationConsoleTest.php b/tests/src/Console/AutomaticInstallationConsoleTest.php
index 5ea349f8b136010babc7b34de024d26f27872d4a..acf5dac7bdc01d192f3f45ce80cfc35696ba7b59 100644 (file)
--- a/tests/src/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Console/AutomaticInstallationConsoleTest.php
@@ -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');