fixing errorsenh/noid/psr-logger-in-qb

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

2 files changed, 14 insertions, 8 deletions

diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index 080484dabfe..d0bf2fa9b75 100644
--- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
@@ -24,11 +24,11 @@ namespace Test\DB\QueryBuilder;
 use Doctrine\DBAL\Query\Expression\CompositeExpression;
 use Doctrine\DBAL\Query\QueryException;
 use Doctrine\DBAL\Result;
+use OC\DB\ConnectionAdapter;
 use OC\DB\QueryBuilder\Literal;
 use OC\DB\QueryBuilder\Parameter;
 use OC\DB\QueryBuilder\QueryBuilder;
 use OC\SystemConfig;
-use OCP\IDBConnection;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -42,7 +42,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	/** @var QueryBuilder */
 	protected $queryBuilder;
 
-	/** @var IDBConnection */
+	/** @var ConnectionAdapter */
 	protected $connection;
 
 	/** @var SystemConfig|\PHPUnit\Framework\MockObject\MockObject */
@@ -54,7 +54,7 @@ class QueryBuilderTest extends \Test\TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->connection = \OC::$server->getDatabaseConnection();
+		$this->connection = \OC::$server->get(ConnectionAdapter::class);
 		$this->config = $this->createMock(SystemConfig::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->queryBuilder = new QueryBuilder($this->connection, $this->config, $this->logger);
@@ -178,7 +178,9 @@ class QueryBuilderTest extends \Test\TestCase {
 	}
 
 	public function dataSelect() {
-		$queryBuilder = new QueryBuilder(\OC::$server->getDatabaseConnection(), $this->config, $this->logger);
+		$config = $this->createMock(SystemConfig::class);
+		$logger = $this->createMock(LoggerInterface::class);
+		$queryBuilder = new QueryBuilder(\OC::$server->get(ConnectionAdapter::class), $config, $logger);
 		return [
 			// select('column1')
 			[['configvalue'], ['configvalue' => '99']],
@@ -244,7 +246,9 @@ class QueryBuilderTest extends \Test\TestCase {
 	}
 
 	public function dataSelectAlias() {
-		$queryBuilder = new QueryBuilder(\OC::$server->getDatabaseConnection(), $this->config, $this->logger);
+		$config = $this->createMock(SystemConfig::class);
+		$logger = $this->createMock(LoggerInterface::class);
+		$queryBuilder = new QueryBuilder(\OC::$server->get(ConnectionAdapter::class), $config, $logger);
 		return [
 			['configvalue', 'cv', ['cv' => '99']],
 			[$queryBuilder->expr()->literal('column1'), 'thing', ['thing' => 'column1']],
@@ -351,7 +355,9 @@ class QueryBuilderTest extends \Test\TestCase {
 	}
 
 	public function dataAddSelect() {
-		$queryBuilder = new QueryBuilder(\OC::$server->getDatabaseConnection(), $this->config, $this->logger);
+		$config = $this->createMock(SystemConfig::class);
+		$logger = $this->createMock(LoggerInterface::class);
+		$queryBuilder = new QueryBuilder(\OC::$server->get(ConnectionAdapter::class), $config, $logger);
 		return [
 			// addSelect('column1')
 			[['configvalue'], ['appid' => 'testFirstResult', 'configvalue' => '99']],
diff --git a/tests/lib/Security/CredentialsManagerTest.php b/tests/lib/Security/CredentialsManagerTest.php
index 3ce80227f44..8905ce8cf49 100644
--- a/tests/lib/Security/CredentialsManagerTest.php
+++ b/tests/lib/Security/CredentialsManagerTest.php
@@ -25,8 +25,8 @@ use OC\DB\ConnectionAdapter;
 use OC\Security\CredentialsManager;
 use OC\SystemConfig;
 use OCP\IDBConnection;
-use OCP\ILogger;
 use OCP\Security\ICrypto;
+use Psr\Log\LoggerInterface;
 
 /**
  * @group DB
@@ -102,7 +102,7 @@ class CredentialsManagerTest extends \Test\TestCase {
 			->setConstructorArgs([
 				$this->dbConnectionAdapter,
 				$this->createMock(SystemConfig::class),
-				$this->createMock(ILogger::class),
+				$this->createMock(LoggerInterface::class),
 			])
 			->setMethods(['execute'])
 			->getMock();