Skip to content

Commit 672a8e1

Browse files
committed
Updated Rector to commit 014b976b1989d40af977ba95bddf8bd63bd6eb94
rectorphp/rector-src@014b976 [CodeQuality] Skip used by other property hooks on InlineConstructorDefaultToPropertyRector (#7920)
1 parent 91111d6 commit 672a8e1

File tree

6 files changed

+56
-12
lines changed

6 files changed

+56
-12
lines changed

vendor/composer/installed.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,12 +1820,12 @@
18201820
"source": {
18211821
"type": "git",
18221822
"url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
1823-
"reference": "4f2e7995458ea61d93e2fbd8dc7ac92ad2b1521b"
1823+
"reference": "bf193a48c7d4fc34583b9ffe7330ef380d7b6deb"
18241824
},
18251825
"dist": {
18261826
"type": "zip",
1827-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/4f2e7995458ea61d93e2fbd8dc7ac92ad2b1521b",
1828-
"reference": "4f2e7995458ea61d93e2fbd8dc7ac92ad2b1521b",
1827+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/bf193a48c7d4fc34583b9ffe7330ef380d7b6deb",
1828+
"reference": "bf193a48c7d4fc34583b9ffe7330ef380d7b6deb",
18291829
"shasum": ""
18301830
},
18311831
"require": {
@@ -1852,7 +1852,7 @@
18521852
"tomasvotruba\/unused-public": "^2.2",
18531853
"tracy\/tracy": "^2.11"
18541854
},
1855-
"time": "2026-03-02T16:40:38+00:00",
1855+
"time": "2026-03-04T08:17:44+00:00",
18561856
"default-branch": true,
18571857
"type": "rector-extension",
18581858
"extra": {

vendor/composer/installed.php

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

vendor/rector/extension-installer/src/GeneratedConfig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010
final class GeneratedConfig
1111
{
12-
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 7da017c'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 8c5e9e1'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 4f2e799'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main a2ecd26'));
12+
public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 7da017c'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main 8c5e9e1'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main bf193a4'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main a2ecd26'));
1313
private function __construct()
1414
{
1515
}

