Merge pull request #46 from simon-mundy/result-count-issue

Fixed tests in Unit and Integration

Author: simon-mundy

composer.lock

@@ -30,24 +30,6 @@ parameters:
 			count: 1
 			path: src/Connection.php
 
-		-
-			message: '#^PHPDoc tag @var for variable \$connectionInstance contains unknown class PhpDb\\Mysql\\Driver\\ConnectionInterface\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Container/DriverInterfaceFactory.php
-
-		-
-			message: '#^PHPDoc tag @var for variable \$resultInstance contains unknown class PhpDb\\Mysql\\Driver\\ResultInterface\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Container/DriverInterfaceFactory.php
-
-		-
-			message: '#^PHPDoc tag @var for variable \$statementInstance contains unknown class PhpDb\\Mysql\\Driver\\StatementInterface\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Container/DriverInterfaceFactory.php
-
 		-
 			message: '#^Instanceof between PhpDb\\Mysql\\Connection and PhpDb\\Adapter\\Driver\\DriverAwareInterface will always evaluate to true\.$#'
 			identifier: instanceof.alwaysTrue
@@ -186,42 +168,6 @@ parameters:
 			count: 1
 			path: src/Statement.php
 
-		-
-			message: '#^Call to an undefined method PhpDb\\Mysql\\Driver\:\:quoteValue\(\)\.$#'
-			identifier: method.notFound
-			count: 2
-			path: test/integration/AdapterPlatformTest.php
-
-		-
-			message: '#^Parameter \#1 \$connection of class PhpDb\\Mysql\\Driver constructor expects PhpDb\\Mysql\\Connection, PDO given\.$#'
-			identifier: argument.type
-			count: 1
-			path: test/integration/AdapterPlatformTest.php
-
-		-
-			message: '#^Parameter \#1 \$connection of class PhpDb\\Mysql\\Driver constructor expects PhpDb\\Mysql\\Connection, mysqli given\.$#'
-			identifier: argument.type
-			count: 1
-			path: test/integration/AdapterPlatformTest.php
-
-		-
-			message: '#^Parameter \#2 \$statementPrototype of class PhpDb\\Mysql\\Driver constructor expects PhpDb\\Mysql\\Statement, PhpDb\\Adapter\\Driver\\Pdo\\Statement given\.$#'
-			identifier: argument.type
-			count: 1
-			path: test/integration/AdapterPlatformTest.php
-
-		-
-			message: '#^Property PhpDbIntegrationTest\\Mysql\\Platform\\AdapterPlatformTest\:\:\$adapters \(array\<string, mysqli\|PDO\>\) does not accept array\<string, mysqli\|PDO\|PhpDb\\Mysql\\Connection\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: test/integration/AdapterPlatformTest.php
-
-		-
-			message: '#^Property PhpDbIntegrationTest\\Mysql\\Platform\\AdapterPlatformTest\:\:\$adapters \(array\<string, mysqli\|PDO\>\) does not accept array\<string, mysqli\|PDO\|PhpDb\\Mysql\\Pdo\\Connection\>\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: test/integration/AdapterPlatformTest.php
-
 		-
 			message: '#^Parameter \#1 \$container of callable PhpDb\\Mysql\\Container\\DriverInterfaceFactory expects Laminas\\ServiceManager\\ServiceManager, Psr\\Container\\ContainerInterface given\.$#'
 			identifier: argument.type
@@ -240,21 +186,3 @@ parameters:
 			count: 1
 			path: test/integration/Pdo/ConnectionTest.php
 
-		-
-			message: '#^Unreachable statement \- code above always terminates\.$#'
-			identifier: deadCode.unreachable
-			count: 1
-			path: test/integration/Pdo/QueryTest.php
-
-		-
-			message: '#^Unreachable statement \- code above always terminates\.$#'
-			identifier: deadCode.unreachable
-			count: 1
-			path: test/integration/Pdo/TableGatewayTest.php
-
-		-
-			message: '#^Unreachable statement \- code above always terminates\.$#'
-			identifier: deadCode.unreachable
-			count: 1
-			path: test/integration/TableGatewayTest.php
-

phpstan-baseline.neon

@@ -34,4 +34,4 @@
         <env name="TESTS_PHPDB_ADAPTER_MYSQL_DATABASE" value="phpdb_test"/>
         <env name="TESTS_PHPDB_ADAPTER_MYSQL_PORT" value="3306"/>
     </php>
-</phpunit>
+</phpunit>

phpunit.xml.dist

@@ -5,8 +5,10 @@
 namespace PhpDb\Mysql\Container;
 
 use Laminas\ServiceManager\ServiceManager;
+use PhpDb\Adapter\Driver\ConnectionInterface;
 use PhpDb\Adapter\Driver\DriverInterface;
 use PhpDb\Adapter\Driver\ResultInterface;
+use PhpDb\Adapter\Driver\StatementInterface;
 use PhpDb\Exception\ContainerException;
 use PhpDb\Mysql\Connection;
 use PhpDb\Mysql\Driver;
@@ -29,16 +31,16 @@ public function __invoke(
             );
         }
 
-        /** @var Driver\ConnectionInterface&Connection $connectionInstance */
+        /** @var ConnectionInterface&Connection $connectionInstance */
         $connectionInstance = $container->build(Connection::class, $options);
 
-        /** @var Driver\StatementInterface&Statement $statementInstance */
+        /** @var StatementInterface&Statement $statementInstance */
         $statementInstance = $container->build(
             Statement::class,
             $options['options'] ?? []
         );
 
-        /** @var Driver\ResultInterface&Result $resultInstance */
+        /** @var ResultInterface&Result $resultInstance */
         $resultInstance = $container->has(ResultInterface::class)
             ? $container->get(ResultInterface::class)
             : new Result();

src/Container/DriverInterfaceFactory.php

@@ -24,7 +24,7 @@ public function createResult($resource): ResultInterface
         /** @var ResultInterface&Result $result */
         $result = clone $this->resultPrototype;
 
-        $rowCount = 0;
+        $rowCount = null;
 
         $lastGeneratedValue = $this->getLastGeneratedValue();