Skip to content

Widen ConnectionInterface::getResource() to resource|object|null #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyrsson merged 2 commits into from
Oct 8, 2026
Merged

Widen ConnectionInterface::getResource() to resource|object|null #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f38d603
Widen ConnectionInterface::getResource() to resource|object|null
Oct 7, 2026
162fcd5
Refresh analyzer baseline for mago 1.52.0
tyrsson Oct 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 11 additions & 29 deletions analyzer-baseline.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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]]
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -2895,25 +2877,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]]
Expand Down Expand Up @@ -2943,25 +2925,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]]
Expand Down
6 changes: 1 addition & 5 deletions src/Adapter/Driver/AbstractConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/Adapter/Driver/ConnectionInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
Loading