Merge remote-tracking branch 'upstream/0.6.x' into qa/mago-sql-typed-constants

Author: simon-mundy

analyzer-baseline.toml

@@ -156,18 +156,6 @@ code = "imprecise-type"
 message = "Type `array` in return type of `getConnectionParameters` is imprecise, equivalent to `array<array-key, mixed>`."
 count = 1
 
-[[issues]]
-file = "src/Adapter/Driver/AbstractConnection.php"
-code = "incompatible-return-type"
-message = 'Return type `null|resource` of `PhpDb\Adapter\Driver\AbstractConnection::getresource()` is incompatible with parent return type `resource` of `PhpDb\Adapter\Driver\ConnectionInterface::getresource()`'
-count = 1
-
-[[issues]]
-file = "src/Adapter/Driver/AbstractConnection.php"
-code = "incompatible-return-type"
-message = 'Return type `null|resource` of `PhpDb\Adapter\Driver\Pdo\AbstractPdoConnection::getresource()` is incompatible with parent return type `resource` of `PhpDb\Adapter\Driver\ConnectionInterface::getresource()`'
-count = 1
-
 [[issues]]
 file = "src/Adapter/Driver/AbstractConnection.php"
 code = "missing-api-or-internal"
@@ -363,19 +351,19 @@ count = 1
 [[issues]]
 file = "src/Adapter/Driver/Pdo/AbstractPdo.php"
 code = "non-existent-method"
-message = "Method `getlastgeneratedvalue` does not exist on type `PDO`."
+message = "Method `getLastGeneratedValue` does not exist on type `PDO`."
 count = 1
 
 [[issues]]
 file = "src/Adapter/Driver/Pdo/AbstractPdo.php"
 code = "non-existent-method"
-message = "Method `getresource` does not exist on type `PDO`."
+message = "Method `getResource` does not exist on type `PDO`."
 count = 1
 
 [[issues]]
 file = "src/Adapter/Driver/Pdo/AbstractPdo.php"
 code = "non-existent-method"
-message = "Method `isconnected` does not exist on type `PDO`."
+message = "Method `isConnected` does not exist on type `PDO`."
 count = 1
 
 [[issues]]
@@ -426,12 +414,6 @@ code = "imprecise-type"
 message = "Type `array` in parameter `$connectionParameters` is imprecise, equivalent to `array<array-key, mixed>`."
 count = 1
 
-[[issues]]
-file = "src/Adapter/Driver/Pdo/AbstractPdoConnection.php"
-code = "incompatible-property-type"
-message = 'Property `PhpDb\Adapter\Driver\Pdo\AbstractPdoConnection::$resource` has an incompatible type declaration from docblock.'
-count = 1
-
 [[issues]]
 file = "src/Adapter/Driver/Pdo/AbstractPdoConnection.php"
 code = "missing-api-or-internal"
@@ -2610,12 +2592,6 @@ code = "nullable-return-statement"
 message = '''Function `PhpDb\Sql\Join::current` is declared to return `array{'columns': array<array-key, PhpDb\Sql\ExpressionInterface|string>, 'name': PhpDb\Sql\TableIdentifier|non-empty-array<string, PhpDb\Sql\Expression|PhpDb\Sql\Select|PhpDb\Sql\TableIdentifier|string>|string, 'on': PhpDb\Sql\Predicate\PredicateInterface|string, 'type': string}` but possibly returns a nullable value (inferred as `array{'columns': array<array-key, PhpDb\Sql\ExpressionInterface|string>, 'name': PhpDb\Sql\TableIdentifier|non-empty-array<string, PhpDb\Sql\Expression|PhpDb\Sql\Select|PhpDb\Sql\TableIdentifier|string>|string, 'on': PhpDb\Sql\Predicate\PredicateInterface|string, 'type': string}|null`).'''
 count = 1
 
-[[issues]]
-file = "src/Sql/Join.php"
-code = "possibly-invalid-argument"
-message = 'Possible argument type mismatch for argument #1 of `PhpDb\Sql\Exception\InvalidArgumentException::forInvalidJoinName`: expected `string`, but possibly received `PhpDb\Sql\Expression|PhpDb\Sql\Select|PhpDb\Sql\TableIdentifier|string`.'
-count = 1
-
 [[issues]]
 file = "src/Sql/Join.php"
 code = "possibly-undefined-int-array-index"
