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 801d367f34aff122d69072dda92a7a34211f815b 

801d367f34 AddParamTypeBasedOnPHPUnitDataProviderRector: Check all data providers (#5068)
This commit is contained in:
Tomas Votruba 2023-09-29 07:28:16 +00:00
parent f5258a2d75
commit d2a4c3c81b
6 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php
View File

@ -195,6 +195,9 @@ final class PhpDocInfo
{
return (bool) $this->getTagsByName($name);
}
/**
* @api
*/
public function getByName(string $name) : ?Node
{
return $this->getTagsByName($name)[0] ?? null;

27
rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php
View File

@ -17,6 +17,7 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
use PHPStan\Type\Constant\ConstantArrayType;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeCombinator;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Core\Exception\ShouldNotHappenException;
@ -132,11 +133,11 @@ CODE_SAMPLE
if ($classMethod->getParams() === []) {
continue;
}
$dataProviderPhpDocTagNode = $this->resolveDataProviderPhpDocTagNode($classMethod);
if (!$dataProviderPhpDocTagNode instanceof PhpDocTagNode) {
$dataProviderPhpDocTagNodes = $this->resolveDataProviderPhpDocTagNode($classMethod);
if ($dataProviderPhpDocTagNodes === []) {
return null;
}
$hasClassMethodChanged = $this->refactorClassMethod($classMethod, $node, $dataProviderPhpDocTagNode);
$hasClassMethodChanged = $this->refactorClassMethod($classMethod, $node, $dataProviderPhpDocTagNodes);
if ($hasClassMethodChanged) {
$hasChanged = \true;
}
@ -253,22 +254,32 @@ CODE_SAMPLE
}
return $paramOnPositionTypes;
}
private function resolveDataProviderPhpDocTagNode(ClassMethod $classMethod) : ?PhpDocTagNode
/**
* @return array<PhpDocTagNode>
*/
private function resolveDataProviderPhpDocTagNode(ClassMethod $classMethod) : array
{
$classMethodPhpDocInfo = $this->phpDocInfoFactory->createFromNode($classMethod);
if (!$classMethodPhpDocInfo instanceof PhpDocInfo) {
return null;
return [];
}
return $classMethodPhpDocInfo->getByName('@dataProvider');
return $classMethodPhpDocInfo->getTagsByName('@dataProvider');
}
private function refactorClassMethod(ClassMethod $classMethod, Class_ $class, PhpDocTagNode $dataProviderPhpDocTagNode) : bool
/**
* @param array<PhpDocTagNode> $dataProviderPhpDocTagNodes
*/
private function refactorClassMethod(ClassMethod $classMethod, Class_ $class, array $dataProviderPhpDocTagNodes) : bool
{
$hasChanged = \false;
foreach ($classMethod->getParams() as $param) {
if ($param->type instanceof Node) {
continue;
}
$paramTypeDeclaration = $this->inferParam($class, $param, $dataProviderPhpDocTagNode);
$paramTypes = [];
foreach ($dataProviderPhpDocTagNodes as $phpDocTagNode) {
$paramTypes[] = $this->inferParam($class, $param, $phpDocTagNode);
}
$paramTypeDeclaration = TypeCombinator::union(...$paramTypes);
if ($paramTypeDeclaration instanceof MixedType) {
continue;
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '547af4e8fd379a605f1b7b3e8bcc0e28b819f220';
public const PACKAGE_VERSION = '801d367f34aff122d69072dda92a7a34211f815b';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-28 20:07:13';
public const RELEASE_DATE = '2023-09-29 09:25:25';
/**
* @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 ComposerAutoloaderInita23307956e2521083dac96cb5fe98ab9::getLoader();
return ComposerAutoloaderInit2ee59e7d02058fc08aee02351b37d5c5::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInita23307956e2521083dac96cb5fe98ab9
class ComposerAutoloaderInit2ee59e7d02058fc08aee02351b37d5c5
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInita23307956e2521083dac96cb5fe98ab9
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInita23307956e2521083dac96cb5fe98ab9', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit2ee59e7d02058fc08aee02351b37d5c5', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInita23307956e2521083dac96cb5fe98ab9', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit2ee59e7d02058fc08aee02351b37d5c5', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInita23307956e2521083dac96cb5fe98ab9::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit2ee59e7d02058fc08aee02351b37d5c5::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInita23307956e2521083dac96cb5fe98ab9::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit2ee59e7d02058fc08aee02351b37d5c5::$files;
$requireFile = \Closure::bind(static function ($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 ComposerStaticInita23307956e2521083dac96cb5fe98ab9
class ComposerStaticInit2ee59e7d02058fc08aee02351b37d5c5
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2600,9 +2600,9 @@ class ComposerStaticInita23307956e2521083dac96cb5fe98ab9
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInita23307956e2521083dac96cb5fe98ab9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita23307956e2521083dac96cb5fe98ab9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita23307956e2521083dac96cb5fe98ab9::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit2ee59e7d02058fc08aee02351b37d5c5::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit2ee59e7d02058fc08aee02351b37d5c5::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit2ee59e7d02058fc08aee02351b37d5c5::$classMap;
}, null, ClassLoader::class);
}