Merge pull request #8128 from nupplaphil/task/di_static_methods

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

diff --git a/tests/Util/AppMockTrait.php b/tests/Util/AppMockTrait.php
index 52941d0d513474a699c8dd0cbce49ab9cbb6dd8c..f0231b280da79b5139041b29c2f6879c5a6f775d 100644 (file)
--- a/tests/Util/AppMockTrait.php
+++ b/tests/Util/AppMockTrait.php
@@ -2,9 +2,10 @@
 
 namespace Friendica\Test\Util;
 
+use Dice\Dice;
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Core\Config;
+use Friendica\DI;
 use Friendica\Render\FriendicaSmartyEngine;
 use Friendica\Util\Profiler;
 use Mockery\MockInterface;
@@ -21,7 +22,7 @@ trait AppMockTrait
        protected $app;
 
        /**
-        * @var MockInterface|Config\Configuration The mocked Config Cache
+        * @var MockInterface|Config\IConfiguration The mocked Config Cache
         */
        protected $configMock;
 
@@ -35,6 +36,11 @@ trait AppMockTrait
         */
        protected $mode;
 
+       /**
+        * @var MockInterface|Dice The dependency injection library
+        */
+       protected $dice;
+
        /**
         * Mock the App
         *
@@ -43,52 +49,52 @@ trait AppMockTrait
         */
        public function mockApp(vfsStreamDirectory $root, $raw = false)
        {
+               $this->dice = \Mockery::mock(Dice::class)->makePartial();
+               $this->dice = $this->dice->addRules(include __DIR__ . '/../../static/dependencies.config.php');
+
                $this->configMock = \Mockery::mock(Config\Cache\ConfigCache::class);
-               $this->configMock->shouldReceive('getAll')->andReturn([])->once();
+               $this->dice->shouldReceive('create')
+                          ->with(Config\Cache\ConfigCache::class)
+                          ->andReturn($this->configMock);
                $this->mode = \Mockery::mock(App\Mode::class);
+               $this->dice->shouldReceive('create')
+                          ->with(App\Mode::class)
+                          ->andReturn($this->mode);
                $configModel= \Mockery::mock(\Friendica\Model\Config\Config::class);
                // Disable the adapter
                $configModel->shouldReceive('isConnected')->andReturn(false);
 
                $config = new Config\JitConfiguration($this->configMock, $configModel);
-               // Initialize empty Config
-               Config::init($config);
+               $this->dice->shouldReceive('create')
+                          ->with(Config\IConfiguration::class)
+                          ->andReturn($config);
 
                // Mocking App and most used functions
                $this->app = \Mockery::mock(App::class);
+               $this->dice->shouldReceive('create')
+                          ->with(App::class)
+                          ->andReturn($this->app);
                $this->app
                        ->shouldReceive('getBasePath')
                        ->andReturn($root->url());
 
-               $this->app
-                       ->shouldReceive('getMode')
-                       ->andReturn($this->mode);
-
                $this->profilerMock = \Mockery::mock(Profiler::class);
                $this->profilerMock->shouldReceive('saveTimestamp');
+               $this->dice->shouldReceive('create')
+                          ->with(Profiler::class)
+                          ->andReturn($this->profilerMock);
 
                $this->app
                        ->shouldReceive('getConfigCache')
                        ->andReturn($this->configMock);
-               $this->app
-                       ->shouldReceive('getConfig')
-                       ->andReturn($config);
                $this->app
                        ->shouldReceive('getTemplateEngine')
                        ->andReturn(new FriendicaSmartyEngine());
                $this->app
                        ->shouldReceive('getCurrentTheme')
                        ->andReturn('Smarty3');
-               $this->app
-                       ->shouldReceive('getProfiler')
-                       ->andReturn($this->profilerMock);
-               $this->app
-                       ->shouldReceive('getBaseUrl')
-                       ->andReturnUsing(function () {
-                               return $this->configMock->get('system', 'url');
-                       });
 
-               BaseObject::setApp($this->app);
+               DI::init($this->dice);
 
                if ($raw) {
                        return;