Skip to content

Commit f650d42

Browse files
committed
Updated Rector to commit 6a3101644b93c439234f00d00a4bde62467e3b75
rectorphp/rector-src@6a31016 Add AddOverrideAttributeToOverriddenPropertiesRector for PHP 8.5 (#7880)
1 parent c206840 commit f650d42

5 files changed

Lines changed: 11 additions & 17 deletions

File tree

vendor/composer/installed.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1818,12 +1818,12 @@
18181818
"source": {
18191819
"type": "git",
18201820
"url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
1821-
"reference": "28c21dce120928b3c83a2b87d5595df67d988b88"
1821+
"reference": "0b6744bba763adaa0fb4adfcf3425461799380d4"
18221822
},
18231823
"dist": {
18241824
"type": "zip",
1825-
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/28c21dce120928b3c83a2b87d5595df67d988b88",
1826-
"reference": "28c21dce120928b3c83a2b87d5595df67d988b88",
1825+
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/0b6744bba763adaa0fb4adfcf3425461799380d4",
1826+
"reference": "0b6744bba763adaa0fb4adfcf3425461799380d4",
18271827
"shasum": ""
18281828
},
18291829
"require": {
@@ -1850,7 +1850,7 @@
18501850
"tomasvotruba\/unused-public": "^2.2",
18511851
"tracy\/tracy": "^2.11"
18521852
},
1853-
"time": "2026-02-10T21:10:56+00:00",
1853+
"time": "2026-02-11T12:14:38+00:00",
18541854
"default-branch": true,
18551855
"type": "rector-extension",
18561856
"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 46e4f77'), '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 a110e2f'), '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 28c21dc'), '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 e9008b6'));
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 46e4f77'), '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 a110e2f'), '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 0b6744b'), '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 e9008b6'));
1313
private function __construct()
1414
{
1515
}

vendor/rector/rector-phpunit/rules/CodeQuality/Rector/ClassMethod/BehatPHPUnitAssertToWebmozartRector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ final class BehatPHPUnitAssertToWebmozartRector extends AbstractRector
8585
/**
8686
* @var string[]
8787
*/
88-
private const FLIPPED_ARGS = ['assertSame', 'assertNotSame', 'assertEquals', 'assertNotEquals', 'assertGreaterThan', 'assertGreaterThanOrEqual', 'assertLessThan', 'assertLessThanOrEqual', 'assertCount', 'assertInstanceOf', 'assertNotInstanceOf', 'assertArrayHasKey', 'assertArrayNotHasKey', 'assertStringContainsString'];
88+
private const FLIPPED_ARGS = ['assertSame', 'assertNotSame', 'assertEquals', 'assertNotEquals', 'assertGreaterThan', 'assertGreaterThanOrEqual', 'assertLessThan', 'assertLessThanOrEqual', 'assertCount', 'assertInstanceOf', 'assertNotInstanceOf', 'assertArrayHasKey', 'assertArrayNotHasKey', 'assertStringContainsString', 'assertStringStartsWith', 'assertMatchesRegularExpression'];
8989
public function __construct(ReflectionProvider $reflectionProvider)
9090
{
9191
$this->reflectionProvider = $reflectionProvider;

vendor/rector/rector-phpunit/rules/PHPUnit80/Rector/MethodCall/SpecificAssertContainsRector.php

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
use PhpParser\Node\Expr\MethodCall;
99
use PhpParser\Node\Expr\StaticCall;
1010
use PhpParser\Node\Identifier;
11-
use PHPStan\Type\StringType;
12-
use PHPStan\Type\UnionType;
11+
use PHPStan\Type\TypeCombinator;
1312
use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
1413
use Rector\Rector\AbstractRector;
1514
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -89,13 +88,8 @@ public function refactor(Node $node): ?Node
8988
private function isPossiblyStringType(Expr $expr): bool
9089
{
9190
$exprType = $this->getType($expr);
92-
if ($exprType instanceof UnionType) {
93-
foreach ($exprType->getTypes() as $unionedType) {
94-
if ($unionedType instanceof StringType) {
95-
return \true;
96-
}
97-
}
98-
}
99-
return $exprType instanceof StringType;
91+
$exprType = TypeCombinator::removeNull($exprType);
92+
$exprType = TypeCombinator::removeFalsey($exprType);
93+
return $exprType->isString()->yes();
10094
}
10195
}

0 commit comments

Comments
 (0)