Minor code cleanup and phpstan revisions

Signed-off-by: Simon Mundy <simon.mundy@peptolab.com>

Author: simon-mundy

phpstan-baseline.neon

@@ -222,63 +222,39 @@ parameters:
 			count: 1
 			path: test/integration/AdapterPlatformTest.php
 
-		-
-			message: '#^Callable PhpDb\\Mysql\\Container\\DriverInterfaceFactory invoked with 1 parameter, 2\-3 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: test/integration/Container/DriverInterfaceFactoryTest.php
-
 		-
 			message: '#^Parameter \#1 \$container of callable PhpDb\\Mysql\\Container\\DriverInterfaceFactory expects Laminas\\ServiceManager\\ServiceManager, Psr\\Container\\ContainerInterface given\.$#'
 			identifier: argument.type
-			count: 1
+			count: 2
 			path: test/integration/Container/DriverInterfaceFactoryTest.php
 
-		-
-			message: '#^Callable PhpDb\\Mysql\\Container\\MetadataInterfaceFactory invoked with 1 parameter, 2\-3 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: test/integration/Container/MetadataInterfaceFactoryTest.php
-
-		-
-			message: '#^Callable PhpDb\\Mysql\\Container\\PdoConnectionInterfaceFactory invoked with 1 parameter, 2\-3 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: test/integration/Container/PdoConnectionInterfaceFactoryTest.php
-
-		-
-			message: '#^Callable PhpDb\\Mysql\\Container\\PdoDriverInterfaceFactory invoked with 1 parameter, 2\-3 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: test/integration/Container/PdoDriverInterfaceFactoryTest.php
-
 		-
 			message: '#^Parameter \#1 \$container of callable PhpDb\\Mysql\\Container\\PdoDriverInterfaceFactory expects Laminas\\ServiceManager\\ServiceManager, Psr\\Container\\ContainerInterface given\.$#'
 			identifier: argument.type
 			count: 1
 			path: test/integration/Container/PdoDriverInterfaceFactoryTest.php
 
 		-
-			message: '#^Callable PhpDb\\Mysql\\Container\\PdoStatementFactory invoked with 1 parameter, 2\-3 required\.$#'
-			identifier: arguments.count
+			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertIsInt\(\) with int will always evaluate to true\.$#'
+			identifier: staticMethod.alreadyNarrowedType
 			count: 1
-			path: test/integration/Container/PdoStatementFactoryTest.php
+			path: test/integration/Pdo/ConnectionTest.php
 
 		-
-			message: '#^Callable PhpDb\\Mysql\\Container\\PlatformInterfaceFactory invoked with 1 parameter, 2\-3 required\.$#'
-			identifier: arguments.count
+			message: '#^Unreachable statement \- code above always terminates\.$#'
+			identifier: deadCode.unreachable
 			count: 1
-			path: test/integration/Container/PlatformInterfaceFactoryTest.php
+			path: test/integration/Pdo/QueryTest.php
 
 		-
-			message: '#^Callable PhpDb\\Mysql\\Container\\StatementInterfaceFactory invoked with 1 parameter, 2\-3 required\.$#'
-			identifier: arguments.count
+			message: '#^Unreachable statement \- code above always terminates\.$#'
+			identifier: deadCode.unreachable
 			count: 1
-			path: test/integration/Container/StatementInterfaceFactoryTest.php
+			path: test/integration/Pdo/TableGatewayTest.php
 
 		-
-			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertIsInt\(\) with int will always evaluate to true\.$#'
-			identifier: staticMethod.alreadyNarrowedType
+			message: '#^Unreachable statement \- code above always terminates\.$#'
+			identifier: deadCode.unreachable
 			count: 1
-			path: test/integration/Pdo/ConnectionTest.php
+			path: test/integration/TableGatewayTest.php
 

test/integration/Container/ConnectionInterfaceFactoryTest.php

@@ -38,7 +38,7 @@ public function testInvokeThrowsExceptionWithoutConnectionConfig(): void
     {
         $this->expectException(InvalidConnectionParametersException::class);
 
-        $factory    = new ConnectionInterfaceFactory();
+        $factory = new ConnectionInterfaceFactory();
         $factory(
             $this->container,
             Connection::class

test/integration/Container/DriverInterfaceFactoryTest.php

@@ -6,10 +6,8 @@
 
 use PhpDb\Adapter\AdapterInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
-use PhpDb\Adapter\Exception\InvalidConnectionParametersException;
 use PhpDb\Exception\ContainerException;
 use PhpDb\Mysql\Connection;
-use PhpDb\Mysql\Container\ConnectionInterfaceFactory;
 use PhpDb\Mysql\Container\DriverInterfaceFactory;
 use PhpDb\Mysql\Driver;
 use PHPUnit\Framework\Attributes;
@@ -40,7 +38,7 @@ public function testInvokeThrowsExceptionWithoutConnectionConfig(): void
     {
         $this->expectException(ContainerException::class);
 
-        $factory    = new DriverInterfaceFactory();
+        $factory = new DriverInterfaceFactory();
         $factory(
             $this->container,
             Connection::class

test/integration/Container/PdoDriverInterfaceFactoryTest.php

@@ -5,7 +5,6 @@
 namespace PhpDbIntegrationTest\Mysql\Container;
 
 use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\PdoDriverInterface;
 use PhpDb\Mysql\Container\PdoDriverInterfaceFactory;
 use PhpDb\Mysql\Pdo\Driver;

test/integration/Container/PlatformInterfaceFactoryTest.php

@@ -5,10 +5,8 @@
 namespace PhpDbIntegrationTest\Mysql\Container;
 
 use PhpDb\Adapter\AdapterInterface;
-use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Platform\PlatformInterface;
 use PhpDb\Mysql\AdapterPlatform;
-use PhpDb\Mysql\Container\DriverInterfaceFactory;
 use PhpDb\Mysql\Container\PlatformInterfaceFactory;
 use PhpDb\Mysql\Pdo\Driver as PdoDriver;
 use PHPUnit\Framework\Attributes\CoversClass;