@@ -2667,25 +2643,25 @@ count = 1
 [[issues]]
 file = "src/Sql/Platform/AbstractPlatform.php"
 code = "non-existent-method"
-message = 'Method `getsqlstring` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
+message = 'Method `getSqlString` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
 count = 1
 
 [[issues]]
 file = "src/Sql/Platform/AbstractPlatform.php"
 code = "non-existent-method"
-message = 'Method `getsqlstring` does not exist on type `PhpDb\Sql\PreparableSqlInterface`.'
+message = 'Method `getSqlString` does not exist on type `PhpDb\Sql\PreparableSqlInterface`.'
 count = 1
 
 [[issues]]
 file = "src/Sql/Platform/AbstractPlatform.php"
 code = "non-existent-method"
-message = 'Method `preparestatement` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
+message = 'Method `prepareStatement` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
 count = 1
 
 [[issues]]
 file = "src/Sql/Platform/AbstractPlatform.php"
 code = "non-existent-method"
-message = 'Method `preparestatement` does not exist on type `PhpDb\Sql\SqlInterface`.'
+message = 'Method `prepareStatement` does not exist on type `PhpDb\Sql\SqlInterface`.'
 count = 1
 
 [[issues]]
@@ -2715,25 +2691,25 @@ count = 1
 [[issues]]
 file = "src/Sql/Platform/Platform.php"
 code = "non-existent-method"
-message = 'Method `getsqlstring` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
+message = 'Method `getSqlString` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
 count = 1
 
 [[issues]]
 file = "src/Sql/Platform/Platform.php"
 code = "non-existent-method"
-message = 'Method `getsqlstring` does not exist on type `PhpDb\Sql\PreparableSqlInterface`.'
+message = 'Method `getSqlString` does not exist on type `PhpDb\Sql\PreparableSqlInterface`.'
 count = 1
 
 [[issues]]
 file = "src/Sql/Platform/Platform.php"
 code = "non-existent-method"
-message = 'Method `preparestatement` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
+message = 'Method `prepareStatement` does not exist on type `PhpDb\Sql\Platform\PlatformDecoratorInterface`.'
 count = 1
 
 [[issues]]
 file = "src/Sql/Platform/Platform.php"
 code = "non-existent-method"
-message = 'Method `preparestatement` does not exist on type `PhpDb\Sql\SqlInterface`.'
+message = 'Method `prepareStatement` does not exist on type `PhpDb\Sql\SqlInterface`.'
 count = 1
 
 [[issues]]

infection.json5.dist

@@ -22,6 +22,7 @@
                 // implode() discards keys, so array_fill()'s start index cannot be observed.
                 "PhpDb\\Sql\\Argument\\Identifiers::getSpecification",
                 "PhpDb\\Sql\\Argument\\Values::getSpecification",
+                "PhpDb\\Sql\\Ddl\\Constraint\\AbstractConstraint::getExpressionData",
                 "PhpDb\\Sql\\Ddl\\Constraint\\ForeignKey::getExpressionData"
             ]
         },
@@ -30,6 +31,7 @@
                 // implode() discards keys, so array_fill()'s start index cannot be observed.
                 "PhpDb\\Sql\\Argument\\Identifiers::getSpecification",
                 "PhpDb\\Sql\\Argument\\Values::getSpecification",
+                "PhpDb\\Sql\\Ddl\\Constraint\\AbstractConstraint::getExpressionData",
                 "PhpDb\\Sql\\Ddl\\Constraint\\ForeignKey::getExpressionData"
             ]
         },

src/Adapter/Driver/AbstractConnection.php

@@ -21,11 +21,7 @@ abstract class AbstractConnection implements ConnectionInterface, ProfilerAwareI
 
     protected ?ProfilerInterface $profiler = null;
 
-    /**
-     * Extending classes must be covariant
-     *
-     * @var mixed
-     */
+    /** Extending classes must be covariant. */
     protected $resource;
 
     #[Override]

src/Adapter/Driver/ConnectionInterface.php

@@ -30,7 +30,7 @@ public function getLastGeneratedValue(?string $name = null): string|int|false|nu
     /**
      * Get resource
      *
-     * @return resource
+     * @return resource|object|null
      */
     public function getResource();
 

src/Metadata/Source/AbstractSource.php

