Merge remote-tracking branch 'upstream/0.6.x' into refactor/dead-code-cleanup

# Conflicts:
#	src/Adapter/Profiler/Profiler.php
#	test/unit/Adapter/Container/AdapterInterfaceDelegatorTest.php
#	test/unit/Adapter/Driver/Pdo/ConnectionTest.php
#	test/unit/Adapter/Driver/Pdo/PdoTest.php

Author: simon-mundy

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,8 +7,8 @@
 use Override;
 use PDO;
 use PDOStatement;
-use PhpDb\Adapter\Driver\ConnectionInterface;
-use PhpDb\Adapter\Driver\Feature\DriverFeatureProviderInterface;
+use PhpDb\Adapter\Driver\AbstractConnection;
+use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\PdoDriverAwareInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
@@ -27,26 +27,14 @@
 
 abstract class AbstractPdo implements PdoDriverInterface, ProfilerAwareInterface
 {
-    /** @internal */
-    protected ?ProfilerInterface $profiler;
+    protected (PdoConnectionInterface&AbstractConnection&PdoDriverAwareInterface)|PDO $connection;
 
-    public function __construct(
-        protected AbstractPdoConnection|PDO $connection,
-        protected StatementInterface&PdoDriverAwareInterface $statementPrototype,
-        protected ResultInterface $resultPrototype,
-        array $features = [],
-    ) {
-        if ($this->connection instanceof PdoDriverAwareInterface) {
-            $this->connection->setDriver($this);
-        }
+    protected StatementInterface&PdoDriverAwareInterface $statementPrototype;
 
-        $this->statementPrototype->setDriver($this);
+    protected ResultInterface $resultPrototype;
 
-        // $features is not constructor promoted because $this->features is defined in the trait
-        if ($features !== [] && $this instanceof DriverFeatureProviderInterface) {
-            $this->addFeatures($features);
-        }
-    }
+    /** @internal */
+    protected ?ProfilerInterface $profiler;
 
     #[Override]
     public function setProfiler(ProfilerInterface $profiler): ProfilerAwareInterface
@@ -83,7 +71,7 @@ public function checkEnvironment(): bool
     }
 
     #[Override]
-    public function getConnection(): ConnectionInterface
+    public function getConnection(): PdoConnectionInterface
     {
         return $this->connection;
     }

src/Adapter/Driver/Pdo/AbstractPdoConnection.php

@@ -16,7 +16,6 @@
 use PhpDb\Adapter\Exception;
 use PhpDb\Adapter\Exception\RuntimeException;
 
-use function is_array;
 use function strtolower;
 
 abstract class AbstractPdoConnection extends AbstractConnection implements
@@ -30,21 +29,6 @@ abstract class AbstractPdoConnection extends AbstractConnection implements
     /** @var ?PDO $resource */
     protected $resource;
 
-    /**
-     * Constructor
-     *
-     * @throws Exception\InvalidArgumentException
-     */
-    public function __construct(
-        PDO|array $connectionParameters
-    ) {
-        if (is_array($connectionParameters)) {
-            $this->setConnectionParameters($connectionParameters);
-        } elseif ($connectionParameters instanceof PDO) {
-            $this->setResource($connectionParameters);
-        }
-    }
-
     #[Override]
     public function setDriver(PdoDriverInterface $driver): PdoDriverAwareInterface
     {

src/Adapter/Driver/Pdo/Statement.php

@@ -44,7 +44,7 @@ class Statement implements StatementInterface, PdoDriverAwareInterface, Profiler
     protected bool $isPrepared = false;
 
     public function __construct(
-        protected ?ParameterContainer $parameterContainer = null,
+        protected ParameterContainer $parameterContainer = new ParameterContainer(),
         protected array $options = [],
     ) {
     }
@@ -114,7 +114,7 @@ public function setParameterContainer(ParameterContainer $parameterContainer): S
     #[Override]
     public function getParameterContainer(): ParameterContainer
     {
-        return $this->parameterContainer ??= new ParameterContainer();
+        return $this->parameterContainer;
     }
 
     /** @throws Exception\RuntimeException */
@@ -156,13 +156,9 @@ public function execute(null|array|ParameterContainer $parameters = null): ?Resu
         }
 
         /** START Standard ParameterContainer Merging Block */
