Merge pull request #28 from php-db/0.1.x

tyrsson · web-flow · commit d7e2ba40237b · 2025-09-06T16:57:14.000-05:00
fix-phpdb-version-psalm-and-fixtureloader-typing
diff --git a/composer.json b/composer.json
@@ -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": "*",
diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -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>
diff --git a/test/integration/FixtureLoader/FixtureLoader.php b/test/integration/FixtureLoader/FixtureLoader.php
diff --git a/test/integration/FixtureLoader/FixtureLoaderInterface.php b/test/integration/FixtureLoader/FixtureLoaderInterface.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpDbIntegrationTest\Adapter\Mysql\FixtureLoader;
+
+interface FixtureLoaderInterface
+{
+    public function createDatabase(): void;
+
+    public function dropDatabase(): void;
+}
diff --git a/test/integration/FixtureLoader/MysqlFixtureLoader.php b/test/integration/FixtureLoader/MysqlFixtureLoader.php
@@ -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';
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`use function print_r;`
`13`	`13`	`use function sprintf;`
`14`	`14`
`15`		`-final class MysqlFixtureLoader implements FixtureLoader`
	`15`	`+final class MysqlFixtureLoader implements FixtureLoaderInterface`
`16`	`16`	`{`
`17`	`17`	`private string $fixtureFile = __DIR__ . '/../TestFixtures/mysql.sql';`
`18`	`18`