Browse Source

Fix more failures.

Mark Story 2 years ago
parent
commit
6c4445822a
2 changed files with 20 additions and 12 deletions
  1. 6 2
      src/Database/Connection.php
  2. 14 10
      tests/TestCase/Database/Driver/MysqlTest.php

+ 6 - 2
src/Database/Connection.php

@@ -318,7 +318,9 @@ class Connection implements ConnectionInterface
      */
     public function connect(): bool
     {
-        deprecationWarning('If you cannot use automatic connection management, use $connection->getDriver()->connect() instead.');
+        deprecationWarning(
+            'If you cannot use automatic connection management, use $connection->getDriver()->connect() instead.'
+        );
 
         $connected = true;
         foreach ([self::ROLE_READ, self::ROLE_WRITE] as $role) {
@@ -349,7 +351,9 @@ class Connection implements ConnectionInterface
      */
     public function disconnect(): void
     {
-        deprecationWarning('If you cannot use automatic connection management, use $connection->getDriver()->disconnect() instead.');
+        deprecationWarning(
+            'If you cannot use automatic connection management, use $connection->getDriver()->disconnect() instead.'
+        );
 
         $this->getDriver(self::ROLE_READ)->disconnect();
         $this->getDriver(self::ROLE_WRITE)->disconnect();

+ 14 - 10
tests/TestCase/Database/Driver/MysqlTest.php

@@ -141,22 +141,26 @@ class MysqlTest extends TestCase
      */
     public function testIsConnected(): void
     {
-        $connection = ConnectionManager::get('test');
-        $connection->disconnect();
-        $this->assertFalse($connection->isConnected(), 'Not connected now.');
+        $this->deprecated(function () {
+            $connection = ConnectionManager::get('test');
+            $connection->disconnect();
+            $this->assertFalse($connection->isConnected(), 'Not connected now.');
 
-        $connection->connect();
-        $this->assertTrue($connection->isConnected(), 'Should be connected.');
+            $connection->connect();
+            $this->assertTrue($connection->isConnected(), 'Should be connected.');
+        });
     }
 
     public function testRollbackTransactionAutoConnect(): void
     {
-        $connection = ConnectionManager::get('test');
-        $connection->disconnect();
+        $this->deprecated(function () {
+            $connection = ConnectionManager::get('test');
+            $connection->disconnect();
 
-        $driver = $connection->getDriver();
-        $this->assertFalse($driver->rollbackTransaction());
-        $this->assertTrue($driver->isConnected());
+            $driver = $connection->getDriver();
+            $this->assertFalse($driver->rollbackTransaction());
+            $this->assertTrue($driver->isConnected());
+        });
     }
 
     public function testCommitTransactionAutoConnect(): void