Provide Driver defaults

src/Adapter/Driver/Pdo/AbstractPdo.php

@@ -7,8 +7,7 @@
 use Override;
 use PDO;
 use PDOStatement;
-use PhpDb\Adapter\Driver\ConnectionInterface;
-use PhpDb\Adapter\Driver\Feature\DriverFeatureProviderInterface;
+use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\PdoDriverAwareInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
@@ -27,26 +26,14 @@
 
 abstract class AbstractPdo implements PdoDriverInterface, ProfilerAwareInterface
 {
-    /** @internal */
-    protected ?ProfilerInterface $profiler;
+    protected (PdoConnectionInterface&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
@@ -81,7 +68,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;
 }

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

@@ -9,13 +9,23 @@
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Driver\Pdo\AbstractPdoConnection;
 
+use function is_array;
 use function sprintf;
 
 /**
  * Test asset for AbstractPdoConnection - provides a concrete implementation for testing
  */
 final class TestConnection extends AbstractPdoConnection
 {
+    public function __construct(PDO|array $connectionParameters)
+    {
+        if (is_array($connectionParameters)) {
+            $this->setConnectionParameters($connectionParameters);
+        } elseif ($connectionParameters instanceof PDO) {
+            $this->setResource($connectionParameters);
+        }
+    }
+
     #[Override]
     public function connect(): ConnectionInterface
     {

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

@@ -6,6 +6,8 @@
 
 use Override;
 use PDO;
+use PhpDb\Adapter\Driver\Feature\DriverFeatureProviderInterface;
+use PhpDb\Adapter\Driver\Feature\DriverFeatureProviderTrait;
 use PhpDb\Adapter\Driver\Pdo\AbstractPdo;
 use PhpDb\Adapter\Driver\Pdo\AbstractPdoConnection;
 use PhpDb\Adapter\Driver\Pdo\Result;
@@ -16,8 +18,10 @@
 /**
  * Test asset for AbstractPdo - provides a concrete implementation for testing
  */
-final class TestPdo extends AbstractPdo
+final class TestPdo extends AbstractPdo implements DriverFeatureProviderInterface
 {
+    use DriverFeatureProviderTrait;
+
     public function __construct(
         array|AbstractPdoConnection|PDO $connection,
         ?Statement $statement = null,
@@ -28,12 +32,20 @@ public function __construct(
             $connection = new TestConnection($connection);
         }
 
-        parent::__construct(
-            $connection,
-            $statement ?? new Statement(),
-            $result ?? new Result(),
-            $features
-        );
+        $this->connection         = $connection;
+        $this->statementPrototype = $statement ?? new Statement();
+        $this->resultPrototype    = $result ?? new Result();
+
+        if (! $this->connection instanceof PDO) {
+            $this->connection->setDriver($this);
+        }
+
+        $this->statementPrototype->setDriver($this);
+
+        // $features is not constructor promoted because $this->features is defined in the trait
+        if ($features !== []) {
+            $this->addFeatures($features);
+        }
     }
 
     /**
@@ -65,6 +77,7 @@ public function getDatabasePlatformName(string $nameFormat = self::NAME_FORMAT_C
             $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',

test/unit/TestAsset/ConnectionWrapper.php

@@ -16,7 +16,7 @@ final class ConnectionWrapper extends AbstractPdoConnection
     public function __construct(
         PDO $connectionParameters = new PdoStubDriver()
     ) {
-        parent::__construct($connectionParameters);
+        $this->setResource($connectionParameters);
     }
 
     public function connect(): ConnectionInterface