Update code to match the project style guide

settermjd · settermjd · commit 5ec52d672fea · 2025-10-19T21:11:00.000+10:00
This change is a result of running phpcbf over the code, and performing
 some manual changes to ensure that the code passes the phpcs
 configuration.
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -7,13 +7,13 @@
 use Laminas\ServiceManager\Factory\InvokableFactory;
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
-use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
+use PhpDb\Adapter\Driver\Pdo\Result;
+use PhpDb\Adapter\Driver\Pdo\Statement;
+use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
 use PhpDb\Adapter\Driver\StatementInterface;
-use PhpDb\Adapter\Driver\Pdo\Result;
-use PhpDb\Adapter\Driver\Pdo\Statement;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Profiler\Profiler;
 use PhpDb\Adapter\Profiler\ProfilerInterface;
@@ -34,10 +34,10 @@ public function __invoke(): array
     public function getDependencies(): array
     {
         return [
-            'aliases'   => [
+            'aliases'    => [
                 MetadataInterface::class => Metadata\Source\SqliteMetadata::class,
             ],
-            'factories' => [
+            'factories'  => [
                 Metadata\Source\SqliteMetadata::class => Container\MetadataInterfaceFactory::class,
             ],
             'delegators' => [
diff --git a/src/Container/AdapterFactory.php b/src/Container/AdapterFactory.php
@@ -81,4 +81,3 @@ public function __invoke(ContainerInterface $container): AdapterInterface
         );
     }
 }
-
diff --git a/src/Container/MetadataInterfaceFactory.php b/src/Container/MetadataInterfaceFactory.php
@@ -5,8 +5,8 @@
 namespace PhpDb\Adapter\Sqlite\Container;
 
 use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\Sqlite\Metadata\Source\SqliteMetadata;
 use PhpDb\Adapter\SchemaAwareInterface;
+use PhpDb\Adapter\Sqlite\Metadata\Source\SqliteMetadata;
 use PhpDb\Metadata\MetadataInterface;
 use Psr\Container\ContainerInterface;
 
diff --git a/src/Container/PdoDriverFactory.php b/src/Container/PdoDriverFactory.php
@@ -10,8 +10,8 @@
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
 use PhpDb\Adapter\Driver\StatementInterface;
-use PhpDb\Adapter\Sqlite\Driver\Pdo\Feature\SqliteRowCounter;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Connection;
+use PhpDb\Adapter\Sqlite\Driver\Pdo\Feature\SqliteRowCounter;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Pdo as PdoDriver;
 use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
diff --git a/src/Container/PdoStatementFactory.php b/src/Container/PdoStatementFactory.php
@@ -6,7 +6,6 @@
 
 use PhpDb\Adapter\Driver\Pdo\Statement;
 use PhpDb\Adapter\Driver\StatementInterface;
-use PhpDb\Adapter\ParameterContainer;
 use Psr\Container\ContainerInterface;
 
 final class PdoStatementFactory
diff --git a/src/Container/PlatformInterfaceFactory.php b/src/Container/PlatformInterfaceFactory.php
@@ -6,8 +6,8 @@
 
 use PDO;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
-use PhpDb\Adapter\Sqlite\Platform\Sqlite;
 use PhpDb\Adapter\Platform\PlatformInterface;
+use PhpDb\Adapter\Sqlite\Platform\Sqlite;
 use PhpDb\Container\AdapterManager;
 use Psr\Container\ContainerInterface;
 
diff --git a/src/Driver/Pdo/Connection.php b/src/Driver/Pdo/Connection.php
@@ -5,6 +5,7 @@
 namespace PhpDb\Adapter\Sqlite\Driver\Pdo;
 
 use Override;
+use PDO;
 use PDOException;
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Driver\Pdo\AbstractPdoConnection;
@@ -94,9 +95,9 @@ public function connect(): ConnectionInterface
         $this->dsn = $dsn;
 
         try {
-            $this->resource = new \PDO(dsn: $dsn, options: $options);
-            $this->resource->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-            $this->driverName = strtolower($this->resource->getAttribute(\PDO::ATTR_DRIVER_NAME));
+            $this->resource = new PDO(dsn: $dsn, options: $options);
+            $this->resource->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            $this->driverName = strtolower($this->resource->getAttribute(PDO::ATTR_DRIVER_NAME));
         } catch (PDOException $e) {
             $code = $e->getCode();
             if (! is_int($code)) {
diff --git a/src/Metadata/Source/SqliteMetadata.php b/src/Metadata/Source/SqliteMetadata.php
@@ -171,7 +171,7 @@ protected function loadConstraintData(string $table, string $schema): void
         $id = $name = null;
         foreach ($foreignKeys as $fk) {
             if ($id !== $fk['id']) {
-                $id                 = $fk['id'];
+                $id = $fk['id'];
                 // todo: decide on whether to continue to use _laminas_
                 $name               = '_laminas_' . $table . '_FOREIGN_KEY_' . ($id + 1);
                 $constraints[$name] = [
diff --git a/src/Platform/Sqlite.php b/src/Platform/Sqlite.php
@@ -5,20 +5,19 @@
 namespace PhpDb\Adapter\Sqlite\Platform;
 
 use Override;
+use PDO;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
-use PhpDb\Adapter\Exception;
 use PhpDb\Adapter\Platform\AbstractPlatform;
-use PhpDb\Sql\Platform\PlatformDecoratorInterface;
-use PhpDb\Adapter\Sqlite\Driver\Pdo;
 use PhpDb\Adapter\Sqlite\Sql\Platform\Sqlite as SqlPlatformDecorator;
+use PhpDb\Sql\Platform\PlatformDecoratorInterface;
 
 class Sqlite extends AbstractPlatform
 {
     public final const PLATFORM_NAME = 'SQLite';
     /** @var string[] */
     protected $quoteIdentifier = ['"', '"'];
 
-    /** @var \PDO */
+    /** @var PDO */
     protected $resource;
 
     /**
@@ -27,7 +26,7 @@ class Sqlite extends AbstractPlatform
     protected $quoteIdentifierTo = '\'';
 
     public function __construct(
-        protected readonly PdoDriverInterface|\PDO $driver
+        protected readonly PdoDriverInterface|PDO $driver
     ) {
     }
 
@@ -43,7 +42,7 @@ public function quoteValue(string $value): string
             $resource = $resource->getConnection()->getResource();
         }
 
-        if ($resource instanceof \PDO) {
+        if ($resource instanceof PDO) {
             return $resource->quote($value);
         }
 
@@ -62,7 +61,7 @@ public function quoteTrustedValue(int|float|string|bool $value): ?string
             $resource = $resource->getConnection()->getResource();
         }
 
-        if ($resource instanceof \PDO) {
+        if ($resource instanceof PDO) {
             return $resource->quote($value);
         }
 
diff --git a/src/Sql/Platform/Ddl/AlterTableDecorator.php b/src/Sql/Platform/Ddl/AlterTableDecorator.php
@@ -4,6 +4,7 @@
 
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Sql\Ddl\AlterTable;
+use PhpDb\Sql\Ddl\Column\ColumnInterface;
 use PhpDb\Sql\Platform\PlatformDecoratorInterface;
 
 use function count;
@@ -147,7 +148,7 @@ protected function processChangeColumns(?PlatformInterface $adapterPlatform = nu
     {
         $sqls = [];
 
-        /** @var \PhpDb\Sql\Ddl\Column\ColumnInterface $column */
+        /** @var ColumnInterface $column */
         foreach ($this->changeColumns as $name => $column) {
             $sql           = $this->processExpression($column, $adapterPlatform);
             $insertStart   = $this->getSqlInsertOffsets($sql);
@@ -217,6 +218,7 @@ private function normalizeColumnOption(string $name): string
 
     /**
      * phpcs:ignore SlevomatCodingStandard.Classes.UnusedPrivateElements.UnusedMethod
+     *
      * @psalm-suppress UnusedReturnValue
      */
     private function compareColumnOptions(string $columnA, string $columnB): int
diff --git a/src/Sql/Platform/Ddl/CreateTableDecorator.php b/src/Sql/Platform/Ddl/CreateTableDecorator.php
@@ -18,9 +18,7 @@
 
 final class CreateTableDecorator extends CreateTable implements PlatformDecoratorInterface
 {
-    /**
-     * @psalm-suppress PossiblyUnusedProperty
-     */
+    /** @psalm-suppress PossiblyUnusedProperty */
     protected CreateTable $subject;
 
     /** @var int[] */
@@ -158,6 +156,7 @@ private function normalizeColumnOption(string $name): string
 
     /**
      * phpcs:ignore SlevomatCodingStandard.Classes.UnusedPrivateElements.UnusedMethod
+     *
      * @psalm-suppress UnusedReturnValue
      */
     private function compareColumnOptions(string $columnA, string $columnB): int
diff --git a/test/integration/Container/TestAsset/SetupTrait.php b/test/integration/Container/TestAsset/SetupTrait.php
@@ -4,17 +4,17 @@
 
 namespace PhpDbIntegrationTest\Adapter\Sqlite\Container\TestAsset;
 
-use Override;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\Stdlib\ArrayUtils;
+use Override;
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Sqlite\ConfigProvider;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Pdo;
 use PhpDb\Container\AdapterManager;
 use PhpDb\Container\ConfigProvider as LaminasDbConfigProvider;
-use Psr\Container\ContainerInterface;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
+use Psr\Container\ContainerInterface;
 
 /**
  * This trait provides a setup method for integration tests that require
diff --git a/test/integration/Driver/Pdo/ConnectionIntegrationTest.php b/test/integration/Driver/Pdo/ConnectionIntegrationTest.php
@@ -36,17 +36,6 @@ public function testGetCurrentSchema(): void
         self::assertIsString($connection->getCurrentSchema());
     }
 
-    // public function testSetResource(): void
-    // {
-    //     $resource   = $this->getAdapter()->getDriver()->getConnection()->getResource();
-    //     $connection = new Connection([]);
-    //     self::assertSame($connection, $connection->setResource($resource));
-
-    //     $connection->disconnect();
-    //     unset($connection);
-    //     unset($resource);
-    // }
-
     public function testGetResource(): void
     {
         $connection = $this->getAdapter()->getDriver()->getConnection();
@@ -129,7 +118,7 @@ public function testGetLastGeneratedValue(): never
     public function testConnectReturnsConnectionWhenResourceSet(): void
     {
         /** @var PDO $resource */
-        $resource   = $this->getAdapter()->getDriver()->getConnection()->getResource();
+        $resource = $this->getAdapter()->getDriver()->getConnection()->getResource();
         /** @var PdoConnectionInterface&Connection $connection */
         $connection = $this->getAdapter()->getDriver()->getConnection();
         self::assertInstanceOf(PdoConnectionInterface::class, $connection);
diff --git a/test/integration/Driver/Pdo/StatementTest.php b/test/integration/Driver/Pdo/StatementTest.php
@@ -6,9 +6,9 @@
 
 use PDO;
 use PDOStatement;
-use PhpDb\Adapter\Driver\StatementInterface;
-use PhpDb\Adapter\Driver\Pdo\Statement;
 use PhpDb\Adapter\Driver\Pdo\Result;
+use PhpDb\Adapter\Driver\Pdo\Statement;
+use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDbIntegrationTest\Adapter\Sqlite\Container\TestAsset\SetupTrait;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\TestCase;
@@ -29,7 +29,7 @@ final class StatementTest extends TestCase
     public function testGetResource(): void
     {
         /** @var PDO $pdo */
-        $pdo  = $this->getAdapter()->getDriver()->getConnection()->getResource();
+        $pdo = $this->getAdapter()->getDriver()->getConnection()->getResource();
         /** @var StatementInterface&Statement $statement */
         $statement = $this->getAdapter()->getDriver()->createStatement();
         /** @var PDOStatement $stmt */
diff --git a/test/unit/AdapterServiceFactoryTest.php b/test/unit/AdapterServiceFactoryTest.php
@@ -2,20 +2,22 @@
 
 namespace PhpDbTest\Adapter\Sqlite;
 
+use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceManager;
+use Override;
 use PhpDb\Adapter\Profiler\Profiler;
 use PhpDb\Adapter\Profiler\ProfilerInterface;
 use PhpDb\Adapter\Sqlite\Adapter;
 use PhpDb\Adapter\Sqlite\AdapterServiceFactory;
 use PhpDb\Adapter\Sqlite\ConfigProvider;
-use Laminas\ServiceManager\ServiceLocatorInterface;
-use Laminas\ServiceManager\ServiceManager;
-use Override;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
+use function array_key_exists;
 use function extension_loaded;
+use function is_array;
 
 #[CoversMethod(AdapterServiceFactory::class, '__invoke')]
 final class AdapterServiceFactoryTest extends TestCase
@@ -24,7 +26,7 @@ final class AdapterServiceFactoryTest extends TestCase
 
     protected function createServiceManager(array $dbConfig): ServiceLocatorInterface
     {
-        $config                       = (new ConfigProvider())->getDependencies();
+        $config = (new ConfigProvider())->getDependencies();
         if (array_key_exists('services', $config) && is_array($config['services'])) {
             $config['services']['config'] = $dbConfig;
         }
diff --git a/test/unit/AdapterTest.php b/test/unit/AdapterTest.php
@@ -3,21 +3,21 @@
 namespace PhpDbTest\Adapter\Sqlite;
 
 use InvalidArgumentException;
+use Override;
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
 use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDb\Adapter\ParameterContainer;
 use PhpDb\Adapter\Profiler;
-use PhpDb\ResultSet\ResultSet;
-use PhpDb\ResultSet\ResultSetInterface;
 use PhpDb\Adapter\Sqlite\Adapter;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Pdo;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Statement;
 use PhpDb\Adapter\Sqlite\Platform\Sqlite as SqlitePlatform;
+use PhpDb\ResultSet\ResultSet;
+use PhpDb\ResultSet\ResultSetInterface;
 use PhpDbTest\Adapter\Sqlite\TestAsset\TemporaryResultSet;
-use Override;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\Attributes\TestDox;
diff --git a/test/unit/ConfigProviderTest.php b/test/unit/ConfigProviderTest.php
@@ -4,15 +4,16 @@
 
 namespace PhpDbTest\Adapter\Sqlite;
 
+use Laminas\ServiceManager\Factory\InvokableFactory;
 use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
+use PhpDb\Adapter\Driver\DriverInterface;
+use PhpDb\Adapter\Driver\Pdo\Result;
+use PhpDb\Adapter\Driver\Pdo\Statement;
 use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
 use PhpDb\Adapter\Driver\StatementInterface;
-use PhpDb\Adapter\Driver\Pdo\Result;
-use PhpDb\Adapter\Driver\Pdo\Statement;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Profiler\Profiler;
 use PhpDb\Adapter\Profiler\ProfilerInterface;
@@ -24,7 +25,6 @@
 use PhpDb\Container\AdapterManager;
 use PhpDb\Metadata\MetadataInterface;
 use PhpDb\ResultSet;
-use Laminas\ServiceManager\Factory\InvokableFactory;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Depends;
 use PHPUnit\Framework\TestCase;
@@ -36,10 +36,10 @@ final class ConfigProviderTest extends TestCase
 {
     /** @var array<string, array<array-key, string>> */
     private array $config = [
-        'aliases'   => [
+        'aliases'    => [
             MetadataInterface::class => Metadata\Source\SqliteMetadata::class,
         ],
-        'factories' => [
+        'factories'  => [
             Metadata\Source\SqliteMetadata::class => Container\MetadataInterfaceFactory::class,
         ],
         'delegators' => [
@@ -76,7 +76,7 @@ final class ConfigProviderTest extends TestCase
             Statement::class             => Container\PdoStatementFactory::class,
             Platform\Sqlite::class       => Container\PlatformInterfaceFactory::class,
             //Profiler::class              => InvokableFactory::class,
-            ResultSet\ResultSet::class   => InvokableFactory::class,
+            ResultSet\ResultSet::class => InvokableFactory::class,
         ],
     ];
 
diff --git a/test/unit/Driver/Pdo/ConnectionTest.php b/test/unit/Driver/Pdo/ConnectionTest.php
@@ -5,9 +5,9 @@
 namespace PhpDbTest\Adapter\Sqlite\Sqlite\Driver\Pdo;
 
 use Exception;
+use Override;
 use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Connection;
-use Override;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
diff --git a/test/unit/Driver/Pdo/ConnectionTransactionsTest.php b/test/unit/Driver/Pdo/ConnectionTransactionsTest.php
@@ -4,11 +4,11 @@
 
 namespace PhpDbTest\Adapter\Sqlite\Driver\Pdo;
 
+use Override;
 use PhpDb\Adapter\Driver\AbstractConnection;
 use PhpDb\Adapter\Exception\RuntimeException;
 use PhpDb\Adapter\Sqlite\Driver\Pdo\Connection;
 use PhpDbTest\Adapter\Sqlite\TestAsset\ConnectionWrapper;
-use Override;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversMethod;
 use PHPUnit\Framework\TestCase;
diff --git a/test/unit/Driver/Pdo/PdoTest.php b/test/unit/Driver/Pdo/PdoTest.php
diff --git a/test/unit/Driver/Pdo/ResultTest.php b/test/unit/Driver/Pdo/ResultTest.php
diff --git a/test/unit/Driver/Pdo/StatementTest.php b/test/unit/Driver/Pdo/StatementTest.php
diff --git a/test/unit/Platform/SqliteTest.php b/test/unit/Platform/SqliteTest.php
diff --git a/test/unit/Sql/Platform/SelectDecoratorTest.php b/test/unit/Sql/Platform/SelectDecoratorTest.php
diff --git a/test/unit/Sql/Platform/SqliteTest.php b/test/unit/Sql/Platform/SqliteTest.php

Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,3 @@ public function __invoke(ContainerInterface $container): AdapterInterface`
`81`	`81`	`);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`		`-`