Skip to content

Commit ac438d7

Browse files
TomasVotrubaTomasVotruba
committed
Updated Rector to commit ea18a76803897dc87bdf0dceba2f74356988bc38
rectorphp/rector-src@ea18a76 Ensure pass string on PathNormalizer::normalize() on InstalledPackageResolver (#6865)
1 parent 683d1e6 commit ac438d7

File tree

10 files changed

+33
-29
lines changed

10 files changed

+33
-29
lines changed

‎vendor/composer/installed.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,8 @@
512512
},
513513
{
514514
"name": "illuminate\/container",
515-
"version": "v11.44.5",
516-
"version_normalized": "11.44.5.0",
515+
"version": "v11.44.6",
516+
"version_normalized": "11.44.6.0",
517517
"source": {
518518
"type": "git",
519519
"url": "https:\/\/github.com\/illuminate\/container.git",
@@ -569,8 +569,8 @@
569569
},
570570
{
571571
"name": "illuminate\/contracts",
572-
"version": "v11.44.5",
573-
"version_normalized": "11.44.5.0",
572+
"version": "v11.44.6",
573+
"version_normalized": "11.44.6.0",
574574
"source": {
575575
"type": "git",
576576
"url": "https:\/\/github.com\/illuminate\/contracts.git",
@@ -1804,12 +1804,12 @@
18041804
"source": {
18051805
"type": "git",
18061806
"url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
1807-
"reference": "6f6793527af12ec72ec0f5c8771e28ae89fc1b56"
1807+
"reference": "c61efd3161a1f347d1b2b2d5c0e07392f8d2a104"
18081808
},
18091809
"dist": {
18101810
"type": "zip",
1811-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/6f6793527af12ec72ec0f5c8771e28ae89fc1b56",
1812-
"reference": "6f6793527af12ec72ec0f5c8771e28ae89fc1b56",
1811+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/c61efd3161a1f347d1b2b2d5c0e07392f8d2a104",
1812+
"reference": "c61efd3161a1f347d1b2b2d5c0e07392f8d2a104",
18131813
"shasum": ""
18141814
},
18151815
"require": {
@@ -1822,16 +1822,18 @@
18221822
"phpecs\/phpecs": "^2.0",
18231823
"phpstan\/extension-installer": "^1.4",
18241824
"phpstan\/phpstan": "^2.1.8",
1825+
"phpstan\/phpstan-deprecation-rules": "^2.0",
18251826
"phpstan\/phpstan-webmozart-assert": "^2.0",
18261827
"phpunit\/phpunit": "^11.5",
18271828
"rector\/rector-src": "dev-main",
18281829
"rector\/swiss-knife": "^1.0",
18291830
"rector\/type-perfect": "^2.0",
1831+
"symplify\/phpstan-extensions": "^12.0",
18301832
"symplify\/vendor-patches": "^11.4",
18311833
"tomasvotruba\/class-leak": "^1.2",
18321834
"tracy\/tracy": "^2.10"
18331835
},
1834-
"time": "2025-04-12T15:37:56+00:00",
1836+
"time": "2025-04-25T11:32:58+00:00",
18351837
"default-branch": true,
18361838
"type": "rector-extension",
18371839
"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 c2dac7b'), '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 a719629'), '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 6f67935'), '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 b3a4192'));
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 c2dac7b'), '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 a719629'), '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 c61efd3'), '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 b3a4192'));
1313
private function __construct()
1414
{
1515
}

‎vendor/rector/rector-phpunit/composer.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
"php": ">=8.2"
88
},
99
"require-dev": {
10-
"rector\/rector-src": "dev-main",
11-
"phpunit\/phpunit": "^11.5",
12-
"phpstan\/phpstan": "^2.1.8",
1310
"phpecs\/phpecs": "^2.0",
1411
"phpstan\/extension-installer": "^1.4",
12+
"phpstan\/phpstan": "^2.1.8",
13+
"phpstan\/phpstan-deprecation-rules": "^2.0",
14+
"phpstan\/phpstan-webmozart-assert": "^2.0",
15+
"phpunit\/phpunit": "^11.5",
16+
"rector\/rector-src": "dev-main",
17+
"rector\/swiss-knife": "^1.0",
18+
"rector\/type-perfect": "^2.0",
19+
"symplify\/phpstan-extensions": "^12.0",
1520
"symplify\/vendor-patches": "^11.4",
16-
"tracy\/tracy": "^2.10",
1721
"tomasvotruba\/class-leak": "^1.2",
18-
"rector\/swiss-knife": "^1.0",
19-
"phpstan\/phpstan-webmozart-assert": "^2.0",
20-
"rector\/type-perfect": "^2.0"
22+
"tracy\/tracy": "^2.10"
2123
},
2224
"autoload": {
2325
"psr-4": {

‎vendor/rector/rector-phpunit/rules/AnnotationsToAttributes/Rector/ClassMethod/TestWithAnnotationToAttributeRector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function refactor(Node $node) : ?Node
136136
$genericTagValueNode = $testWithPhpDocTagNode->value;
137137
$testWithItems = \explode("\n", \trim($genericTagValueNode->value));
138138
foreach ($testWithItems as $testWithItem) {
139-
$jsonArray = Json::decode(\trim($testWithItem), Json::FORCE_ARRAY);
139+
$jsonArray = Json::decode(\trim($testWithItem), \true);
140140
$attributeGroups[] = $this->phpAttributeGroupFactory->createFromClassWithItems(self::TEST_WITH_ATTRIBUTE, [$jsonArray]);
141141
}
142142
}

‎vendor/rector/rector-phpunit/rules/CodeQuality/Rector/ClassMethod/RemoveEmptyTestMethodRector.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
use PhpParser\Node;
77
use PhpParser\Node\Stmt\ClassMethod;
8-
use PhpParser\NodeTraverser;
8+
use PhpParser\NodeVisitor;
99
use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
1010
use Rector\Rector\AbstractRector;
1111
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -69,6 +69,6 @@ public function refactor(Node $node) : ?int
6969
if ($node->stmts !== []) {
7070
return null;
7171
}
72-
return NodeTraverser::REMOVE_NODE;
72+
return NodeVisitor::REMOVE_NODE;
7373
}
7474
}

‎vendor/rector/rector-phpunit/rules/CodeQuality/Rector/Class_/ConstructClassMethodToSetUpTestCaseRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use PhpParser\Node\Stmt\Class_;
1313
use PhpParser\Node\Stmt\ClassMethod;
1414
use PhpParser\Node\Stmt\Expression;
15-
use PhpParser\NodeTraverser;
15+
use PhpParser\NodeVisitor;
1616
use PHPStan\Reflection\ClassReflection;
1717
use Rector\NodeAnalyzer\ClassAnalyzer;
1818
use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -153,11 +153,11 @@ private function shouldSkip(Class_ $class, ClassMethod $classMethod) : bool
153153
$isFoundParamUsed = \false;
154154
$this->traverseNodesWithCallable((array) $classMethod->stmts, function (Node $subNode) use($paramNames, &$isFoundParamUsed) : ?int {
155155
if ($subNode instanceof StaticCall && $this->isName($subNode->name, MethodName::CONSTRUCT)) {
156-
return NodeTraverser::DONT_TRAVERSE_CHILDREN;
156+
return NodeVisitor::DONT_TRAVERSE_CHILDREN;
157157
}
158158
if ($subNode instanceof Variable && $this->isNames($subNode, $paramNames)) {
159159
$isFoundParamUsed = \true;
160-
return NodeTraverser::STOP_TRAVERSAL;
160+
return NodeVisitor::STOP_TRAVERSAL;
161161
}
162162
return null;
163163
});

‎vendor/rector/rector-phpunit/rules/CodeQuality/Rector/Class_/PreferPHPUnitThisCallRector.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use PhpParser\Node\Expr\StaticCall;
1010
use PhpParser\Node\Stmt\Class_;
1111
use PhpParser\Node\Stmt\ClassMethod;
12-
use PhpParser\NodeTraverser;
12+
use PhpParser\NodeVisitor;
1313
use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
1414
use Rector\Rector\AbstractRector;
1515
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -26,7 +26,7 @@ final class PreferPHPUnitThisCallRector extends AbstractRector
2626
/**
2727
* @var string[]
2828
*/
29-
private const NON_ASSERT_STATIC_METHODS = ['createMock', 'atLeast', 'atLeastOnce', 'once', 'never'];
29+
private const NON_ASSERT_STATIC_METHODS = ['createMock', 'atLeast', 'atLeastOnce', 'once', 'never', 'expectException', 'expectExceptionMessage', 'expectExceptionCode', 'expectExceptionMessageMatches'];
3030
public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer)
3131
{
3232
$this->testsNodeAnalyzer = $testsNodeAnalyzer;
@@ -76,7 +76,7 @@ public function refactor(Node $node) : ?Node
7676
$this->traverseNodesWithCallable($node, function (Node $node) use(&$hasChanged) {
7777
$isInsideStaticFunctionLike = $node instanceof ClassMethod && $node->isStatic() || $node instanceof Closure && $node->static;
7878
if ($isInsideStaticFunctionLike) {
79-
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
79+
return NodeVisitor::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
8080
}
8181
if (!$node instanceof StaticCall) {
8282
return null;

‎vendor/rector/rector-phpunit/rules/CodeQuality/Rector/Class_/TestWithToDataProviderRector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ private function extractTestWithData(GenericTagValueNode $genericTagValueNode) :
172172
$testWithItems = \explode("\n", \trim($genericTagValueNode->value));
173173
$jsonArray = [];
174174
foreach ($testWithItems as $testWithItem) {
175-
$jsonArray[] = Json::decode(\trim($testWithItem), Json::FORCE_ARRAY);
175+
$jsonArray[] = Json::decode(\trim($testWithItem), \true);
176176
}
177177
return $jsonArray;
178178
}

‎vendor/rector/rector-phpunit/rules/PHPUnit100/Rector/StmtsAwareInterface/ExpectsMethodCallDecorator.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use PhpParser\Node\Expr\StaticCall;
1111
use PhpParser\Node\Expr\Variable;
1212
use PhpParser\Node\Stmt\Expression;
13-
use PhpParser\NodeTraverser;
13+
use PhpParser\NodeVisitor;
1414
use Rector\NodeNameResolver\NodeNameResolver;
1515
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
1616
use Rector\PHPUnit\Enum\ConsecutiveVariable;
@@ -69,7 +69,7 @@ public function decorate(Expression $expression)
6969
return null;
7070
}
7171
$node->var = new MethodCall($node->var, 'expects', [new Arg(new Variable(ConsecutiveVariable::MATCHER))]);
72-
return NodeTraverser::STOP_TRAVERSAL;
72+
return NodeVisitor::STOP_TRAVERSAL;
7373
});
7474
}
7575
return $expectsExactlyCall;

0 commit comments

Comments
 (0)