Code alignment

tyrsson · tyrsson · commit ebbb32be0e33 · 2026-02-25T11:49:38.000-06:00
Signed-off-by: Joey Smith &lt;jsmith@webinertia.net&gt;
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     },
     "extra": {
         "laminas": {
-            "config-provider": "PhpDb\\Adapter\\Pgsql\\ConfigProvider"
+            "config-provider": "PhpDb\\Pgsql\\ConfigProvider"
         }
     },
     "require": {
@@ -48,14 +48,14 @@
     },
     "autoload": {
         "psr-4": {
-            "PhpDb\\Adapter\\Pgsql\\": "src/"
+            "PhpDb\\Pgsql\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "PhpDbTest\\Adapter\\Pgsql\\": "test/unit/",
+            "PhpDbTest\\Pgsql\\": "test/unit/",
             "PhpDbTestAsset\\Pgsql\\": "test/asset/",
-            "PhpDbIntegrationTest\\Adapter\\Pgsql\\": "test/integration/"
+            "PhpDbIntegrationTest\\Pgsql\\": "test/integration/"
         }
     },
     "scripts": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,6 +13,10 @@
          failOnNotice="true"
          failOnDeprecation="true"
          failOnWarning="true">
+
+    <extensions>
+        <bootstrap class="PhpDbIntegrationTest\Pgsql\Extension\ListenerExtension" />
+    </extensions>
     <testsuites>
         <testsuite name="unit test">
             <directory>./test/unit</directory>
@@ -29,10 +33,10 @@
         </include>
     </source>
     <php>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL" value="true"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_HOSTNAME" value="postgresql"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_USERNAME" value="postgres"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_PASSWORD" value="postgres"/>
-        <env name="TESTS_PHPDB_ADAPTER_PGSQL_DATABASE" value="phpdb_test"/>
+        <env name="TESTS_PHPDB_PGSQL" value="true"/>
+        <env name="TESTS_PHPDB_PGSQL_HOSTNAME" value="postgresql"/>
+        <env name="TESTS_PHPDB_PGSQL_USERNAME" value="postgres"/>
+        <env name="TESTS_PHPDB_PGSQL_PASSWORD" value="postgres"/>
+        <env name="TESTS_PHPDB_PGSQL_DATABASE" value="phpdb_test"/>
     </php>
-</phpunit>
+</phpunit>
diff --git a/src/AdapterPlatform.php b/src/AdapterPlatform.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql;
+namespace PhpDb\Pgsql;
 
 use Override;
 use PDO;
diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql;
+namespace PhpDb\Pgsql;
 
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\Pdo\Statement as PdoStatement;
 use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
-use PhpDb\Adapter\Pgsql\Pdo\Connection as PdoConnection;
-use PhpDb\Adapter\Pgsql\Pdo\Driver as PdoDriver;
+use PhpDb\Pgsql\Pdo\Connection as PdoConnection;
+use PhpDb\Pgsql\Pdo\Driver as PdoDriver;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\ConfigProvider as PhpDbConfigProvider;
 use PhpDb\Metadata\MetadataInterface;
diff --git a/src/Connection.php b/src/Connection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql;
+namespace PhpDb\Pgsql;
 
 use Override;
 use PgSql\Connection as PgSqlConnection;
diff --git a/src/Container/ConnectionInterfaceFactory.php b/src/Container/ConnectionInterfaceFactory.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
 use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
-use PhpDb\Adapter\Pgsql\Connection;
+use PhpDb\Pgsql\Connection;
 use PhpDb\Adapter\Pgsql\Exception\ContainerException;
 use Psr\Container\ContainerInterface;
 
diff --git a/src/Container/DriverInterfaceFactory.php b/src/Container/DriverInterfaceFactory.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
 use Laminas\ServiceManager\ServiceManager;
 use PhpDb\Adapter\Driver\DriverInterface;
-use PhpDb\Adapter\Pgsql;
+use PhpDb\Pgsql;
 use PhpDb\Exception\ContainerException;
 use Psr\Container\ContainerInterface;
 
