Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use PHPUnit\Framework\TestCase;
final class BareVarTest extends TestCase
{
/**
* @var FormBuilderInterface&Stub
* @var FormBuilderInterface&\PHPUnit\Framework\MockObject\Stub
*/
private \PHPUnit\Framework\MockObject\Stub $formBuilder;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use PHPUnit\Framework\TestCase;
final class IntersectionTypeTest extends TestCase
{
/**
* @var FieldModel&Stub
* @var FieldModel&\PHPUnit\Framework\MockObject\Stub
*/
private \PHPUnit\Framework\MockObject\Stub $leadFieldModel;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use PHPUnit\Framework\TestCase;
final class UnionTypeTest extends TestCase
{
/**
* @var FieldModel|Stub
* @var FieldModel|\PHPUnit\Framework\MockObject\Stub
*/
private \PHPUnit\Framework\MockObject\Stub $leadFieldModel;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function getRuleDefinition(): RuleDefinition
,
<<<'CODE_SAMPLE'
/**
* @var FormBuilderInterface&Stub
* @var FormBuilderInterface&\PHPUnit\Framework\MockObject\Stub
*/
private \PHPUnit\Framework\MockObject\Stub $formBuilder;
CODE_SAMPLE
Expand Down Expand Up @@ -128,7 +128,10 @@ private function addStubIntersection(VarTagValueNode $varTagValueNode): bool
return false;
}

$varTagValueNode->type = new BracketsAwareIntersectionTypeNode([$typeNode, new IdentifierTypeNode('Stub')]);
$varTagValueNode->type = new BracketsAwareIntersectionTypeNode([
$typeNode,
new IdentifierTypeNode('\\' . PHPUnitClassName::STUB),
]);

return true;
}
Expand Down
15 changes: 3 additions & 12 deletions rules/PHPUnit120/Rector/Property/MockObjectVarToStubRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function getRuleDefinition(): RuleDefinition
,
<<<'CODE_SAMPLE'
/**
* @var FieldModel|Stub
* @var FieldModel|\PHPUnit\Framework\MockObject\Stub
*/
private \PHPUnit\Framework\MockObject\Stub $leadFieldModel;
CODE_SAMPLE
Expand Down Expand Up @@ -120,7 +120,7 @@ private function replaceMockObjectWithStub(VarTagValueNode $varTagValueNode): bo
$hasChanged = false;
foreach ($typeNode->types as $key => $innerType) {
if ($innerType instanceof IdentifierTypeNode && $this->isMockObjectIdentifier($innerType)) {
$typeNode->types[$key] = new IdentifierTypeNode($this->resolveStubName($innerType->name));
$typeNode->types[$key] = new IdentifierTypeNode('\\' . PHPUnitClassName::STUB);
$hasChanged = true;
}
}
Expand All @@ -129,7 +129,7 @@ private function replaceMockObjectWithStub(VarTagValueNode $varTagValueNode): bo
}

if ($typeNode instanceof IdentifierTypeNode && $this->isMockObjectIdentifier($typeNode)) {
$varTagValueNode->type = new IdentifierTypeNode($this->resolveStubName($typeNode->name));
$varTagValueNode->type = new IdentifierTypeNode('\\' . PHPUnitClassName::STUB);
return true;
}

Expand All @@ -145,13 +145,4 @@ private function isMockObjectIdentifier(IdentifierTypeNode $identifierTypeNode):

return $shortName === 'MockObject';
}

private function resolveStubName(string $name): string
{
$lastBackslashPosition = strrpos($name, '\\');

return $lastBackslashPosition === false
? 'Stub'
: substr($name, 0, $lastBackslashPosition + 1) . 'Stub';
}
}
Loading