Merge pull request #3957 from morozov/logging-test

Reworked LoggingTest to be able to test Statement::executeUpdate()

tests/Doctrine/Tests/DBAL/Connection/LoggingTest.php

+<?php
+
+namespace Doctrine\Tests\DBAL\Connection;
+
+use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Driver\Connection as DriverConnection;
+use Doctrine\DBAL\Driver\Statement;
+use Doctrine\DBAL\Logging\SQLLogger;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use PHPUnit\Framework\TestCase;
+
+final class LoggingTest extends TestCase
+{
+    public function testLogExecuteQuery() : void
+    {
+        $driverConnection = $this->createStub(DriverConnection::class);
+        $driverConnection->method('query')
+            ->willReturn($this->createStub(Statement::class));
+
+        $this->createConnection($driverConnection, 'SELECT * FROM table')
+            ->executeQuery('SELECT * FROM table');
+    }
+
+    public function testLogExecuteUpdate() : void
+    {
+        $this->createConnection(
+            $this->createStub(DriverConnection::class),
+            'UPDATE table SET foo = ?'
+        )
+            ->executeUpdate('UPDATE table SET foo = ?');
+    }
+
+    public function testLogPrepareExecute() : void
+    {
+        $driverConnection = $this->createStub(DriverConnection::class);
+        $driverConnection->method('prepare')
+            ->willReturn($this->createStub(Statement::class));
+
+        $this->createConnection($driverConnection, 'UPDATE table SET foo = ?')
+            ->prepare('UPDATE table SET foo = ?')
+            ->execute();
+    }
+
+    private function createConnection(DriverConnection $driverConnection, string $expectedSQL) : Connection
+    {
+        $driver = $this->createStub(Driver::class);
+        $driver->method('connect')
+            ->willReturn($driverConnection);
+        $driver->method('getDatabasePlatform')
+            ->willReturn($this->createMock(AbstractPlatform::class));
+
+        $logger = $this->createMock(SQLLogger::class);
+        $logger->expects($this->once())
+            ->method('startQuery')
+            ->with($this->equalTo($expectedSQL), $this->equalTo([]));
+        $logger->expects($this->at(1))
+            ->method('stopQuery');
+
+        $connection = new Connection([], $driver);
+        $connection->getConfiguration()->setSQLLogger($logger);
+
+        return $connection;
+    }
+}

tests/Doctrine/Tests/DBAL/Functional/LoggingTest.php

-<?php
-
-namespace Doctrine\Tests\DBAL\Functional;
-
-use Doctrine\DBAL\Logging\SQLLogger;
-use Doctrine\Tests\DbalFunctionalTestCase;
-
-class LoggingTest extends DbalFunctionalTestCase
-{
-    public function testLogExecuteQuery() : void
-    {
-        $sql = $this->connection->getDatabasePlatform()->getDummySelectSQL();
-
-        $logMock = $this->createMock(SQLLogger::class);
-        $logMock->expects($this->at(0))
-                ->method('startQuery')
-                ->with($this->equalTo($sql), $this->equalTo([]), $this->equalTo([]));
-        $logMock->expects($this->at(1))
-                ->method('stopQuery');
-        $this->connection->getConfiguration()->setSQLLogger($logMock);
-        $this->connection->executeQuery($sql, []);
-    }
-
-    public function testLogExecuteUpdate() : void
-    {
-        $this->markTestSkipped('Test breaks MySQL but works on all other platforms (Unbuffered Queries stuff).');
-
-        $sql = $this->connection->getDatabasePlatform()->getDummySelectSQL();
-
-        $logMock = $this->createMock(SQLLogger::class);
-        $logMock->expects($this->at(0))
-                ->method('startQuery')
-                ->with($this->equalTo($sql), $this->equalTo([]), $this->equalTo([]));
-        $logMock->expects($this->at(1))
-                ->method('stopQuery');
-        $this->connection->getConfiguration()->setSQLLogger($logMock);
-        $this->connection->executeUpdate($sql, []);
-    }
-
-    public function testLogPrepareExecute() : void
-    {
-        $sql = $this->connection->getDatabasePlatform()->getDummySelectSQL();
-
-        $logMock = $this->createMock(SQLLogger::class);
-        $logMock->expects($this->once())
-                ->method('startQuery')
-                ->with($this->equalTo($sql), $this->equalTo([]));
-        $logMock->expects($this->at(1))
-                ->method('stopQuery');
-        $this->connection->getConfiguration()->setSQLLogger($logMock);
-
-        $stmt = $this->connection->prepare($sql);
-        $stmt->execute();
-    }
-}