octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit db6623f608 

db6623f608 Update phpdoc-parser conflict config to <1.6 on scoped build (#2472)
This commit is contained in:
Tomas Votruba 2022-06-10 09:57:49 +00:00
parent a9ffd906d7
commit a262e411c8
9 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -20,7 +20,7 @@
}
},
"conflict": {
"phpstan/phpdoc-parser": "<1.2",
"phpstan/phpdoc-parser": "<1.6",
"rector/rector-prefixed": "*",
"rector/rector-phpunit": "*",
"rector/rector-symfony": "*",

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '368dbb048c0c891e205ec4dae8427b53deb4d316';
public const PACKAGE_VERSION = 'db6623f60856a0adb9bd2efebbdee792c24f195f';
/**
* @var string
*/
public const RELEASE_DATE = '2022-06-10 07:49:18';
public const RELEASE_DATE = '2022-06-10 09:51:40';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit6d0d61ea80e033f5b47110dd1b095ea9
class ComposerAutoloaderInitb91057a9d2a06c426adf05715b841592
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit6d0d61ea80e033f5b47110dd1b095ea9
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit6d0d61ea80e033f5b47110dd1b095ea9', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitb91057a9d2a06c426adf05715b841592', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit6d0d61ea80e033f5b47110dd1b095ea9', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitb91057a9d2a06c426adf05715b841592', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit6d0d61ea80e033f5b47110dd1b095ea9::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitb91057a9d2a06c426adf05715b841592::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit6d0d61ea80e033f5b47110dd1b095ea9::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitb91057a9d2a06c426adf05715b841592::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire6d0d61ea80e033f5b47110dd1b095ea9($fileIdentifier, $file);
composerRequireb91057a9d2a06c426adf05715b841592($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit6d0d61ea80e033f5b47110dd1b095ea9
* @param string $file
* @return void
*/
function composerRequire6d0d61ea80e033f5b47110dd1b095ea9($fileIdentifier, $file)
function composerRequireb91057a9d2a06c426adf05715b841592($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit6d0d61ea80e033f5b47110dd1b095ea9
class ComposerStaticInitb91057a9d2a06c426adf05715b841592
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3389,9 +3389,9 @@ class ComposerStaticInit6d0d61ea80e033f5b47110dd1b095ea9
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit6d0d61ea80e033f5b47110dd1b095ea9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6d0d61ea80e033f5b47110dd1b095ea9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit6d0d61ea80e033f5b47110dd1b095ea9::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitb91057a9d2a06c426adf05715b841592::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitb91057a9d2a06c426adf05715b841592::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitb91057a9d2a06c426adf05715b841592::$classMap;
}, null, ClassLoader::class);
}

15
vendor/composer/installed.json vendored
View File

@ -755,17 +755,17 @@
},
{
"name": "phpstan\/phpdoc-parser",
"version": "1.6.0",
"version_normalized": "1.6.0.0",
"version": "1.6.2",
"version_normalized": "1.6.2.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpdoc-parser.git",
"reference": "3cb62d10845338136ff4ba299ab0986bbf84ba77"
"reference": "76150ae7512439b4e6903db834e4a327596b617d"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/3cb62d10845338136ff4ba299ab0986bbf84ba77",
"reference": "3cb62d10845338136ff4ba299ab0986bbf84ba77",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/76150ae7512439b4e6903db834e4a327596b617d",
"reference": "76150ae7512439b4e6903db834e4a327596b617d",
"shasum": ""
},
"require": {
@ -775,11 +775,12 @@
"php-parallel-lint\/php-parallel-lint": "^1.2",
"phpstan\/extension-installer": "^1.0",
"phpstan\/phpstan": "^1.5",
"phpstan\/phpstan-phpunit": "^1.1",
"phpstan\/phpstan-strict-rules": "^1.0",
"phpunit\/phpunit": "^9.5",
"symfony\/process": "^5.2"
},
"time": "2022-06-09T09:45:59+00:00",
"time": "2022-06-10T09:29:33+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -796,7 +797,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.6.0"
"source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.6.2"
},
"install-path": "..\/phpstan\/phpdoc-parser"
},

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

