octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-11 13:42:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 40f6d194e78026978fa5af3a0be9d209a511c173

Browse Source 
40f6d194e7 [PHP 8.1] Add support for values method in SpatieEnumClassToEnumRector (#3196)
This commit is contained in:
Tomas Votruba 2022-12-15 10:18:35 +00:00
parent 41faaad8b8
commit 5b79ce9485
5 changed files with 78 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
rules/Php81/NodeFactory/EnumFactory.php
View File

@ -4,14 +4,19 @@ declare (strict_types=1);
namespace Rector\Php81\NodeFactory;
use PhpParser\BuilderFactory;
use PhpParser\Node\Expr;
use PhpParser\Node\Identifier;
use PhpParser\Node\Scalar\LNumber;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassConst;
use PhpParser\Node\Stmt\Enum_;
use PhpParser\Node\Stmt\EnumCase;
use PhpParser\Node\Stmt\Return_;
use PHPStan\PhpDocParser\Ast\PhpDoc\MethodTagValueNode;
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\PhpParser\Node\Value\ValueResolver;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
@ -37,12 +42,18 @@ final class EnumFactory
* @var \Rector\Core\PhpParser\Node\Value\ValueResolver
*/
private $valueResolver;
public function __construct(NodeNameResolver $nodeNameResolver, PhpDocInfoFactory $phpDocInfoFactory, BuilderFactory $builderFactory, ValueResolver $valueResolver)
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
public function __construct(NodeNameResolver $nodeNameResolver, PhpDocInfoFactory $phpDocInfoFactory, BuilderFactory $builderFactory, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder)
{
$this->nodeNameResolver = $nodeNameResolver;
$this->phpDocInfoFactory = $phpDocInfoFactory;
$this->builderFactory = $builderFactory;
$this->valueResolver = $valueResolver;
$this->betterNodeFinder = $betterNodeFinder;
}
public function createFromClass(Class_ $class) : Enum_
{
@ -70,9 +81,11 @@ final class EnumFactory
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($class);
$docBlockMethods = $phpDocInfo->getTagsByName('@method');
if ($docBlockMethods !== []) {
$enum->scalarType = new Identifier('string');
$mapping = $this->generateMappingFromClass($class);
$identifierType = $this->getIdentifierTypeFromMappings($mapping);
$enum->scalarType = new Identifier($identifierType);
foreach ($docBlockMethods as $docBlockMethod) {
$enum->stmts[] = $this->createEnumCaseFromDocComment($docBlockMethod);
$enum->stmts[] = $this->createEnumCaseFromDocComment($docBlockMethod, $mapping);
}
}
return $enum;
@ -86,12 +99,58 @@ final class EnumFactory
$enumCase->setAttribute(AttributeKey::COMMENTS, $classConst->getAttribute(AttributeKey::COMMENTS));
return $enumCase;
}
private function createEnumCaseFromDocComment(PhpDocTagNode $phpDocTagNode) : EnumCase
/**
* @param array<int|string, mixed> $mapping
*/
private function createEnumCaseFromDocComment(PhpDocTagNode $phpDocTagNode, array $mapping = []) : EnumCase
{
/** @var MethodTagValueNode $nodeValue */
$nodeValue = $phpDocTagNode->value;
$enumValue = $mapping[$nodeValue->methodName] ?? $nodeValue->methodName;
$enumName = \strtoupper($nodeValue->methodName);
$enumExpr = $this->builderFactory->val($nodeValue->methodName);
$enumExpr = $this->builderFactory->val($enumValue);
return new EnumCase($enumName, $enumExpr);
}
/**
* @return array<int|string, mixed>
*/
private function generateMappingFromClass(Class_ $class) : array
{
$classMethod = $class->getMethod('values');
if ($classMethod === null) {
return [];
}
$returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($classMethod, Return_::class);
$mapping = [];
foreach ($returns as $returnStmt) {
if (!$returnStmt->expr instanceof Expr\Array_) {
continue;
}
foreach ($returnStmt->expr->items as $item) {
if ($item instanceof Expr\ArrayItem && ($item->key instanceof LNumber || $item->key instanceof String_) && ($item->value instanceof LNumber || $item->value instanceof String_)) {
$mapping[$item->key->value] = $item->value->value;
}
}
}
return $mapping;
}
/**
* @param array<int|string, mixed> $mapping
*/
private function getIdentifierTypeFromMappings(array $mapping) : string
{
$valueTypes = \array_map(static function ($value) : string {
return \gettype($value);
}, $mapping);
$uniqueValueTypes = \array_unique($valueTypes);
if (\count($uniqueValueTypes) === 1) {
$identifierType = \reset($uniqueValueTypes);
if ($identifierType === 'integer') {
$identifierType = 'int';
}
} else {
$identifierType = 'string';
}
return $identifierType;
}
}

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'e71df1ba87d3c0189112b626e0e44880e3b608bf';
public const PACKAGE_VERSION = '40f6d194e78026978fa5af3a0be9d209a511c173';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-12-14 20:40:06';
public const RELEASE_DATE = '2022-12-15 11:14:37';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitc010984494198416d38b04345b4db5d9
class ComposerAutoloaderInit57288704ab80d1fa10d9d662af03a4d5
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitc010984494198416d38b04345b4db5d9
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitc010984494198416d38b04345b4db5d9', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit57288704ab80d1fa10d9d662af03a4d5', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitc010984494198416d38b04345b4db5d9', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit57288704ab80d1fa10d9d662af03a4d5', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitc010984494198416d38b04345b4db5d9::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit57288704ab80d1fa10d9d662af03a4d5::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitc010984494198416d38b04345b4db5d9::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit57288704ab80d1fa10d9d662af03a4d5::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirec010984494198416d38b04345b4db5d9($fileIdentifier, $file);
composerRequire57288704ab80d1fa10d9d662af03a4d5($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitc010984494198416d38b04345b4db5d9
* @param string $file
* @return void
*/
function composerRequirec010984494198416d38b04345b4db5d9($fileIdentifier, $file)
function composerRequire57288704ab80d1fa10d9d662af03a4d5($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 ComposerStaticInitc010984494198416d38b04345b4db5d9
class ComposerStaticInit57288704ab80d1fa10d9d662af03a4d5
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3029,9 +3029,9 @@ class ComposerStaticInitc010984494198416d38b04345b4db5d9
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitc010984494198416d38b04345b4db5d9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitc010984494198416d38b04345b4db5d9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitc010984494198416d38b04345b4db5d9::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit57288704ab80d1fa10d9d662af03a4d5::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit57288704ab80d1fa10d9d662af03a4d5::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit57288704ab80d1fa10d9d662af03a4d5::$classMap;
}, null, ClassLoader::class);
}