Updated Rector to commit a16a04d0bc90df11918efd4b7fc117a9e3dcc1c3

a16a04d0bc composer-dependency-analyser: fix dependency issues (#5777)
This commit is contained in:
Tomas Votruba 2024-04-04 14:00:19 +00:00
parent e004423e08
commit d59efe6a88
8 changed files with 38 additions and 22 deletions

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api * @api
* @var string * @var string
*/ */
public const PACKAGE_VERSION = '8e022d170a2e88d66e12631536f298de8b22d42d'; public const PACKAGE_VERSION = 'a16a04d0bc90df11918efd4b7fc117a9e3dcc1c3';
/** /**
* @api * @api
* @var string * @var string
*/ */
public const RELEASE_DATE = '2024-04-03 18:39:54'; public const RELEASE_DATE = '2024-04-04 20:57:17';
/** /**
* @var int * @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'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit67be42e0079886f0083b7116ae1de531::getLoader(); return ComposerAutoloaderInit005507a96a37a412a8adf9cfaae1e621::getLoader();

View File

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

View File

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

View File

@ -858,17 +858,17 @@
}, },
{ {
"name": "phpstan\/phpdoc-parser", "name": "phpstan\/phpdoc-parser",
"version": "1.27.0", "version": "1.28.0",
"version_normalized": "1.27.0.0", "version_normalized": "1.28.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https:\/\/github.com\/phpstan\/phpdoc-parser.git", "url": "https:\/\/github.com\/phpstan\/phpdoc-parser.git",
"reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757" "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/86e4d5a4b036f8f0be1464522f4c6b584c452757", "url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757", "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -885,7 +885,7 @@
"phpunit\/phpunit": "^9.5", "phpunit\/phpunit": "^9.5",
"symfony\/process": "^5.2" "symfony\/process": "^5.2"
}, },
"time": "2024-03-21T13:14:53+00:00", "time": "2024-04-03T18:51:33+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -902,7 +902,7 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types", "description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": { "support": {
"issues": "https:\/\/github.com\/phpstan\/phpdoc-parser\/issues", "issues": "https:\/\/github.com\/phpstan\/phpdoc-parser\/issues",
"source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.27.0" "source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.28.0"
}, },
"install-path": "..\/phpstan\/phpdoc-parser" "install-path": "..\/phpstan\/phpdoc-parser"
}, },

File diff suppressed because one or more lines are too long

View File

@ -282,6 +282,7 @@ class PhpDocParser
case '@param': case '@param':
case '@phpstan-param': case '@phpstan-param':
case '@psalm-param': case '@psalm-param':
case '@phan-param':
$tagValue = $this->parseParamTagValue($tokens); $tagValue = $this->parseParamTagValue($tokens);
break; break;
case '@param-immediately-invoked-callable': case '@param-immediately-invoked-callable':
@ -299,11 +300,14 @@ class PhpDocParser
case '@var': case '@var':
case '@phpstan-var': case '@phpstan-var':
case '@psalm-var': case '@psalm-var':
case '@phan-var':
$tagValue = $this->parseVarTagValue($tokens); $tagValue = $this->parseVarTagValue($tokens);
break; break;
case '@return': case '@return':
case '@phpstan-return': case '@phpstan-return':
case '@psalm-return': case '@psalm-return':
case '@phan-return':
case '@phan-real-return':
$tagValue = $this->parseReturnTagValue($tokens); $tagValue = $this->parseReturnTagValue($tokens);
break; break;
case '@throws': case '@throws':
@ -311,6 +315,7 @@ class PhpDocParser
$tagValue = $this->parseThrowsTagValue($tokens); $tagValue = $this->parseThrowsTagValue($tokens);
break; break;
case '@mixin': case '@mixin':
case '@phan-mixin':
$tagValue = $this->parseMixinTagValue($tokens); $tagValue = $this->parseMixinTagValue($tokens);
break; break;
case '@psalm-require-extends': case '@psalm-require-extends':
@ -333,16 +338,21 @@ class PhpDocParser
case '@psalm-property': case '@psalm-property':
case '@psalm-property-read': case '@psalm-property-read':
case '@psalm-property-write': case '@psalm-property-write':
case '@phan-property':
case '@phan-property-read':
case '@phan-property-write':
$tagValue = $this->parsePropertyTagValue($tokens); $tagValue = $this->parsePropertyTagValue($tokens);
break; break;
case '@method': case '@method':
case '@phpstan-method': case '@phpstan-method':
case '@psalm-method': case '@psalm-method':
case '@phan-method':
$tagValue = $this->parseMethodTagValue($tokens); $tagValue = $this->parseMethodTagValue($tokens);
break; break;
case '@template': case '@template':
case '@phpstan-template': case '@phpstan-template':
case '@psalm-template': case '@psalm-template':
case '@phan-template':
case '@template-covariant': case '@template-covariant':
case '@phpstan-template-covariant': case '@phpstan-template-covariant':
case '@psalm-template-covariant': case '@psalm-template-covariant':
@ -355,6 +365,8 @@ class PhpDocParser
break; break;
case '@extends': case '@extends':
case '@phpstan-extends': case '@phpstan-extends':
case '@phan-extends':
case '@phan-inherits':
case '@template-extends': case '@template-extends':
$tagValue = $this->parseExtendsTagValue('@extends', $tokens); $tagValue = $this->parseExtendsTagValue('@extends', $tokens);
break; break;
@ -370,6 +382,7 @@ class PhpDocParser
break; break;
case '@phpstan-type': case '@phpstan-type':
case '@psalm-type': case '@psalm-type':
case '@phan-type':
$tagValue = $this->parseTypeAliasTagValue($tokens); $tagValue = $this->parseTypeAliasTagValue($tokens);
break; break;
case '@phpstan-import-type': case '@phpstan-import-type':
@ -382,6 +395,9 @@ class PhpDocParser
case '@psalm-assert': case '@psalm-assert':
case '@psalm-assert-if-true': case '@psalm-assert-if-true':
case '@psalm-assert-if-false': case '@psalm-assert-if-false':
case '@phan-assert':
case '@phan-assert-if-true':
case '@phan-assert-if-false':
$tagValue = $this->parseAssertTagValue($tokens); $tagValue = $this->parseAssertTagValue($tokens);
break; break;
case '@phpstan-this-out': case '@phpstan-this-out':
@ -759,7 +775,7 @@ class PhpDocParser
{ {
$alias = $tokens->currentTokenValue(); $alias = $tokens->currentTokenValue();
$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER); $tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
// support psalm-type syntax // support phan-type/psalm-type syntax
$tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL); $tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL);
if ($this->preserveTypeAliasesWithInvalidTypes) { if ($this->preserveTypeAliasesWithInvalidTypes) {
$startLine = $tokens->currentTokenLine(); $startLine = $tokens->currentTokenLine();

View File

@ -30,7 +30,7 @@ if (!function_exists('humbug_phpscoper_expose_class')) {
} }
} }
humbug_phpscoper_expose_class('AutoloadIncluder', 'RectorPrefix202404\AutoloadIncluder'); humbug_phpscoper_expose_class('AutoloadIncluder', 'RectorPrefix202404\AutoloadIncluder');
humbug_phpscoper_expose_class('ComposerAutoloaderInit67be42e0079886f0083b7116ae1de531', 'RectorPrefix202404\ComposerAutoloaderInit67be42e0079886f0083b7116ae1de531'); humbug_phpscoper_expose_class('ComposerAutoloaderInit005507a96a37a412a8adf9cfaae1e621', 'RectorPrefix202404\ComposerAutoloaderInit005507a96a37a412a8adf9cfaae1e621');
humbug_phpscoper_expose_class('Product', 'RectorPrefix202404\Product'); humbug_phpscoper_expose_class('Product', 'RectorPrefix202404\Product');
// Function aliases. For more information see: // Function aliases. For more information see: