[frio] Larger clickable area for tabs

[friendica.git] / tests / functional / DependencyCheckTest.php

diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php
index 9065ca1685e4968f8ea60cb025392cefdac95322..27e693295ecd4af55311dfb57d24fb4c92e6d77c 100644 (file)
--- a/tests/functional/DependencyCheckTest.php
+++ b/tests/functional/DependencyCheckTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,8 +31,7 @@ use Friendica\Core\Lock\Capability\ICanLock;
 use Friendica\Database\Database;
 use Friendica\Test\Util\VFSTrait;
 use Friendica\Util\BasePath;
-use Friendica\Core\Config\Util\ConfigFileLoader;
-use Friendica\Util\Profiler;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 
@@ -52,7 +51,18 @@ class DependencyCheckTest extends TestCase
                $this->setUpVfsDir();
 
                $this->dice = (new Dice())
-                       ->addRules(include __DIR__ . '/../../static/dependencies.config.php');
+                       ->addRules(include __DIR__ . '/../../static/dependencies.config.php')
+                       ->addRule(BasePath::class, [
+                               'constructParams' => [
+                                       $this->root->url(),
+                                       [],
+                               ],
+                       ])
+                       ->addRule(LoggerInterface::class, ['constructParams' => ['test']]);
+
+               /** @var IManageConfigValues $config */
+               $config = $this->dice->create(IManageConfigValues::class);
+               $config->set('system', 'logfile', $this->root->url() . '/logs/friendica.log');
        }
 
        /**
@@ -73,46 +83,19 @@ class DependencyCheckTest extends TestCase
         */
        public function testConfigFileLoader()
        {
-               /** @var ConfigFileLoader $configFileLoader */
-               $configFileLoader = $this->dice->create(ConfigFileLoader::class);
+               /** @var ConfigFileManager $configFileManager */
+               $configFileManager = $this->dice->create(ConfigFileManager::class);
 
-               self::assertInstanceOf(ConfigFileLoader::class, $configFileLoader);
+               self::assertInstanceOf(ConfigFileManager::class, $configFileManager);
 
                $configCache = new Cache();
-               $configFileLoader->setupCache($configCache);
+               $configFileManager->setupCache($configCache);
 
                self::assertNotEmpty($configCache->getAll());
                self::assertArrayHasKey('database', $configCache->getAll());
                self::assertArrayHasKey('system', $configCache->getAll());
        }
 
-       /**
-        * Test the construction of a profiler class with DI
-        */
-       public function testProfiler()
-       {
-               /** @var Profiler $profiler */
-               $profiler = $this->dice->create(Profiler::class);
-
-               self::assertInstanceOf(Profiler::class, $profiler);
-
-               $configCache = new Cache([
-                       'system' => [
-                               'profiler' => true,
-                       ],
-                       'rendertime' => [
-                               'callstack' => true,
-                       ]
-               ]);
-
-               // create new DI-library because of shared instance rule (so the Profiler wouldn't get created twice)
-               $this->dice = new Dice();
-               $profiler = $this->dice->create(Profiler::class, [$configCache]);
-
-               self::assertInstanceOf(Profiler::class, $profiler);
-               self::assertTrue($profiler->isRendertime());
-       }
-
        public function testDatabase()
        {
                // PDO needs to be disabled for PHP 7.2, see https://jira.mariadb.org/browse/MDEV-24121
@@ -150,7 +133,6 @@ class DependencyCheckTest extends TestCase
 
                self::assertTrue($mode->has(App\Mode::LOCALCONFIGPRESENT), 'No local config present');
                self::assertTrue($mode->has(App\Mode::DBAVAILABLE), 'Database is not available');
-               self::assertTrue($mode->has(App\Mode::DBCONFIGAVAILABLE), 'Database config is not available');
                self::assertTrue($mode->has(App\Mode::MAINTENANCEDISABLED), 'In maintenance mode');
 
                self::assertTrue($mode->isNormal(), 'Not in normal mode');
@@ -169,7 +151,7 @@ class DependencyCheckTest extends TestCase
        public function testLogger()
        {
                /** @var LoggerInterface $logger */
-               $logger = $this->dice->create(LoggerInterface::class, ['test']);
+               $logger = $this->dice->create(LoggerInterface::class, [['$channel' => 'test']]);
 
                self::assertInstanceOf(LoggerInterface::class, $logger);
        }
@@ -181,7 +163,7 @@ class DependencyCheckTest extends TestCase
                $config->set('system', 'dlogfile', $this->root->url() . '/friendica.log');
 
                /** @var LoggerInterface $logger */
-               $logger = $this->dice->create('$devLogger', ['dev']);
+               $logger = $this->dice->create('$devLogger', [['$channel' => 'dev']]);
 
                self::assertInstanceOf(LoggerInterface::class, $logger);
        }
@@ -191,6 +173,7 @@ class DependencyCheckTest extends TestCase
                /** @var ICanCache $cache */
                $cache = $this->dice->create(ICanCache::class);
 
+
                self::assertInstanceOf(ICanCache::class, $cache);
        }