Updated Rector to commit 83fdfb3648e0c1a636ef0589e261cc48ea921456

83fdfb3648 [DeadCode] Handle duplicated annotation on space before close parentheses on RemoveUselessParamTagRector (#4795)
This commit is contained in:
Tomas Votruba 2023-08-15 15:20:12 +00:00
parent 1f172665e6
commit 61d0700b14
7 changed files with 25 additions and 21 deletions

View File

@ -112,7 +112,8 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
if (!$nextPhpDocChildNode->value instanceof GenericTagValueNode) {
continue;
}
if ($this->isClosedContent($genericTagValueNode->value)) {
$isNewLinedGenericTagValueNode = \strncmp($genericTagValueNode->value, '(', \strlen('(')) === 0 && \substr_compare($genericTagValueNode->value, ')', -\strlen(')')) !== 0;
if ($this->isClosedContent($genericTagValueNode->value, $isNewLinedGenericTagValueNode)) {
break;
}
$composedContent = $genericTagValueNode->value . \PHP_EOL . $nextPhpDocChildNode->name . $nextPhpDocChildNode->value->value;
@ -171,7 +172,7 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
* This is closed block, e.g. {( ... )},
* false on: {( ... )
*/
private function isClosedContent(string $composedContent) : bool
private function isClosedContent(string $composedContent, bool $isNewLined) : bool
{
$composedTokenIterator = $this->tokenIteratorFactory->create($composedContent);
$tokenCount = $composedTokenIterator->count();
@ -181,11 +182,14 @@ final class DoctrineAnnotationDecorator implements PhpDocNodeDecoratorInterface
return \true;
}
do {
if ($composedTokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET, Lexer::TOKEN_CLOSE_PARENTHESES) || \strpos($composedTokenIterator->currentTokenValue(), ')') !== \false) {
++$closeBracketCount;
}
if ($composedTokenIterator->isCurrentTokenType(Lexer::TOKEN_OPEN_CURLY_BRACKET, Lexer::TOKEN_OPEN_PARENTHESES) || \strpos($composedTokenIterator->currentTokenValue(), '(') !== \false) {
++$openBracketCount;
}
if ($composedTokenIterator->isCurrentTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET, Lexer::TOKEN_CLOSE_PARENTHESES) || \strpos($composedTokenIterator->currentTokenValue(), ')') !== \false) {
++$closeBracketCount;
if ($composedTokenIterator->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL) && $composedTokenIterator->getContentBetween($composedTokenIterator->currentPosition() - 1, $composedTokenIterator->currentPosition()) === '(' && $isNewLined && $openBracketCount > $closeBracketCount) {
--$openBracketCount;
}
$composedTokenIterator->next();
} while ($composedTokenIterator->currentPosition() < $tokenCount - 1);

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'd8d4e8d0b244ba368e3ce8767343c71b108ec93c';
public const PACKAGE_VERSION = '83fdfb3648e0c1a636ef0589e261cc48ea921456';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-14 20:58:29';
public const RELEASE_DATE = '2023-08-15 22:16:05';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitac102f4955b679dbad1826e7ab76734d::getLoader();
return ComposerAutoloaderInit58ea6986522d3c31aaeb0ef2dd623920::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitac102f4955b679dbad1826e7ab76734d
class ComposerAutoloaderInit58ea6986522d3c31aaeb0ef2dd623920
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInitac102f4955b679dbad1826e7ab76734d
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitac102f4955b679dbad1826e7ab76734d', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit58ea6986522d3c31aaeb0ef2dd623920', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitac102f4955b679dbad1826e7ab76734d', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit58ea6986522d3c31aaeb0ef2dd623920', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitac102f4955b679dbad1826e7ab76734d::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit58ea6986522d3c31aaeb0ef2dd623920::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInitac102f4955b679dbad1826e7ab76734d::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit58ea6986522d3c31aaeb0ef2dd623920::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitac102f4955b679dbad1826e7ab76734d
class ComposerStaticInit58ea6986522d3c31aaeb0ef2dd623920
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2959,9 +2959,9 @@ class ComposerStaticInitac102f4955b679dbad1826e7ab76734d
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitac102f4955b679dbad1826e7ab76734d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitac102f4955b679dbad1826e7ab76734d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitac102f4955b679dbad1826e7ab76734d::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit58ea6986522d3c31aaeb0ef2dd623920::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit58ea6986522d3c31aaeb0ef2dd623920::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit58ea6986522d3c31aaeb0ef2dd623920::$classMap;
}, null, ClassLoader::class);
}

View File

@ -504,8 +504,8 @@
},
{
"name": "illuminate\/container",
"version": "v10.18.0",
"version_normalized": "10.18.0.0",
"version": "v10.19.0",
"version_normalized": "10.19.0.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/illuminate\/container.git",
@ -561,8 +561,8 @@
},
{
"name": "illuminate\/contracts",
"version": "v10.18.0",
"version_normalized": "10.18.0.0",
"version": "v10.19.0",
"version_normalized": "10.19.0.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/illuminate\/contracts.git",

File diff suppressed because one or more lines are too long