Revert "PhpCS and Psalm corrections"

tyrsson · tyrsson · commit 8074b5badb43 · 2025-09-15T22:16:03.000-05:00
This reverts commit 59854cb. Signed-off-by: Joey Smith <jsmith@webinertia.net>
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -18,8 +18,8 @@
 use PhpDb\Container\AdapterManager;
 use PhpDb\Container\ConnectionInterfaceFactoryFactoryInterface;
 use PhpDb\Container\DriverInterfaceFactoryFactoryInterface;
-use PhpDb\Container\MetadataFactory;
 use PhpDb\Container\PlatformInterfaceFactoryFactoryInterface;
+use PhpDb\Container\MetadataFactory;
 use PhpDb\Metadata\MetadataInterface;
 use PhpDb\ResultSet;
 
@@ -39,13 +39,13 @@ public function getDependencies(): array
             'abstract_factories' => [
                 AdapterAbstractServiceFactory::class,
             ],
-            'aliases'            => [
+            'aliases'    => [
                 MetadataInterface::class => MysqlMetadata::class,
             ],
-            'factories'          => [
+            'factories'  => [
                 MysqlMetadata::class => MetadataFactory::class,
             ],
-            'delegators'         => [
+            'delegators' => [
                 AdapterManager::class => [
                     Container\AdapterManagerDelegator::class,
                 ],
@@ -56,7 +56,7 @@ public function getDependencies(): array
     public function getAdapterManagerConfig(): array
     {
         return [
-            'aliases'    => [
+            'aliases'   => [
                 'MySqli'                                          => Driver\Mysqli\Mysqli::class,
                 'MySQLi'                                          => Driver\Mysqli\Mysqli::class,
                 'Mysqli'                                          => Driver\Mysqli\Mysqli::class,
@@ -76,7 +76,7 @@ public function getAdapterManagerConfig(): array
                 DriverInterfaceFactoryFactoryInterface::class     => Container\DriverInterfaceFactoryFactory::class,
                 PlatformInterfaceFactoryFactoryInterface::class   => Container\PlatformInterfaceFactoryFactory::class,
             ],
-            'factories'  => [
+            'factories' => [
                 AdapterInterface::class         => Container\AdapterFactory::class,
                 Driver\Mysqli\Mysqli::class     => Container\MysqliDriverFactory::class,
                 Driver\Mysqli\Connection::class => Container\MysqliConnectionFactory::class,
@@ -91,12 +91,9 @@ public function getAdapterManagerConfig(): array
                 ResultSet\ResultSet::class      => InvokableFactory::class,
             ],
             'invokables' => [
-                Container\ConnectionInterfaceFactoryFactory::class
-                    => Container\ConnectionInterfaceFactoryFactory::class,
-                Container\DriverInterfaceFactoryFactory::class
-                    => Container\DriverInterfaceFactoryFactory::class,
-                Container\PlatformInterfaceFactoryFactory::class
-                    => Container\PlatformInterfaceFactoryFactory::class,
+                Container\ConnectionInterfaceFactoryFactory::class => Container\ConnectionInterfaceFactoryFactory::class,
+                Container\DriverInterfaceFactoryFactory::class     => Container\DriverInterfaceFactoryFactory::class,
+                Container\PlatformInterfaceFactoryFactory::class   => Container\PlatformInterfaceFactoryFactory::class,
             ],
         ];
     }
diff --git a/src/Container/AdapterFactory.php b/src/Container/AdapterFactory.php
@@ -55,6 +55,7 @@ public function __invoke(ContainerInterface $container): AdapterInterface
             ));
         }
 
+        /** @var PlatformInterface $platformInstance */
         $platformInstance = $adapterManager->get(PlatformInterface::class);
 
         if (! $adapterManager->has(ResultSetInterface::class)) {
@@ -64,8 +65,10 @@ public function __invoke(ContainerInterface $container): AdapterInterface
             ));
         }
 
+        /** @var ResultSetInterface $resultSetInstance */
         $resultSetInstance = $adapterManager->get(ResultSetInterface::class);
 
+        /** @var ProfilerInterface|null $profilerInstanceOrNull */
         $profilerInstanceOrNull = $adapterManager->has(ProfilerInterface::class)
                 ? $adapterManager->get(ProfilerInterface::class)
                 : null;
diff --git a/src/Container/AdapterManagerDelegator.php b/src/Container/AdapterManagerDelegator.php
@@ -5,7 +5,7 @@
 namespace PhpDb\Adapter\Mysql\Container;
 
 use Laminas\ServiceManager\Factory\DelegatorFactoryInterface;
-use PhpDb\Adapter\Mysql\ConfigProvider;
+use PhpDB\Adapter\Mysql\ConfigProvider;
 use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
 
diff --git a/src/Container/ConnectionInterfaceFactoryFactory.php b/src/Container/ConnectionInterfaceFactoryFactory.php
@@ -24,7 +24,7 @@ public function __invoke(
     ): callable {
         $adapterConfig = $container->get('config')['db']['adapters'] ?? [];
         if (! isset($adapterConfig[$requestedName]['driver'])) {
-            throw new RuntimeException(sprintf(
+            throw new \RuntimeException(sprintf(
                 'Named adapter "%s" is not configured with a driver',
                 $requestedName
             ));
diff --git a/src/Container/DriverInterfaceFactoryFactory.php b/src/Container/DriverInterfaceFactoryFactory.php
@@ -7,7 +7,6 @@
 use PhpDb\Container\AdapterManager;
 use PhpDb\Container\DriverInterfaceFactoryFactoryInterface as FactoryFactoryInterface;
 use Psr\Container\ContainerInterface;
-use RuntimeException;
 
 use function sprintf;
 
@@ -19,16 +18,16 @@ public function __invoke(
     ): callable {
         $adapterConfig = $container->get('config')['db']['adapters'] ?? [];
         if (! isset($adapterConfig[$requestedName]['driver'])) {
-            throw new RuntimeException(sprintf(
+            throw new \RuntimeException(sprintf(
                 'Named adapter "%s" is not configured with a driver',
                 $requestedName
             ));
         }
         $adapterServices = $container->get('config')[AdapterManager::class];
 
         $configuredDriver = $adapterConfig[$requestedName]['driver'];
-        $aliasTo        ??= $adapterServices['aliases'][$configuredDriver] ?? $configuredDriver;
-        $driverFactory    = $adapterServices['factories'][$aliasTo];
+        $aliasTo ??= $adapterServices['aliases'][$configuredDriver] ?? $configuredDriver;
+        $driverFactory = $adapterServices['factories'][$aliasTo];
         return new $driverFactory();
     }
 }
diff --git a/src/Container/MysqliConnectionFactory.php b/src/Container/MysqliConnectionFactory.php
@@ -27,4 +27,12 @@ public function __invoke(
 
         return new Connection($connectionConfig);
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName
+    ): ConnectionInterface&Connection {
+        $adapterConfig = $container->get('config')['db']['adapters'][$requestedName] ?? [];
+        return new Connection($adapterConfig['connection'] ?? []);
+    }
 }
diff --git a/src/Container/MysqliDriverFactory.php b/src/Container/MysqliDriverFactory.php
@@ -5,6 +5,7 @@
 namespace PhpDb\Adapter\Mysql\Container;
 
 use PhpDb\Adapter\Driver;
+use PhpDb\Adapter\Mysql\Container\ConnectionInterfaceFactoryFactory as ConnectionFactoryFactory;
 use PhpDb\Adapter\Mysql\Driver\Mysqli;
 use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
@@ -41,4 +42,27 @@ public function __invoke(ContainerInterface $container): Driver\DriverInterface&
             $options
         );
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName,
+    ): Driver\DriverInterface&Mysqli\Mysqli {
+
+        /** @var AdapterManager $adapterManager */
+        $adapterManager    = $container->get(AdapterManager::class);
+        $connectionFactory = ($adapterManager->get(ConnectionInterfaceFactoryFactory::class))($container, $requestedName);
+        /** @var array $config */
+        $config = $container->get('config');
+        /** @var array $dbConfig */
+        $dbConfig = $config['db'] ?? [];
+        /** @var array $adapterConfig */
+        $adapterConfig = $dbConfig['adapters'][$requestedName] ?? [];
+
+        return new Mysqli\Mysqli(
+            $connectionFactory::createFromConfig($container, $requestedName),
+            $adapterManager->get(Mysqli\Statement::class),
+            $adapterManager->get(Mysqli\Result::class),
+            $adapterConfig['options'] ?? []
+        );
+    }
 }
diff --git a/src/Container/PdoConnectionFactory.php b/src/Container/PdoConnectionFactory.php
@@ -23,4 +23,12 @@ public function __invoke(ContainerInterface $container): ConnectionInterface&Con
 
         return new Connection($connectionConfig);
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName
+    ): ConnectionInterface&Connection {
+        $adapterConfig = $container->get('config')['db']['adapters'][$requestedName] ?? [];
+        return new Connection($adapterConfig['connection'] ?? []);
+    }
 }
