This commit removes getDatabasePlatformName from the API. These changes will need to be made downstream in the driver packages.

Signed-off-by: Joey Smith <[email protected]>

Author: tyrsson

phpstan-baseline.neon

@@ -6,12 +6,6 @@ parameters:
 			count: 1
 			path: src/Sql/AbstractSql.php
 
-		-
-			message: '#^Cannot call method getAttribute\(\) on resource\.$#'
-			identifier: method.nonObject
-			count: 1
-			path: test/unit/Adapter/Driver/Pdo/TestAsset/TestPdo.php
-
 		-
 			message: '#^Parameter \#1 \$attribute \(string\) of method PhpDbTest\\Adapter\\Driver\\TestAsset\\PdoMock\:\:getAttribute\(\) should be compatible with parameter \$attribute \(int\) of method PDO\:\:getAttribute\(\)$#'
 			identifier: method.childParameterType

src/Adapter/Driver/DriverInterface.php

@@ -10,11 +10,6 @@ interface DriverInterface
 {
     public const PARAMETERIZATION_POSITIONAL = 'positional';
     public const PARAMETERIZATION_NAMED      = 'named';
-    public const NAME_FORMAT_CAMELCASE       = 'camelCase';
-    public const NAME_FORMAT_NATURAL         = 'natural';
-
-    /** Get database platform name */
-    public function getDatabasePlatformName(string $nameFormat = DriverInterface::NAME_FORMAT_CAMELCASE): string;
 
     /**
      * Check environment

src/Adapter/Driver/Pdo/AbstractPdo.php

@@ -7,6 +7,7 @@
 use Override;
 use PDO;
 use PDOStatement;
+use PhpDb\Adapter\Driver\AbstractConnection;
 use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\PdoDriverAwareInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
@@ -26,7 +27,7 @@
 
 abstract class AbstractPdo implements PdoDriverInterface, ProfilerAwareInterface
 {
-    protected (PdoConnectionInterface&PdoDriverAwareInterface)|PDO $connection;
+    protected (PdoConnectionInterface&AbstractConnection&PdoDriverAwareInterface)|PDO $connection;
 
     protected StatementInterface&PdoDriverAwareInterface $statementPrototype;
 

test/unit/Adapter/Container/AdapterInterfaceDelegatorTest.php

@@ -213,11 +213,6 @@ public function testDelegatorWithServiceManagerAndCustomAdapterName(): void
 
     public function testDelegatorWithPluginManager(): void
     {
-        $this->markTestSkipped(
-            'Test requires factory-based plugin manager configuration to pass options to constructor'
-        );
-
-        /** @phpstan-ignore deadCode.unreachable */
         $databaseAdapter = new Adapter(
             $this->createMock(DriverInterface::class),
             $this->createMock(PlatformInterface::class),
@@ -241,7 +236,6 @@ public function testDelegatorWithPluginManager(): void
             ],
         ];
 
