Updated Rector to commit eb5df4dde7515bbc497af6da84d5f9dbf96399d8

eb5df4dde7 Use vendor-patches main branch (#6453)
This commit is contained in:
Tomas Votruba 2024-11-20 17:08:46 +00:00
parent 1ecae80ea8
commit 1c26e0e6fa
5 changed files with 12 additions and 8 deletions

View File

@ -1750,12 +1750,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-downgrade-php.git",
"reference": "bb0c6c5225dbce2611df35cce447fca5bf6e0045"
"reference": "f27079261e79b8da625b8755054eaea35338b007"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/bb0c6c5225dbce2611df35cce447fca5bf6e0045",
"reference": "bb0c6c5225dbce2611df35cce447fca5bf6e0045",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-downgrade-php\/zipball\/f27079261e79b8da625b8755054eaea35338b007",
"reference": "f27079261e79b8da625b8755054eaea35338b007",
"shasum": ""
},
"require": {
@ -1773,7 +1773,7 @@
"tomasvotruba\/class-leak": "^1.0",
"tracy\/tracy": "^2.10"
},
"time": "2024-11-20T16:52:32+00:00",
"time": "2024-11-20T17:05:33+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

File diff suppressed because one or more lines are too long

View File

@ -11,11 +11,11 @@ class Token extends \PhpParser\Internal\TokenPolyfill
/** Get (exclusive) zero-based end position of the token. */
public function getEndPos() : int
{
return $this->pos + \strlen(\is_array($this) ? $this[1] : $this);
return $this->pos + \strlen($this->text);
}
/** Get 1-based end line number of the token. */
public function getEndLine() : int
{
return $this->line + \substr_count(\is_array($this) ? $this[1] : $this, "\n");
return $this->line + \substr_count($this->text, "\n");
}
}

View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
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 02ae401'), '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 bb0c6c5'), '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 a506b2c'), '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 89fa7a4'));
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 02ae401'), '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 f270792'), '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 a506b2c'), '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 89fa7a4'));
private function __construct()
{
}

View File

@ -14,6 +14,7 @@ use PhpParser\Node\Expr\Ternary;
use PhpParser\Node\Name;
use PhpParser\Node\Scalar\Int_;
use PHPStan\Type\ObjectType;
use PHPStan\Type\ThisType;
use PHPStan\Type\Type;
use Rector\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@ -114,6 +115,9 @@ CODE_SAMPLE
}
private function skipPhpParserInternalToken(Type $type) : bool
{
if ($type instanceof ThisType) {
$type = $type->getStaticObjectType();
}
if ($type instanceof ObjectType) {
return $type->isInstanceOf('PhpParser\\Internal\\TokenPolyfill')->yes();
}