vendor/rector/rector-phpunit/rules/CodeQuality/NodeAnalyser/AssertMethodAnalyzer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function detectTestCaseCall($call): bool
5555
}
5656
// only handle methods in TestCase or Assert class classes
5757
$declaringClassName = $extendedMethodReflection->getDeclaringClass()->getName();
58-
return in_array($declaringClassName, [PHPUnitClassName::TEST_CASE, PHPUnitClassName::ASSERT]);
58+
return in_array($declaringClassName, [PHPUnitClassName::TEST_CASE, PHPUnitClassName::ASSERT], \true);
5959
}
6060
public function detectTestCaseCallForStatic(MethodCall $methodCall): bool
6161
{

vendor/rector/rector-phpunit/rules/PHPUnit120/Rector/CallLike/CreateStubOverCreateMockArgRector.php

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace Rector\PHPUnit\PHPUnit120\Rector\CallLike;
55

66
use PhpParser\Node;
7+
use PhpParser\Node\Arg;
78
use PhpParser\Node\ArrayItem;
89
use PhpParser\Node\Expr;
910
use PhpParser\Node\Expr\Assign;
@@ -14,9 +15,19 @@
1415
use PhpParser\Node\Identifier;
1516
use PhpParser\Node\Stmt\ClassMethod;
1617
use PhpParser\Node\Stmt\Expression;
18+
use PHPStan\Reflection\FunctionReflection;
19+
use PHPStan\Reflection\MethodReflection;
20+
use PHPStan\Reflection\ParametersAcceptor;
21+
use PHPStan\Type\MixedType;
22+
use PHPStan\Type\ObjectType;
23+
use PHPStan\Type\Type;
24+
use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
25+
use Rector\PHPStan\ScopeFetcher;
1726
use Rector\PHPUnit\CodeQuality\NodeAnalyser\MockObjectExprDetector;
27+
use Rector\PHPUnit\Enum\PHPUnitClassName;
1828
use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
1929
use Rector\Rector\AbstractRector;
30+
use Rector\Reflection\ReflectionResolver;
2031
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
2132
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
2233
/**
@@ -34,10 +45,15 @@ final class CreateStubOverCreateMockArgRector extends AbstractRector
3445
* @readonly
3546
*/
3647
private MockObjectExprDetector $mockObjectExprDetector;
37-
public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, MockObjectExprDetector $mockObjectExprDetector)
48+
/**
49+
* @readonly
50+
*/
51+
private ReflectionResolver $reflectionResolver;
52+
public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, MockObjectExprDetector $mockObjectExprDetector, ReflectionResolver $reflectionResolver)
3853
{
3954
$this->testsNodeAnalyzer = $testsNodeAnalyzer;
4055
$this->mockObjectExprDetector = $mockObjectExprDetector;
56+
$this->reflectionResolver = $reflectionResolver;
4157
}
4258
public function getRuleDefinition(): RuleDefinition
4359
{
@@ -98,10 +114,21 @@ public function refactor(Node $node)
98114
if ($node->isFirstClassCallable()) {
99115
return null;
100116
}
101-
foreach ($node->getArgs() as $arg) {
117+
$scope = ScopeFetcher::fetch($node);
118+
$reflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($node);
119+
if (!$reflection instanceof FunctionReflection && !$reflection instanceof MethodReflection) {
120+
return null;
121+
}
122+
$parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($reflection, $node, $scope);
123+
foreach ($node->getArgs() as $key => $arg) {
102124
if (!$arg->value instanceof MethodCall) {
103125
continue;
104126
}
127+
$type = $this->resolveTypeFromArgumentAndKey($parametersAcceptor, $arg, $key);
128+
$superType = new ObjectType(PHPUnitClassName::MOCK_OBJECT);
129+
if ($superType->isSuperTypeOf($type)->yes()) {
130+
continue;
131+
}
105132
$methodCall = $arg->value;
106133
if (!$this->isName($methodCall->name, 'createMock')) {
107134
continue;
@@ -114,6 +141,23 @@ public function refactor(Node $node)
114141
}
115142
return null;
116143
}
144+
private function resolveTypeFromArgumentAndKey(ParametersAcceptor $parametersAcceptor, Arg $arg, int $key): Type
145+
{
146+
$parameters = $parametersAcceptor->getParameters();
147+
if (!$arg->name instanceof Identifier) {
148+
if (!isset($parameters[$key])) {
149+
return new MixedType();
150+
}
151+
return $parameters[$key]->getType();
152+
}
153+
foreach ($parameters as $parameter) {
154+
if ($parameter->getName() !== $arg->name->toString()) {
155+
continue;
156+
}
157+
return $parameter->getType();
158+
}
159+
return new MixedType();
160+
}
117161
private function matchCreateMockMethodCall(Expr $expr): ?\PhpParser\Node\Expr\MethodCall
118162
{
119163
if (!$expr instanceof MethodCall) {

vendor/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/PropertyCreateMockToCreateStubRector.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ private function shouldSkipClass(Class_ $class): bool
141141
/**
142142
* @return \PhpParser\Node\IntersectionType|\PhpParser\Node\Name\FullyQualified
143143
*/
144-
private function updatePropertyType(?Node $type)
144+
private function updatePropertyType(?Node $node)
145145
{
146-
if ($type instanceof IntersectionType) {
146+
if ($node instanceof IntersectionType) {
147147
$newTypes = [];
148-
foreach ($type->types as $innerType) {
148+
foreach ($node->types as $innerType) {
149149
if ($innerType instanceof FullyQualified && $innerType->toString() === PHPUnitClassName::MOCK_OBJECT) {
150150
$newTypes[] = new FullyQualified(PHPUnitClassName::STUB);
151151
} else {

0 commit comments

Comments
 (0)