From 3b5a7181baad9bb7116db75c5c322e42ddca4735 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 15 Aug 2022 18:36:53 +0000 Subject: [PATCH] Updated Rector to commit 1f6cea323ef7a3125c8fe56958e71ad4dd9944c7 https://github.com/rectorphp/rector-src/commit/1f6cea323ef7a3125c8fe56958e71ad4dd9944c7 [Php80] Handle trailing comma on AnnotationToAttributeRector on Doctrine JoinColumn (#2766) --- .../StaticDoctrineAnnotationParser.php | 3 +++ src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php index e416a086934..73252d362ac 100644 --- a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php +++ b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser.php @@ -94,6 +94,9 @@ final class StaticDoctrineAnnotationParser if (\is_array($nestedValues)) { $values = \array_merge($values, $nestedValues); } else { + if ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_END)) { + break; + } $values[] = $nestedValues; } } diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index fd5a22c6738..703a643a625 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -17,12 +17,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '2977d091b2a7dfcddf855c376534a835876e3ffd'; + public const PACKAGE_VERSION = '1f6cea323ef7a3125c8fe56958e71ad4dd9944c7'; /** * @api * @var string */ - public const RELEASE_DATE = '2022-08-15 20:31:16'; + public const RELEASE_DATE = '2022-08-15 20:31:51'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index affb02bb89f..8a94bc98aa9 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit30e12c774bc11b584246cf359fb708c1::getLoader(); +return ComposerAutoloaderInitff69ad3dd9c3119a43b6dcd529d4ff78::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b1df5e93c1b..9a0c0519c75 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit30e12c774bc11b584246cf359fb708c1 +class ComposerAutoloaderInitff69ad3dd9c3119a43b6dcd529d4ff78 { private static $loader; @@ -22,19 +22,19 @@ class ComposerAutoloaderInit30e12c774bc11b584246cf359fb708c1 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit30e12c774bc11b584246cf359fb708c1', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitff69ad3dd9c3119a43b6dcd529d4ff78', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit30e12c774bc11b584246cf359fb708c1', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitff69ad3dd9c3119a43b6dcd529d4ff78', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit30e12c774bc11b584246cf359fb708c1::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitff69ad3dd9c3119a43b6dcd529d4ff78::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit30e12c774bc11b584246cf359fb708c1::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInitff69ad3dd9c3119a43b6dcd529d4ff78::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire30e12c774bc11b584246cf359fb708c1($fileIdentifier, $file); + composerRequireff69ad3dd9c3119a43b6dcd529d4ff78($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ class ComposerAutoloaderInit30e12c774bc11b584246cf359fb708c1 * @param string $file * @return void */ -function composerRequire30e12c774bc11b584246cf359fb708c1($fileIdentifier, $file) +function composerRequireff69ad3dd9c3119a43b6dcd529d4ff78($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index da6552c425e..86f4b25fc10 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit30e12c774bc11b584246cf359fb708c1 +class ComposerStaticInitff69ad3dd9c3119a43b6dcd529d4ff78 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -3250,9 +3250,9 @@ class ComposerStaticInit30e12c774bc11b584246cf359fb708c1 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit30e12c774bc11b584246cf359fb708c1::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit30e12c774bc11b584246cf359fb708c1::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit30e12c774bc11b584246cf359fb708c1::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitff69ad3dd9c3119a43b6dcd529d4ff78::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitff69ad3dd9c3119a43b6dcd529d4ff78::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitff69ad3dd9c3119a43b6dcd529d4ff78::$classMap; }, null, ClassLoader::class); }