diff --git a/src/Container/MetadataInterfaceFactory.php b/src/Container/MetadataInterfaceFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
 final class MetadataInterfaceFactory
 {
diff --git a/src/Container/PdoConnectionInterfaceFactory.php b/src/Container/PdoConnectionInterfaceFactory.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
-use PhpDb\Adapter\Pgsql\Exception\ContainerException;
-use PhpDb\Adapter\Pgsql\Pdo;
+use PhpDb\Exception\ContainerException;
+use PhpDb\Pgsql\Pdo;
 use Psr\Container\ContainerInterface;
 
 use function is_array;
@@ -29,8 +29,9 @@ public function __invoke(
     ): PdoConnectionInterface&Pdo\Connection {
         if (! $container->has('config')) {
             // todo: Once latest PR is merged for 0.5.0 update to use PhpDB\Exception\ContainerException
-            throw ContainerException::forServiceFailure(
+            throw ContainerException::forService(
                 Pdo\Connection::class,
+                self::class,
                 'Container is missing a config service'
             );
         }
diff --git a/src/Container/PdoDriverInterfaceFactory.php b/src/Container/PdoDriverInterfaceFactory.php
@@ -2,15 +2,15 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
 use Laminas\ServiceManager\ServiceManager;
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\Pdo\Result;
 use PhpDb\Adapter\Driver\Pdo\Statement;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
-use PhpDb\Adapter\Pgsql\Exception\ContainerException;
-use PhpDb\Adapter\Pgsql\Pdo;
+use PhpDb\Exception\ContainerException;
+use PhpDb\Pgsql\Pdo;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -25,8 +25,9 @@ public function __invoke(
     ): PdoDriverInterface&Pdo\Driver {
         if (! $container->has('config')) {
             // todo: Once latest PR is merged for 0.5.0 update to use PhpDB\Exception\ContainerException
-            throw ContainerException::forServiceFailure(
+            throw ContainerException::forService(
                 Pdo\Driver::class,
+                self::class,
                 'Container is missing a config service'
             );
         }
diff --git a/src/Container/PdoStatementFactory.php b/src/Container/PdoStatementFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
 use PhpDb\Adapter\Driver\Pdo\Statement as PdoStatement;
 use PhpDb\Adapter\Driver\StatementInterface;
diff --git a/src/Container/PlatformInterfaceFactory.php b/src/Container/PlatformInterfaceFactory.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
-use PhpDb\Adapter\Pgsql;
+use PhpDb\Pgsql;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Exception\ContainerException;
 use Psr\Container\ContainerInterface;
diff --git a/src/Container/StatementInterfaceFactory.php b/src/Container/StatementInterfaceFactory.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Container;
+namespace PhpDb\Pgsql\Container;
 
 use PhpDb\Adapter\Driver\StatementInterface;
-use PhpDb\Adapter\Pgsql;
+use PhpDb\Pgsql;
 use Psr\Container\ContainerInterface;
 
 final class StatementInterfaceFactory
diff --git a/src/DatabasePlatformNameTrait.php b/src/DatabasePlatformNameTrait.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql;
+namespace PhpDb\Pgsql;
 
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Exception\InvalidArgumentException;
diff --git a/src/Driver.php b/src/Driver.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql;
+namespace PhpDb\Pgsql;
 
 use Override;
 use PgSql\Result as PgSqlResult;
diff --git a/src/Metadata/Source.php b/src/Metadata/Source.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Metadata;
+namespace PhpDb\Pgsql\Metadata;
 
 use DateTime;
 use Override;
diff --git a/src/Pdo/Connection.php b/src/Pdo/Connection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Pdo;
+namespace PhpDb\Pgsql\Pdo;
 
 use Override;
 use PDO;
diff --git a/src/Pdo/Driver.php b/src/Pdo/Driver.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql\Pdo;
+namespace PhpDb\Pgsql\Pdo;
 
 use Override;
 use PDOStatement;
 use PhpDb\Adapter\Driver\Pdo\AbstractPdo;
 use PhpDb\Adapter\Driver\Pdo\Result;
 use PhpDb\Adapter\Driver\ResultInterface;
-use PhpDb\Adapter\Pgsql\DatabasePlatformNameTrait;
+use PhpDb\Pgsql\DatabasePlatformNameTrait;
 
 class Driver extends AbstractPdo
 {
diff --git a/src/Result.php b/src/Result.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql;
+namespace PhpDb\Pgsql;
 
 use Override;
 use PgSql\Result as PgSqlResult;
diff --git a/src/Statement.php b/src/Statement.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDb\Adapter\Pgsql;
+namespace PhpDb\Pgsql;
 
 use Override;
 use PgSql\Connection as PgSqlConnection;
diff --git a/test/asset/SetupTrait.php b/test/asset/SetupTrait.php
@@ -11,7 +11,7 @@
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\PdoConnectionInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
-use PhpDb\Adapter\Pgsql;
+use PhpDb\Pgsql;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\ConfigProvider as PhpDbConfigProvider;
 use Psr\Container\ContainerInterface;
diff --git a/test/integration/AdapterPlatformTest.php b/test/integration/AdapterPlatformTest.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace PhpDbIntegrationTest\Adapter\Pgsql;
+namespace PhpDbIntegrationTest\Pgsql;
 
 use PhpDb\Adapter\Exception\VunerablePlatformQuoteException;
-use PhpDb\Adapter\Pgsql\AdapterPlatform;
+use PhpDb\Pgsql\AdapterPlatform;
 use PhpDbTestAsset\Pgsql\SetupTrait;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\CoversMethod;
diff --git a/test/integration/AdapterTest.php b/test/integration/AdapterTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDbIntegrationTest\Adapter\Pgsql;
+namespace PhpDbIntegrationTest\Pgsql;
 
 use PhpDb\Adapter\Adapter;
 use PhpDb\Adapter\AdapterInterface;
diff --git a/test/integration/Extension/IntegrationTestStartedListener.php b/test/integration/Extension/IntegrationTestStartedListener.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace PhpDbIntegrationTest\Adapter\Pgsql\Extension;
+namespace PhpDbIntegrationTest\Pgsql\Extension;
 
 use Exception;
-use PhpDbIntegrationTest\Adapter\Pgsql\FixtureLoader\FixtureLoaderInterface;
-use PhpDbIntegrationTest\Adapter\Pgsql\FixtureLoader\PgsqlFixtureLoader;
+use PhpDbIntegrationTest\Pgsql\FixtureLoader\FixtureLoaderInterface;
+use PhpDbIntegrationTest\Pgsql\FixtureLoader\PgsqlFixtureLoader;
 use PHPUnit\Event\TestSuite\Started;
 use PHPUnit\Event\TestSuite\StartedSubscriber;
 
@@ -27,7 +27,7 @@ public function notify(Started $event): void
             return;
         }
 
-        if ((bool) getenv('TESTS_PHPDB_ADAPTER_PGSQL')) {
+        if ((bool) getenv('TESTS_PHPDB_PGSQL')) {
             $this->fixtureLoaders[] = new PgsqlFixtureLoader();
         }
 
diff --git a/test/integration/Extension/IntegrationTestStoppedListener.php b/test/integration/Extension/IntegrationTestStoppedListener.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace PhpDbIntegrationTest\Adapter\Pgsql\Extension;
+namespace PhpDbIntegrationTest\Pgsql\Extension;
 
-use PhpDbIntegrationTest\Adapter\Pgsql\FixtureLoader\FixtureLoaderInterface;
+use PhpDbIntegrationTest\Pgsql\FixtureLoader\FixtureLoaderInterface;
 use PHPUnit\Event\TestSuite\Finished;
 use PHPUnit\Event\TestSuite\FinishedSubscriber;
 
diff --git a/test/integration/Extension/ListenerExtension.php b/test/integration/Extension/ListenerExtension.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDbIntegrationTest\Adapter\Pgsql\Extension;
+namespace PhpDbIntegrationTest\Pgsql\Extension;
 
 use PHPUnit\Runner\Extension\Extension;
 use PHPUnit\Runner\Extension\Facade;
diff --git a/test/integration/FixtureLoader/FixtureLoaderInterface.php b/test/integration/FixtureLoader/FixtureLoaderInterface.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PhpDbIntegrationTest\Adapter\Pgsql\FixtureLoader;
+namespace PhpDbIntegrationTest\Pgsql\FixtureLoader;
 
 interface FixtureLoaderInterface
 {
diff --git a/test/integration/FixtureLoader/PgsqlFixtureLoader.php b/test/integration/FixtureLoader/PgsqlFixtureLoader.php
diff --git a/test/integration/Pdo/AdapterTest.php b/test/integration/Pdo/AdapterTest.php
diff --git a/test/integration/Pdo/TableGatewayTest.php b/test/integration/Pdo/TableGatewayTest.php
diff --git a/test/unit/Adapter/ConfigProviderTest.php b/test/unit/Adapter/ConfigProviderTest.php
diff --git a/test/unit/Adapter/SetupTest.php b/test/unit/Adapter/SetupTest.php

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`declare(strict_types=1);`
`4`	`4`
`5`		`-namespace PhpDb\Adapter\Pgsql\Container;`
	`5`	`+namespace PhpDb\Pgsql\Container;`
`6`	`6`
`7`	`7`	`final class MetadataInterfaceFactory`
`8`	`8`	`{`