Merge pull request #4 from tyrsson:simplify-adapterinterface-factory

Latest Revisions

Author: tyrsson

composer.json

@@ -71,7 +71,7 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "test-integration": "phpunit --colors=always --testsuite \"integration test\"",
         "sa": "vendor/bin/phpstan analyse --memory-limit=256M",
-        "sa-generate-baseline": "vendor/bin/phpstan analyse --memory-limit=256M --generate-baseline",
+        "sa-gen-baseline": "vendor/bin/phpstan analyse --memory-limit=256M --generate-baseline",
         "sa-verbose": "vendor/bin/phpstan analyse --memory-limit=256M -vv",
         "upload-coverage": "coveralls -v"
     }

composer.lock

@@ -1,2 +1,19 @@
 parameters:
-    ignoreErrors:
+	ignoreErrors:
+		-
+			message: '#^Parameter \#2 \$array of function implode expects array\<string\>, array\<int, array\<int\|string, string\>\> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Metadata/Source.php
+
+		-
+			message: '#^Parameter \#2 \$array of function implode expects array\<string\>, array\<int, array\<string, string\>\|string\> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Metadata/Source.php
+
+		-
+			message: '#^Parameter \#2 \$array of function implode expects array\<string\>, array\<int, list\<string\>\> given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Metadata/Source.php

phpstan-baseline.neon

@@ -27,12 +27,6 @@ class AdapterPlatform extends AbstractPlatform
      */
     protected string $quoteIdentifierTo = '""';
 
-    /** @var string[] */
-    private array $knownPgsqlResources = [
-        'pgsql link',
-        'pgsql link persistent',
-    ];
-
     public function __construct(
         private readonly DriverInterface|PdoDriverInterface|PDO $driver,
     ) {
@@ -89,6 +83,7 @@ public function quoteTrustedValue($value): string
      */
     protected function quoteViaDriver($value): ?string
     {
+        /** @var PgSqlConnection|string $resource */
         $resource = $this->driver instanceof DriverInterface
             ? $this->driver->getConnection()->getResource()
             : $this->driver;

src/AdapterPlatform.php

@@ -4,30 +4,29 @@
 
 namespace PhpDb\Adapter\Pgsql;
 
-use Laminas\ServiceManager\Factory\InvokableFactory;
 use PhpDb\Adapter\Adapter;
 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\Driver\Pdo\Statement as PdoStatement;
-use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Adapter\Pgsql\Pdo\Connection as PdoConnection;
 use PhpDb\Adapter\Pgsql\Pdo\Driver as PdoDriver;
-use PhpDb\Adapter\Profiler\Profiler;
-use PhpDb\Adapter\Profiler\ProfilerInterface;
-use PhpDb\Container\AdapterAbstractServiceFactory;
+use PhpDb\Adapter\Platform\PlatformInterface;
+use PhpDb\ConfigProvider as PhpDbConfigProvider;
 use PhpDb\Metadata\MetadataInterface;
-use PhpDb\ResultSet\ResultSetInterface;
 
+/**
+ * @internal
+ */
 final readonly class ConfigProvider
 {
     public function __invoke(): array
     {
         return [
             'dependencies'          => $this->getDependencies(),
-            AdapterInterface::class => $this->getConfig(),
+            //AdapterInterface::class => $this->getConfig(),
         ];
     }
 
@@ -44,7 +43,7 @@ public function getConfig(): array
                 'database' => 'your_database',
             ],
             // Named Adapter configurations
-            'adapters' => [
+            PhpDbConfigProvider::NAMED_ADAPTER_KEY => [
                 AdapterInterface::class => [
                     'driver'     => Driver::class,
                     'connection' => [
@@ -62,11 +61,7 @@ public function getConfig(): array
     public function getDependencies(): array
     {
         return [
-            'abstract_factories' => [
-                Container\AdapterAbstractServiceFactory::class,
-            ],
             'aliases'   => [
-                AdapterInterface::class       => Adapter::class,
                 DriverInterface::class        => Driver::class,
                 'pgsql'                       => Driver::class,
                 'PgSQL'                       => Driver::class,
@@ -88,15 +83,14 @@ public function getDependencies(): array
                 PlatformInterface::class      => AdapterPlatform::class,
             ],
             'factories' => [
-                Adapter::class          => Container\AdapterInterfaceFactory::class,
-                AdapterPlatform::class  => Container\PlatformInterfaceFactory::class,
-                Connection::class       => Container\ConnectionInterfaceFactory::class,
-                Metadata\Source::class  => Container\MetadataInterfaceFactory::class,
-                Statement::class        => Container\StatementInterfaceFactory::class,
-                Driver::class           => Container\DriverInterfaceFactory::class,
-                PdoConnection::class    => Container\PdoConnectionInterfaceFactory::class,
-                PdoDriver::class        => Container\PdoDriverInterfaceFactory::class,
-                PdoStatement::class     => Container\PdoStatemenFactory::class,
+                AdapterPlatform::class => Container\PlatformInterfaceFactory::class,
+                Connection::class      => Container\ConnectionInterfaceFactory::class,
+                Driver::class          => Container\DriverInterfaceFactory::class,
+                Metadata\Source::class => Container\MetadataInterfaceFactory::class,
+                PdoConnection::class   => Container\PdoConnectionInterfaceFactory::class,
+                PdoDriver::class       => Container\PdoDriverInterfaceFactory::class,
+                PdoStatement::class    => Container\PdoStatementFactory::class,
+                Statement::class       => Container\StatementInterfaceFactory::class,
                 // Provide the following if you wish to override the Profiler implementation
                 //ProfilerInterface::class => YourCustomProfilerFactory::class,
                 // Provide the following if you wish to override the ResultSet implementation

src/ConfigProvider.php

@@ -33,7 +33,7 @@
 
 class Connection extends AbstractConnection implements DriverAwareInterface
 {
-    protected Driver $driver;
+    protected DriverInterface|Driver $driver;
 
     /** @var ?PgSqlConnection */
     protected $resource;
@@ -58,6 +58,7 @@ public function setResource(
         return $this;
     }
 
+    /** @phpstan-ignore method.childReturnType */
     #[Override]
     public function getResource(): ?PgSqlConnection
     {
@@ -66,7 +67,7 @@ public function getResource(): ?PgSqlConnection
 
     #[Override]
     public function setDriver(
-        DriverInterface $driver
+        DriverInterface|Driver $driver
     ): ConnectionInterface&DriverAwareInterface {
         $this->driver = $driver;
 
@@ -120,8 +121,8 @@ public function connect(): static
         set_error_handler(function ($number, $string) {
             throw new Exception\RuntimeException(
                 self::class . '::connect: Unable to connect to database',
-                $number ?? 0,
-                new Exception\ErrorException($string, $number ?? 0)
+                $number,
+                new Exception\ErrorException($string, $number)
             );
         });
         try {
@@ -253,6 +254,7 @@ public function execute($sql): ResultInterface
             throw new Exception\InvalidQueryException(pg_last_error($this->resource));
         }
 
+        /** @phpstan-ignore argument.type */
         return $this->driver->createResult($resultResource);
     }