-        /** @var AbstractPluginManager $pluginManager */
         $pluginManager = new class ($container, $pluginManagerConfig) extends AbstractPluginManager {
             public function validate(mixed $instance): void
             {
@@ -254,7 +248,7 @@ public function validate(mixed $instance): void
         ];
 
         /** @var ConcreteAdapterAwareObject $result */
-        $result = $pluginManager->get(
+        $result = $pluginManager->build(
             ConcreteAdapterAwareObject::class,
             $options
         );

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

@@ -40,10 +40,8 @@ protected function setUp(): void
      */
     public function testResource(): void
     {
-        $this->markTestSkipped('Test requires concrete driver implementation with DSN building logic');
-        /** @phpstan-ignore deadCode.unreachable */
-        $this->expectException(InvalidConnectionParametersException::class);
-        $this->connection->getResource();
+        $resource = $this->connection->getResource();
+        self::assertNotNull($resource);
     }
 
     /**
@@ -65,7 +63,7 @@ public function testGetDsn(): void
     #[Group('2622')]
     public function testArrayOfConnectionParametersCreatesCorrectDsn(): void
     {
-        $this->markTestSkipped('Test requires concrete MySQL driver implementation with DSN building logic');
+        $this->markTestSkipped('This test will pass with current sqlite::memory: prefix, but shouldn\'t.');
         /** @phpstan-ignore deadCode.unreachable */
         $this->connection->setConnectionParameters([
             'driver'      => 'pdo_mysql',
@@ -80,7 +78,7 @@ public function testArrayOfConnectionParametersCreatesCorrectDsn(): void
         }
         $responseString = $this->connection->getDsn();
 
-        self::assertStringStartsWith('mysql:', $responseString);
+        self::assertStringStartsWith('sqlite::memory:', $responseString);
         self::assertStringContainsString('charset=utf8', $responseString);
         self::assertStringContainsString('dbname=foo', $responseString);
         self::assertStringContainsString('port=3306', $responseString);

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

@@ -14,7 +14,6 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
-#[CoversMethod(AbstractPdo::class, 'getDatabasePlatformName')]
 #[CoversMethod(AbstractPdo::class, 'getResultPrototype')]
 final class PdoTest extends TestCase
 {
@@ -30,14 +29,6 @@ protected function setUp(): void
         $this->pdo = new TestPdo([]);
     }
 
-    public function testGetDatabasePlatformName(): void
-    {
-        // Test platform name for SqlServer
-        $this->pdo->getConnection()->setConnectionParameters(['pdodriver' => 'sqlsrv']);
-        self::assertEquals('SqlServer', $this->pdo->getDatabasePlatformName());
-        self::assertEquals('SQLServer', $this->pdo->getDatabasePlatformName(DriverInterface::NAME_FORMAT_NATURAL));
-    }
-
     /** @psalm-return array<array-key, array{0: int|string, 1: null|string, 2: string}> */
     public static function getParamsAndType(): array
     {

test/unit/Adapter/Driver/Pdo/TestAsset/TestPdo.php

@@ -13,8 +13,6 @@
 use PhpDb\Adapter\Driver\Pdo\Result;
 use PhpDb\Adapter\Driver\Pdo\Statement;
 
-use function ucfirst;
-
 /**
  * Test asset for AbstractPdo - provides a concrete implementation for testing
  */
@@ -61,41 +59,4 @@ public function createResult($resource): Result
         $result->initialize($resource, $this->connection->getLastGeneratedValue());
         return $result;
     }
-
-    /**
-     * Get database platform name
-     */
-    #[Override]
-    public function getDatabasePlatformName(string $nameFormat = self::NAME_FORMAT_CAMELCASE): string
-    {
-        $pdoDriver = null;
-        if ($this->connection instanceof TestConnection) {
-            $pdoDriver = $this->connection->getConnectionParameters()['pdodriver'] ?? null;
-        }
-
-        if ($pdoDriver === null && $this->connection->isConnected()) {
-            $pdoDriver = $this->connection->getResource()->getAttribute(PDO::ATTR_DRIVER_NAME);
-        }
-
-        // todo: None of this belongs here
-        return match ($nameFormat) {
-            self::NAME_FORMAT_CAMELCASE => match ($pdoDriver) {
-                'sqlsrv', 'dblib', 'mssql' => 'SqlServer',
-                'mysql' => 'MySql',
-                'oci' => 'Oracle',
-                'pgsql' => 'PostgreSql',
-                'sqlite' => 'Sqlite',
-                default => 'Sql92',
-            },
-            self::NAME_FORMAT_NATURAL => match ($pdoDriver) {
-                'sqlsrv', 'dblib', 'mssql' => 'SQLServer',
-                'mysql' => 'MySQL',
-                'oci' => 'Oracle',
-                'pgsql' => 'PostgreSQL',
-                'sqlite' => 'SQLite',
-                default => 'SQL92',
-            },
-            default => $pdoDriver !== null ? ucfirst($pdoDriver) : 'SQL92',
-        };
-    }
 }