diff --git a/src/Container/PdoDriverFactory.php b/src/Container/PdoDriverFactory.php
@@ -37,4 +37,38 @@ public function __invoke(ContainerInterface $container): PdoDriverInterface&PdoD
             $resultInstance
         );
     }
+
+    public static function createFromConfig(
+        ContainerInterface $container,
+        string $requestedName,
+    ): PdoDriverInterface&PdoDriver {
+
+        /** @var AdapterManager $adapterManager */
+        $adapterManager    = $container->get(AdapterManager::class);
+        $connectionFactory = ($adapterManager->get(ConnectionInterfaceFactoryFactory::class ))($container, $requestedName);
+        /** @var array $config */
+        $config = $container->get('config');
+        /** @var array $dbConfig */
+        $dbConfig = $config['db'] ?? [];
+        /** @var array $adapterConfig */
+        $adapterConfig = $dbConfig['adapters'][$requestedName] ?? [];
+        /** @var array $options */
+        $options = $adapterConfig['options'] ?? [];
+
+        /** @var ConnectionInterface&Connection $connectionInstance */
+        $connectionInstance = $connectionFactory::createFromConfig($container, $requestedName);
+
+        /** @var StatementInterface&Statement $statementInstance */
+        $statementInstance = $adapterManager->get(Statement::class);
+
+        /** @var ResultInterface&Result $resultInstance */
+        $resultInstance = $adapterManager->get(Result::class);
+
+        return new PdoDriver(
+            $connectionInstance,
+            $statementInstance,
+            $resultInstance,
+            $options
+        );
+    }
 }
