From 6b48fac1c1137b5acd876395ab730457c1cc37fb Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 9 Jun 2026 22:05:26 +0200 Subject: [PATCH 1/2] Revert "Fix debug leftover (#5834)" This reverts commit 21bde62758d6e21cad9bbe026ee74df9aedf7af3. --- tests/bench/RegressionBench.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/bench/RegressionBench.php b/tests/bench/RegressionBench.php index bef98a0789f..1e1e4d2dedb 100644 --- a/tests/bench/RegressionBench.php +++ b/tests/bench/RegressionBench.php @@ -4,6 +4,7 @@ use PhpBench\Attributes as Bench; use Symfony\Component\Finder\Finder; +use function array_first; #[Bench\Revs(revs: 1)] #[Bench\Iterations(iterations: 5)] @@ -32,7 +33,8 @@ public function benchRunAnalyse(array $params): void */ public function provideFiles(): iterable { - yield from self::findTestDataFilesFromDirectory(__DIR__ . '/data'); + $arr = self::findTestDataFilesFromDirectory(__DIR__ . '/data'); + yield array_first($arr); } private static function findTestDataFilesFromDirectory(string $directory): array From 4d59336d7fcb5530d07f014b60a9cc55316ebc93 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Tue, 9 Jun 2026 22:05:29 +0200 Subject: [PATCH 2/2] Revert "Update PHPBench to 1.7.0 (#5830)" This reverts commit c5a25851c5274f2e7616c065c2a8a654bc19bcaa. --- phpbench.json | 22 ++++++---------------- tests/bench/RegressionBench.php | 4 +--- tests/composer.lock | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/phpbench.json b/phpbench.json index aadaed58bf8..ba4446c0d11 100644 --- a/phpbench.json +++ b/phpbench.json @@ -6,22 +6,12 @@ "storage.xml_storage_path": "tests/bench/storage", "report.generators": { "my-report": { - "generator": "expression", - "aggregate": [ - "iteration_index" - ], - "expressions": { - "_mode": "mode(result_time_avg)" - }, - "cols": [ - "set", - "mem_peak", - "mode", - "rstdev", - "diff" - ], - "derivations": { - "diff": "if(min(table['_mode']) > 0, format('%.2fx', row['_mode'] / min(table['_mode'])), 'N/A')" + "extends": "aggregate", + "cols": { + "set": null, + "mem_peak": null, + "mode": null, + "rstdev": null } } } diff --git a/tests/bench/RegressionBench.php b/tests/bench/RegressionBench.php index 1e1e4d2dedb..bef98a0789f 100644 --- a/tests/bench/RegressionBench.php +++ b/tests/bench/RegressionBench.php @@ -4,7 +4,6 @@ use PhpBench\Attributes as Bench; use Symfony\Component\Finder\Finder; -use function array_first; #[Bench\Revs(revs: 1)] #[Bench\Iterations(iterations: 5)] @@ -33,8 +32,7 @@ public function benchRunAnalyse(array $params): void */ public function provideFiles(): iterable { - $arr = self::findTestDataFilesFromDirectory(__DIR__ . '/data'); - yield array_first($arr); + yield from self::findTestDataFilesFromDirectory(__DIR__ . '/data'); } private static function findTestDataFilesFromDirectory(string $directory): array diff --git a/tests/composer.lock b/tests/composer.lock index d4757d065c0..11535d0d88b 100644 --- a/tests/composer.lock +++ b/tests/composer.lock @@ -664,16 +664,16 @@ }, { "name": "phpbench/phpbench", - "version": "1.7.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/phpbench/phpbench.git", - "reference": "3d13c0d5dcf8730a67b70fa7fb03b4556b5cc0fe" + "reference": "9a28fd0833f11171b949843c6fd663eb69b6d14c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpbench/phpbench/zipball/3d13c0d5dcf8730a67b70fa7fb03b4556b5cc0fe", - "reference": "3d13c0d5dcf8730a67b70fa7fb03b4556b5cc0fe", + "url": "https://api.github.com/repos/phpbench/phpbench/zipball/9a28fd0833f11171b949843c6fd663eb69b6d14c", + "reference": "9a28fd0833f11171b949843c6fd663eb69b6d14c", "shasum": "" }, "require": { @@ -698,14 +698,14 @@ "require-dev": { "dantleech/invoke": "^2.0", "ergebnis/composer-normalize": "^2.39", - "jangregor/phpstan-prophecy": "^2.0", + "jangregor/phpstan-prophecy": "^1.0", "php-cs-fixer/shim": "^3.9", "phpspec/prophecy": "^1.22", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^2.0", - "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^11.5", - "rector/rector": "^2.2", + "rector/rector": "^1.2", "sebastian/exporter": "^6.3.2", "symfony/error-handler": "^6.1 || ^7.0 || ^8.0", "symfony/var-dumper": "^6.1 || ^7.0 || ^8.0" @@ -751,7 +751,7 @@ ], "support": { "issues": "https://github.com/phpbench/phpbench/issues", - "source": "https://github.com/phpbench/phpbench/tree/1.7.0" + "source": "https://github.com/phpbench/phpbench/tree/1.5.1" }, "funding": [ { @@ -759,7 +759,7 @@ "type": "github" } ], - "time": "2026-06-08T19:09:20+00:00" + "time": "2026-03-05T08:18:58+00:00" }, { "name": "phpunit/php-code-coverage",