@@ -300,10 +300,8 @@ public function getConstraintKeys(string $constraint, string $table, ?string $sc
         foreach ($this->data['constraint_keys'][$schema] ?? [] as $constraintKeyInfo) {
             if (
                 ! (
-
-                        $constraintKeyInfo['table_name'] === $table
-                        && $constraintKeyInfo['constraint_name'] === $constraint
-
+                    $constraintKeyInfo['table_name'] === $table
+                    && $constraintKeyInfo['constraint_name'] === $constraint
                 )
             ) {
                 continue;

src/Sql/Join.php

@@ -12,6 +12,7 @@
 use function array_key_exists;
 use function array_shift;
 use function count;
+use function get_debug_type;
 use function is_array;
 use function is_string;
 use function key;
@@ -112,7 +113,11 @@ public function join(
         string $type = self::JOIN_INNER,
     ): static {
         if (is_array($name) && (! is_string(key($name)) || count($name) !== 1)) {
-            throw Exception\InvalidArgumentException::forInvalidJoinName(array_shift($name));
+            $first = array_shift($name);
+
+            throw Exception\InvalidArgumentException::forInvalidJoinName(
+                is_string($first) ? $first : get_debug_type($first),
+            );
         }
 
         if (! is_array($columns)) {

test/unit/Sql/Ddl/Constraint/PrimaryKeyTest.php

@@ -28,4 +28,21 @@ public function getExpressionData(): void
             $expressionData['values'],
         );
     }
+
+    #[Test]
+    public function getExpressionDataListsEveryColumnInTheSpecification(): void
+    {
+        $pk = new PrimaryKey(['foo', 'bar']);
+
+        $expressionData = $pk->getExpressionData();
+
+        static::assertSame('PRIMARY KEY (%s, %s)', $expressionData['spec']);
+        static::assertEquals(
+            [
+                Argument::identifier('foo'),
+                Argument::identifier('bar'),
+            ],
+            $expressionData['values'],
+        );
+    }
 }

test/unit/Sql/Ddl/Constraint/UniqueKeyTest.php

@@ -29,4 +29,22 @@ public function getExpressionData(): void
             $expressionData['values'],
         );
     }
+
+    #[Test]
+    public function getExpressionDataListsEveryColumnInTheSpecification(): void
+    {
+        $uk = new UniqueKey(['foo', 'bar'], 'my_uk');
+
+        $expressionData = $uk->getExpressionData();
+
+        static::assertSame('CONSTRAINT %s UNIQUE (%s, %s)', $expressionData['spec']);
+        static::assertEquals(
+            [
+                Argument::identifier('my_uk'),
+                Argument::identifier('foo'),
+                Argument::identifier('bar'),
+            ],
+            $expressionData['values'],
+        );
+    }
 }

test/unit/Sql/JoinTest.php

@@ -9,6 +9,7 @@
 use PhpDb\Sql\Select;
 use PhpDbTest\DeprecatedAssertionsTrait;
 use PHPUnit\Framework\Attributes\CoversMethod;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\Attributes\Test;
@@ -32,6 +33,16 @@ class JoinTest extends TestCase
 {
     use DeprecatedAssertionsTrait;
 
+    /** @return array<string, array{array<array-key, mixed>, string}> */
+    public static function invalidJoinNameWithoutStringElementProvider(): array
+    {
+        return [
+            'empty array'          => [[], 'null'],
+            'select without alias' => [[new Select('foo')], Select::class],
+            'integer element'      => [[5], 'int'],
+        ];
+    }
+
     #[Test]
     #[TestDox('unit test: Test count() returns correct count')]
     public function countsJoinedTables(): void
@@ -91,6 +102,20 @@ public function joinFullOuter(): void
         static::assertSame($join, $return);
     }
 
+    /**
+     * @param array<array-key, mixed> $name
+     */
+    #[Test]
+    #[DataProvider('invalidJoinNameWithoutStringElementProvider')]
+    public function joinThrowsInvalidArgumentWhenInvalidNameHasNoLeadingString(array $name, string $described): void
+    {
+        $join = new Join();
+
+        self::expectException(InvalidArgumentException::class);
+        self::expectExceptionMessage("expects '{$described}' as a single element associative array");
+        $join->join($name, 'on');
+    }
+
     #[Test]
     public function joinThrowsOnInvalidMultiElementArray(): void
     {