From 9eed15ece98cbf5dd2d1238d427b7ed62ea76a1c Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Fri, 2 Jun 2023 10:03:55 +0000 Subject: [PATCH] Updated Rector to commit 897cdda68d73ed5fcc1c768219207ff54c8459cb https://github.com/rectorphp/rector-src/commit/897cdda68d73ed5fcc1c768219207ff54c8459cb Apply coding standard (#4047) --- .../PhpDoc/ArrayItemNode.php | 1 - .../AbstractValuesAwareNode.php | 8 +++--- src/Application/VersionResolver.php | 4 +-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 10 +++---- vendor/composer/autoload_static.php | 8 +++--- vendor/composer/installed.json | 28 +++++++++---------- vendor/composer/installed.php | 2 +- .../src/GeneratedConfig.php | 2 +- vendor/rector/rector-doctrine/composer.json | 4 +-- .../src/NodeFactory/EntityIdNodeFactory.php | 6 ++-- .../ColumnPropertyTypeResolver.php | 9 ++++-- .../DoctrineItemDefaultValueManipulator.php | 4 +++ .../ToManyRelationPropertyTypeResolver.php | 9 ++++-- .../ToOneRelationPropertyTypeResolver.php | 4 +++ ...TimeDefaultInEntityToConstructorRector.php | 7 ++++- ...ngeBigIntEntityPropertyToIntTypeRector.php | 7 ++++- ...rectDefaultTypesOnEntityPropertyRector.php | 4 +++ ...argetEntityStringToClassConstantRector.php | 14 ++++++---- .../TypeAnalyzer/CollectionTypeResolver.php | 9 ++++-- vendor/rector/rector-symfony/composer.json | 8 +++--- .../RouteRequiredParamNameToTypesResolver.php | 15 +++++++--- .../Annotations/StringValueQuoteWrapper.php | 7 +++-- .../src/NodeFactory/ThisRenderFactory.php | 27 ++++++++++++++---- .../ClassMethod/AddRouteAnnotationRector.php | 14 +++++----- ...ethodAnnotationToRouteAnnotationRector.php | 8 +++--- .../src/TypeAnalyzer/JMSDITypeResolver.php | 21 +++++++++++--- 27 files changed, 159 insertions(+), 83 deletions(-) diff --git a/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php b/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php index c801bc70c52..9067250986b 100644 --- a/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php +++ b/packages/BetterPhpDocParser/PhpDoc/ArrayItemNode.php @@ -3,7 +3,6 @@ declare (strict_types=1); namespace Rector\BetterPhpDocParser\PhpDoc; -use PhpParser\Node\Scalar\String_; use PHPStan\PhpDocParser\Ast\NodeAttributes; use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode; use Stringable; diff --git a/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php b/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php index 486725f8293..0aa3e11d98e 100644 --- a/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php +++ b/packages/BetterPhpDocParser/ValueObject/PhpDoc/DoctrineAnnotation/AbstractValuesAwareNode.php @@ -117,12 +117,12 @@ abstract class AbstractValuesAwareNode implements PhpDocTagValueNode } return $itemContents; } - private function isValueKeyEquals(ArrayItemNode $value, string $desiredKey) : bool + private function isValueKeyEquals(ArrayItemNode $arrayItemNode, string $desiredKey) : bool { - if ($value->key instanceof StringNode) { - return $value->key->value === $desiredKey; + if ($arrayItemNode->key instanceof StringNode) { + return $arrayItemNode->key->value === $desiredKey; } - return $value->key === $desiredKey; + return $arrayItemNode->key === $desiredKey; } /** * @param mixed $value diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index a6620e3d13e..97e8c03a0f8 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -19,12 +19,12 @@ final class VersionResolver * @api * @var string */ - public const PACKAGE_VERSION = '92ff716761e19c7f30bd68065af7eeefac0480de'; + public const PACKAGE_VERSION = '897cdda68d73ed5fcc1c768219207ff54c8459cb'; /** * @api * @var string */ - public const RELEASE_DATE = '2023-06-02 10:38:22'; + public const RELEASE_DATE = '2023-06-02 11:00:00'; /** * @var int */ diff --git a/vendor/autoload.php b/vendor/autoload.php index 060a16b6945..bdfbf566211 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitcf48d20d0276ea83626472d23bf244a0::getLoader(); +return ComposerAutoloaderInit1d9bd30edaf60f0968a6ac6add7989f5::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 0a9fce3aa5f..450c43e1cc9 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitcf48d20d0276ea83626472d23bf244a0 +class ComposerAutoloaderInit1d9bd30edaf60f0968a6ac6add7989f5 { private static $loader; @@ -22,17 +22,17 @@ class ComposerAutoloaderInitcf48d20d0276ea83626472d23bf244a0 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitcf48d20d0276ea83626472d23bf244a0', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit1d9bd30edaf60f0968a6ac6add7989f5', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitcf48d20d0276ea83626472d23bf244a0', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit1d9bd30edaf60f0968a6ac6add7989f5', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitcf48d20d0276ea83626472d23bf244a0::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit1d9bd30edaf60f0968a6ac6add7989f5::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $filesToLoad = \Composer\Autoload\ComposerStaticInitcf48d20d0276ea83626472d23bf244a0::$files; + $filesToLoad = \Composer\Autoload\ComposerStaticInit1d9bd30edaf60f0968a6ac6add7989f5::$files; $requireFile = \Closure::bind(static function ($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 164a8aaf9e8..591b08c0991 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitcf48d20d0276ea83626472d23bf244a0 +class ComposerStaticInit1d9bd30edaf60f0968a6ac6add7989f5 { public static $files = array ( 'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php', @@ -3068,9 +3068,9 @@ class ComposerStaticInitcf48d20d0276ea83626472d23bf244a0 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitcf48d20d0276ea83626472d23bf244a0::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitcf48d20d0276ea83626472d23bf244a0::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitcf48d20d0276ea83626472d23bf244a0::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit1d9bd30edaf60f0968a6ac6add7989f5::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit1d9bd30edaf60f0968a6ac6add7989f5::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit1d9bd30edaf60f0968a6ac6add7989f5::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 7faa8cd7770..79bb6290c7e 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1856,12 +1856,12 @@ "source": { "type": "git", "url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git", - "reference": "7f0656f46f812aa55b6975ceed0ec1db2642387d" + "reference": "3b10c4bb9df3fb0e5b9dcf15b77ad92c9aa03621" }, "dist": { "type": "zip", - "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/7f0656f46f812aa55b6975ceed0ec1db2642387d", - "reference": "7f0656f46f812aa55b6975ceed0ec1db2642387d", + "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/3b10c4bb9df3fb0e5b9dcf15b77ad92c9aa03621", + "reference": "3b10c4bb9df3fb0e5b9dcf15b77ad92c9aa03621", "shasum": "" }, "require": { @@ -1883,10 +1883,10 @@ "symplify\/phpstan-rules": "^11.1", "symplify\/rule-doc-generator": "^11.1", "symplify\/vendor-patches": "^11.1", - "tomasvotruba\/type-coverage": "^0.2.0", - "tomasvotruba\/unused-public": "^0.1.10" + "tomasvotruba\/type-coverage": "^0.2", + "tomasvotruba\/unused-public": "^0.1" }, - "time": "2023-05-29T19:29:27+00:00", + "time": "2023-06-02T09:48:50+00:00", "default-branch": true, "type": "rector-extension", "extra": { @@ -2060,12 +2060,12 @@ "source": { "type": "git", "url": "https:\/\/github.com\/rectorphp\/rector-symfony.git", - "reference": "13f7cc4888f1e318766ceb2212a1dc0a31012b41" + "reference": "5c0d61c8c0563057f01cf88998465e480d536747" }, "dist": { "type": "zip", - "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/13f7cc4888f1e318766ceb2212a1dc0a31012b41", - "reference": "13f7cc4888f1e318766ceb2212a1dc0a31012b41", + "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/5c0d61c8c0563057f01cf88998465e480d536747", + "reference": "5c0d61c8c0563057f01cf88998465e480d536747", "shasum": "" }, "require": { @@ -2085,17 +2085,17 @@ "symfony\/security-core": "^6.2", "symfony\/security-http": "^6.1", "symfony\/validator": "^6.2", - "symplify\/easy-ci": "^11.1", + "symplify\/easy-ci": "^11.2", "symplify\/easy-coding-standard": "^11.2", "symplify\/phpstan-extensions": "^11.1", "symplify\/phpstan-rules": "^11.2", "symplify\/rule-doc-generator": "^11.2", "symplify\/vendor-patches": "^11.2", - "tomasvotruba\/cognitive-complexity": "^0.0.5", - "tomasvotruba\/type-coverage": "^0.0.9", - "tomasvotruba\/unused-public": "^0.0.34" + "tomasvotruba\/cognitive-complexity": "^0.1", + "tomasvotruba\/type-coverage": "^0.2", + "tomasvotruba\/unused-public": "^0.1" }, - "time": "2023-06-01T16:05:52+00:00", + "time": "2023-06-02T09:45:32+00:00", "default-branch": true, "type": "rector-extension", "extra": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 66c68a6d7c7..bd2cab493fa 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -2,4 +2,4 @@ namespace RectorPrefix202306; -return array('root' => array('name' => 'rector/rector-src', 'pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => NULL, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(0 => '0.15.x-dev'), 'dev' => \false), 'versions' => array('clue/ndjson-react' => array('pretty_version' => 'v1.3.0', 'version' => '1.3.0.0', 'reference' => '392dc165fce93b5bb5c637b67e59619223c931b0', 'type' => 'library', 'install_path' => __DIR__ . '/../clue/ndjson-react', 'aliases' => array(), 'dev_requirement' => \false), 'composer/pcre' => array('pretty_version' => '3.1.0', 'version' => '3.1.0.0', 'reference' => '4bff79ddd77851fe3cdd11616ed3f92841ba5bd2', 'type' => 'library', 'install_path' => __DIR__ . '/./pcre', 'aliases' => array(), 'dev_requirement' => \false), 'composer/semver' => array('pretty_version' => '3.3.2', 'version' => '3.3.2.0', 'reference' => '3953f23262f2bff1919fc82183ad9acb13ff62c9', 'type' => 'library', 'install_path' => __DIR__ . '/./semver', 'aliases' => array(), 'dev_requirement' => \false), 'composer/xdebug-handler' => array('pretty_version' => '3.0.3', 'version' => '3.0.3.0', 'reference' => 'ced299686f41dce890debac69273b47ffe98a40c', 'type' => 'library', 'install_path' => __DIR__ . '/./xdebug-handler', 'aliases' => array(), 'dev_requirement' => \false), 'doctrine/inflector' => array('pretty_version' => '2.0.6', 'version' => '2.0.6.0', 'reference' => 'd9d313a36c872fd6ee06d9a6cbcf713eaa40f024', 'type' => 'library', 'install_path' => __DIR__ . '/../doctrine/inflector', 'aliases' => array(), 'dev_requirement' => \false), 'evenement/evenement' => array('pretty_version' => 'v3.0.1', 'version' => '3.0.1.0', 'reference' => '531bfb9d15f8aa57454f5f0285b18bec903b8fb7', 'type' => 'library', 'install_path' => __DIR__ . '/../evenement/evenement', 'aliases' => array(), 'dev_requirement' => \false), 'fidry/cpu-core-counter' => array('pretty_version' => '0.5.1', 'version' => '0.5.1.0', 'reference' => 'b58e5a3933e541dc286cc91fc4f3898bbc6f1623', 'type' => 'library', 'install_path' => __DIR__ . '/../fidry/cpu-core-counter', 'aliases' => array(), 'dev_requirement' => \false), 'nette/neon' => array('pretty_version' => 'v3.4.0', 'version' => '3.4.0.0', 'reference' => '372d945c156ee7f35c953339fb164538339e6283', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/neon', 'aliases' => array(), 'dev_requirement' => \false), 'nette/utils' => array('pretty_version' => 'v3.2.9', 'version' => '3.2.9.0', 'reference' => 'c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/utils', 'aliases' => array(), 'dev_requirement' => \false), 'nikic/php-parser' => array('pretty_version' => 'v4.15.5', 'version' => '4.15.5.0', 'reference' => '11e2663a5bc9db5d714eedb4277ee300403b4a9e', 'type' => 'library', 'install_path' => __DIR__ . '/../nikic/php-parser', 'aliases' => array(), 'dev_requirement' => \false), 'ondram/ci-detector' => array('pretty_version' => '4.1.0', 'version' => '4.1.0.0', 'reference' => '8a4b664e916df82ff26a44709942dfd593fa6f30', 'type' => 'library', 'install_path' => __DIR__ . '/../ondram/ci-detector', 'aliases' => array(), 'dev_requirement' => \false), 'phpstan/phpdoc-parser' => array('pretty_version' => '1.22.0', 'version' => '1.22.0.0', 'reference' => 'ec58baf7b3c7f1c81b3b00617c953249fb8cf30c', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpdoc-parser', 'aliases' => array(), 'dev_requirement' => \false), 'phpstan/phpstan' => array('pretty_version' => '1.10.15', 'version' => '1.10.15.0', 'reference' => '762c4dac4da6f8756eebb80e528c3a47855da9bd', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpstan', 'aliases' => array(), 'dev_requirement' => \false), 'psr/cache' => array('pretty_version' => '3.0.0', 'version' => '3.0.0.0', 'reference' => 'aa5030cfa5405eccfdcb1083ce040c2cb8d253bf', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/cache', 'aliases' => array(), 'dev_requirement' => \false), 'psr/container' => array('pretty_version' => '2.0.2', 'version' => '2.0.2.0', 'reference' => 'c71ecc56dfe541dbd90c5360474fbc405f8d5963', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/container', 'aliases' => array(), 'dev_requirement' => \false), 'psr/container-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.1|2.0')), 'psr/event-dispatcher' => array('pretty_version' => '1.0.0', 'version' => '1.0.0.0', 'reference' => 'dbefd12671e8a14ec7f180cab83036ed26714bb0', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/event-dispatcher', 'aliases' => array(), 'dev_requirement' => \false), 'psr/log' => array('pretty_version' => '3.0.0', 'version' => '3.0.0.0', 'reference' => 'fe5ea303b0887d5caefd3d431c3e61ad47037001', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/log', 'aliases' => array(), 'dev_requirement' => \false), 'psr/log-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.0|2.0|3.0')), 'react/cache' => array('pretty_version' => 'v1.2.0', 'version' => '1.2.0.0', 'reference' => 'd47c472b64aa5608225f47965a484b75c7817d5b', 'type' => 'library', 'install_path' => __DIR__ . '/../react/cache', 'aliases' => array(), 'dev_requirement' => \false), 'react/child-process' => array('pretty_version' => 'v0.6.5', 'version' => '0.6.5.0', 'reference' => 'e71eb1aa55f057c7a4a0d08d06b0b0a484bead43', 'type' => 'library', 'install_path' => __DIR__ . '/../react/child-process', 'aliases' => array(), 'dev_requirement' => \false), 'react/dns' => array('pretty_version' => 'v1.10.0', 'version' => '1.10.0.0', 'reference' => 'a5427e7dfa47713e438016905605819d101f238c', 'type' => 'library', 'install_path' => __DIR__ . '/../react/dns', 'aliases' => array(), 'dev_requirement' => \false), 'react/event-loop' => array('pretty_version' => 'v1.4.0', 'version' => '1.4.0.0', 'reference' => '6e7e587714fff7a83dcc7025aee42ab3b265ae05', 'type' => 'library', 'install_path' => __DIR__ . '/../react/event-loop', 'aliases' => array(), 'dev_requirement' => \false), 'react/promise' => array('pretty_version' => 'v2.10.0', 'version' => '2.10.0.0', 'reference' => 'f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38', 'type' => 'library', 'install_path' => __DIR__ . '/../react/promise', 'aliases' => array(), 'dev_requirement' => \false), 'react/promise-timer' => array('pretty_version' => 'v1.9.0', 'version' => '1.9.0.0', 'reference' => 'aa7a73c74b8d8c0f622f5982ff7b0351bc29e495', 'type' => 'library', 'install_path' => __DIR__ . '/../react/promise-timer', 'aliases' => array(), 'dev_requirement' => \false), 'react/socket' => array('pretty_version' => 'v1.12.0', 'version' => '1.12.0.0', 'reference' => '81e1b4d7f5450ebd8d2e9a95bb008bb15ca95a7b', 'type' => 'library', 'install_path' => __DIR__ . '/../react/socket', 'aliases' => array(), 'dev_requirement' => \false), 'react/stream' => array('pretty_version' => 'v1.2.0', 'version' => '1.2.0.0', 'reference' => '7a423506ee1903e89f1e08ec5f0ed430ff784ae9', 'type' => 'library', 'install_path' => __DIR__ . '/../react/stream', 'aliases' => array(), 'dev_requirement' => \false), 'rector/extension-installer' => array('pretty_version' => '0.11.2', 'version' => '0.11.2.0', 'reference' => '05544e9b195863b8571ae2a3b903cbec7fa062e0', 'type' => 'composer-plugin', 'install_path' => __DIR__ . '/../rector/extension-installer', 'aliases' => array(), 'dev_requirement' => \false), 'rector/rector' => array('dev_requirement' => \false, 'replaced' => array(0 => '0.15.x-dev', 1 => 'dev-main')), 'rector/rector-doctrine' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => '7f0656f46f812aa55b6975ceed0ec1db2642387d', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-doctrine', 'aliases' => array(0 => '9999999-dev'), 'dev_requirement' => \false), 'rector/rector-downgrade-php' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => '7e64cfd91c3656c88780fe5f32d5a9903ea763bb', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-downgrade-php', 'aliases' => array(0 => '9999999-dev'), 'dev_requirement' => \false), 'rector/rector-phpunit' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => 'b980109c94df9fac555f52b848161053cf104243', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-phpunit', 'aliases' => array(0 => '0.11.x-dev'), 'dev_requirement' => \false), 'rector/rector-src' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => NULL, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(0 => '0.15.x-dev'), 'dev_requirement' => \false), 'rector/rector-symfony' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => '13f7cc4888f1e318766ceb2212a1dc0a31012b41', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-symfony', 'aliases' => array(0 => '9999999-dev'), 'dev_requirement' => \false), 'sebastian/diff' => array('pretty_version' => '5.0.3', 'version' => '5.0.3.0', 'reference' => '912dc2fbe3e3c1e7873313cc801b100b6c68c87b', 'type' => 'library', 'install_path' => __DIR__ . '/../sebastian/diff', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/cache-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/config' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => 'a5e00dec161b08c946a2c16eed02adbeedf827ae', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/config', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/console' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => '8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/console', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/contracts' => array('pretty_version' => 'v3.3.0', 'version' => '3.3.0.0', 'reference' => '9e4b5e4e44e7620475dbceecf7c72c3883f3ea35', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/contracts', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/dependency-injection' => array('pretty_version' => 'v6.1.12', 'version' => '6.1.12.0', 'reference' => '360c9d0948e1fe675336346d5862e8e55b378d90', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/dependency-injection', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/deprecation-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/event-dispatcher-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/filesystem' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => '97b698e1d77d356304def77a8d0cd73090b359ea', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/filesystem', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/finder' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => 'd9b01ba073c44cef617c7907ce2419f8d00d75e2', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/finder', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/http-client-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/polyfill-ctype' => array('dev_requirement' => \false, 'replaced' => array(0 => '*')), 'symfony/polyfill-intl-grapheme' => array('dev_requirement' => \false, 'replaced' => array(0 => '*')), 'symfony/polyfill-intl-normalizer' => array('pretty_version' => 'v1.27.0', 'version' => '1.27.0.0', 'reference' => '19bd1e4fcd5b91116f14d8533c57831ed00571b6', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/polyfill-mbstring' => array('pretty_version' => 'v1.27.0', 'version' => '1.27.0.0', 'reference' => '8ad114f6b39e2c98a8b0e3bd907732c207c2b534', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-mbstring', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/process' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => '8741e3ed7fe2e91ec099e02446fb86667a0f1628', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/process', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/service-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/service-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.1|2.0|3.0')), 'symfony/string' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => 'f2e190ee75ff0f5eced645ec0be5c66fac81f51f', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/string', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/translation-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symplify/easy-parallel' => array('pretty_version' => '11.1.27', 'version' => '11.1.27.0', 'reference' => '28911142f6a0f4127271f745e2403bb84fcd2b87', 'type' => 'library', 'install_path' => __DIR__ . '/../symplify/easy-parallel', 'aliases' => array(), 'dev_requirement' => \false), 'symplify/rule-doc-generator-contracts' => array('pretty_version' => '11.1.26', 'version' => '11.1.26.0', 'reference' => '3e66b3fec678b74a076395ec629d535fb95293b5', 'type' => 'library', 'install_path' => __DIR__ . '/../symplify/rule-doc-generator-contracts', 'aliases' => array(), 'dev_requirement' => \false), 'tracy/tracy' => array('pretty_version' => 'v2.10.2', 'version' => '2.10.2.0', 'reference' => '882fee7cf4258a602ad4a37461e837ed2ca1406b', 'type' => 'library', 'install_path' => __DIR__ . '/../tracy/tracy', 'aliases' => array(), 'dev_requirement' => \false), 'webmozart/assert' => array('pretty_version' => '1.11.0', 'version' => '1.11.0.0', 'reference' => '11cb2199493b2f8a3b53e7f19068fc6aac760991', 'type' => 'library', 'install_path' => __DIR__ . '/../webmozart/assert', 'aliases' => array(), 'dev_requirement' => \false))); +return array('root' => array('name' => 'rector/rector-src', 'pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => NULL, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(0 => '0.15.x-dev'), 'dev' => \false), 'versions' => array('clue/ndjson-react' => array('pretty_version' => 'v1.3.0', 'version' => '1.3.0.0', 'reference' => '392dc165fce93b5bb5c637b67e59619223c931b0', 'type' => 'library', 'install_path' => __DIR__ . '/../clue/ndjson-react', 'aliases' => array(), 'dev_requirement' => \false), 'composer/pcre' => array('pretty_version' => '3.1.0', 'version' => '3.1.0.0', 'reference' => '4bff79ddd77851fe3cdd11616ed3f92841ba5bd2', 'type' => 'library', 'install_path' => __DIR__ . '/./pcre', 'aliases' => array(), 'dev_requirement' => \false), 'composer/semver' => array('pretty_version' => '3.3.2', 'version' => '3.3.2.0', 'reference' => '3953f23262f2bff1919fc82183ad9acb13ff62c9', 'type' => 'library', 'install_path' => __DIR__ . '/./semver', 'aliases' => array(), 'dev_requirement' => \false), 'composer/xdebug-handler' => array('pretty_version' => '3.0.3', 'version' => '3.0.3.0', 'reference' => 'ced299686f41dce890debac69273b47ffe98a40c', 'type' => 'library', 'install_path' => __DIR__ . '/./xdebug-handler', 'aliases' => array(), 'dev_requirement' => \false), 'doctrine/inflector' => array('pretty_version' => '2.0.6', 'version' => '2.0.6.0', 'reference' => 'd9d313a36c872fd6ee06d9a6cbcf713eaa40f024', 'type' => 'library', 'install_path' => __DIR__ . '/../doctrine/inflector', 'aliases' => array(), 'dev_requirement' => \false), 'evenement/evenement' => array('pretty_version' => 'v3.0.1', 'version' => '3.0.1.0', 'reference' => '531bfb9d15f8aa57454f5f0285b18bec903b8fb7', 'type' => 'library', 'install_path' => __DIR__ . '/../evenement/evenement', 'aliases' => array(), 'dev_requirement' => \false), 'fidry/cpu-core-counter' => array('pretty_version' => '0.5.1', 'version' => '0.5.1.0', 'reference' => 'b58e5a3933e541dc286cc91fc4f3898bbc6f1623', 'type' => 'library', 'install_path' => __DIR__ . '/../fidry/cpu-core-counter', 'aliases' => array(), 'dev_requirement' => \false), 'nette/neon' => array('pretty_version' => 'v3.4.0', 'version' => '3.4.0.0', 'reference' => '372d945c156ee7f35c953339fb164538339e6283', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/neon', 'aliases' => array(), 'dev_requirement' => \false), 'nette/utils' => array('pretty_version' => 'v3.2.9', 'version' => '3.2.9.0', 'reference' => 'c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c', 'type' => 'library', 'install_path' => __DIR__ . '/../nette/utils', 'aliases' => array(), 'dev_requirement' => \false), 'nikic/php-parser' => array('pretty_version' => 'v4.15.5', 'version' => '4.15.5.0', 'reference' => '11e2663a5bc9db5d714eedb4277ee300403b4a9e', 'type' => 'library', 'install_path' => __DIR__ . '/../nikic/php-parser', 'aliases' => array(), 'dev_requirement' => \false), 'ondram/ci-detector' => array('pretty_version' => '4.1.0', 'version' => '4.1.0.0', 'reference' => '8a4b664e916df82ff26a44709942dfd593fa6f30', 'type' => 'library', 'install_path' => __DIR__ . '/../ondram/ci-detector', 'aliases' => array(), 'dev_requirement' => \false), 'phpstan/phpdoc-parser' => array('pretty_version' => '1.22.0', 'version' => '1.22.0.0', 'reference' => 'ec58baf7b3c7f1c81b3b00617c953249fb8cf30c', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpdoc-parser', 'aliases' => array(), 'dev_requirement' => \false), 'phpstan/phpstan' => array('pretty_version' => '1.10.15', 'version' => '1.10.15.0', 'reference' => '762c4dac4da6f8756eebb80e528c3a47855da9bd', 'type' => 'library', 'install_path' => __DIR__ . '/../phpstan/phpstan', 'aliases' => array(), 'dev_requirement' => \false), 'psr/cache' => array('pretty_version' => '3.0.0', 'version' => '3.0.0.0', 'reference' => 'aa5030cfa5405eccfdcb1083ce040c2cb8d253bf', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/cache', 'aliases' => array(), 'dev_requirement' => \false), 'psr/container' => array('pretty_version' => '2.0.2', 'version' => '2.0.2.0', 'reference' => 'c71ecc56dfe541dbd90c5360474fbc405f8d5963', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/container', 'aliases' => array(), 'dev_requirement' => \false), 'psr/container-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.1|2.0')), 'psr/event-dispatcher' => array('pretty_version' => '1.0.0', 'version' => '1.0.0.0', 'reference' => 'dbefd12671e8a14ec7f180cab83036ed26714bb0', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/event-dispatcher', 'aliases' => array(), 'dev_requirement' => \false), 'psr/log' => array('pretty_version' => '3.0.0', 'version' => '3.0.0.0', 'reference' => 'fe5ea303b0887d5caefd3d431c3e61ad47037001', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/log', 'aliases' => array(), 'dev_requirement' => \false), 'psr/log-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.0|2.0|3.0')), 'react/cache' => array('pretty_version' => 'v1.2.0', 'version' => '1.2.0.0', 'reference' => 'd47c472b64aa5608225f47965a484b75c7817d5b', 'type' => 'library', 'install_path' => __DIR__ . '/../react/cache', 'aliases' => array(), 'dev_requirement' => \false), 'react/child-process' => array('pretty_version' => 'v0.6.5', 'version' => '0.6.5.0', 'reference' => 'e71eb1aa55f057c7a4a0d08d06b0b0a484bead43', 'type' => 'library', 'install_path' => __DIR__ . '/../react/child-process', 'aliases' => array(), 'dev_requirement' => \false), 'react/dns' => array('pretty_version' => 'v1.10.0', 'version' => '1.10.0.0', 'reference' => 'a5427e7dfa47713e438016905605819d101f238c', 'type' => 'library', 'install_path' => __DIR__ . '/../react/dns', 'aliases' => array(), 'dev_requirement' => \false), 'react/event-loop' => array('pretty_version' => 'v1.4.0', 'version' => '1.4.0.0', 'reference' => '6e7e587714fff7a83dcc7025aee42ab3b265ae05', 'type' => 'library', 'install_path' => __DIR__ . '/../react/event-loop', 'aliases' => array(), 'dev_requirement' => \false), 'react/promise' => array('pretty_version' => 'v2.10.0', 'version' => '2.10.0.0', 'reference' => 'f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38', 'type' => 'library', 'install_path' => __DIR__ . '/../react/promise', 'aliases' => array(), 'dev_requirement' => \false), 'react/promise-timer' => array('pretty_version' => 'v1.9.0', 'version' => '1.9.0.0', 'reference' => 'aa7a73c74b8d8c0f622f5982ff7b0351bc29e495', 'type' => 'library', 'install_path' => __DIR__ . '/../react/promise-timer', 'aliases' => array(), 'dev_requirement' => \false), 'react/socket' => array('pretty_version' => 'v1.12.0', 'version' => '1.12.0.0', 'reference' => '81e1b4d7f5450ebd8d2e9a95bb008bb15ca95a7b', 'type' => 'library', 'install_path' => __DIR__ . '/../react/socket', 'aliases' => array(), 'dev_requirement' => \false), 'react/stream' => array('pretty_version' => 'v1.2.0', 'version' => '1.2.0.0', 'reference' => '7a423506ee1903e89f1e08ec5f0ed430ff784ae9', 'type' => 'library', 'install_path' => __DIR__ . '/../react/stream', 'aliases' => array(), 'dev_requirement' => \false), 'rector/extension-installer' => array('pretty_version' => '0.11.2', 'version' => '0.11.2.0', 'reference' => '05544e9b195863b8571ae2a3b903cbec7fa062e0', 'type' => 'composer-plugin', 'install_path' => __DIR__ . '/../rector/extension-installer', 'aliases' => array(), 'dev_requirement' => \false), 'rector/rector' => array('dev_requirement' => \false, 'replaced' => array(0 => '0.15.x-dev', 1 => 'dev-main')), 'rector/rector-doctrine' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => '3b10c4bb9df3fb0e5b9dcf15b77ad92c9aa03621', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-doctrine', 'aliases' => array(0 => '9999999-dev'), 'dev_requirement' => \false), 'rector/rector-downgrade-php' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => '7e64cfd91c3656c88780fe5f32d5a9903ea763bb', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-downgrade-php', 'aliases' => array(0 => '9999999-dev'), 'dev_requirement' => \false), 'rector/rector-phpunit' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => 'b980109c94df9fac555f52b848161053cf104243', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-phpunit', 'aliases' => array(0 => '0.11.x-dev'), 'dev_requirement' => \false), 'rector/rector-src' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => NULL, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(0 => '0.15.x-dev'), 'dev_requirement' => \false), 'rector/rector-symfony' => array('pretty_version' => 'dev-main', 'version' => 'dev-main', 'reference' => '5c0d61c8c0563057f01cf88998465e480d536747', 'type' => 'rector-extension', 'install_path' => __DIR__ . '/../rector/rector-symfony', 'aliases' => array(0 => '9999999-dev'), 'dev_requirement' => \false), 'sebastian/diff' => array('pretty_version' => '5.0.3', 'version' => '5.0.3.0', 'reference' => '912dc2fbe3e3c1e7873313cc801b100b6c68c87b', 'type' => 'library', 'install_path' => __DIR__ . '/../sebastian/diff', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/cache-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/config' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => 'a5e00dec161b08c946a2c16eed02adbeedf827ae', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/config', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/console' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => '8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/console', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/contracts' => array('pretty_version' => 'v3.3.0', 'version' => '3.3.0.0', 'reference' => '9e4b5e4e44e7620475dbceecf7c72c3883f3ea35', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/contracts', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/dependency-injection' => array('pretty_version' => 'v6.1.12', 'version' => '6.1.12.0', 'reference' => '360c9d0948e1fe675336346d5862e8e55b378d90', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/dependency-injection', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/deprecation-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/event-dispatcher-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/filesystem' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => '97b698e1d77d356304def77a8d0cd73090b359ea', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/filesystem', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/finder' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => 'd9b01ba073c44cef617c7907ce2419f8d00d75e2', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/finder', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/http-client-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/polyfill-ctype' => array('dev_requirement' => \false, 'replaced' => array(0 => '*')), 'symfony/polyfill-intl-grapheme' => array('dev_requirement' => \false, 'replaced' => array(0 => '*')), 'symfony/polyfill-intl-normalizer' => array('pretty_version' => 'v1.27.0', 'version' => '1.27.0.0', 'reference' => '19bd1e4fcd5b91116f14d8533c57831ed00571b6', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/polyfill-mbstring' => array('pretty_version' => 'v1.27.0', 'version' => '1.27.0.0', 'reference' => '8ad114f6b39e2c98a8b0e3bd907732c207c2b534', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-mbstring', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/process' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => '8741e3ed7fe2e91ec099e02446fb86667a0f1628', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/process', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/service-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symfony/service-implementation' => array('dev_requirement' => \false, 'provided' => array(0 => '1.1|2.0|3.0')), 'symfony/string' => array('pretty_version' => 'v6.3.0', 'version' => '6.3.0.0', 'reference' => 'f2e190ee75ff0f5eced645ec0be5c66fac81f51f', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/string', 'aliases' => array(), 'dev_requirement' => \false), 'symfony/translation-contracts' => array('dev_requirement' => \false, 'replaced' => array(0 => 'v3.3.0')), 'symplify/easy-parallel' => array('pretty_version' => '11.1.27', 'version' => '11.1.27.0', 'reference' => '28911142f6a0f4127271f745e2403bb84fcd2b87', 'type' => 'library', 'install_path' => __DIR__ . '/../symplify/easy-parallel', 'aliases' => array(), 'dev_requirement' => \false), 'symplify/rule-doc-generator-contracts' => array('pretty_version' => '11.1.26', 'version' => '11.1.26.0', 'reference' => '3e66b3fec678b74a076395ec629d535fb95293b5', 'type' => 'library', 'install_path' => __DIR__ . '/../symplify/rule-doc-generator-contracts', 'aliases' => array(), 'dev_requirement' => \false), 'tracy/tracy' => array('pretty_version' => 'v2.10.2', 'version' => '2.10.2.0', 'reference' => '882fee7cf4258a602ad4a37461e837ed2ca1406b', 'type' => 'library', 'install_path' => __DIR__ . '/../tracy/tracy', 'aliases' => array(), 'dev_requirement' => \false), 'webmozart/assert' => array('pretty_version' => '1.11.0', 'version' => '1.11.0.0', 'reference' => '11cb2199493b2f8a3b53e7f19068fc6aac760991', 'type' => 'library', 'install_path' => __DIR__ . '/../webmozart/assert', 'aliases' => array(), 'dev_requirement' => \false))); diff --git a/vendor/rector/extension-installer/src/GeneratedConfig.php b/vendor/rector/extension-installer/src/GeneratedConfig.php index a0bae0a8138..72db4e0b419 100644 --- a/vendor/rector/extension-installer/src/GeneratedConfig.php +++ b/vendor/rector/extension-installer/src/GeneratedConfig.php @@ -9,7 +9,7 @@ namespace Rector\RectorInstaller; */ final class GeneratedConfig { - public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7f0656f'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7e64cfd'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main b980109'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 13f7cc4')); + public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 3b10c4b'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7e64cfd'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main b980109'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 5c0d61c')); private function __construct() { } diff --git a/vendor/rector/rector-doctrine/composer.json b/vendor/rector/rector-doctrine/composer.json index 9e170772d5d..5e27342a5af 100644 --- a/vendor/rector/rector-doctrine/composer.json +++ b/vendor/rector/rector-doctrine/composer.json @@ -22,8 +22,8 @@ "symplify\/vendor-patches": "^11.1", "rector\/rector-generator": "^0.6", "symplify\/easy-ci": "^11.2", - "tomasvotruba\/unused-public": "^0.1.10", - "tomasvotruba\/type-coverage": "^0.2.0" + "tomasvotruba\/unused-public": "^0.1", + "tomasvotruba\/type-coverage": "^0.2" }, "autoload": { "psr-4": { diff --git a/vendor/rector/rector-doctrine/src/NodeFactory/EntityIdNodeFactory.php b/vendor/rector/rector-doctrine/src/NodeFactory/EntityIdNodeFactory.php index 891fc78c8e7..3d504dc54a6 100644 --- a/vendor/rector/rector-doctrine/src/NodeFactory/EntityIdNodeFactory.php +++ b/vendor/rector/rector-doctrine/src/NodeFactory/EntityIdNodeFactory.php @@ -3,13 +3,13 @@ declare (strict_types=1); namespace Rector\Doctrine\NodeFactory; -use PhpParser\Node\Scalar\String_; use PhpParser\Node\Stmt\Property; use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode; use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; use Rector\BetterPhpDocParser\PhpDoc\SpacelessPhpDocTagNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\Core\PhpParser\Node\NodeFactory; final class EntityIdNodeFactory @@ -45,8 +45,8 @@ final class EntityIdNodeFactory // add @ORM\Id $phpDocTagNodes = []; $phpDocTagNodes[] = new SpacelessPhpDocTagNode('@ORM\\Id', new DoctrineAnnotationTagValueNode(new IdentifierTypeNode('Doctrine\\ORM\\Mapping\\Id'), null, [])); - $phpDocTagNodes[] = new SpacelessPhpDocTagNode('@ORM\\Column', new DoctrineAnnotationTagValueNode(new IdentifierTypeNode('Doctrine\\ORM\\Mapping\\Column'), null, [new ArrayItemNode('integer', 'type', String_::KIND_DOUBLE_QUOTED)])); - $phpDocTagNodes[] = new SpacelessPhpDocTagNode('@ORM\\GeneratedValue', new DoctrineAnnotationTagValueNode(new IdentifierTypeNode('Doctrine\\ORM\\Mapping\\GeneratedValue'), null, [new ArrayItemNode('AUTO', 'strategy', String_::KIND_DOUBLE_QUOTED)])); + $phpDocTagNodes[] = new SpacelessPhpDocTagNode('@ORM\\Column', new DoctrineAnnotationTagValueNode(new IdentifierTypeNode('Doctrine\\ORM\\Mapping\\Column'), null, [new ArrayItemNode(new StringNode('integer'), 'type')])); + $phpDocTagNodes[] = new SpacelessPhpDocTagNode('@ORM\\GeneratedValue', new DoctrineAnnotationTagValueNode(new IdentifierTypeNode('Doctrine\\ORM\\Mapping\\GeneratedValue'), null, [new ArrayItemNode(new StringNode('AUTO'), 'strategy')])); foreach ($phpDocTagNodes as $phpDocTagNode) { $phpDocInfo->addPhpDocTagNode($phpDocTagNode); } diff --git a/vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php b/vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php index f04fe0a7d64..9f2ffab3c3a 100644 --- a/vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php +++ b/vendor/rector/rector-doctrine/src/NodeManipulator/ColumnPropertyTypeResolver.php @@ -15,6 +15,7 @@ use PHPStan\Type\StringType; use PHPStan\Type\Type; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\Doctrine\NodeAnalyzer\AttributeFinder; @@ -116,10 +117,14 @@ final class ColumnPropertyTypeResolver if (!$typeArrayItemNode instanceof ArrayItemNode) { return new MixedType(); } - if (!\is_string($typeArrayItemNode->value)) { + $typeValue = $typeArrayItemNode->value; + if ($typeValue instanceof StringNode) { + $typeValue = $typeValue->value; + } + if (!\is_string($typeValue)) { return null; } - return $this->createPHPStanTypeFromDoctrineStringType($typeArrayItemNode->value, $isNullable); + return $this->createPHPStanTypeFromDoctrineStringType($typeValue, $isNullable); } private function createPHPStanTypeFromDoctrineStringType(string $type, bool $isNullable) : Type { diff --git a/vendor/rector/rector-doctrine/src/NodeManipulator/DoctrineItemDefaultValueManipulator.php b/vendor/rector/rector-doctrine/src/NodeManipulator/DoctrineItemDefaultValueManipulator.php index bae6001de0c..e1e4eb1f8be 100644 --- a/vendor/rector/rector-doctrine/src/NodeManipulator/DoctrineItemDefaultValueManipulator.php +++ b/vendor/rector/rector-doctrine/src/NodeManipulator/DoctrineItemDefaultValueManipulator.php @@ -8,6 +8,7 @@ use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode; use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprTrueNode; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey; final class DoctrineItemDefaultValueManipulator @@ -47,6 +48,9 @@ final class DoctrineItemDefaultValueManipulator if (\is_int($defaultValue) && $currentValue instanceof ConstExprIntegerNode) { $currentValue = (int) $currentValue->value; } + if (\is_string($defaultValue) && $currentValue instanceof StringNode) { + $currentValue = $currentValue->value; + } return $currentValue === $defaultValue; } } diff --git a/vendor/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php b/vendor/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php index c84a460055e..b94ac750365 100644 --- a/vendor/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php +++ b/vendor/rector/rector-doctrine/src/NodeManipulator/ToManyRelationPropertyTypeResolver.php @@ -9,6 +9,7 @@ use PHPStan\Type\Generic\GenericObjectType; use PHPStan\Type\Type; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\Core\PhpParser\Node\Value\ValueResolver; use Rector\Doctrine\NodeAnalyzer\AttributeFinder; @@ -70,10 +71,14 @@ final class ToManyRelationPropertyTypeResolver if (!$targetEntityArrayItemNode instanceof ArrayItemNode) { return null; } - if (!\is_string($targetEntityArrayItemNode->value)) { + $targetEntityClass = $targetEntityArrayItemNode->value; + if ($targetEntityClass instanceof StringNode) { + $targetEntityClass = $targetEntityClass->value; + } + if (!\is_string($targetEntityClass)) { return null; } - return $this->resolveTypeFromTargetEntity($targetEntityArrayItemNode->value, $property); + return $this->resolveTypeFromTargetEntity($targetEntityClass, $property); } /** * @param \PhpParser\Node\Expr|string $targetEntity diff --git a/vendor/rector/rector-doctrine/src/NodeManipulator/ToOneRelationPropertyTypeResolver.php b/vendor/rector/rector-doctrine/src/NodeManipulator/ToOneRelationPropertyTypeResolver.php index ec7e120790f..a504ef0d60d 100644 --- a/vendor/rector/rector-doctrine/src/NodeManipulator/ToOneRelationPropertyTypeResolver.php +++ b/vendor/rector/rector-doctrine/src/NodeManipulator/ToOneRelationPropertyTypeResolver.php @@ -13,6 +13,7 @@ use PHPStan\Type\Type; use PHPStan\Type\TypeCombinator; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher; @@ -85,6 +86,9 @@ final class ToOneRelationPropertyTypeResolver return new MixedType(); } $targetEntityClass = $targetEntityArrayItemNode->value; + if ($targetEntityClass instanceof StringNode) { + $targetEntityClass = $targetEntityClass->value; + } if (!\is_string($targetEntityClass)) { return new MixedType(); } diff --git a/vendor/rector/rector-doctrine/src/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php b/vendor/rector/rector-doctrine/src/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php index ff92ef3a0bf..5aeb01a58d1 100644 --- a/vendor/rector/rector-doctrine/src/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php +++ b/vendor/rector/rector-doctrine/src/Rector/Class_/MoveCurrentDateTimeDefaultInEntityToConstructorRector.php @@ -10,6 +10,7 @@ use PhpParser\Node\Stmt\ClassMethod; use PhpParser\Node\Stmt\Property; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\MethodName; @@ -123,7 +124,11 @@ CODE_SAMPLE if (!$typeArrayItemNode instanceof ArrayItemNode) { return; } - if ($typeArrayItemNode->value !== 'datetime') { + $typeValue = $typeArrayItemNode->value; + if ($typeValue instanceof StringNode) { + $typeValue = $typeValue->value; + } + if ($typeValue !== 'datetime') { return; } $node = $this->constructorAssignPropertyAnalyzer->resolveConstructorAssign($property); diff --git a/vendor/rector/rector-doctrine/src/Rector/Property/ChangeBigIntEntityPropertyToIntTypeRector.php b/vendor/rector/rector-doctrine/src/Rector/Property/ChangeBigIntEntityPropertyToIntTypeRector.php index f59b386f8a5..9d1edb86fc9 100644 --- a/vendor/rector/rector-doctrine/src/Rector/Property/ChangeBigIntEntityPropertyToIntTypeRector.php +++ b/vendor/rector/rector-doctrine/src/Rector/Property/ChangeBigIntEntityPropertyToIntTypeRector.php @@ -12,6 +12,7 @@ use PHPStan\Type\IntegerType; use PHPStan\Type\StringType; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\Core\Rector\AbstractRector; use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockClassRenamer; use Rector\NodeTypeResolver\ValueObject\OldToNewType; @@ -88,7 +89,11 @@ CODE_SAMPLE if (!$typeArrayItemNode instanceof ArrayItemNode) { return null; } - if ($typeArrayItemNode->value !== 'bigint') { + $typeValue = $typeArrayItemNode->value; + if ($typeValue instanceof StringNode) { + $typeValue = $typeValue->value; + } + if ($typeValue !== 'bigint') { return null; } $varTagValueNode = $phpDocInfo->getVarTagValueNode(); diff --git a/vendor/rector/rector-doctrine/src/Rector/Property/CorrectDefaultTypesOnEntityPropertyRector.php b/vendor/rector/rector-doctrine/src/Rector/Property/CorrectDefaultTypesOnEntityPropertyRector.php index 9586714b837..283d65cc8f0 100644 --- a/vendor/rector/rector-doctrine/src/Rector/Property/CorrectDefaultTypesOnEntityPropertyRector.php +++ b/vendor/rector/rector-doctrine/src/Rector/Property/CorrectDefaultTypesOnEntityPropertyRector.php @@ -13,6 +13,7 @@ use PhpParser\Node\Stmt\Property; use PhpParser\Node\Stmt\PropertyProperty; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\Core\Exception\NotImplementedYetException; use Rector\Core\Rector\AbstractRector; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; @@ -81,6 +82,9 @@ CODE_SAMPLE return null; } $typeValue = $typeArrayItemNode->value; + if ($typeValue instanceof StringNode) { + $typeValue = $typeValue->value; + } if (!\is_string($typeValue)) { return null; } diff --git a/vendor/rector/rector-doctrine/src/Rector/Property/DoctrineTargetEntityStringToClassConstantRector.php b/vendor/rector/rector-doctrine/src/Rector/Property/DoctrineTargetEntityStringToClassConstantRector.php index 6afc2087336..edf91c2be93 100644 --- a/vendor/rector/rector-doctrine/src/Rector/Property/DoctrineTargetEntityStringToClassConstantRector.php +++ b/vendor/rector/rector-doctrine/src/Rector/Property/DoctrineTargetEntityStringToClassConstantRector.php @@ -14,6 +14,7 @@ use PhpParser\Node\Identifier; use PhpParser\Node\Stmt\Property; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo; use Rector\Core\Rector\AbstractRector; use Rector\Doctrine\NodeAnalyzer\AttributeFinder; @@ -151,24 +152,25 @@ CODE_SAMPLE if (!$targetEntityArrayItemNode instanceof ArrayItemNode) { return null; } - $targetEntity = $targetEntityArrayItemNode->value; - if (!\is_string($targetEntity)) { + $targetEntityClass = $targetEntityArrayItemNode->value; + if ($targetEntityClass instanceof StringNode) { + $targetEntityClass = $targetEntityClass->value; + } + if (!\is_string($targetEntityClass)) { return null; } // resolve to FQN - $tagFullyQualifiedName = $this->doctrineClassAnnotationMatcher->resolveExpectingDoctrineFQCN($targetEntity, $property); + $tagFullyQualifiedName = $this->doctrineClassAnnotationMatcher->resolveExpectingDoctrineFQCN($targetEntityClass, $property); if ($tagFullyQualifiedName === null) { return null; } - if ($tagFullyQualifiedName === $targetEntity) { + if ($tagFullyQualifiedName === $targetEntityClass) { return null; } $currentArrayItemNode = $doctrineAnnotationTagValueNode->getValue($key); if (!$currentArrayItemNode instanceof ArrayItemNode) { return null; } - // no quotes needed, it's a constants - $currentArrayItemNode->kindValueQuoted = null; $currentArrayItemNode->value = '\\' . \ltrim($tagFullyQualifiedName, '\\') . '::class'; $currentArrayItemNode->setAttribute('orig_node', null); return $property; diff --git a/vendor/rector/rector-doctrine/src/TypeAnalyzer/CollectionTypeResolver.php b/vendor/rector/rector-doctrine/src/TypeAnalyzer/CollectionTypeResolver.php index d80a5a9c607..b046d104fc0 100644 --- a/vendor/rector/rector-doctrine/src/TypeAnalyzer/CollectionTypeResolver.php +++ b/vendor/rector/rector-doctrine/src/TypeAnalyzer/CollectionTypeResolver.php @@ -11,6 +11,7 @@ use PHPStan\PhpDocParser\Ast\Type\TypeNode; use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\Doctrine\PhpDoc\ShortClassExpander; use Rector\StaticTypeMapper\Naming\NameScopeFactory; @@ -66,10 +67,14 @@ final class CollectionTypeResolver if (!$targetEntityArrayItemNode instanceof ArrayItemNode) { return null; } - if (!\is_string($targetEntityArrayItemNode->value)) { + $targetEntityClass = $targetEntityArrayItemNode->value; + if ($targetEntityClass instanceof StringNode) { + $targetEntityClass = $targetEntityClass->value; + } + if (!\is_string($targetEntityClass)) { return null; } - $fullyQualifiedTargetEntity = $this->shortClassExpander->resolveFqnTargetEntity($targetEntityArrayItemNode->value, $property); + $fullyQualifiedTargetEntity = $this->shortClassExpander->resolveFqnTargetEntity($targetEntityClass, $property); return new FullyQualifiedObjectType($fullyQualifiedTargetEntity); } } diff --git a/vendor/rector/rector-symfony/composer.json b/vendor/rector/rector-symfony/composer.json index 79babc68dcb..9927f0d8cc2 100644 --- a/vendor/rector/rector-symfony/composer.json +++ b/vendor/rector/rector-symfony/composer.json @@ -20,15 +20,15 @@ "symfony\/security-core": "^6.2", "symfony\/security-http": "^6.1", "symfony\/validator": "^6.2", - "symplify\/easy-ci": "^11.1", + "symplify\/easy-ci": "^11.2", "symplify\/easy-coding-standard": "^11.2", "symplify\/phpstan-extensions": "^11.1", "symplify\/phpstan-rules": "^11.2", "symplify\/rule-doc-generator": "^11.2", "symplify\/vendor-patches": "^11.2", - "tomasvotruba\/cognitive-complexity": "^0.0.5", - "tomasvotruba\/type-coverage": "^0.0.9", - "tomasvotruba\/unused-public": "^0.0.34" + "tomasvotruba\/cognitive-complexity": "^0.1", + "tomasvotruba\/type-coverage": "^0.2", + "tomasvotruba\/unused-public": "^0.1" }, "autoload": { "psr-4": { diff --git a/vendor/rector/rector-symfony/src/NodeAnalyzer/RouteRequiredParamNameToTypesResolver.php b/vendor/rector/rector-symfony/src/NodeAnalyzer/RouteRequiredParamNameToTypesResolver.php index 314fb4d51a9..9f8f39bbc53 100644 --- a/vendor/rector/rector-symfony/src/NodeAnalyzer/RouteRequiredParamNameToTypesResolver.php +++ b/vendor/rector/rector-symfony/src/NodeAnalyzer/RouteRequiredParamNameToTypesResolver.php @@ -13,6 +13,7 @@ use PHPStan\Type\StringType; use PHPStan\Type\Type; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode; use Rector\Doctrine\NodeAnalyzer\AttrinationFinder; use Rector\NodeNameResolver\NodeNameResolver; @@ -90,14 +91,20 @@ final class RouteRequiredParamNameToTypesResolver return []; } foreach ($requirementsArrayItemNode->value->getValuesWithSilentKey() as $nestedArrayItemNode) { - if (!\is_string($nestedArrayItemNode->value)) { - continue; + $paramRegex = $nestedArrayItemNode->value; + if ($paramRegex instanceof StringNode) { + $paramRegex = $paramRegex->value; } - if (!\is_string($nestedArrayItemNode->key)) { + if (!\is_string($paramRegex)) { continue; } $paramName = $nestedArrayItemNode->key; - $paramRegex = $nestedArrayItemNode->value; + if ($paramName instanceof StringNode) { + $paramName = $paramName->value; + } + if (!\is_string($paramName)) { + continue; + } $paramsToRegexes[$paramName] = $paramRegex; } return $paramsToRegexes; diff --git a/vendor/rector/rector-symfony/src/NodeFactory/Annotations/StringValueQuoteWrapper.php b/vendor/rector/rector-symfony/src/NodeFactory/Annotations/StringValueQuoteWrapper.php index 016dd260f46..408a9a4e4b8 100644 --- a/vendor/rector/rector-symfony/src/NodeFactory/Annotations/StringValueQuoteWrapper.php +++ b/vendor/rector/rector-symfony/src/NodeFactory/Annotations/StringValueQuoteWrapper.php @@ -3,6 +3,7 @@ declare (strict_types=1); namespace Rector\Symfony\NodeFactory\Annotations; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\ArrayParser; use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode; final class StringValueQuoteWrapper @@ -17,13 +18,13 @@ final class StringValueQuoteWrapper $this->arrayParser = $arrayParser; } /** - * @return mixed|CurlyListNode|string + * @return mixed|CurlyListNode|StringNode * @param mixed $value */ public function wrap($value, ?string $key) { if (\is_string($value)) { - return '"' . $value . '"'; + return new StringNode($value); } if (\is_array($value)) { return $this->wrapArray($value, $key); @@ -41,7 +42,7 @@ final class StringValueQuoteWrapper if (\is_numeric($nestedValue)) { continue; } - $value[$nestedKey] = '"' . $nestedValue . '"'; + $value[$nestedKey] = new StringNode($nestedValue); } } $arrayItemNodes = $this->arrayParser->createArrayFromValues($value); diff --git a/vendor/rector/rector-symfony/src/NodeFactory/ThisRenderFactory.php b/vendor/rector/rector-symfony/src/NodeFactory/ThisRenderFactory.php index 5aaf22943e7..28f3ec73e1d 100644 --- a/vendor/rector/rector-symfony/src/NodeFactory/ThisRenderFactory.php +++ b/vendor/rector/rector-symfony/src/NodeFactory/ThisRenderFactory.php @@ -16,6 +16,7 @@ use PhpParser\Node\Stmt\Return_; use PHPStan\Type\ArrayType; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode; use Rector\Core\PhpParser\Node\NodeFactory; use Rector\NodeNameResolver\NodeNameResolver; @@ -114,7 +115,11 @@ final class ThisRenderFactory { $arrayItems = []; foreach ($arrayItemNodes as $arrayItemNode) { - $arrayItems[] = new ArrayItem(new Variable($arrayItemNode->value), new String_($arrayItemNode->value)); + $arrayItemNodeValue = $arrayItemNode->value; + if ($arrayItemNodeValue instanceof StringNode) { + $arrayItemNodeValue = $arrayItemNodeValue->value; + } + $arrayItems[] = new ArrayItem(new Variable($arrayItemNodeValue), new String_($arrayItemNodeValue)); } return new Array_($arrayItems); } @@ -129,12 +134,24 @@ final class ThisRenderFactory private function resolveTemplate(DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode) : ?string { $templateParameter = $doctrineAnnotationTagValueNode->getValue('template'); - if ($templateParameter instanceof ArrayItemNode && \is_string($templateParameter->value)) { - return $templateParameter->value; + if ($templateParameter instanceof ArrayItemNode) { + $templateParameterValue = $templateParameter->value; + if ($templateParameterValue instanceof StringNode) { + $templateParameterValue = $templateParameterValue->value; + } + if (\is_string($templateParameterValue)) { + return $templateParameterValue; + } } $arrayItemNode = $doctrineAnnotationTagValueNode->getSilentValue(); - if ($arrayItemNode instanceof ArrayItemNode && \is_string($arrayItemNode->value)) { - return $arrayItemNode->value; + if ($arrayItemNode instanceof ArrayItemNode) { + $arrayItemNodeValue = $arrayItemNode->value; + if ($arrayItemNodeValue instanceof StringNode) { + $arrayItemNodeValue = $arrayItemNodeValue->value; + } + if (\is_string($arrayItemNodeValue)) { + return $arrayItemNodeValue; + } } return null; } diff --git a/vendor/rector/rector-symfony/src/Rector/ClassMethod/AddRouteAnnotationRector.php b/vendor/rector/rector-symfony/src/Rector/ClassMethod/AddRouteAnnotationRector.php index 6d5993affc9..97c4ef0b4e6 100644 --- a/vendor/rector/rector-symfony/src/Rector/ClassMethod/AddRouteAnnotationRector.php +++ b/vendor/rector/rector-symfony/src/Rector/ClassMethod/AddRouteAnnotationRector.php @@ -4,11 +4,11 @@ declare (strict_types=1); namespace Rector\Symfony\Rector\ClassMethod; use PhpParser\Node; -use PhpParser\Node\Scalar\String_; use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocParser\StaticDoctrineAnnotationParser\ArrayParser; use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode; use Rector\Core\Rector\AbstractRector; @@ -132,8 +132,8 @@ CODE_SAMPLE private function createRouteItems(SymfonyRouteMetadata $symfonyRouteMetadata) : array { $arrayItemNodes = []; - $arrayItemNodes[] = new ArrayItemNode($symfonyRouteMetadata->getPath(), 'path', String_::KIND_DOUBLE_QUOTED); - $arrayItemNodes[] = new ArrayItemNode($symfonyRouteMetadata->getName(), 'name', String_::KIND_DOUBLE_QUOTED); + $arrayItemNodes[] = new ArrayItemNode(new StringNode($symfonyRouteMetadata->getPath()), 'path'); + $arrayItemNodes[] = new ArrayItemNode(new StringNode($symfonyRouteMetadata->getName()), 'name'); if ($symfonyRouteMetadata->getRequirements() !== []) { $curlyListNode = $this->createCurlyQuoted($symfonyRouteMetadata->getRequirements()); $arrayItemNodes[] = new ArrayItemNode($curlyListNode, 'requirements'); @@ -149,7 +149,7 @@ CODE_SAMPLE $arrayItemNodes[] = new ArrayItemNode($defaultsWithoutControllerCurlyList, 'defaults'); } if ($symfonyRouteMetadata->getHost() !== '') { - $arrayItemNodes[] = new ArrayItemNode($symfonyRouteMetadata->getHost(), 'host', String_::KIND_DOUBLE_QUOTED); + $arrayItemNodes[] = new ArrayItemNode(new StringNode($symfonyRouteMetadata->getHost()), 'host'); } if ($symfonyRouteMetadata->getMethods() !== []) { $methodsCurlyList = $this->createCurlyQuoted($symfonyRouteMetadata->getMethods()); @@ -160,7 +160,7 @@ CODE_SAMPLE $arrayItemNodes[] = new ArrayItemNode($schemesArrayItemNodes, 'schemes'); } if ($symfonyRouteMetadata->getCondition() !== '') { - $arrayItemNodes[] = new ArrayItemNode($symfonyRouteMetadata->getCondition(), 'condition', String_::KIND_DOUBLE_QUOTED); + $arrayItemNodes[] = new ArrayItemNode(new StringNode($symfonyRouteMetadata->getCondition()), 'condition'); } return $arrayItemNodes; } @@ -186,10 +186,10 @@ CODE_SAMPLE $curlyListNode = new CurlyListNode($methodsArrayItems); foreach ($curlyListNode->values as $nestedMethodsArrayItem) { if (\is_string($nestedMethodsArrayItem->value)) { - $nestedMethodsArrayItem->kindValueQuoted = String_::KIND_DOUBLE_QUOTED; + $nestedMethodsArrayItem->value = new StringNode($nestedMethodsArrayItem->value); } if (\is_string($nestedMethodsArrayItem->key)) { - $nestedMethodsArrayItem->kindKeyQuoted = String_::KIND_DOUBLE_QUOTED; + $nestedMethodsArrayItem->key = new StringNode($nestedMethodsArrayItem->key); } if ($nestedMethodsArrayItem->value === null) { $nestedMethodsArrayItem->value = 'null'; diff --git a/vendor/rector/rector-symfony/src/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector.php b/vendor/rector/rector-symfony/src/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector.php index bc68ec01e18..bdc588851fc 100644 --- a/vendor/rector/rector-symfony/src/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector.php +++ b/vendor/rector/rector-symfony/src/Rector/ClassMethod/MergeMethodAnnotationToRouteAnnotationRector.php @@ -4,11 +4,11 @@ declare (strict_types=1); namespace Rector\Symfony\Rector\ClassMethod; use PhpParser\Node; -use PhpParser\Node\Scalar\String_; use PhpParser\Node\Stmt\ClassLike; use PhpParser\Node\Stmt\ClassMethod; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover; use Rector\BetterPhpDocParser\Printer\PhpDocInfoPrinter; use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode; @@ -104,8 +104,8 @@ CODE_SAMPLE if ($sensioMethods === null) { return null; } - if (\is_string($sensioMethods)) { - $sensioMethods = new CurlyListNode([new ArrayItemNode($sensioMethods, null, String_::KIND_DOUBLE_QUOTED)]); + if (\is_string($sensioMethods) || $sensioMethods instanceof StringNode) { + $sensioMethods = new CurlyListNode([new ArrayItemNode($sensioMethods)]); } $symfonyMethodsArrayItemNode = $symfonyDoctrineAnnotationTagValueNode->getValue('methods'); // value is already filled, do not enter anything @@ -118,7 +118,7 @@ CODE_SAMPLE return $node; } /** - * @return string|string[]|null|CurlyListNode + * @return string|string[]|null|CurlyListNode|StringNode */ private function resolveMethods(DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode) { diff --git a/vendor/rector/rector-symfony/src/TypeAnalyzer/JMSDITypeResolver.php b/vendor/rector/rector-symfony/src/TypeAnalyzer/JMSDITypeResolver.php index 8a1eddc9fcb..f264f1e863b 100644 --- a/vendor/rector/rector-symfony/src/TypeAnalyzer/JMSDITypeResolver.php +++ b/vendor/rector/rector-symfony/src/TypeAnalyzer/JMSDITypeResolver.php @@ -10,6 +10,7 @@ use PHPStan\Type\ObjectType; use PHPStan\Type\Type; use Rector\BetterPhpDocParser\PhpDoc\ArrayItemNode; use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode; +use Rector\BetterPhpDocParser\PhpDoc\StringNode; use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory; use Rector\Core\Exception\ShouldNotHappenException; use Rector\Core\Provider\CurrentFileProvider; @@ -101,12 +102,24 @@ final class JMSDITypeResolver private function resolveServiceName(DoctrineAnnotationTagValueNode $doctrineAnnotationTagValueNode, Property $property) : string { $serviceNameParameter = $doctrineAnnotationTagValueNode->getValue('serviceName'); - if ($serviceNameParameter instanceof ArrayItemNode && \is_string($serviceNameParameter->value)) { - return $serviceNameParameter->value; + if ($serviceNameParameter instanceof ArrayItemNode) { + $serviceNameParameterValue = $serviceNameParameter->value; + if ($serviceNameParameterValue instanceof StringNode) { + $serviceNameParameterValue = $serviceNameParameterValue->value; + } + if (\is_string($serviceNameParameterValue)) { + return $serviceNameParameterValue; + } } $arrayItemNode = $doctrineAnnotationTagValueNode->getSilentValue(); - if ($arrayItemNode instanceof ArrayItemNode && \is_string($arrayItemNode->value)) { - return $arrayItemNode->value; + if ($arrayItemNode instanceof ArrayItemNode) { + $arrayItemNodeValue = $arrayItemNode->value; + if ($arrayItemNodeValue instanceof StringNode) { + $arrayItemNodeValue = $arrayItemNodeValue->value; + } + if (\is_string($arrayItemNodeValue)) { + return $arrayItemNodeValue; + } } return $this->nodeNameResolver->getName($property); }