Merge upstream/0.6.x (PR #142) into test/adapter-coverage-100

Resolves 7-file conflict caused by PR #142's test-method renames and
attribute cleanup overlapping with this branch's coverage work.

- AdapterAwareTraitTest: adopt CoversMethod over CoversTrait to match
  the rest of the suite (78 other files use CoversMethod; this was the
  only CoversTrait usage)
- AbstractConnectionTest/TestConnection: kept this branch's TestConnection
  fixture (extends AbstractConnection directly) over upstream's
  ConnectionWrapper, which extends AbstractPdoConnection and would have
  reintroduced the wrong-hierarchy coverage gap this PR fixes. Also gave
  TestConnection a constructor param for driverName so
  testGetDriverNameReturnsValueWhenSet genuinely exercises a non-null
  value instead of asserting null
- AdapterInterfaceDelegatorTest: both branches independently added the
  same three tests at different positions; deduplicated to one copy
- PdoTest: adopted upstream's `$unused = $pdo->getProfiler()` over a
  phpstan-ignore comment to silence the unused-result warning
- ProfilerTest: kept this branch's split of testProfilerStart into
  separate string/container tests (one logical assertion per test)
  over upstream's combined version
- Dropped upstream's `CoversMethod(..., '__construct')` additions on
  AbstractPdo/AbstractPdoConnection in PdoTest/ConnectionTest since
  neither class declares its own constructor

Full unit suite (1451 tests), phpcs, and phpstan all pass post-merge.

Author: simon-mundy

test/unit/Adapter/AdapterAwareTraitTest.php

@@ -9,12 +9,12 @@
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDbTest\Adapter\TestAsset\ConcreteAdapterAwareObject;
-use PHPUnit\Framework\Attributes\CoversTrait;
+use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 
-#[CoversTrait(AdapterAwareTrait::class)]
+#[CoversMethod(AdapterAwareTrait::class, 'setDbAdapter')]
 #[Group('unit')]
 class AdapterAwareTraitTest extends TestCase
 {

test/unit/Adapter/AdapterTest.php

@@ -70,14 +70,14 @@ protected function setUp(): void
     }
 
     #[TestDox('unit test: Test setProfiler() will store profiler')]
-    public function testSetProfiler(): void
+    public function testFluentSetProfiler(): void
     {
         $ret = $this->adapter->setProfiler(new Profiler\Profiler());
         self::assertSame($this->adapter, $ret);
     }
 
     #[TestDox('unit test: Test getProfiler() will store profiler')]
-    public function testGetProfiler(): void
+    public function testGetProfilerReturnsProfiler(): void
     {
         $this->adapter->setProfiler($profiler = new Profiler\Profiler());
         self::assertSame($profiler, $this->adapter->getProfiler());
@@ -91,25 +91,25 @@ public function testGetProfiler(): void
     }
 
     #[TestDox('unit test: Test getDriver() will return driver object')]
-    public function testGetDriver(): void
+    public function testGetDriverReturnsDriver(): void
     {
         self::assertSame($this->mockDriver, $this->adapter->getDriver());
     }
 
     #[TestDox('unit test: Test getPlatform() returns platform object')]
-    public function testGetPlatform(): void
+    public function testGetPlatformReturnsPlatform(): void
     {
         self::assertSame($this->mockPlatform, $this->adapter->getPlatform());
     }
 
     #[TestDox('unit test: Test getPlatform() returns platform object')]
-    public function testGetQueryResultSetPrototype(): void
+    public function testGetQueryResultSetPrototypeReturnsResultSet(): void
     {
         self::assertInstanceOf(ResultSetInterface::class, $this->adapter->getQueryResultSetPrototype());
     }
 
     #[TestDox('unit test: Test getCurrentSchema() returns current schema from connection object')]
-    public function testGetCurrentSchema(): void
+    public function testGetCurrentSchemaDelegatesToConnection(): void
     {
         $this->mockConnection->expects($this->any())->method('getCurrentSchema')->willReturn('FooSchema');
         self::assertEquals('FooSchema', $this->adapter->getCurrentSchema());
@@ -218,15 +218,13 @@ public function testQueryWhenExecutedProducesAResultSetObjectWhenResultIsQuery()
     }
 
     #[TestDox('unit test: Test createStatement() produces a statement object')]
-    public function testCreateStatement(): void
+    public function testCreateStatementDelegatesToDriver(): void
     {
         self::assertSame($this->mockStatement, $this->adapter->createStatement());
     }
 
-    // @codingStandardsIgnoreStart
-    public function test__get(): void
+    public function testMagicGetReturnsDriverAndPlatformCaseInsensitively(): void
     {
-        // @codingStandardsIgnoreEnd
         self::assertSame($this->mockDriver, $this->adapter->driver);
         /** @phpstan-ignore property.notFound */
         self::assertSame($this->mockDriver, $this->adapter->DrivER);

test/unit/Adapter/Driver/AbstractConnectionTest.php

@@ -51,9 +51,15 @@ public function testGetConnectionParametersReturnsEmptyByDefault(): void
     }
 
     public function testGetDriverNameReturnsValueWhenSet(): void
+    {
+        $connection = new TestConnection('sqlite');
+
+        self::assertSame('sqlite', $connection->getDriverName());
+    }
+
+    public function testGetDriverNameReturnsNullByDefault(): void
     {
         $connection = new TestConnection();
-        $connection->setConnectionParameters(['driver' => 'sqlite']);
 
         self::assertNull($connection->getDriverName());
     }

test/unit/Adapter/Driver/Pdo/ConnectionTest.php

@@ -64,7 +64,7 @@ public function testResource(): void
     /**
      * Test getConnectedDsn returns a DSN string if it has been set
      */
-    public function testGetDsn(): void
+    public function testGetDsnReturnsDsnAfterConnect(): void
     {
         $dsn = "sqlite::memory:";
         $this->connection->setConnectionParameters(['dsn' => $dsn]);
@@ -93,7 +93,7 @@ public function testConstructorWithArraySetsConnectionParameters(): void
         self::assertSame($params, $connection->getConnectionParameters());
     }
 
-    public function testSetDriverReturnsInstance(): void
+    public function testFluentSetDriver(): void
     {
         $driver = $this->createMock(PdoDriverInterface::class);
 

test/unit/Adapter/Driver/Pdo/PdoTest.php

@@ -66,7 +66,7 @@ public static function getParamsAndType(): array
     }
 
     #[DataProvider('getParamsAndType')]
-    public function testFormatParameterName(int|string $name, ?string $type, string $expected): void
+    public function testFormatParameterNameFormatsCorrectly(int|string $name, ?string $type, string $expected): void
     {
         $result = $this->pdo->formatParameterName($name, $type);
         $this->assertEquals($expected, $result);
@@ -90,7 +90,7 @@ public function testFormatParameterNameWithInvalidCharacters(string $name): void
         $this->pdo->formatParameterName($name);
     }
 
-    public function testGetResultPrototype(): void
+    public function testGetResultPrototypeReturnsResult(): void
     {
         $resultPrototype = $this->pdo->getResultPrototype();
 
@@ -172,8 +172,8 @@ public function testGetProfilerThrowsWhenNotInitialized(): void
         $pdo = new TestPdo([]);
 
         $this->expectException(Error::class);
-        /** @phpstan-ignore method.resultUnused */
-        $pdo->getProfiler();
+
+        $unused = $pdo->getProfiler();
     }
 
     public function testGetProfilerReturnsSetProfiler(): void

test/unit/Adapter/Driver/Pdo/ResultTest.php

@@ -42,7 +42,7 @@ final class ResultTest extends TestCase
     /**
      * Tests current method returns same data on consecutive calls.
      */
-    public function testCurrent(): void
+    public function testCurrentReturnsSameDataOnConsecutiveCalls(): void
     {
         $stub = $this->getMockBuilder('PDOStatement')->getMock();
         $stub->expects($this->any())
@@ -55,7 +55,7 @@ public function testCurrent(): void
         self::assertEquals($result->current(), $result->current());
     }
 
-    public function testFetchModeException(): void
+    public function testSetFetchModeThrowsOnInvalidMode(): void
     {
         $result = new Result();
 
@@ -66,7 +66,7 @@ public function testFetchModeException(): void
     /**
      * Tests whether the fetch mode was set properly and
      */
-    public function testFetchModeAnonymousObject(): void
+    public function testFetchModeObjReturnsStdClass(): void
     {
         $stub = $this->getMockBuilder('PDOStatement')->getMock();
         $stub->expects($this->any())
@@ -84,7 +84,7 @@ public function testFetchModeAnonymousObject(): void
     /**
      * Tests whether the fetch mode has a broader range
      */
-    public function testFetchModeRange(): void
+    public function testFetchModeAcceptsNamedMode(): void
     {
         $stub = $this->getMockBuilder('PDOStatement')->getMock();
         $stub->expects($this->any())
@@ -97,7 +97,7 @@ public function testFetchModeRange(): void
         self::assertInstanceOf('stdClass', $result->current());
     }
 
-    public function testMultipleRewind(): void
+    public function testRewindResetsIterationToStart(): void
     {
         $data     = [
             ['test' => 1],

test/unit/Adapter/Driver/Pdo/StatementTest.php

@@ -62,27 +62,24 @@ protected function tearDown(): void
     {
     }
 
-    public function testSetDriver(): void
+    public function testFluentSetDriver(): void
     {
         self::assertEquals($this->statement, $this->statement->setDriver(new TestPdo([])));
     }
 
-    public function testSetParameterContainer(): void
+    public function testFluentSetParameterContainer(): void
     {
         self::assertSame($this->statement, $this->statement->setParameterContainer(new ParameterContainer()));
     }
 
-    /**
-     * @todo Implement testGetParameterContainer().
-     */
-    public function testGetParameterContainer(): void
+    public function testGetParameterContainerReturnsContainer(): void
     {
         $container = new ParameterContainer();
         $this->statement->setParameterContainer($container);
         self::assertSame($container, $this->statement->getParameterContainer());
     }
 
-    public function testGetResource(): void
+    public function testGetResourceReturnsPdoStatement(): void
     {
         $pdo  = new SqliteMemoryPdo();
         $stmt = $pdo->prepare('SELECT 1');
@@ -103,26 +100,23 @@ public function testGetSql(): void
         self::assertEquals('SELECT 1', $this->statement->getSql());
     }
 
-    /**
-     * Test that prepare() returns the statement for method chaining
-     */
-    public function testPrepare(): void
+    public function testFluentPrepare(): void
     {
         $this->statement->initialize(new SqliteMemoryPdo());
         $result = $this->statement->prepare('SELECT 1');
         self::assertInstanceOf(Statement::class, $result);
         self::assertSame($this->statement, $result);
     }
 
-    public function testIsPrepared(): void
+    public function testIsPreparedReturnsTrueAfterPrepare(): void
     {
         self::assertFalse($this->statement->isPrepared());
         $this->statement->initialize(new SqliteMemoryPdo());
         $this->statement->prepare('SELECT 1');
         self::assertTrue($this->statement->isPrepared());
     }
 
-    public function testExecute(): void
+    public function testExecuteReturnsResult(): void
     {
         $this->statement->setDriver(new TestPdo(new TestConnection($pdo = new SqliteMemoryPdo())));
         $this->statement->initialize($pdo);

test/unit/Adapter/Driver/TestAsset/TestConnection.php

@@ -10,7 +10,9 @@
 
 final class TestConnection extends AbstractConnection
 {
-    protected ?string $driverName = null;
+    public function __construct(protected ?string $driverName = null)
+    {
+    }
 
     public function beginTransaction(): ConnectionInterface
     {

test/unit/Adapter/Platform/Sql92Test.php

@@ -82,7 +82,7 @@ public function testQuoteValueRaisesNoticeWithoutPlatformSupport(): void
         $this->platform->quoteValue('value');
     }
 
-    public function testQuoteValue(): void
+    public function testQuoteValueThrowsWithoutDriver(): void
     {
         $this->expectException(VunerablePlatformQuoteException::class);
         self::assertEquals("'value'", @$this->platform->quoteValue('value'));
@@ -97,7 +97,7 @@ public function testQuoteValue(): void
         );
     }
 
-    public function testQuoteTrustedValue(): void
+    public function testQuoteTrustedValueEscapesSpecialCharacters(): void
     {
         self::assertEquals("'value'", $this->platform->quoteTrustedValue('value'));
         self::assertEquals("'Foo O\\'Bar'", $this->platform->quoteTrustedValue("Foo O'Bar"));
@@ -113,7 +113,7 @@ public function testQuoteTrustedValue(): void
         );
     }
 
-    public function testQuoteValueList(): void
+    public function testQuoteValueListThrowsWithoutDriver(): void
     {
         $this->expectException(VunerablePlatformQuoteException::class);
         self::assertEquals("'Foo O\\'Bar'", $this->platform->quoteValueList("Foo O'Bar"));

test/unit/Adapter/Profiler/ProfilerTest.php

@@ -44,7 +44,7 @@ public function testProfilerStartWithStatementContainer(): void
         self::assertSame($this->profiler, $ret);
     }
 
-    public function testProfilerFinish(): void
+    public function testProfilerFinishThrowsWithoutStart(): void
     {
         $this->profiler->profilerStart('SELECT * FROM FOO');
         $ret = $this->profiler->profilerFinish();
@@ -56,7 +56,7 @@ public function testProfilerFinish(): void
         $profiler->profilerFinish();
     }
 
-    public function testGetLastProfile(): void
+    public function testGetLastProfileReturnsSqlAndTimings(): void
     {
         $this->profiler->profilerStart('SELECT * FROM FOO');
         $this->profiler->profilerFinish();
@@ -68,7 +68,7 @@ public function testGetLastProfile(): void
         self::assertIsFloat($profile['elapse']);
     }
 
-    public function testGetProfiles(): void
+    public function testGetProfilesReturnsAllRecordedProfiles(): void
     {
         $this->profiler->profilerStart('SELECT * FROM FOO1');
         $this->profiler->profilerFinish();