From 0cacbca4606b30eb51762f7a7950c0cc3695a160 Mon Sep 17 00:00:00 2001 From: Julien Guittard Date: Sat, 6 Sep 2025 13:20:05 +0200 Subject: [PATCH 1/5] fix: composer dependency for phpdb Signed-off-by: Julien Guittard --- composer.json | 2 +- composer.lock | 63 ++++++++++++++++++++++++--------------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/composer.json b/composer.json index 05263af..5cc16a5 100644 --- 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 index fa5e9e0..930fce5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a56a17093380a5b2977b09cf04899957", + "content-hash": "0a28997311306ff77626a0d7c49dc330", "packages": [ { "name": "brick/varexporter", @@ -259,7 +259,7 @@ }, { "name": "php-db/phpdb", - "version": "dev-x.x.2", + "version": "0.1.0", "source": { "type": "git", "url": "https://github.com/php-db/phpdb.git", @@ -292,7 +292,6 @@ "laminas/laminas-eventmanager": "Laminas\\EventManager component", "laminas/laminas-hydrator": "(^5.0.0) Laminas\\Hydrator component for using HydratingResultSets" }, - "default-branch": true, "type": "library", "extra": { "laminas": { @@ -691,16 +690,16 @@ }, { "name": "amphp/parallel", - "version": "v2.3.1", + "version": "v2.3.2", "source": { "type": "git", "url": "https://github.com/amphp/parallel.git", - "reference": "5113111de02796a782f5d90767455e7391cca190" + "reference": "321b45ae771d9c33a068186b24117e3cd1c48dce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/parallel/zipball/5113111de02796a782f5d90767455e7391cca190", - "reference": "5113111de02796a782f5d90767455e7391cca190", + "url": "https://api.github.com/repos/amphp/parallel/zipball/321b45ae771d9c33a068186b24117e3cd1c48dce", + "reference": "321b45ae771d9c33a068186b24117e3cd1c48dce", "shasum": "" }, "require": { @@ -763,7 +762,7 @@ ], "support": { "issues": "https://github.com/amphp/parallel/issues", - "source": "https://github.com/amphp/parallel/tree/v2.3.1" + "source": "https://github.com/amphp/parallel/tree/v2.3.2" }, "funding": [ { @@ -771,7 +770,7 @@ "type": "github" } ], - "time": "2024-12-21T01:56:09+00:00" + "time": "2025-08-27T21:55:40+00:00" }, { "name": "amphp/parser", @@ -2876,16 +2875,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.35", + "version": "11.5.36", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d341ee94ee5007b286fc7907b383aae6b5b3cc91" + "reference": "264a87c7ef68b1ab9af7172357740dc266df5957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d341ee94ee5007b286fc7907b383aae6b5b3cc91", - "reference": "d341ee94ee5007b286fc7907b383aae6b5b3cc91", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/264a87c7ef68b1ab9af7172357740dc266df5957", + "reference": "264a87c7ef68b1ab9af7172357740dc266df5957", "shasum": "" }, "require": { @@ -2957,7 +2956,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.35" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.36" }, "funding": [ { @@ -2981,7 +2980,7 @@ "type": "tidelift" } ], - "time": "2025-08-28T05:13:54+00:00" + "time": "2025-09-03T06:24:17+00:00" }, { "name": "psalm/plugin-phpunit", @@ -4247,32 +4246,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.20.0", + "version": "8.22.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "b4f9f02edd4e6a586777f0cabe8d05574323f3eb" + "reference": "a4cef983bad2e70125612d22b2f6e2bd1333d5c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b4f9f02edd4e6a586777f0cabe8d05574323f3eb", - "reference": "b4f9f02edd4e6a586777f0cabe8d05574323f3eb", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/a4cef983bad2e70125612d22b2f6e2bd1333d5c2", + "reference": "a4cef983bad2e70125612d22b2f6e2bd1333d5c2", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.1.2", "php": "^7.4 || ^8.0", - "phpstan/phpdoc-parser": "^2.2.0", - "squizlabs/php_codesniffer": "^3.13.2" + "phpstan/phpdoc-parser": "^2.3.0", + "squizlabs/php_codesniffer": "^3.13.4" }, "require-dev": { "phing/phing": "3.0.1|3.1.0", "php-parallel-lint/php-parallel-lint": "1.4.0", - "phpstan/phpstan": "2.1.19", + "phpstan/phpstan": "2.1.22", "phpstan/phpstan-deprecation-rules": "2.0.3", "phpstan/phpstan-phpunit": "2.0.7", "phpstan/phpstan-strict-rules": "2.0.6", - "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.27|12.2.7" + "phpunit/phpunit": "9.6.8|10.5.48|11.4.4|11.5.36|12.3.8" }, "type": "phpcodesniffer-standard", "extra": { @@ -4296,7 +4295,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.20.0" + "source": "https://github.com/slevomat/coding-standard/tree/8.22.0" }, "funding": [ { @@ -4308,7 +4307,7 @@ "type": "tidelift" } ], - "time": "2025-07-26T15:35:10+00:00" + "time": "2025-09-06T09:14:48+00:00" }, { "name": "spatie/array-to-xml", @@ -4380,16 +4379,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.2", + "version": "3.13.4", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "5b5e3821314f947dd040c70f7992a64eac89025c" + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c", - "reference": "5b5e3821314f947dd040c70f7992a64eac89025c", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119", + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119", "shasum": "" }, "require": { @@ -4460,7 +4459,7 @@ "type": "thanks_dev" } ], - "time": "2025-06-17T22:17:01+00:00" + "time": "2025-09-05T05:47:09+00:00" }, { "name": "staabm/side-effects-detector", @@ -5622,9 +5621,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "php-db/phpdb": 20 - }, + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { From d64f7b7eb85e3a20423a15535fc7113234c1364e Mon Sep 17 00:00:00 2001 From: Julien Guittard Date: Sat, 6 Sep 2025 21:29:20 +0200 Subject: [PATCH 2/5] fix: semver fix: fixture loader return types in UT Signed-off-by: Julien Guittard --- composer.json | 2 +- test/integration/FixtureLoader/FixtureLoader.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5cc16a5..55effa2 100644 --- 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": "~0.1.0" + "php-db/phpdb": "^0.1.0" }, "require-dev": { "ext-mysqli": "*", diff --git a/test/integration/FixtureLoader/FixtureLoader.php b/test/integration/FixtureLoader/FixtureLoader.php index be39bbf..57ea241 100644 --- a/test/integration/FixtureLoader/FixtureLoader.php +++ b/test/integration/FixtureLoader/FixtureLoader.php @@ -7,7 +7,7 @@ // phpcs:ignore WebimpressCodingStandard.NamingConventions.Interface.Suffix interface FixtureLoader { - public function createDatabase(); + public function createDatabase(): void; - public function dropDatabase(); + public function dropDatabase(): void; } From f1b39ba1bda60165b9740dcac80892f9e571fb65 Mon Sep 17 00:00:00 2001 From: Julien Guittard Date: Sat, 6 Sep 2025 22:25:42 +0200 Subject: [PATCH 3/5] fix: psalm baseline revert Signed-off-by: Julien Guittard --- test/integration/FixtureLoader/FixtureLoader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/FixtureLoader/FixtureLoader.php b/test/integration/FixtureLoader/FixtureLoader.php index 57ea241..be39bbf 100644 --- a/test/integration/FixtureLoader/FixtureLoader.php +++ b/test/integration/FixtureLoader/FixtureLoader.php @@ -7,7 +7,7 @@ // phpcs:ignore WebimpressCodingStandard.NamingConventions.Interface.Suffix interface FixtureLoader { - public function createDatabase(): void; + public function createDatabase(); - public function dropDatabase(): void; + public function dropDatabase(); } From 425f438602b242c5c7bc29b9642121e72145e9f1 Mon Sep 17 00:00:00 2001 From: Julien Guittard Date: Sat, 6 Sep 2025 23:01:11 +0200 Subject: [PATCH 4/5] fix: missing return annotations on PhpDbIntegrationTest\Adapter\Mysql\FixtureLoader Signed-off-by: Julien Guittard --- test/integration/FixtureLoader/FixtureLoader.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/integration/FixtureLoader/FixtureLoader.php b/test/integration/FixtureLoader/FixtureLoader.php index be39bbf..c479113 100644 --- a/test/integration/FixtureLoader/FixtureLoader.php +++ b/test/integration/FixtureLoader/FixtureLoader.php @@ -7,7 +7,13 @@ // phpcs:ignore WebimpressCodingStandard.NamingConventions.Interface.Suffix interface FixtureLoader { + /** + * @return void + */ public function createDatabase(); + /** + * @return void + */ public function dropDatabase(); } From 73aec393b03fad6295c15f2d94a6311e7766835f Mon Sep 17 00:00:00 2001 From: Joey Smith Date: Sat, 6 Sep 2025 16:53:08 -0500 Subject: [PATCH 5/5] Fix various Psalm, PhpCS and PhpUnit failures. Reset Psalm baseline Signed-off-by: Joey Smith Signed-off-by: Joey Smith --- psalm-baseline.xml | 6 ------ .../FixtureLoader/FixtureLoader.php | 19 ------------------- .../FixtureLoader/FixtureLoaderInterface.php | 12 ++++++++++++ .../FixtureLoader/MysqlFixtureLoader.php | 2 +- 4 files changed, 13 insertions(+), 26 deletions(-) delete mode 100644 test/integration/FixtureLoader/FixtureLoader.php create mode 100644 test/integration/FixtureLoader/FixtureLoaderInterface.php diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 253787f..59f46a9 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -698,12 +698,6 @@ - - - - - - fixtureFile)]]> diff --git a/test/integration/FixtureLoader/FixtureLoader.php b/test/integration/FixtureLoader/FixtureLoader.php deleted file mode 100644 index c479113..0000000 --- a/test/integration/FixtureLoader/FixtureLoader.php +++ /dev/null @@ -1,19 +0,0 @@ -