tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated method `DbConnection::getConnection()` with `DbConnection::getDbAdapter()`

This commit is contained in:
Sukhwinder Dhillon 2022-05-02 15:50:38 +02:00 committed by Johannes Meyer
parent aded6a055e
commit 8f0ac0492d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Test/BaseTestCase.php
View File

@ -305,7 +305,7 @@ namespace Icinga\Test {
); );
} }
$resource->getConnection()->exec($sqlData); $resource->getDbAdapter()->exec($sqlData);
} }
/** /**
@ -324,7 +324,7 @@ namespace Icinga\Test {
return; return;
} }
$adapter = $resource->getConnection(); $adapter = $resource->getDbAdapter();
try { try {
$adapter->getConnection(); $adapter->getConnection();

20
test/php/library/Icinga/Test/BaseTestCaseTest.php
View File

@ -25,7 +25,7 @@ class BaseTestCaseTest extends BaseTestCase
public function testWhetherMySqlProviderAnnotationSetsUpZendDbAdapter($resource) public function testWhetherMySqlProviderAnnotationSetsUpZendDbAdapter($resource)
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$this->assertInstanceOf('Zend_Db_Adapter_Pdo_Mysql', $resource->getConnection()); $this->assertInstanceOf('Zend_Db_Adapter_Pdo_Mysql', $resource->getDbAdapter());
} }
/** /**
@ -43,7 +43,7 @@ class BaseTestCaseTest extends BaseTestCase
public function testWhetherCreatingTablesWithMySqlAdapterWorks($resource) public function testWhetherCreatingTablesWithMySqlAdapterWorks($resource)
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$adapter = $resource->getConnection(); $adapter = $resource->getDbAdapter();
$adapter->exec('CREATE TABLE test(uid INT NOT NULL PRIMARY KEY);'); $adapter->exec('CREATE TABLE test(uid INT NOT NULL PRIMARY KEY);');
$tables = $adapter->listTables(); $tables = $adapter->listTables();
@ -58,7 +58,7 @@ class BaseTestCaseTest extends BaseTestCase
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$tables = $resource->getConnection()->listTables(); $tables = $resource->getDbAdapter()->listTables();
$this->assertCount(0, $tables); $this->assertCount(0, $tables);
} }
@ -68,7 +68,7 @@ class BaseTestCaseTest extends BaseTestCase
public function testWhetherPgSqlProviderAnnotationSetsUpZendDbAdapter($resource) public function testWhetherPgSqlProviderAnnotationSetsUpZendDbAdapter($resource)
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$this->assertInstanceOf('Zend_Db_Adapter_Pdo_Pgsql', $resource->getConnection()); $this->assertInstanceOf('Zend_Db_Adapter_Pdo_Pgsql', $resource->getDbAdapter());
} }
/** /**
@ -86,7 +86,7 @@ class BaseTestCaseTest extends BaseTestCase
public function testWhetherCreatingTablesWithPgSqlAdapterWorks($resource) public function testWhetherCreatingTablesWithPgSqlAdapterWorks($resource)
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$adapter = $resource->getConnection(); $adapter = $resource->getDbAdapter();
$adapter->exec('CREATE TABLE test(uid INT NOT NULL PRIMARY KEY);'); $adapter->exec('CREATE TABLE test(uid INT NOT NULL PRIMARY KEY);');
$tables = $adapter->listTables(); $tables = $adapter->listTables();
@ -101,7 +101,7 @@ class BaseTestCaseTest extends BaseTestCase
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$tables = $resource->getConnection()->listTables(); $tables = $resource->getDbAdapter()->listTables();
$this->assertCount(0, $tables); $this->assertCount(0, $tables);
} }
@ -111,7 +111,7 @@ class BaseTestCaseTest extends BaseTestCase
public function testWhetherOciProviderAnnotationSetsUpZendDbAdapter($resource) public function testWhetherOciProviderAnnotationSetsUpZendDbAdapter($resource)
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$this->assertInstanceOf('Zend_Db_Adapter_Pdo_Oci', $resource->getConnection()); $this->assertInstanceOf('Zend_Db_Adapter_Pdo_Oci', $resource->getDbAdapter());
} }
/** /**
@ -129,7 +129,7 @@ class BaseTestCaseTest extends BaseTestCase
public function testWhetherCreatingTablesWithOciAdapterWorks($resource) public function testWhetherCreatingTablesWithOciAdapterWorks($resource)
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$adapter = $resource->getConnection(); $adapter = $resource->getDbAdapter();
$adapter->exec('CREATE TABLE test(uid INT NOT NULL PRIMARY KEY);'); $adapter->exec('CREATE TABLE test(uid INT NOT NULL PRIMARY KEY);');
$tables = $adapter->listTables(); $tables = $adapter->listTables();
@ -144,7 +144,7 @@ class BaseTestCaseTest extends BaseTestCase
{ {
$this->setupDbProvider($resource); $this->setupDbProvider($resource);
$tables = $resource->getConnection()->listTables(); $tables = $resource->getDbAdapter()->listTables();
$this->assertCount(0, $tables); $this->assertCount(0, $tables);
} }
@ -176,7 +176,7 @@ class BaseTestCaseTest extends BaseTestCase
$this->loadSql($resource, $tempFile); $this->loadSql($resource, $tempFile);
$count = (int) $resource->getConnection()->fetchOne('SELECT COUNT(*) as cntX from dummyData;'); $count = (int) $resource->getDbAdapter()->fetchOne('SELECT COUNT(*) as cntX from dummyData;');
$this->assertSame(20, $count); $this->assertSame(20, $count);
$this->assertTrue(unlink($tempFile)); $this->assertTrue(unlink($tempFile));