Skip to content

fix-phpdb-version-psalm-and-fixtureloader-typing #28

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 6 commits into from
Sep 6, 2025
Merged

fix-phpdb-version-psalm-and-fixtureloader-typing #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0cacbca
fix: composer dependency for phpdb
jguittard Sep 6, 2025
d64f7b7
fix: semver
jguittard Sep 6, 2025
f1b39ba
fix: psalm baseline revert
jguittard Sep 6, 2025
425f438
fix: missing return annotations on PhpDbIntegrationTest\Adapter\Mysql…
jguittard Sep 6, 2025
d62b954
Merge pull request #27 from jguittard/fix/composer-deps
tyrsson Sep 6, 2025
73aec39
Fix various Psalm, PhpCS and PhpUnit failures.
tyrsson Sep 6, 2025
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"php-db/phpdb": "dev-x.x.2"
"php-db/phpdb": "^0.1.0"
},
"require-dev": {
"ext-mysqli": "*",
Expand Down
63 changes: 30 additions & 33 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,12 +698,6 @@
<code><![CDATA[private array $fixtureLoaders = [];]]></code>
</UndefinedDocblockClass>
</file>
<file src="test/integration/FixtureLoader/FixtureLoader.php">
<MissingReturnType>
<code><![CDATA[createDatabase]]></code>
<code><![CDATA[dropDatabase]]></code>
</MissingReturnType>
</file>
<file src="test/integration/FixtureLoader/MysqlFixtureLoader.php">
<PossiblyFalseArgument>
<code><![CDATA[file_get_contents($this->fixtureFile)]]></code>
Expand Down
13 changes: 0 additions & 13 deletions test/integration/FixtureLoader/FixtureLoader.php
View file
Open in desktop

This file was deleted.

12 changes: 12 additions & 0 deletions test/integration/FixtureLoader/FixtureLoaderInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

declare(strict_types=1);

namespace PhpDbIntegrationTest\Adapter\Mysql\FixtureLoader;

interface FixtureLoaderInterface
{
public function createDatabase(): void;

public function dropDatabase(): void;
}
2 changes: 1 addition & 1 deletion test/integration/FixtureLoader/MysqlFixtureLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use function print_r;
use function sprintf;

final class MysqlFixtureLoader implements FixtureLoader
final class MysqlFixtureLoader implements FixtureLoaderInterface
{
private string $fixtureFile = __DIR__ . '/../TestFixtures/mysql.sql';

Expand Down