From c5eba6ded483b27f415da69a838476674d75f4d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Aug 2026 01:03:41 +0000 Subject: [PATCH 1/2] chore: Bump the composer-development group with 2 updates Bumps the composer-development group with 2 updates: [phpstan/phpstan](https://github.com/phpstan/phpstan-phar-composer-source) and [rector/rector](https://github.com/rectorphp/rector). Updates `phpstan/phpstan` from 2.2.7 to 2.2.8 - [Commits](https://github.com/phpstan/phpstan-phar-composer-source/commits) Updates `rector/rector` from 2.5.8 to 2.6.1 - [Release notes](https://github.com/rectorphp/rector/releases) - [Commits](https://github.com/rectorphp/rector/compare/2.5.8...2.6.1) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-version: 2.2.8 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: composer-development - dependency-name: rector/rector dependency-version: 2.6.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: composer-development ... Signed-off-by: dependabot[bot] --- composer.json | 4 ++-- composer.lock | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index a0a38e2..2f65f0f 100644 --- a/composer.json +++ b/composer.json @@ -31,9 +31,9 @@ "testcontainers/testcontainers": "^1.0.10" }, "require-dev": { - "phpstan/phpstan": "2.2.7", + "phpstan/phpstan": "2.2.8", "phpunit/phpunit": "11.5.50", - "rector/rector": "2.5.8", + "rector/rector": "2.6.1", "symplify/easy-coding-standard": "13.2.17" }, "scripts": { diff --git a/composer.lock b/composer.lock index e614ab3..3d939cf 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": "ec66ab5592897460f4e59bdf2a2b6e93", + "content-hash": "2c6f6468134a96a05bc3994358a860b0", "packages": [ { "name": "beluga-php/docker-php", @@ -2619,11 +2619,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.2.7", + "version": "2.2.8", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/692db47b9dddb0487934e5236e77d48594aef921", - "reference": "692db47b9dddb0487934e5236e77d48594aef921", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e285254e60f33c21902efef4a926ca0987c06804", + "reference": "e285254e60f33c21902efef4a926ca0987c06804", "shasum": "" }, "require": { @@ -2679,7 +2679,7 @@ "type": "github" } ], - "time": "2026-07-29T17:39:32+00:00" + "time": "2026-08-04T22:21:45+00:00" }, { "name": "phpunit/php-code-coverage", @@ -3139,16 +3139,16 @@ }, { "name": "rector/rector", - "version": "2.5.8", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "861c77fd2a6d45317a401f4e0b617f947e8b6f96" + "reference": "b8e68f058bca43e01a2e1caa51ef022d6551ed95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/861c77fd2a6d45317a401f4e0b617f947e8b6f96", - "reference": "861c77fd2a6d45317a401f4e0b617f947e8b6f96", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/b8e68f058bca43e01a2e1caa51ef022d6551ed95", + "reference": "b8e68f058bca43e01a2e1caa51ef022d6551ed95", "shasum": "" }, "require": { @@ -3187,7 +3187,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/2.5.8" + "source": "https://github.com/rectorphp/rector/tree/2.6.1" }, "funding": [ { @@ -3195,7 +3195,7 @@ "type": "github" } ], - "time": "2026-07-27T06:19:16+00:00" + "time": "2026-08-03T17:30:34+00:00" }, { "name": "sebastian/cli-parser", From 2d238f485e080bdff602b8ff89a76c7eb372d688 Mon Sep 17 00:00:00 2001 From: Golo Roden Date: Fri, 14 Aug 2026 16:56:50 +0200 Subject: [PATCH 2/2] style: Use native intersection types for mock object properties Rector 2.6 adds AddIntersectionVarToMockObjectPropertyRector, which wants @var docblocks on plain MockObject properties. Native intersection types express the same thing without the docblocks. Also drops EncapsedStringsToSprintfRector from withSkip(), as Rector 2.6 deprecated the rule and no longer registers it. Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01GASeR4L9L4tg7RxrCPpRMD --- rector.php | 2 -- tests/Stream/CurlFactoryTest.php | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rector.php b/rector.php index 9b66e68..96bf7a9 100755 --- a/rector.php +++ b/rector.php @@ -4,7 +4,6 @@ use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; use Rector\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector; -use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector; use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector; use Rector\Naming\Rector\Class_\RenamePropertyToMatchTypeRector; use Rector\PHPUnit\CodeQuality\Rector\ClassMethod\BareCreateMockAssignToDirectUseRector; @@ -35,7 +34,6 @@ __DIR__ . '/tests', ]) ->withSkip([ - EncapsedStringsToSprintfRector::class, NewlineAfterStatementRector::class, RenamePropertyToMatchTypeRector::class, SimplifyUselessVariableRector::class, diff --git a/tests/Stream/CurlFactoryTest.php b/tests/Stream/CurlFactoryTest.php index 57f767e..804ab44 100644 --- a/tests/Stream/CurlFactoryTest.php +++ b/tests/Stream/CurlFactoryTest.php @@ -13,10 +13,10 @@ final class CurlFactoryTest extends TestCase { - private MockObject $requestMock; - private MockObject $headerQueueMock; - private MockObject $writeQueueMock; - private MockObject $uriMock; + private MockObject&Request $requestMock; + private MockObject&Queue $headerQueueMock; + private MockObject&Queue $writeQueueMock; + private MockObject&Uri $uriMock; protected function setUp(): void {