1
vendor/phpstan/phpdoc-parser/composer.json vendored
View File

@ -9,6 +9,7 @@
"php-parallel-lint\/php-parallel-lint": "^1.2",
"phpstan\/extension-installer": "^1.0",
"phpstan\/phpstan": "^1.5",
"phpstan\/phpstan-phpunit": "^1.1",
"phpstan\/phpstan-strict-rules": "^1.0",
"phpunit\/phpunit": "^9.5",
"symfony\/process": "^5.2"

21
vendor/phpstan/phpdoc-parser/src/Lexer/Lexer.php vendored
View File

@ -62,15 +62,10 @@ class Lexer
}
assert($this->regexp !== null);
assert($this->types !== null);
preg_match_all($this->regexp, $s, $tokens, PREG_SET_ORDER);
$count = count($this->types);
foreach ($tokens as &$match) {
for ($i = 1; $i <= $count; $i++) {
if ($match[$i] !== null && $match[$i] !== '') {
$match = [$match[0], $this->types[$i - 1]];
break;
}
}
preg_match_all($this->regexp, $s, $matches, PREG_SET_ORDER);
$tokens = [];
foreach ($matches as $match) {
$tokens[] = [$match[0], $this->types[count($match) - 2]];
}
$tokens[] = ['', self::TOKEN_END];
return $tokens;
@ -78,6 +73,10 @@ class Lexer
private function initialize() : void
{
$patterns = [
self::TOKEN_HORIZONTAL_WS => '[\\x09\\x20]++',
self::TOKEN_IDENTIFIER => '(?:[\\\\]?+[a-z_\\x80-\\xFF][0-9a-z_\\x80-\\xFF-]*+)++',
self::TOKEN_THIS_VARIABLE => '\\$this(?![0-9a-z_\\x80-\\xFF])',
self::TOKEN_VARIABLE => '\\$[a-z_\\x80-\\xFF][0-9a-z_\\x80-\\xFF]*+',
// '&' followed by TOKEN_VARIADIC, TOKEN_VARIABLE, TOKEN_EQUAL, TOKEN_EQUAL or TOKEN_CLOSE_PARENTHESES
self::TOKEN_REFERENCE => '&(?=\\s*+(?:[.,=)]|(?:\\$(?!this(?![0-9a-z_\\x80-\\xFF])))))',
self::TOKEN_UNION => '\\|',
@ -106,10 +105,6 @@ class Lexer
self::TOKEN_INTEGER => '-?(?:(?:0b[0-1]++)|(?:0o[0-7]++)|(?:0x[0-9a-f]++)|(?:[0-9]++))',
self::TOKEN_SINGLE_QUOTED_STRING => '\'(?:\\\\[^\\r\\n]|[^\'\\r\\n\\\\])*+\'',
self::TOKEN_DOUBLE_QUOTED_STRING => '"(?:\\\\[^\\r\\n]|[^"\\r\\n\\\\])*+"',
self::TOKEN_IDENTIFIER => '(?:[\\\\]?+[a-z_\\x80-\\xFF][0-9a-z_\\x80-\\xFF-]*+)++',
self::TOKEN_THIS_VARIABLE => '\\$this(?![0-9a-z_\\x80-\\xFF])',
self::TOKEN_VARIABLE => '\\$[a-z_\\x80-\\xFF][0-9a-z_\\x80-\\xFF]*+',
self::TOKEN_HORIZONTAL_WS => '[\\x09\\x20]++',
self::TOKEN_WILDCARD => '\\*',
// anything but TOKEN_CLOSE_PHPDOC or TOKEN_HORIZONTAL_WS or TOKEN_EOL
self::TOKEN_OTHER => '(?:(?!\\*/)[^\\s])++',