Merge pull request #8128 from nupplaphil/task/di_static_methods

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

diff --git a/tests/Util/RendererMockTrait.php b/tests/Util/RendererMockTrait.php
index b12327f49cf0de18345fc9d926e3ec5d880702e4..57fd9dc445b22baf19e668612912904c6bd87a91 100644 (file)
--- a/tests/Util/RendererMockTrait.php
+++ b/tests/Util/RendererMockTrait.php
@@ -1,14 +1,8 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: philipp
- * Date: 01.11.18
- * Time: 10:08
- */
 
 namespace Friendica\Test\Util;
 
-
+use Friendica\Core\Renderer;
 use Mockery\MockInterface;
 
 trait RendererMockTrait
@@ -21,14 +15,14 @@ trait RendererMockTrait
        /**
         * Mocking the method 'Renderer::getMarkupTemplate()'
         *
-        * @param string $templateName The name of the template which should get
-        * @param string $return the return value of the mock (should be defined to have it later for followUp use)
-        * @param null|int $times How often the method will get used
+        * @param string   $templateName The name of the template which should get
+        * @param string   $return       the return value of the mock (should be defined to have it later for followUp use)
+        * @param null|int $times        How often the method will get used
         */
        public function mockGetMarkupTemplate($templateName, $return = '', $times = null)
        {
                if (!isset($this->rendererMock)) {
-                       $this->rendererMock = \Mockery::mock('alias:Friendica\Core\Renderer');
+                       $this->rendererMock = \Mockery::mock('alias:' . Renderer::class);
                }
 
                $this->rendererMock
@@ -41,15 +35,19 @@ trait RendererMockTrait
        /**
         * Mocking the method 'Renderer::replaceMacros()'
         *
-        * @param string $template The template to use (normally, it is the mock result of 'mockGetMarkupTemplate()'
-        * @param array $args The arguments to pass to the macro
-        * @param string $return the return value of the mock
-        * @param null|int $times How often the method will get used
+        * @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 string              $return       the return value of the mock
+        * @param null|int            $times        How often the method will get used
         */
-       public function mockReplaceMacros($template, $args = [], $return = '', $times = null)
+       public function mockReplaceMacros($template, $args = null, $return = '', $times = null)
        {
                if (!isset($this->rendererMock)) {
-                       $this->rendererMock = \Mockery::mock('alias:Friendica\Core\Renderer');
+                       $this->rendererMock = \Mockery::mock('alias:' . Renderer::class);
+               }
+
+               if (!isset($args)) {
+                       $args = [];
                }
 
                $this->rendererMock