X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Ffunctional%2FDependencyCheckTest.php;h=9065ca1685e4968f8ea60cb025392cefdac95322;hb=732ef70b8d1b0a8334c1d1444ce1ed376a1760e1;hp=42dcb7817644914ef237fe6380c77d180817f83b;hpb=b8c647f65aa347f4ef8d4b90b993f116901950fa;p=friendica.git

diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php
index 42dcb78176..9065ca1685 100644
--- a/tests/functional/DependencyCheckTest.php
+++ b/tests/functional/DependencyCheckTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,15 +23,15 @@ namespace Friendica\Test\functional;
 
 use Dice\Dice;
 use Friendica\App;
-use Friendica\Core\Cache\ICache;
-use Friendica\Core\Cache\IMemoryCache;
-use Friendica\Core\Config\Cache;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\Lock\ILock;
+use Friendica\Core\Cache\Capability\ICanCache;
+use Friendica\Core\Cache\Capability\ICanCacheInMemory;
+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\Util\BasePath;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\Profiler;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -45,7 +45,7 @@ class DependencyCheckTest extends TestCase
 	 */
 	private $dice;
 
-	protected function setUp()
+	protected function setUp() : void
 	{
 		parent::setUp();
 
@@ -79,7 +79,6 @@ class DependencyCheckTest extends TestCase
 		self::assertInstanceOf(ConfigFileLoader::class, $configFileLoader);
 
 		$configCache = new Cache();
-		$configCache->set('database', 'disable_pdo', true);
 		$configFileLoader->setupCache($configCache);
 
 		self::assertNotEmpty($configCache->getAll());
@@ -116,6 +115,12 @@ 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);
 
@@ -132,6 +137,12 @@ class DependencyCheckTest extends TestCase
 
 	public function testAppMode()
 	{
+		// 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 App\Mode $mode */
 		$mode = $this->dice->create(App\Mode::class);
 
@@ -147,10 +158,10 @@ class DependencyCheckTest extends TestCase
 
 	public function testConfiguration()
 	{
-		/** @var IConfig $config */
-		$config = $this->dice->create(IConfig::class);
+		/** @var IManageConfigValues $config */
+		$config = $this->dice->create(IManageConfigValues::class);
 
-		self::assertInstanceOf(IConfig::class, $config);
+		self::assertInstanceOf(IManageConfigValues::class, $config);
 
 		self::assertNotEmpty($config->get('database', 'username'));
 	}
@@ -165,8 +176,8 @@ class DependencyCheckTest extends TestCase
 
 	public function testDevLogger()
 	{
-		/** @var IConfig $config */
-		$config = $this->dice->create(IConfig::class);
+		/** @var IManageConfigValues $config */
+		$config = $this->dice->create(IManageConfigValues::class);
 		$config->set('system', 'dlogfile', $this->root->url() . '/friendica.log');
 
 		/** @var LoggerInterface $logger */
@@ -177,26 +188,26 @@ class DependencyCheckTest extends TestCase
 
 	public function testCache()
 	{
-		/** @var ICache $cache */
-		$cache = $this->dice->create(ICache::class);
+		/** @var ICanCache $cache */
+		$cache = $this->dice->create(ICanCache::class);
 
-		self::assertInstanceOf(ICache::class, $cache);
+		self::assertInstanceOf(ICanCache::class, $cache);
 	}
 
 	public function testMemoryCache()
 	{
-		/** @var IMemoryCache $cache */
-		$cache = $this->dice->create(IMemoryCache::class);
+		/** @var ICanCacheInMemory $cache */
+		$cache = $this->dice->create(ICanCacheInMemory::class);
 
 		// We need to check "just" ICache, because the default Cache is DB-Cache, which isn't a memorycache
-		self::assertInstanceOf(ICache::class, $cache);
+		self::assertInstanceOf(ICanCache::class, $cache);
 	}
 
 	public function testLock()
 	{
-		/** @var ILock $cache */
-		$lock = $this->dice->create(ILock::class);
+		/** @var ICanLock $cache */
+		$lock = $this->dice->create(ICanLock::class);
 
-		self::assertInstanceOf(ILock::class, $lock);
+		self::assertInstanceOf(ICanLock::class, $lock);
 	}
 }