diff --git a/src/Container/PlatformInterfaceFactory.php b/src/Container/PlatformInterfaceFactory.php
@@ -33,4 +33,9 @@ public function __invoke(ContainerInterface $container): PlatformInterface&Mysql
 
         return new Mysql($driverInstance);
     }
+
+    public static function fromDriver(DriverInterface $driverInstance): PlatformInterface&Mysql
+    {
+        return new Mysql($driverInstance);
+    }
 }
diff --git a/src/Driver/Mysqli/Connection.php b/src/Driver/Mysqli/Connection.php
@@ -1,4 +1,4 @@
-final <?php
+<?php
 
 declare(strict_types=1);
 
@@ -56,13 +56,9 @@ public function setDriver(DriverInterface $driver): DriverAwareInterface
         return $this;
     }
 
-    /**
-     * @inheritDoc
-     *
-     * @return float|int|null|string
-     */
+    /** @inheritDoc */
     #[Override]
-    public function getCurrentSchema(): float|int|string|null|bool
+    public function getCurrentSchema(): string|bool
     {
         if (! $this->isConnected()) {
             $this->connect();
@@ -94,6 +90,7 @@ public function connect(): ConnectionInterface
             return $this;
         }
 
+        /** @var array $p */
         $p = $this->connectionParameters;
 
         // given a list of key names, test for existence in $p
@@ -108,10 +105,12 @@ public function connect(): ConnectionInterface
             return null;
         };
 
