X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Ffunctional%2FDependencyCheckTest.php;h=f3bc4842725d02666001b9f3c5fb0ab4ae598366;hb=89e74202371c4e3b37488e1251818e8fcf3287fe;hp=27e693295ecd4af55311dfb57d24fb4c92e6d77c;hpb=b2d7c4ec430d4706e634e982dbb56db45b153aec;p=friendica.git

diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php
index 27e693295e..f3bc484272 100644
--- a/tests/functional/DependencyCheckTest.php
+++ b/tests/functional/DependencyCheckTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,6 @@
 
 namespace Friendica\Test\functional;
 
-use Dice\Dice;
 use Friendica\App;
 use Friendica\Core\Cache\Capability\ICanCache;
 use Friendica\Core\Cache\Capability\ICanCacheInMemory;
@@ -29,37 +28,17 @@ use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Lock\Capability\ICanLock;
 use Friendica\Database\Database;
-use Friendica\Test\Util\VFSTrait;
+use Friendica\Test\FixtureTest;
 use Friendica\Util\BasePath;
 use Friendica\Core\Config\Util\ConfigFileManager;
-use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 
-class DependencyCheckTest extends TestCase
+class DependencyCheckTest extends FixtureTest
 {
-	use VFSTrait;
-
-	/**
-	 * @var Dice
-	 */
-	private $dice;
-
 	protected function setUp() : void
 	{
 		parent::setUp();
 
-		$this->setUpVfsDir();
-
-		$this->dice = (new Dice())
-			->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');
@@ -75,6 +54,9 @@ class DependencyCheckTest extends TestCase
 
 		self::assertInstanceOf(BasePath::class, $basePath);
 		self::assertEquals($this->root->url(), $basePath->getPath());
+
+		/** @var Database $dba */
+		$dba = $this->dice->create(Database::class);
 	}
 
 	/**
@@ -98,12 +80,6 @@ class DependencyCheckTest extends TestCase
 
 	public function testDatabase()
 	{
-		// PDO needs to be disabled for PHP 7.2, see https://jira.mariadb.org/browse/MDEV-24121
-		if (version_compare(PHP_VERSION, '7.3') < 0) {
-			$configCache = $this->dice->create(Cache::class);
-			$configCache->set('database', 'disable_pdo', true);
-		}
-
 		/** @var Database $database */
 		$database = $this->dice->create(Database::class);
 
@@ -163,7 +139,7 @@ class DependencyCheckTest extends TestCase
 		$config->set('system', 'dlogfile', $this->root->url() . '/friendica.log');
 
 		/** @var LoggerInterface $logger */
-		$logger = $this->dice->create('$devLogger', [['$channel' => 'dev']]);
+		$logger = $this->dice->create('$devLogger', ['dev']);
 
 		self::assertInstanceOf(LoggerInterface::class, $logger);
 	}