Skip to content

Include match() to invoke counting in WithConsecutiveRector #362

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
TomasVotruba merged 2 commits into from
Sep 25, 2024
Merged

Include match() to invoke counting in WithConsecutiveRector #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a748d04
Include match() to invoke counting
TomasVotruba Sep 25, 2024
dfb5783
add expects call
TomasVotruba Sep 25, 2024
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 ...terface/WithConsecutiveRector/Fixture/combine_with_on_consecutive_without_expects.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ final class CombineWithOnConsecutiveWithoutExcepts extends TestCase
public function test()
{
$matcher = $this->exactly(2);
$this->userServiceMock->method('prepare')->willReturnCallback(function ($parameters) use ($matcher) {
$this->userServiceMock->method('prepare')->expects($matcher)->willReturnCallback(function ($parameters) use ($matcher) {
match ($matcher->numberOfInvocations()) {
1 => self::assertEquals([1, 2], $parameters),
2 => self::assertEquals([3, 4], $parameters),
Expand Down
12 changes: 11 additions & 1 deletion rules/PHPUnit100/Rector/StmtsAwareInterface/WithConsecutiveRector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;

/**
* @see \Rector\PHPUnit\Tests\Rector\StmtsAwareInterface\WithConsecutiveRector\WithConsecutiveRectorTest
* @see \Rector\PHPUnit\Tests\PHPUnit100\Rector\StmtsAwareInterface\WithConsecutiveRector\WithConsecutiveRectorTest
*/
final class WithConsecutiveRector extends AbstractRector implements MinPhpVersionInterface
{
Expand Down Expand Up @@ -386,6 +386,16 @@ private function refactorToWillReturnCallback(
)),
];

$hasExpects = $this->findMethodCall($expression, 'expects') instanceof MethodCall;
if ($hasExpects === false) {
/** @var MethodCall $mockMethodCall */
$mockMethodCall = $expression->expr;

$mockMethodCall->var = new MethodCall($mockMethodCall->var, 'expects', [
new Arg(new Variable('matcher')),
]);
}

$matcherAssign = new Assign(new Variable('matcher'), $expectsCall);
return [new Expression($matcherAssign), $expression];
}
Expand Down