+        /** @var string|null $hostname */
         $hostname = $findParameterValue(['hostname', 'host']);
         $username = $findParameterValue(['username', 'user']);
         $password = $findParameterValue(['password', 'passwd', 'pw']);
         $database = $findParameterValue(['database', 'dbname', 'db', 'schema']);
+        /** @var int|null $port */
         $port = isset($p['port']) ? (int) $p['port'] : null;
         /** @var string|null $socket */
         $socket = $p['socket'] ?? null;
diff --git a/src/Driver/Mysqli/Mysqli.php b/src/Driver/Mysqli/Mysqli.php
@@ -1,4 +1,4 @@
-final <?php
+<?php
 
 declare(strict_types=1);
 
@@ -39,6 +39,7 @@ public function __construct(
     ) {
         $this->checkEnvironment();
 
+        $options = array_intersect_key(array_merge($this->options, $options), $this->options);
 
         if ($this->connection instanceof DriverAwareInterface) {
             $this->connection->setDriver($this);
@@ -60,6 +61,24 @@ public function setProfiler(ProfilerInterface $profiler): ProfilerAwareInterface
         return $this;
     }
 
+    public function getProfiler(): ?ProfilerInterface
+    {
+        return $this->profiler;
+    }
+
+    /**
+     * Get statement prototype
+     */
+    public function getStatementPrototype(): StatementInterface&Statement
+    {
+        return $this->statementPrototype;
+    }
+
+    public function getResultPrototype(): ResultInterface&Result
+    {
+        return $this->resultPrototype;
+    }
+
     public function checkEnvironment(): bool
     {
         if (! extension_loaded('mysqli')) {
@@ -137,10 +156,8 @@ public function formatParameterName(string $name, ?string $type = null): string
 
     /**
      * Get last generated value
-     *
-     * @return bool|int|null|string
      */
-    public function getLastGeneratedValue(): bool|int|string|null|string|null|false
+    public function getLastGeneratedValue(): int|string|null|false
     {
         return $this->getConnection()->getLastGeneratedValue();
     }
diff --git a/src/Driver/Mysqli/Result.php b/src/Driver/Mysqli/Result.php
@@ -1,4 +1,4 @@
-final <?php
+<?php
 
 declare(strict_types=1);
 
@@ -126,13 +126,9 @@ public function isQueryResult(): bool
 
     /**
      * {@inheritDoc}
-     *
-     * @return int|numeric-string
-     *
-     * @psalm-return int<-1, max>|numeric-string
      */
     #[Override]
-    public function getAffectedRows(): int|string
+    public function getAffectedRows(): int
     {
         if ($this->resource instanceof mysqli || $this->resource instanceof mysqli_stmt) {
             return $this->resource->affected_rows;
@@ -183,6 +179,7 @@ protected function loadDataFromMysqliStatement(): bool
                 $this->statementBindValues['keys'][] = $col->name;
             }
             $this->statementBindValues['values'] = array_fill(0, count($this->statementBindValues['keys']), null);
+            $refs                                = [];
             foreach ($this->statementBindValues['values'] as $i => &$f) {
                 $refs[$i] = &$f;
             }
diff --git a/src/Driver/Mysqli/Statement.php b/src/Driver/Mysqli/Statement.php
@@ -1,4 +1,4 @@
-final <?php
+<?php
 
 declare(strict_types=1);
 
@@ -54,6 +54,11 @@ public function setProfiler(ProfilerInterface $profiler): ProfilerAwareInterface
         return $this;
     }
 
+    public function getProfiler(): ?ProfilerInterface
+    {
+        return $this->profiler;
+    }
+
     public function initialize(\mysqli $mysqli): static
     {
         $this->mysqli = $mysqli;
diff --git a/src/Driver/Pdo/Pdo.php b/src/Driver/Pdo/Pdo.php
@@ -1,4 +1,4 @@
-final <?php
+<?php
 
 declare(strict_types=1);
 
@@ -24,8 +24,10 @@ public function createResult($resource): ResultInterface
         /** @var Result $result */
         $result = clone $this->resultPrototype;
 
+        /** @var null $rowCount */
         $rowCount = null;
 
+        /** @var string|int|bool|null $lastGeneratedValue */
         $lastGeneratedValue = $this->getLastGeneratedValue();
 
         $result->initialize($resource, $lastGeneratedValue, $rowCount);
diff --git a/src/Metadata/Source/MysqlMetadata.php b/src/Metadata/Source/MysqlMetadata.php
diff --git a/src/Platform/Mysql.php b/src/Platform/Mysql.php
diff --git a/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php b/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php
diff --git a/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php b/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
diff --git a/src/Sql/Platform/Mysql/Mysql.php b/src/Sql/Platform/Mysql/Mysql.php
diff --git a/src/Sql/Platform/Mysql/SelectDecorator.php b/src/Sql/Platform/Mysql/SelectDecorator.php
diff --git a/test/integration/Driver/Pdo/AbstractAdapterTestCase.php b/test/integration/Driver/Pdo/AbstractAdapterTestCase.php

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public function __invoke(ContainerInterface $container): AdapterInterface`
`55`	`55`	`));`
`56`	`56`	`}`
`57`	`57`
	`58`	`+ /** @var PlatformInterface $platformInstance */`
`58`	`59`	`$platformInstance = $adapterManager->get(PlatformInterface::class);`
`59`	`60`
`60`	`61`	`if (! $adapterManager->has(ResultSetInterface::class)) {`
`@@ -64,8 +65,10 @@ public function __invoke(ContainerInterface $container): AdapterInterface`
`64`	`65`	`));`
`65`	`66`	`}`
`66`	`67`
	`68`	`+ /** @var ResultSetInterface $resultSetInstance */`
`67`	`69`	`$resultSetInstance = $adapterManager->get(ResultSetInterface::class);`
`68`	`70`
	`71`	`+ /** @var ProfilerInterface\|null $profilerInstanceOrNull */`
`69`	`72`	`$profilerInstanceOrNull = $adapterManager->has(ProfilerInterface::class)`
`70`	`73`	`? $adapterManager->get(ProfilerInterface::class)`
`71`	`74`	`: null;`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,12 @@ public function __invoke(`
`27`	`27`
`28`	`28`	`return new Connection($connectionConfig);`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ public static function createFromConfig(`
	`32`	`+ ContainerInterface $container,`
	`33`	`+ string $requestedName`
	`34`	`+ ): ConnectionInterface&Connection {`
	`35`	`+ $adapterConfig = $container->get('config')['db']['adapters'][$requestedName] ?? [];`
	`36`	`+ return new Connection($adapterConfig['connection'] ?? []);`
	`37`	`+ }`
`30`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,12 @@ public function __invoke(ContainerInterface $container): ConnectionInterface&Con`
`23`	`23`
`24`	`24`	`return new Connection($connectionConfig);`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+ public static function createFromConfig(`
	`28`	`+ ContainerInterface $container,`
	`29`	`+ string $requestedName`
	`30`	`+ ): ConnectionInterface&Connection {`
	`31`	`+ $adapterConfig = $container->get('config')['db']['adapters'][$requestedName] ?? [];`
	`32`	`+ return new Connection($adapterConfig['connection'] ?? []);`
	`33`	`+ }`
`26`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,9 @@ public function __invoke(ContainerInterface $container): PlatformInterface&Mysql`
`33`	`33`
`34`	`34`	`return new Mysql($driverInstance);`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public static function fromDriver(DriverInterface $driverInstance): PlatformInterface&Mysql`
	`38`	`+ {`
	`39`	`+ return new Mysql($driverInstance);`
	`40`	`+ }`
`36`	`41`	`}`