Merge branch 'master' 2019.12 into develop

[friendica.git] / tests / Util / RendererMockTrait.php

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);
        }
 }