-        if (! $this->parameterContainer instanceof ParameterContainer) {
-            if ($parameters instanceof ParameterContainer) {
+        if ($parameters instanceof ParameterContainer) {
                 $this->parameterContainer = $parameters;
                 $parameters               = null;
-            } else {
-                $this->parameterContainer = new ParameterContainer();
-            }
         }
 
         if (is_array($parameters)) {
@@ -247,11 +243,9 @@ protected function bindParametersFromContainer(): void
     /** Perform a deep clone */
     public function __clone(): void
     {
-        $this->isPrepared      = false;
-        $this->parametersBound = false;
-        $this->resource        = null;
-        if ($this->parameterContainer) {
-            $this->parameterContainer = clone $this->parameterContainer;
-        }
+        $this->isPrepared         = false;
+        $this->parametersBound    = false;
+        $this->resource           = null;
+        $this->parameterContainer = clone $this->parameterContainer;
     }
 }

src/Adapter/Driver/PdoConnectionInterface.php

@@ -4,7 +4,7 @@
 
 namespace PhpDb\Adapter\Driver;
 
-interface PdoConnectionInterface
+interface PdoConnectionInterface extends ConnectionInterface
 {
     public function getDsn(): string;
 }

src/Adapter/Profiler/Profiler.php

@@ -5,20 +5,36 @@
 namespace PhpDb\Adapter\Profiler;
 
 use PhpDb\Adapter\Exception;
+use PhpDb\Adapter\Exception\InvalidArgumentException;
+use PhpDb\Adapter\ParameterContainer;
 use PhpDb\Adapter\StatementContainerInterface;
 
 use function end;
+use function is_string;
 use function microtime;
 
+/**
+ * @phpstan-type ProfileShape array{
+ *     sql: string,
+ *     parameters: ParameterContainer|null,
+ *     start: float,
+ *     end: float|null,
+ *     elapse: float|null,
+ * }
+ * @phpstan-type ProfilesShape ProfileShape[]
+ */
 class Profiler implements ProfilerInterface
 {
-    /** @var array */
+    /** @var ProfilesShape */
     protected $profiles = [];
 
     /** @var int */
     protected $currentIndex = 0;
 
-    /** @return $this Provides a fluent interface */
+    /**
+     * @throws InvalidArgumentException
+     * @return $this Provides a fluent interface
+     */
     public function profilerStart(string|StatementContainerInterface $target): ProfilerInterface
     {
         $profileInformation = [
@@ -28,14 +44,15 @@ public function profilerStart(string|StatementContainerInterface $target): Profi
             'end'        => null,
             'elapse'     => null,
         ];
-        if ($target instanceof StatementContainerInterface) {
+
+        if (is_string($target)) {
+            $profileInformation['sql'] = $target;
+        } else {
             $profileInformation['sql'] = $target->getSql();
             $container                 = $target->getParameterContainer();
             if ($container !== null) {
                 $profileInformation['parameters'] = clone $container;
             }
-        } else {
-            $profileInformation['sql'] = $target;
         }
 
         $this->profiles[$this->currentIndex] = $profileInformation;
@@ -61,13 +78,16 @@ public function profilerFinish(): ProfilerInterface
     }
 
     /**
-     * @return array|null
+     * @return ProfileShape|null
      */
     public function getLastProfile(): ?array
     {
         return end($this->profiles);
     }
 
+    /**
+     * @return ProfilesShape
+     */
     public function getProfiles(): array
     {
         return $this->profiles;

test/unit/Adapter/Container/AdapterInterfaceDelegatorTest.php

@@ -4,6 +4,7 @@
 
 namespace PhpDbTest\Adapter\Container;
 
+use Laminas\ServiceManager\AbstractPluginManager;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\ServiceManager;
 use PhpDb\Adapter\Adapter;
@@ -255,4 +256,53 @@ public function testInvokeReturnsInstanceWhenAdapterIsNotAdapterInterface(): voi
         self::assertInstanceOf(ConcreteAdapterAwareObject::class, $result);
         self::assertNull($result->getAdapter());
     }
+
+    public function testDelegatorWithPluginManager(): void
+    {
+        $databaseAdapter = new Adapter(
+            $this->createMock(DriverInterface::class),
+            $this->createMock(PlatformInterface::class),
+            $this->createMock(ResultSetInterface::class)
+        );
+
+        $container = new ServiceManager([
+            'factories' => [
+                AdapterInterface::class => static fn() => $databaseAdapter,
+            ],
+        ]);
+
+        $pluginManagerConfig = [
+            'invokables' => [
+                ConcreteAdapterAwareObject::class => ConcreteAdapterAwareObject::class,
+            ],
+            'delegators' => [
+                ConcreteAdapterAwareObject::class => [
+                    AdapterInterfaceDelegator::class,
+                ],
+            ],
+        ];
+
+        $pluginManager = new class ($container, $pluginManagerConfig) extends AbstractPluginManager {
+            public function validate(mixed $instance): void
+            {
+            }
+        };
+
+        $options = [
+            'table' => 'foo',
+            'field' => 'bar',
+        ];
+
+        /** @var ConcreteAdapterAwareObject $result */
+        $result = $pluginManager->build(
+            ConcreteAdapterAwareObject::class,
+            $options
+        );
+
+        $this->assertInstanceOf(
+            AdapterInterface::class,
+            $result->getAdapter()
+        );
+        $this->assertSame($options, $result->getOptions());
+    }
 }

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

@@ -53,6 +53,15 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Test getResource method tries to connect to  the database, it should never return null
+     */
+    public function testResource(): void
+    {
+        $resource = $this->connection->getResource();
+        self::assertNotNull($resource);
+    }
+
     /**
      * Test getConnectedDsn returns a DSN string if it has been set
      */

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

@@ -23,7 +23,6 @@
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
-#[CoversMethod(AbstractPdo::class, 'getDatabasePlatformName')]
 #[CoversMethod(AbstractPdo::class, 'getResultPrototype')]
 #[CoversMethod(AbstractPdo::class, '__construct')]
 #[CoversMethod(AbstractPdo::class, 'checkEnvironment')]
@@ -48,14 +47,6 @@ protected function setUp(): void
         $this->pdo = new TestPdo([]);
     }
 
-    public function testGetDatabasePlatformNameReturnsCamelAndNaturalFormats(): 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
     {