Skip to content

Commit

Permalink
Updated Rector to commit a16a04d0bc90df11918efd4b7fc117a9e3dcc1c3
Browse files Browse the repository at this point in the history
rectorphp/rector-src@a16a04d composer-dependency-analyser: fix dependency issues (#5777)
  • Loading branch information
TomasVotruba committed Apr 4, 2024
1 parent e004423 commit d59efe6
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 22 deletions.
4 changes: 2 additions & 2 deletions src/Application/VersionResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '8e022d170a2e88d66e12631536f298de8b22d42d';
public const PACKAGE_VERSION = 'a16a04d0bc90df11918efd4b7fc117a9e3dcc1c3';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-04-03 18:39:54';
public const RELEASE_DATE = '2024-04-04 20:57:17';
/**
* @var int
*/
Expand Down
2 changes: 1 addition & 1 deletion vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInit67be42e0079886f0083b7116ae1de531::getLoader();
return ComposerAutoloaderInit005507a96a37a412a8adf9cfaae1e621::getLoader();
10 changes: 5 additions & 5 deletions vendor/composer/autoload_real.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// autoload_real.php @generated by Composer

class ComposerAutoloaderInit67be42e0079886f0083b7116ae1de531
class ComposerAutoloaderInit005507a96a37a412a8adf9cfaae1e621
{
private static $loader;

Expand All @@ -22,17 +22,17 @@ public static function getLoader()
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__));
spl_autoload_unregister(array('ComposerAutoloaderInit67be42e0079886f0083b7116ae1de531', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit005507a96a37a412a8adf9cfaae1e621', 'loadClassLoader'));

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->register(true);

$filesToLoad = \Composer\Autoload\ComposerStaticInit67be42e0079886f0083b7116ae1de531::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit005507a96a37a412a8adf9cfaae1e621::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/autoload_static.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace Composer\Autoload;

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

}, null, ClassLoader::class);
}
Expand Down
14 changes: 7 additions & 7 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -858,17 +858,17 @@
},
{
"name": "phpstan\/phpdoc-parser",
"version": "1.27.0",
"version_normalized": "1.27.0.0",
"version": "1.28.0",
"version_normalized": "1.28.0.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpdoc-parser.git",
"reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757"
"reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/86e4d5a4b036f8f0be1464522f4c6b584c452757",
"reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
"shasum": ""
},
"require": {
Expand All @@ -885,7 +885,7 @@
"phpunit\/phpunit": "^9.5",
"symfony\/process": "^5.2"
},
"time": "2024-03-21T13:14:53+00:00",
"time": "2024-04-03T18:51:33+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -902,7 +902,7 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"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"
},
Expand Down
2 changes: 1 addition & 1 deletion vendor/composer/installed.php

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion vendor/phpstan/phpdoc-parser/src/Parser/PhpDocParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ public function parseTagValue(\PHPStan\PhpDocParser\Parser\TokenIterator $tokens
case '@param':
case '@phpstan-param':
case '@psalm-param':
case '@phan-param':
$tagValue = $this->parseParamTagValue($tokens);
break;
case '@param-immediately-invoked-callable':
Expand All @@ -299,18 +300,22 @@ public function parseTagValue(\PHPStan\PhpDocParser\Parser\TokenIterator $tokens
case '@var':
case '@phpstan-var':
case '@psalm-var':
case '@phan-var':
$tagValue = $this->parseVarTagValue($tokens);
break;
case '@return':
case '@phpstan-return':
case '@psalm-return':
case '@phan-return':
case '@phan-real-return':
$tagValue = $this->parseReturnTagValue($tokens);
break;
case '@throws':
case '@phpstan-throws':
$tagValue = $this->parseThrowsTagValue($tokens);
break;
case '@mixin':
case '@phan-mixin':
$tagValue = $this->parseMixinTagValue($tokens);
break;
case '@psalm-require-extends':
Expand All @@ -333,16 +338,21 @@ public function parseTagValue(\PHPStan\PhpDocParser\Parser\TokenIterator $tokens
case '@psalm-property':
case '@psalm-property-read':
case '@psalm-property-write':
case '@phan-property':
case '@phan-property-read':
case '@phan-property-write':
$tagValue = $this->parsePropertyTagValue($tokens);
break;
case '@method':
case '@phpstan-method':
case '@psalm-method':
case '@phan-method':
$tagValue = $this->parseMethodTagValue($tokens);
break;
case '@template':
case '@phpstan-template':
case '@psalm-template':
case '@phan-template':
case '@template-covariant':
case '@phpstan-template-covariant':
case '@psalm-template-covariant':
Expand All @@ -355,6 +365,8 @@ public function parseTagValue(\PHPStan\PhpDocParser\Parser\TokenIterator $tokens
break;
case '@extends':
case '@phpstan-extends':
case '@phan-extends':
case '@phan-inherits':
case '@template-extends':
$tagValue = $this->parseExtendsTagValue('@extends', $tokens);
break;
Expand All @@ -370,6 +382,7 @@ public function parseTagValue(\PHPStan\PhpDocParser\Parser\TokenIterator $tokens
break;
case '@phpstan-type':
case '@psalm-type':
case '@phan-type':
$tagValue = $this->parseTypeAliasTagValue($tokens);
break;
case '@phpstan-import-type':
Expand All @@ -382,6 +395,9 @@ public function parseTagValue(\PHPStan\PhpDocParser\Parser\TokenIterator $tokens
case '@psalm-assert':
case '@psalm-assert-if-true':
case '@psalm-assert-if-false':
case '@phan-assert':
case '@phan-assert-if-true':
case '@phan-assert-if-false':
$tagValue = $this->parseAssertTagValue($tokens);
break;
case '@phpstan-this-out':
Expand Down Expand Up @@ -759,7 +775,7 @@ private function parseTypeAliasTagValue(\PHPStan\PhpDocParser\Parser\TokenIterat
{
$alias = $tokens->currentTokenValue();
$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
// support psalm-type syntax
// support phan-type/psalm-type syntax
$tokens->tryConsumeTokenType(Lexer::TOKEN_EQUAL);
if ($this->preserveTypeAliasesWithInvalidTypes) {
$startLine = $tokens->currentTokenLine();
Expand Down
2 changes: 1 addition & 1 deletion vendor/scoper-autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function humbug_phpscoper_expose_class($exposed, $prefixed) {
}
}
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');

// Function aliases. For more information see:
Expand Down

0 comments on commit d59efe6

Please sign in to comment.