mirror of
https://github.com/rectorphp/rector.git
synced 2024-06-21 10:32:24 +00:00
Updated Rector to commit bb59a7c99ad30770689fe011c89377402bf6c7ba
bb59a7c99a
[DX] Inline symplify/astral to use only active classes (#2851)
This commit is contained in:
parent
d29663ff64
commit
5edd3689a8
|
@ -8,6 +8,7 @@ use RectorPrefix202208\Doctrine\Inflector\Inflector;
|
|||
use RectorPrefix202208\Doctrine\Inflector\Rules\English\InflectorFactory;
|
||||
use RectorPrefix202208\OndraM\CiDetector\CiDetector;
|
||||
use PhpParser\BuilderFactory;
|
||||
use PhpParser\ConstExprEvaluator;
|
||||
use PhpParser\Lexer;
|
||||
use PhpParser\NodeFinder;
|
||||
use PhpParser\NodeVisitor\CloningVisitor;
|
||||
|
@ -18,6 +19,7 @@ use PHPStan\Dependency\DependencyResolver;
|
|||
use PHPStan\File\FileHelper;
|
||||
use PHPStan\Parser\Parser;
|
||||
use PHPStan\PhpDoc\TypeNodeResolver;
|
||||
use PHPStan\PhpDocParser\Parser\ConstExprParser;
|
||||
use PHPStan\PhpDocParser\Parser\PhpDocParser;
|
||||
use PHPStan\PhpDocParser\Parser\TypeParser;
|
||||
use PHPStan\Reflection\ReflectionProvider;
|
||||
|
@ -35,12 +37,14 @@ use Rector\Core\Validation\Collector\EmptyConfigurableRectorCollector;
|
|||
use Rector\NodeTypeResolver\DependencyInjection\PHPStanServicesFactory;
|
||||
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocator\IntermediateSourceLocator;
|
||||
use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpParser\SmartPhpParser;
|
||||
use Rector\PhpDocParser\PhpParser\SmartPhpParserFactory;
|
||||
use Rector\PSR4\Composer\PSR4NamespaceMatcher;
|
||||
use Rector\PSR4\Contract\PSR4AutoloadNamespaceMatcherInterface;
|
||||
use Rector\Utils\Command\MissingInSetCommand;
|
||||
use RectorPrefix202208\Symfony\Component\Console\Application;
|
||||
use function RectorPrefix202208\Symfony\Component\DependencyInjection\Loader\Configurator\service;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use RectorPrefix202208\Symplify\EasyParallel\ValueObject\EasyParallelConfig;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\Parameter\ParameterProvider;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\Php\TypeChecker;
|
||||
|
@ -74,6 +78,10 @@ return static function (RectorConfig $rectorConfig) : void {
|
|||
__DIR__ . '/../packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfo.php',
|
||||
__DIR__ . '/../packages/Testing/PHPUnit',
|
||||
__DIR__ . '/../packages/BetterPhpDocParser/PhpDoc',
|
||||
__DIR__ . '/../packages/PhpDocParser/NodeVisitor',
|
||||
__DIR__ . '/../packages/PhpDocParser/PhpParser/SmartPhpParser.php',
|
||||
__DIR__ . '/../packages/PhpDocParser/ValueObject',
|
||||
__DIR__ . '/../packages/PhpDocParser/PhpDocParser/PhpDocNodeVisitor/CallablePhpDocNodeVisitor.php',
|
||||
__DIR__ . '/../packages/PHPStanStaticTypeMapper/Enum',
|
||||
__DIR__ . '/../packages/Caching/Cache.php',
|
||||
__DIR__ . '/../packages/NodeTypeResolver/PhpDocNodeVisitor/UnderscoreRenamePhpDocNodeVisitor.php',
|
||||
|
@ -140,4 +148,13 @@ return static function (RectorConfig $rectorConfig) : void {
|
|||
$services->set(TypeNodeResolver::class)->factory([service(PHPStanServicesFactory::class), 'createTypeNodeResolver']);
|
||||
$services->set(DynamicSourceLocatorProvider::class)->factory([service(PHPStanServicesFactory::class), 'createDynamicSourceLocatorProvider']);
|
||||
$services->set(MissingInSetCommand::class);
|
||||
// phpdoc parser
|
||||
$services->set(SmartPhpParser::class)->factory([service(SmartPhpParserFactory::class), 'create']);
|
||||
$services->set(ConstExprEvaluator::class);
|
||||
$services->set(NodeFinder::class);
|
||||
// phpdoc parser
|
||||
$services->set(PhpDocParser::class);
|
||||
$services->set(\PHPStan\PhpDocParser\Lexer\Lexer::class);
|
||||
$services->set(TypeParser::class);
|
||||
$services->set(ConstExprParser::class);
|
||||
};
|
||||
|
|
|
@ -6,12 +6,12 @@ namespace Rector\BetterPhpDocParser\Comment;
|
|||
use PhpParser\Comment;
|
||||
use PhpParser\Node;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class CommentsMerger
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
declare (strict_types=1);
|
||||
namespace Rector\BetterPhpDocParser\Contract;
|
||||
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\Contract\PhpDocNodeVisitorInterface;
|
||||
use Rector\PhpDocParser\PhpDocParser\Contract\PhpDocNodeVisitorInterface;
|
||||
interface BasePhpDocNodeVisitorInterface extends PhpDocNodeVisitorInterface
|
||||
{
|
||||
}
|
||||
|
|
|
@ -28,8 +28,8 @@ use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
|
|||
use Rector\BetterPhpDocParser\ValueObject\Type\ShortenedIdentifierTypeNode;
|
||||
use Rector\ChangesReporting\Collector\RectorChangeCollector;
|
||||
use Rector\Core\Configuration\CurrentNodeProvider;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
/**
|
||||
* @see \Rector\Tests\BetterPhpDocParser\PhpDocInfo\PhpDocInfo\PhpDocInfoTest
|
||||
*/
|
||||
|
|
|
@ -7,7 +7,7 @@ use PHPStan\PhpDocParser\Ast\Node;
|
|||
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
|
||||
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
|
||||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
final class PhpDocTagRemover
|
||||
{
|
||||
public function removeByName(PhpDocInfo $phpDocInfo, string $name) : void
|
||||
|
|
|
@ -6,7 +6,7 @@ namespace Rector\BetterPhpDocParser\PhpDocNodeFinder;
|
|||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
|
||||
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
/**
|
||||
* @template TNode as \PHPStan\PhpDocParser\Ast\Node
|
||||
*/
|
||||
|
|
|
@ -7,9 +7,9 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
|
|||
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
|
||||
use Rector\BetterPhpDocParser\DataProvider\CurrentTokenIteratorProvider;
|
||||
use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor;
|
||||
/**
|
||||
* @see \Rector\Tests\BetterPhpDocParser\PhpDocNodeMapperTest
|
||||
*/
|
||||
|
@ -22,12 +22,12 @@ final class PhpDocNodeMapper
|
|||
private $currentTokenIteratorProvider;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor
|
||||
* @var \Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitor
|
||||
*/
|
||||
private $parentConnectingPhpDocNodeVisitor;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor
|
||||
* @var \Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\CloningPhpDocNodeVisitor
|
||||
*/
|
||||
private $cloningPhpDocNodeVisitor;
|
||||
/**
|
||||
|
|
|
@ -8,7 +8,7 @@ use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
|
|||
use Rector\BetterPhpDocParser\Attributes\AttributeMirrorer;
|
||||
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
|
||||
use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareArrayTypeNode;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class ArrayTypePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -8,7 +8,7 @@ use PHPStan\PhpDocParser\Ast\Type\CallableTypeNode;
|
|||
use Rector\BetterPhpDocParser\Attributes\AttributeMirrorer;
|
||||
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
|
||||
use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareCallableTypeNode;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class CallableTypePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -5,7 +5,7 @@ namespace Rector\BetterPhpDocParser\PhpDocNodeVisitor;
|
|||
|
||||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class ChangedPhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -8,7 +8,7 @@ use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
|
|||
use Rector\BetterPhpDocParser\Attributes\AttributeMirrorer;
|
||||
use Rector\BetterPhpDocParser\Contract\BasePhpDocNodeVisitorInterface;
|
||||
use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareIntersectionTypeNode;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class IntersectionTypeNodePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -14,7 +14,7 @@ use Rector\BetterPhpDocParser\ValueObject\PhpDoc\SpacingAwareTemplateTagValueNod
|
|||
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
|
||||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class TemplatePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -13,7 +13,7 @@ use Rector\BetterPhpDocParser\ValueObject\Parser\BetterTokenIterator;
|
|||
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
|
||||
use Rector\BetterPhpDocParser\ValueObject\Type\BracketsAwareUnionTypeNode;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class UnionTypeNodePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor implements BasePhpDocNodeVisitorInterface
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -10,8 +10,8 @@ use PHPStan\PhpDocParser\Ast\Node;
|
|||
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
|
||||
use Rector\BetterPhpDocParser\Contract\PhpDocParser\PhpDocNodeDecoratorInterface;
|
||||
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\StaticTypeMapper\Naming\NameScopeFactory;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
/**
|
||||
* Decorate node with fully qualified class name for const epxr,
|
||||
* e.g. Direction::*
|
||||
|
@ -25,7 +25,7 @@ final class ConstExprClassNameDecorator implements PhpDocNodeDecoratorInterface
|
|||
private $nameScopeFactory;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\PhpDocParser\PhpDocNodeTraverser
|
||||
* @var \Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser
|
||||
*/
|
||||
private $phpDocNodeTraverser;
|
||||
public function __construct(NameScopeFactory $nameScopeFactory, PhpDocNodeTraverser $phpDocNodeTraverser)
|
||||
|
|
|
@ -22,7 +22,7 @@ use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
|
|||
use Rector\BetterPhpDocParser\ValueObject\StartAndEnd;
|
||||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\Core\Util\StringUtils;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
/**
|
||||
* @see \Rector\Tests\BetterPhpDocParser\PhpDocInfo\PhpDocInfoPrinter\PhpDocInfoPrinterTest
|
||||
*/
|
||||
|
@ -75,7 +75,7 @@ final class PhpDocInfoPrinter
|
|||
private $phpDocInfo;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\PhpDocParser\PhpDocNodeTraverser
|
||||
* @var \Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser
|
||||
*/
|
||||
private $changedPhpDocNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
declare (strict_types=1);
|
||||
namespace Rector\BetterPhpDocParser\ValueObject;
|
||||
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\ValueObject\PhpDocAttributeKey as NativePhpDocAttributeKey;
|
||||
use Rector\PhpDocParser\PhpDocParser\ValueObject\PhpDocAttributeKey as NativePhpDocAttributeKey;
|
||||
final class PhpDocAttributeKey
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -20,9 +20,9 @@ use Rector\NodeNameResolver\NodeNameResolver;
|
|||
use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use RectorPrefix202208\Symfony\Contracts\Service\Attribute\Required;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
/**
|
||||
* @see \Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\ParamTypeResolver\ParamTypeResolverTest
|
||||
*
|
||||
|
@ -40,7 +40,7 @@ final class ParamTypeResolver implements NodeTypeResolverInterface
|
|||
private $staticTypeMapper;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -6,7 +6,7 @@ namespace Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer;
|
|||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
|
||||
use Rector\NodeTypeResolver\PhpDocNodeVisitor\ClassRenamePhpDocNodeVisitor;
|
||||
use Rector\NodeTypeResolver\ValueObject\OldToNewType;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
final class DocBlockClassRenamer
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -6,7 +6,7 @@ namespace Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer;
|
|||
use PhpParser\Node;
|
||||
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
|
||||
use Rector\NodeTypeResolver\PhpDocNodeVisitor\NameImportingPhpDocNodeVisitor;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
final class DocBlockNameImporter
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -14,8 +14,8 @@ use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
|
|||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
|
||||
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
|
||||
use Rector\Naming\NamespaceMatcher;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\Renaming\ValueObject\RenamedNamespace;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
final class DocBlockNamespaceRenamer
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -6,9 +6,9 @@ namespace Rector\NodeTypeResolver\PhpDoc;
|
|||
use PhpParser\Node;
|
||||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
|
||||
use Rector\NodeTypeResolver\PhpDocNodeVisitor\UnderscoreRenamePhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\Renaming\ValueObject\PseudoNamespaceToNamespace;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
final class PhpDocTypeRenamer
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -21,10 +21,10 @@ use Rector\Naming\Naming\UseImportsResolver;
|
|||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\ValueObject\OldToNewType;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class ClassRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -17,10 +17,10 @@ use Rector\Core\Configuration\Option;
|
|||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\Core\Provider\CurrentFileProvider;
|
||||
use Rector\Core\ValueObject\Application\File;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\PostRector\Collector\UseNodesToAddCollector;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\Parameter\ParameterProvider;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\Reflection\ClassLikeExistenceChecker;
|
||||
final class NameImportingPhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
|
||||
|
|
|
@ -7,9 +7,9 @@ use RectorPrefix202208\Nette\Utils\Strings;
|
|||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
|
||||
use PHPStan\Type\ObjectType;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
use Rector\Renaming\ValueObject\PseudoNamespaceToNamespace;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor;
|
||||
final class UnderscoreRenamePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\Contract\NodeValueResolver;
|
||||
namespace Rector\PhpDocParser\Contract\NodeValueResolver;
|
||||
|
||||
use PhpParser\Node\Expr;
|
||||
/**
|
|
@ -0,0 +1,9 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\PhpDocParser\Exception;
|
||||
|
||||
use Exception;
|
||||
final class UnresolvableValueException extends Exception
|
||||
{
|
||||
}
|
|
@ -1,11 +1,11 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\NodeTraverser;
|
||||
namespace Rector\PhpDocParser\NodeTraverser;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\NodeTraverser;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeVisitor\CallableNodeVisitor;
|
||||
use Rector\PhpDocParser\NodeVisitor\CallableNodeVisitor;
|
||||
/**
|
||||
* @api
|
||||
*/
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\NodeValue;
|
||||
namespace Rector\PhpDocParser\NodeValue;
|
||||
|
||||
use PhpParser\ConstExprEvaluationException;
|
||||
use PhpParser\ConstExprEvaluator;
|
||||
|
@ -11,15 +11,16 @@ use PhpParser\Node\Expr\Instanceof_;
|
|||
use PhpParser\Node\Expr\MethodCall;
|
||||
use PhpParser\Node\Expr\PropertyFetch;
|
||||
use PhpParser\Node\Expr\Variable;
|
||||
use RectorPrefix202208\Symplify\Astral\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\Exception\ShouldNotHappenException;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver\ClassConstFetchValueResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver\ConstFetchValueResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver\FuncCallValueResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver\MagicConstValueResolver;
|
||||
use PHPStan\Reflection\ReflectionProvider;
|
||||
use Rector\PhpDocParser\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
use Rector\PhpDocParser\Exception\UnresolvableValueException;
|
||||
use Rector\PhpDocParser\NodeValue\NodeValueResolver\ClassConstFetchValueResolver;
|
||||
use Rector\PhpDocParser\NodeValue\NodeValueResolver\ConstFetchValueResolver;
|
||||
use Rector\PhpDocParser\NodeValue\NodeValueResolver\FuncCallValueResolver;
|
||||
use Rector\PhpDocParser\NodeValue\NodeValueResolver\MagicConstValueResolver;
|
||||
/**
|
||||
* @api
|
||||
* @see \Symplify\Astral\Tests\NodeValue\NodeValueResolverTest
|
||||
* @see \Rector\Tests\PhpDocParser\NodeValue\NodeValueResolverTest
|
||||
*
|
||||
* @deprecated Use $scope->getType() instead
|
||||
*/
|
||||
|
@ -30,6 +31,7 @@ final class NodeValueResolver
|
|||
*/
|
||||
private const UNRESOLVABLE_TYPES = [Variable::class, Cast::class, MethodCall::class, PropertyFetch::class, Instanceof_::class];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PhpParser\ConstExprEvaluator
|
||||
*/
|
||||
private $constExprEvaluator;
|
||||
|
@ -41,12 +43,12 @@ final class NodeValueResolver
|
|||
* @var NodeValueResolverInterface[]
|
||||
*/
|
||||
private $nodeValueResolvers = [];
|
||||
public function __construct()
|
||||
public function __construct(ReflectionProvider $reflectionProvider)
|
||||
{
|
||||
$this->constExprEvaluator = new ConstExprEvaluator(function (Expr $expr) {
|
||||
return $this->resolveByNode($expr);
|
||||
});
|
||||
$this->nodeValueResolvers[] = new ClassConstFetchValueResolver();
|
||||
$this->nodeValueResolvers[] = new ClassConstFetchValueResolver($reflectionProvider);
|
||||
$this->nodeValueResolvers[] = new ConstFetchValueResolver();
|
||||
$this->nodeValueResolvers[] = new MagicConstValueResolver();
|
||||
$this->nodeValueResolvers[] = new FuncCallValueResolver($this->constExprEvaluator);
|
||||
|
@ -70,7 +72,7 @@ final class NodeValueResolver
|
|||
private function resolveByNode(Expr $expr)
|
||||
{
|
||||
if ($this->currentFilePath === null) {
|
||||
throw new ShouldNotHappenException();
|
||||
throw new UnresolvableValueException();
|
||||
}
|
||||
foreach ($this->nodeValueResolvers as $nodeValueResolver) {
|
||||
if (\is_a($expr, $nodeValueResolver->getType(), \true)) {
|
|
@ -1,22 +1,32 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver;
|
||||
namespace Rector\PhpDocParser\NodeValue\NodeValueResolver;
|
||||
|
||||
use PhpParser\ConstExprEvaluationException;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Expr\ClassConstFetch;
|
||||
use PhpParser\Node\Identifier;
|
||||
use PhpParser\Node\Name;
|
||||
use PHPStan\Reflection\ReflectionProvider;
|
||||
use Rector\PhpDocParser\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
use ReflectionClassConstant;
|
||||
use RectorPrefix202208\Symplify\Astral\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
/**
|
||||
* @see \Symplify\Astral\Tests\NodeValue\NodeValueResolverTest
|
||||
* @see \Rector\Tests\PhpDocParser\NodeValue\NodeValueResolverTest
|
||||
*
|
||||
* @implements NodeValueResolverInterface<ClassConstFetch>
|
||||
*/
|
||||
final class ClassConstFetchValueResolver implements NodeValueResolverInterface
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PHPStan\Reflection\ReflectionProvider
|
||||
*/
|
||||
private $reflectionProvider;
|
||||
public function __construct(ReflectionProvider $reflectionProvider)
|
||||
{
|
||||
$this->reflectionProvider = $reflectionProvider;
|
||||
}
|
||||
public function getType() : string
|
||||
{
|
||||
return ClassConstFetch::class;
|
||||
|
@ -42,7 +52,7 @@ final class ClassConstFetchValueResolver implements NodeValueResolverInterface
|
|||
if ($constantName === 'class') {
|
||||
return $className;
|
||||
}
|
||||
if (!\class_exists($className) && !\interface_exists($className)) {
|
||||
if (!$this->reflectionProvider->hasClass($className)) {
|
||||
return null;
|
||||
}
|
||||
$reflectionClassConstant = new ReflectionClassConstant($className, $constantName);
|
|
@ -1,14 +1,13 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver;
|
||||
namespace Rector\PhpDocParser\NodeValue\NodeValueResolver;
|
||||
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Expr\ConstFetch;
|
||||
use PhpParser\Node\Name;
|
||||
use RectorPrefix202208\Symplify\Astral\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
use Rector\PhpDocParser\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
/**
|
||||
* @see \Symplify\Astral\Tests\NodeValue\NodeValueResolverTest
|
||||
* @see \Rector\Tests\PhpDocParser\NodeValue\NodeValueResolverTest
|
||||
*
|
||||
* @implements NodeValueResolverInterface<ConstFetch>
|
||||
*/
|
||||
|
@ -24,9 +23,6 @@ final class ConstFetchValueResolver implements NodeValueResolverInterface
|
|||
*/
|
||||
public function resolve(Expr $expr, string $currentFilePath)
|
||||
{
|
||||
if (!$expr->name instanceof Name) {
|
||||
return null;
|
||||
}
|
||||
$constFetchName = $expr->name->toString();
|
||||
return \constant($constFetchName);
|
||||
}
|
|
@ -1,16 +1,16 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver;
|
||||
namespace Rector\PhpDocParser\NodeValue\NodeValueResolver;
|
||||
|
||||
use PhpParser\ConstExprEvaluator;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Expr\FuncCall;
|
||||
use PhpParser\Node\Name;
|
||||
use RectorPrefix202208\Symplify\Astral\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\Exception\ShouldNotHappenException;
|
||||
use Rector\PhpDocParser\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
use Rector\PhpDocParser\Exception\UnresolvableValueException;
|
||||
/**
|
||||
* @see \Symplify\Astral\Tests\NodeValue\NodeValueResolverTest
|
||||
* @see \Rector\Tests\PhpDocParser\NodeValue\NodeValueResolverTest
|
||||
*
|
||||
* @implements NodeValueResolverInterface<FuncCall>
|
||||
*/
|
||||
|
@ -21,6 +21,7 @@ final class FuncCallValueResolver implements NodeValueResolverInterface
|
|||
*/
|
||||
private const EXCLUDED_FUNC_NAMES = ['pg_*'];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PhpParser\ConstExprEvaluator
|
||||
*/
|
||||
private $constExprEvaluator;
|
||||
|
@ -54,7 +55,7 @@ final class FuncCallValueResolver implements NodeValueResolverInterface
|
|||
if (\function_exists($functionName)) {
|
||||
return $functionName(...$arguments);
|
||||
}
|
||||
throw new ShouldNotHappenException();
|
||||
throw new UnresolvableValueException();
|
||||
}
|
||||
return null;
|
||||
}
|
|
@ -1,15 +1,15 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\NodeValue\NodeValueResolver;
|
||||
namespace Rector\PhpDocParser\NodeValue\NodeValueResolver;
|
||||
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Scalar\MagicConst;
|
||||
use PhpParser\Node\Scalar\MagicConst\Dir;
|
||||
use PhpParser\Node\Scalar\MagicConst\File;
|
||||
use RectorPrefix202208\Symplify\Astral\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
use Rector\PhpDocParser\Contract\NodeValueResolver\NodeValueResolverInterface;
|
||||
/**
|
||||
* @see \Symplify\Astral\Tests\NodeValue\NodeValueResolverTest
|
||||
* @see \Rector\Tests\PhpDocParser\NodeValue\NodeValueResolverTest
|
||||
*
|
||||
* @implements NodeValueResolverInterface<MagicConst>
|
||||
*/
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\NodeVisitor;
|
||||
namespace Rector\PhpDocParser\NodeVisitor;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr;
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\Contract;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\Contract;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\Exception;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\Exception;
|
||||
|
||||
use Exception;
|
||||
final class InvalidTraverseException extends Exception
|
|
@ -1,19 +1,19 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser;
|
||||
namespace Rector\PhpDocParser\PhpDocParser;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\Contract\PhpDocNodeVisitorInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\Exception\InvalidTraverseException;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor\CallablePhpDocNodeVisitor;
|
||||
use Rector\PhpDocParser\PhpDocParser\Contract\PhpDocNodeVisitorInterface;
|
||||
use Rector\PhpDocParser\PhpDocParser\Exception\InvalidTraverseException;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\CallablePhpDocNodeVisitor;
|
||||
/**
|
||||
* @api
|
||||
*
|
||||
* Mimics
|
||||
* https://github.com/nikic/PHP-Parser/blob/4abdcde5f16269959a834e4e58ea0ba0938ab133/lib/PhpParser/NodeTraverser.php
|
||||
*
|
||||
* @see \Symplify\Astral\Tests\PhpDocParser\SimplePhpDocNodeTraverser\PhpDocNodeTraverserTest
|
||||
* @see \Rector\Tests\PhpDocParser\PhpDocParser\SimplePhpDocNodeTraverser\PhpDocNodeTraverserTest
|
||||
*/
|
||||
final class PhpDocNodeTraverser
|
||||
{
|
||||
|
@ -96,7 +96,8 @@ final class PhpDocNodeTraverser
|
|||
*/
|
||||
private function traverseNode(Node $node) : Node
|
||||
{
|
||||
$subNodeNames = \array_keys(\get_object_vars($node));
|
||||
$objectPublicPropertiesToValues = \get_object_vars($node);
|
||||
$subNodeNames = \array_keys($objectPublicPropertiesToValues);
|
||||
foreach ($subNodeNames as $subNodeName) {
|
||||
$subNode =& $node->{$subNodeName};
|
||||
if (\is_array($subNode)) {
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\Contract\PhpDocNodeVisitorInterface;
|
||||
use Rector\PhpDocParser\PhpDocParser\Contract\PhpDocNodeVisitorInterface;
|
||||
/**
|
||||
* Inspired by https://github.com/nikic/PHP-Parser/blob/master/lib/PhpParser/NodeVisitorAbstract.php
|
||||
*/
|
|
@ -1,16 +1,17 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
final class CallablePhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
|
||||
final class CallablePhpDocNodeVisitor extends \Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor
|
||||
{
|
||||
/**
|
||||
* @var callable(Node, string|null): (int|null|Node)
|
||||
*/
|
||||
private $callable;
|
||||
/**
|
||||
* @readonly
|
||||
* @var string|null
|
||||
*/
|
||||
private $docContent;
|
|
@ -1,17 +1,17 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
use Rector\PhpDocParser\PhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
/**
|
||||
* @api
|
||||
*
|
||||
* Mirrors
|
||||
* https://github.com/nikic/PHP-Parser/blob/d520bc9e1d6203c35a1ba20675b79a051c821a9e/lib/PhpParser/NodeVisitor/CloningVisitor.php
|
||||
*/
|
||||
final class CloningPhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
|
||||
final class CloningPhpDocNodeVisitor extends \Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor
|
||||
{
|
||||
public function enterNode(Node $node) : Node
|
||||
{
|
|
@ -1,18 +1,18 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeVisitor;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\Node;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
use Rector\PhpDocParser\PhpDocParser\ValueObject\PhpDocAttributeKey;
|
||||
/**
|
||||
* @api
|
||||
*
|
||||
* Mimics https://github.com/nikic/PHP-Parser/blob/master/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php
|
||||
*
|
||||
* @see \Symplify\Astral\Tests\PhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitorTest
|
||||
* @see \Rector\Tests\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\ParentConnectingPhpDocNodeVisitorTest
|
||||
*/
|
||||
final class ParentConnectingPhpDocNodeVisitor extends AbstractPhpDocNodeVisitor
|
||||
final class ParentConnectingPhpDocNodeVisitor extends \Rector\PhpDocParser\PhpDocParser\PhpDocNodeVisitor\AbstractPhpDocNodeVisitor
|
||||
{
|
||||
/**
|
||||
* @var Node[]
|
|
@ -1,25 +1,27 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser;
|
||||
namespace Rector\PhpDocParser\PhpDocParser;
|
||||
|
||||
use PhpParser\Comment\Doc;
|
||||
use PhpParser\Node;
|
||||
use PHPStan\PhpDocParser\Lexer\Lexer;
|
||||
use PHPStan\PhpDocParser\Parser\PhpDocParser;
|
||||
use PHPStan\PhpDocParser\Parser\TokenIterator;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\ValueObject\Ast\PhpDoc\SimplePhpDocNode;
|
||||
use Rector\PhpDocParser\PhpDocParser\ValueObject\Ast\PhpDoc\SimplePhpDocNode;
|
||||
/**
|
||||
* @api
|
||||
* @see \Symplify\Astral\Tests\PhpDocParser\SimplePhpDocParser\SimplePhpDocParserTest
|
||||
* @see \Rector\Tests\PhpDocParser\PhpDocParser\SimplePhpDocParser\SimplePhpDocParserTest
|
||||
*/
|
||||
final class SimplePhpDocParser
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PHPStan\PhpDocParser\Parser\PhpDocParser
|
||||
*/
|
||||
private $phpDocParser;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PHPStan\PhpDocParser\Lexer\Lexer
|
||||
*/
|
||||
private $lexer;
|
|
@ -1,13 +1,13 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\StaticFactory;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\StaticFactory;
|
||||
|
||||
use PHPStan\PhpDocParser\Lexer\Lexer;
|
||||
use PHPStan\PhpDocParser\Parser\ConstExprParser;
|
||||
use PHPStan\PhpDocParser\Parser\PhpDocParser;
|
||||
use PHPStan\PhpDocParser\Parser\TypeParser;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\SimplePhpDocParser;
|
||||
use Rector\PhpDocParser\PhpDocParser\SimplePhpDocParser;
|
||||
/**
|
||||
* @api
|
||||
*/
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\ValueObject\Ast\PhpDoc;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\ValueObject\Ast\PhpDoc;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
|
||||
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpDocParser\ValueObject;
|
||||
namespace Rector\PhpDocParser\PhpDocParser\ValueObject;
|
||||
|
||||
final class PhpDocAttributeKey
|
||||
{
|
|
@ -1,18 +1,19 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpParser;
|
||||
namespace Rector\PhpDocParser\PhpParser;
|
||||
|
||||
use PhpParser\Node\Stmt;
|
||||
use PHPStan\Parser\Parser;
|
||||
/**
|
||||
* @see \Symplify\Astral\PhpParser\SmartPhpParserFactory
|
||||
* @see \Rector\PhpDocParser\PhpParser\SmartPhpParserFactory
|
||||
*
|
||||
* @api
|
||||
*/
|
||||
final class SmartPhpParser
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PHPStan\Parser\Parser
|
||||
*/
|
||||
private $parser;
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\PhpParser;
|
||||
namespace Rector\PhpDocParser\PhpParser;
|
||||
|
||||
use PhpParser\Lexer\Emulative;
|
||||
use PhpParser\NodeVisitor\NameResolver;
|
||||
|
@ -20,11 +20,11 @@ final class SmartPhpParserFactory
|
|||
/**
|
||||
* @api
|
||||
*/
|
||||
public function create() : SmartPhpParser
|
||||
public function create() : \Rector\PhpDocParser\PhpParser\SmartPhpParser
|
||||
{
|
||||
$nativePhpParser = $this->createNativePhpParser();
|
||||
$cachedParser = $this->createPHPStanParser($nativePhpParser);
|
||||
return new SmartPhpParser($cachedParser);
|
||||
return new \Rector\PhpDocParser\PhpParser\SmartPhpParser($cachedParser);
|
||||
}
|
||||
private function createNativePhpParser() : Parser
|
||||
{
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\TypeAnalyzer;
|
||||
namespace Rector\PhpDocParser\TypeAnalyzer;
|
||||
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PHPStan\Analyser\Scope;
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral;
|
||||
namespace Rector\PhpDocParser;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\NodeFinder;
|
||||
|
@ -12,6 +12,7 @@ use PhpParser\NodeFinder;
|
|||
final class TypeAwareNodeFinder
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PhpParser\NodeFinder
|
||||
*/
|
||||
private $nodeFinder;
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject;
|
||||
namespace Rector\PhpDocParser\ValueObject;
|
||||
|
||||
/**
|
||||
* @api
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder;
|
||||
namespace Rector\PhpDocParser\ValueObject\NodeBuilder;
|
||||
|
||||
use PhpParser\Builder\Class_;
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder;
|
||||
namespace Rector\PhpDocParser\ValueObject\NodeBuilder;
|
||||
|
||||
use PhpParser\Builder\Method;
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder;
|
||||
namespace Rector\PhpDocParser\ValueObject\NodeBuilder;
|
||||
|
||||
use PhpParser\Builder\Namespace_;
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder;
|
||||
namespace Rector\PhpDocParser\ValueObject\NodeBuilder;
|
||||
|
||||
use PhpParser\Builder\Param;
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder;
|
||||
namespace Rector\PhpDocParser\ValueObject\NodeBuilder;
|
||||
|
||||
use PhpParser\Builder\Property;
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder;
|
||||
namespace Rector\PhpDocParser\ValueObject\NodeBuilder;
|
||||
|
||||
use PhpParser\Builder\TraitUse;
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder;
|
||||
namespace Rector\PhpDocParser\ValueObject\NodeBuilder;
|
||||
|
||||
use PhpParser\Builder\Use_;
|
||||
use PhpParser\Node\Name;
|
|
@ -14,7 +14,7 @@ use PhpParser\Node\Stmt\Foreach_;
|
|||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ForeachAnalyzer
|
||||
{
|
||||
/**
|
||||
|
@ -34,7 +34,7 @@ final class ForeachAnalyzer
|
|||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -25,7 +25,7 @@ use Rector\NodeNameResolver\NodeNameResolver;
|
|||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class LocalPropertyAnalyzer
|
||||
{
|
||||
/**
|
||||
|
@ -34,7 +34,7 @@ final class LocalPropertyAnalyzer
|
|||
private const LARAVEL_COLLECTION_CLASS = 'Illuminate\\Support\\Collection';
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -22,10 +22,10 @@ use Rector\Core\Util\StringUtils;
|
|||
use Rector\Core\ValueObject\Application\File;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
use ReflectionClass;
|
||||
use RectorPrefix202208\Symfony\Contracts\Service\Attribute\Required;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
/**
|
||||
* @see \Rector\Tests\CodingStyle\ClassNameImport\ShortNameResolver\ShortNameResolverTest
|
||||
*/
|
||||
|
@ -46,7 +46,7 @@ final class ShortNameResolver
|
|||
private $phpDocInfoFactory;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -9,12 +9,12 @@ use PhpParser\Node\Stmt\GroupUse;
|
|||
use PhpParser\Node\Stmt\Use_;
|
||||
use PhpParser\Node\Stmt\UseUse;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class UseImportsTraverser
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -11,12 +11,12 @@ use PhpParser\Node\Expr\Variable;
|
|||
use PhpParser\Node\Stmt;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ModifiedVariableNamesCollector
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -8,7 +8,7 @@ use PhpParser\Node\Expr\FuncCall;
|
|||
use PhpParser\Node\FunctionLike;
|
||||
use PhpParser\NodeTraverser;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class VariadicFunctionLikeDetector
|
||||
{
|
||||
/**
|
||||
|
@ -17,7 +17,7 @@ final class VariadicFunctionLikeDetector
|
|||
private const VARIADIC_FUNCTION_NAMES = ['func_get_arg', 'func_get_args', 'func_num_args'];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -9,7 +9,7 @@ use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
|
|||
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
|
||||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
|
||||
use Rector\DeadCode\PhpDoc\DeadParamTagValueNodeAnalyzer;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
final class ParamTagRemover
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -10,12 +10,12 @@ use PhpParser\Node\Identifier;
|
|||
use PhpParser\Node\Stmt\ClassLike;
|
||||
use PhpParser\Node\VarLikeIdentifier;
|
||||
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class PropertyFetchRenamer
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -17,12 +17,12 @@ use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
|||
use Rector\Naming\PhpDoc\VarTagValueNodeRenamer;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class VariableRenamer
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -16,7 +16,7 @@ use Rector\Core\Configuration\Option;
|
|||
use Rector\Core\Enum\ObjectReference;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\Parameter\ParameterProvider;
|
||||
final class FullyQualifyStmtsAnalyzer
|
||||
{
|
||||
|
@ -27,7 +27,7 @@ final class FullyQualifyStmtsAnalyzer
|
|||
private $parameterProvider;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -30,12 +30,12 @@ use Rector\Core\PhpParser\Comparing\NodeComparator;
|
|||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class UndefinedVariableResolver
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -44,10 +44,10 @@ use Rector\Core\PhpParser\Parser\SimplePhpParser;
|
|||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\Php72\NodeManipulator\ClosureNestedUsesDecorator;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use ReflectionParameter;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\Reflection\PrivatesAccessor;
|
||||
final class AnonymousFunctionFactory
|
||||
{
|
||||
|
@ -78,7 +78,7 @@ final class AnonymousFunctionFactory
|
|||
private $staticTypeMapper;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -25,8 +25,8 @@ use Rector\NodeNameResolver\NodeNameResolver;
|
|||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\Php80\ValueObject\ArrayDimFetchAndConstFetch;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class TokenManipulator
|
||||
{
|
||||
/**
|
||||
|
@ -35,7 +35,7 @@ final class TokenManipulator
|
|||
private $assignedNameExpr;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -28,8 +28,8 @@ use Rector\Php80\NodeManipulator\AttributeGroupNamedArgumentManipulator;
|
|||
use Rector\Php80\ValueObject\AnnotationToAttribute;
|
||||
use Rector\Php80\ValueObject\DoctrineTagAndAnnotationToAttribute;
|
||||
use Rector\PhpAttribute\NodeFactory\PhpAttributeGroupFactory;
|
||||
use Rector\PhpDocParser\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Rector\VersionBonding\Contract\MinPhpVersionInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpDocParser\PhpDocNodeTraverser;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
use RectorPrefix202208\Webmozart\Assert\Assert;
|
||||
|
|
|
@ -12,8 +12,8 @@ use PhpParser\Node\Stmt\Property;
|
|||
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
||||
use Rector\Core\PhpParser\Node\NodeFactory;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\Privatization\Naming\ConstantNaming;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class PropertyFetchWithConstFetchReplacer
|
||||
{
|
||||
/**
|
||||
|
@ -23,7 +23,7 @@ final class PropertyFetchWithConstFetchReplacer
|
|||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -23,7 +23,7 @@ use Rector\DeadCode\SideEffect\SideEffectNodeDetector;
|
|||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeRemoval\NodeRemover;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ComplexNodeRemover
|
||||
{
|
||||
/**
|
||||
|
@ -48,7 +48,7 @@ final class ComplexNodeRemover
|
|||
private $sideEffectNodeDetector;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -32,8 +32,8 @@ use Rector\NodeRemoval\NodeRemover;
|
|||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockClassRenamer;
|
||||
use Rector\NodeTypeResolver\ValueObject\OldToNewType;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\Parameter\ParameterProvider;
|
||||
final class ClassRenamer
|
||||
{
|
||||
|
@ -52,7 +52,7 @@ final class ClassRenamer
|
|||
private $betterNodeFinder;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -14,9 +14,9 @@ use PHPStan\Type\ObjectType;
|
|||
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
||||
use Rector\Core\ValueObject\MethodName;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\TypeDeclaration\Matcher\PropertyAssignMatcher;
|
||||
use Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ConstructorAssignDetector
|
||||
{
|
||||
/**
|
||||
|
@ -35,7 +35,7 @@ final class ConstructorAssignDetector
|
|||
private $propertyAssignMatcher;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -10,9 +10,9 @@ use PhpParser\Node\Stmt\ClassLike;
|
|||
use PhpParser\NodeTraverser;
|
||||
use Rector\NodeNestingScope\ScopeNestingComparator;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PHPStanStaticTypeMapper\DoctrineTypeAnalyzer;
|
||||
use Rector\TypeDeclaration\Matcher\PropertyAssignMatcher;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
/**
|
||||
* Should add extra null type
|
||||
*/
|
||||
|
@ -40,7 +40,7 @@ final class NullTypeAssignDetector
|
|||
private $propertyAssignMatcher;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
public function __construct(ScopeNestingComparator $scopeNestingComparator, DoctrineTypeAnalyzer $doctrineTypeAnalyzer, NodeTypeResolver $nodeTypeResolver, PropertyAssignMatcher $propertyAssignMatcher, SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
|
||||
|
|
|
@ -19,8 +19,8 @@ use Rector\BetterPhpDocParser\ValueObject\Type\SpacingAwareArrayTypeNode;
|
|||
use Rector\Core\Rector\AbstractScopeAwareRector;
|
||||
use Rector\Core\Util\StringUtils;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PhpDocParser\TypeAnalyzer\ClassMethodReturnTypeResolver;
|
||||
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
|
||||
use RectorPrefix202208\Symplify\Astral\TypeAnalyzer\ClassMethodReturnTypeResolver;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
/**
|
||||
|
@ -35,7 +35,7 @@ final class ArrayShapeFromConstantArrayReturnRector extends AbstractScopeAwareRe
|
|||
private const SKIPPED_CHAR_REGEX = '#\\W#u';
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\TypeAnalyzer\ClassMethodReturnTypeResolver
|
||||
* @var \Rector\PhpDocParser\TypeAnalyzer\ClassMethodReturnTypeResolver
|
||||
*/
|
||||
private $classMethodReturnTypeResolver;
|
||||
/**
|
||||
|
|
|
@ -21,9 +21,9 @@ use PHPStan\Analyser\Scope;
|
|||
use PHPStan\Reflection\ClassReflection;
|
||||
use Rector\Core\Rector\AbstractScopeAwareRector;
|
||||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\TypeDeclaration\NodeAnalyzer\CallerParamMatcher;
|
||||
use Rector\VendorLocker\ParentClassMethodTypeOverrideGuard;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
/**
|
||||
|
@ -38,7 +38,7 @@ final class ParamTypeByMethodCallTypeRector extends AbstractScopeAwareRector
|
|||
private $callerParamMatcher;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -17,11 +17,11 @@ use Rector\Core\NodeAnalyzer\ExprAnalyzer;
|
|||
use Rector\Core\PhpParser\Node\Value\ValueResolver;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector;
|
||||
use Rector\TypeDeclaration\AlreadyAssignDetector\NullTypeAssignDetector;
|
||||
use Rector\TypeDeclaration\AlreadyAssignDetector\PropertyDefaultAssignDetector;
|
||||
use Rector\TypeDeclaration\Matcher\PropertyAssignMatcher;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
/**
|
||||
* @deprecated
|
||||
* @todo Split into many narrow-focused rules
|
||||
|
@ -50,7 +50,7 @@ final class AssignToPropertyTypeInferer
|
|||
private $nullTypeAssignDetector;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -17,8 +17,8 @@ use Rector\Core\NodeManipulator\PropertyFetchAssignManipulator;
|
|||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\TypeDeclaration\Contract\TypeInferer\ParamTypeInfererInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class GetterNodeParamTypeInferer implements ParamTypeInfererInterface
|
||||
{
|
||||
/**
|
||||
|
@ -43,7 +43,7 @@ final class GetterNodeParamTypeInferer implements ParamTypeInfererInterface
|
|||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -17,10 +17,10 @@ use Rector\NodeNameResolver\NodeNameResolver;
|
|||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use Rector\TypeDeclaration\Contract\TypeInferer\ParamTypeInfererInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class PropertyNodeParamTypeInferer implements ParamTypeInfererInterface
|
||||
{
|
||||
/**
|
||||
|
@ -35,7 +35,7 @@ final class PropertyNodeParamTypeInferer implements ParamTypeInfererInterface
|
|||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -29,11 +29,11 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
|
|||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
|
||||
use Rector\NodeTypeResolver\TypeComparator\TypeComparator;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
|
||||
use Rector\TypeDeclaration\TypeInferer\AssignToPropertyTypeInferer;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
/**
|
||||
* @deprecated
|
||||
* @todo split to more specialized rules with narrow focus
|
||||
|
@ -57,7 +57,7 @@ final class TrustedClassMethodPropertyTypeInferer
|
|||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -24,10 +24,10 @@ use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
|||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\TypeDeclaration\Contract\TypeInferer\ReturnTypeInfererInterface;
|
||||
use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver;
|
||||
use Rector\TypeDeclaration\TypeInferer\SplArrayFixedTypeNarrower;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
/**
|
||||
* @deprecated
|
||||
* @todo Split into many narrow-focused rules
|
||||
|
@ -46,7 +46,7 @@ final class ReturnedNodesReturnTypeInfererTypeInferer implements ReturnTypeInfer
|
|||
private $nodeTypeResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -16,10 +16,10 @@ use PHPStan\Type\Type;
|
|||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedGenericObjectType;
|
||||
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
|
||||
use Rector\TypeDeclaration\Contract\TypeInferer\ReturnTypeInfererInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class YieldNodesReturnTypeInfererTypeInferer implements ReturnTypeInfererInterface
|
||||
{
|
||||
/**
|
||||
|
@ -34,7 +34,7 @@ final class YieldNodesReturnTypeInfererTypeInferer implements ReturnTypeInfererI
|
|||
private $typeFactory;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -17,12 +17,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'ad7cdc74eeb9379091e99bda90e95f1166c81147';
|
||||
public const PACKAGE_VERSION = 'bb59a7c99ad30770689fe011c89377402bf6c7ba';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2022-08-29 20:19:27';
|
||||
public const RELEASE_DATE = '2022-08-29 22:44:20';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
|
@ -12,7 +12,6 @@ use Rector\Core\DependencyInjection\CompilerPass\RemoveSkippedRectorsCompilerPas
|
|||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use RectorPrefix202208\Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
|
||||
use RectorPrefix202208\Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use RectorPrefix202208\Symplify\Astral\ValueObject\AstralConfig;
|
||||
use RectorPrefix202208\Symplify\AutowireArrayParameter\DependencyInjection\CompilerPass\AutowireArrayParameterCompilerPass;
|
||||
use RectorPrefix202208\Symplify\ComposerJsonManipulator\ValueObject\ComposerJsonManipulatorConfig;
|
||||
use RectorPrefix202208\Symplify\PackageBuilder\DependencyInjection\CompilerPass\AutowireInterfacesCompilerPass;
|
||||
|
@ -82,6 +81,6 @@ final class RectorKernel implements LightKernelInterface
|
|||
*/
|
||||
private function createDefaultConfigFiles() : array
|
||||
{
|
||||
return [__DIR__ . '/../../config/config.php', AstralConfig::FILE_PATH, ComposerJsonManipulatorConfig::FILE_PATH, SkipperConfig::FILE_PATH, ConsoleColorDiffConfig::FILE_PATH];
|
||||
return [__DIR__ . '/../../config/config.php', ComposerJsonManipulatorConfig::FILE_PATH, SkipperConfig::FILE_PATH, ConsoleColorDiffConfig::FILE_PATH];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
|||
use Rector\Core\PhpParser\Node\Value\ValueResolver;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ParamAnalyzer
|
||||
{
|
||||
/**
|
||||
|
@ -48,7 +48,7 @@ final class ParamAnalyzer
|
|||
private $funcCallManipulator;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -22,7 +22,7 @@ use Rector\Core\PhpParser\AstResolver;
|
|||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\Core\ValueObject\MethodName;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class PropertyFetchAnalyzer
|
||||
{
|
||||
/**
|
||||
|
@ -46,7 +46,7 @@ final class PropertyFetchAnalyzer
|
|||
private $astResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
public function __construct(NodeNameResolver $nodeNameResolver, BetterNodeFinder $betterNodeFinder, AstResolver $astResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
|
||||
|
|
|
@ -10,12 +10,12 @@ use PhpParser\Node\Expr\List_;
|
|||
use PhpParser\Node\Expr\Variable;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ArrayDestructVariableFilter
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -13,12 +13,12 @@ use PhpParser\Node\Stmt\ClassMethod;
|
|||
use PhpParser\NodeTraverser;
|
||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ClassMethodPropertyFetchManipulator
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -17,7 +17,7 @@ use Rector\Core\PhpParser\Node\NodeFactory;
|
|||
use Rector\Core\ValueObject\MethodName;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class DependencyClassMethodDecorator
|
||||
{
|
||||
/**
|
||||
|
@ -42,7 +42,7 @@ final class DependencyClassMethodDecorator
|
|||
private $astResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -9,12 +9,12 @@ use PhpParser\Node\Stmt\Function_;
|
|||
use PhpParser\Node\Stmt\Return_;
|
||||
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class FunctionLikeManipulator
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -15,12 +15,12 @@ use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
|||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\Core\ValueObject\MethodName;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class PropertyFetchAssignManipulator
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -8,12 +8,12 @@ use PhpParser\Node\Stmt;
|
|||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PhpParser\Node\Stmt\Expression;
|
||||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class StmtsManipulator
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -22,8 +22,8 @@ use Rector\Core\PhpParser\Comparing\NodeComparator;
|
|||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\ReadWrite\Guard\VariableToConstantGuard;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class VariableManipulator
|
||||
{
|
||||
/**
|
||||
|
@ -38,7 +38,7 @@ final class VariableManipulator
|
|||
private $betterNodeFinder;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -32,7 +32,7 @@ use Rector\Core\ValueObject\MethodName;
|
|||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpParser\SmartPhpParser;
|
||||
use Rector\PhpDocParser\PhpParser\SmartPhpParser;
|
||||
use Symplify\SmartFileSystem\SmartFileInfo;
|
||||
/**
|
||||
* The nodes provided by this resolver is for read-only analysis only!
|
||||
|
@ -56,7 +56,7 @@ final class AstResolver
|
|||
private $functionsByName = [];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\PhpParser\SmartPhpParser
|
||||
* @var \Rector\PhpDocParser\PhpParser\SmartPhpParser
|
||||
*/
|
||||
private $smartPhpParser;
|
||||
/**
|
||||
|
|
|
@ -11,7 +11,7 @@ use PhpParser\Node\Stmt\Trait_;
|
|||
use PHPStan\Reflection\ClassReflection;
|
||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\Core\ValueObject\Application\File;
|
||||
use RectorPrefix202208\Symplify\Astral\PhpParser\SmartPhpParser;
|
||||
use Rector\PhpDocParser\PhpParser\SmartPhpParser;
|
||||
final class ClassLikeAstResolver
|
||||
{
|
||||
/**
|
||||
|
@ -23,7 +23,7 @@ final class ClassLikeAstResolver
|
|||
private $classLikesByName = [];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Symplify\Astral\PhpParser\SmartPhpParser
|
||||
* @var \Rector\PhpDocParser\PhpParser\SmartPhpParser
|
||||
*/
|
||||
private $smartPhpParser;
|
||||
/**
|
||||
|
|
|
@ -3,11 +3,13 @@
|
|||
declare (strict_types=1);
|
||||
namespace Rector\Core\PhpParser\Node;
|
||||
|
||||
use PhpParser\Builder\Method;
|
||||
use PhpParser\Builder\Param as ParamBuilder;
|
||||
use PhpParser\Builder\Property as PropertyBuilder;
|
||||
use PhpParser\BuilderFactory;
|
||||
use PhpParser\BuilderHelpers;
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Arg;
|
||||
use PhpParser\Node\Const_;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Expr\Array_;
|
||||
use PhpParser\Node\Expr\ArrayItem;
|
||||
|
@ -31,33 +33,24 @@ use PhpParser\Node\Param;
|
|||
use PhpParser\Node\Scalar;
|
||||
use PhpParser\Node\Scalar\String_;
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PhpParser\Node\Stmt\ClassConst;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PhpParser\Node\Stmt\Property;
|
||||
use PhpParser\Node\Stmt\Return_;
|
||||
use PhpParser\Node\Stmt\Use_;
|
||||
use PhpParser\Node\Stmt\UseUse;
|
||||
use PHPStan\PhpDocParser\Ast\PhpDoc\GenericTagValueNode;
|
||||
use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
|
||||
use PHPStan\Type\MixedType;
|
||||
use PHPStan\Type\Type;
|
||||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
|
||||
use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger;
|
||||
use Rector\Core\Configuration\CurrentNodeProvider;
|
||||
use Rector\Core\Enum\ObjectReference;
|
||||
use Rector\Core\Exception\NotImplementedYetException;
|
||||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\Core\NodeDecorator\PropertyTypeDecorator;
|
||||
use Rector\Core\Php\PhpVersionProvider;
|
||||
use Rector\Core\ValueObject\MethodName;
|
||||
use Rector\Core\ValueObject\PhpVersionFeature;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
|
||||
use Rector\PostRector\ValueObject\PropertyMetadata;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder\MethodBuilder;
|
||||
use RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder\ParamBuilder;
|
||||
use RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder\PropertyBuilder;
|
||||
/**
|
||||
* @see \Rector\Core\Tests\PhpParser\Node\NodeFactoryTest
|
||||
*/
|
||||
|
@ -77,21 +70,11 @@ final class NodeFactory
|
|||
* @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
|
||||
*/
|
||||
private $phpDocInfoFactory;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\Php\PhpVersionProvider
|
||||
*/
|
||||
private $phpVersionProvider;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\StaticTypeMapper\StaticTypeMapper
|
||||
*/
|
||||
private $staticTypeMapper;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTypeChanger
|
||||
*/
|
||||
private $phpDocTypeChanger;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\Configuration\CurrentNodeProvider
|
||||
|
@ -102,13 +85,11 @@ final class NodeFactory
|
|||
* @var \Rector\Core\NodeDecorator\PropertyTypeDecorator
|
||||
*/
|
||||
private $propertyTypeDecorator;
|
||||
public function __construct(BuilderFactory $builderFactory, PhpDocInfoFactory $phpDocInfoFactory, PhpVersionProvider $phpVersionProvider, StaticTypeMapper $staticTypeMapper, PhpDocTypeChanger $phpDocTypeChanger, CurrentNodeProvider $currentNodeProvider, PropertyTypeDecorator $propertyTypeDecorator)
|
||||
public function __construct(BuilderFactory $builderFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentNodeProvider $currentNodeProvider, PropertyTypeDecorator $propertyTypeDecorator)
|
||||
{
|
||||
$this->builderFactory = $builderFactory;
|
||||
$this->phpDocInfoFactory = $phpDocInfoFactory;
|
||||
$this->phpVersionProvider = $phpVersionProvider;
|
||||
$this->staticTypeMapper = $staticTypeMapper;
|
||||
$this->phpDocTypeChanger = $phpDocTypeChanger;
|
||||
$this->currentNodeProvider = $currentNodeProvider;
|
||||
$this->propertyTypeDecorator = $propertyTypeDecorator;
|
||||
}
|
||||
|
@ -188,20 +169,20 @@ final class NodeFactory
|
|||
}
|
||||
public function createPublicMethod(string $name) : ClassMethod
|
||||
{
|
||||
$methodBuilder = new MethodBuilder($name);
|
||||
$methodBuilder->makePublic();
|
||||
return $methodBuilder->getNode();
|
||||
$method = new Method($name);
|
||||
$method->makePublic();
|
||||
return $method->getNode();
|
||||
}
|
||||
public function createParamFromNameAndType(string $name, ?Type $type) : Param
|
||||
{
|
||||
$paramBuilder = new ParamBuilder($name);
|
||||
$param = new ParamBuilder($name);
|
||||
if ($type !== null) {
|
||||
$typeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($type, TypeKind::PARAM);
|
||||
if ($typeNode !== null) {
|
||||
$paramBuilder->setType($typeNode);
|
||||
$param->setType($typeNode);
|
||||
}
|
||||
}
|
||||
return $paramBuilder->getNode();
|
||||
return $param->getNode();
|
||||
}
|
||||
public function createPublicInjectPropertyFromNameAndType(string $name, ?Type $type) : Property
|
||||
{
|
||||
|
@ -262,34 +243,6 @@ final class NodeFactory
|
|||
$this->phpDocInfoFactory->createFromNode($property);
|
||||
return $property;
|
||||
}
|
||||
public function createGetterClassMethod(string $propertyName, Type $type) : ClassMethod
|
||||
{
|
||||
$methodBuilder = new MethodBuilder('get' . \ucfirst($propertyName));
|
||||
$methodBuilder->makePublic();
|
||||
$propertyFetch = new PropertyFetch(new Variable(self::THIS), $propertyName);
|
||||
$return = new Return_($propertyFetch);
|
||||
$methodBuilder->addStmt($return);
|
||||
$typeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($type, TypeKind::RETURN);
|
||||
if ($typeNode !== null) {
|
||||
$methodBuilder->setReturnType($typeNode);
|
||||
}
|
||||
return $methodBuilder->getNode();
|
||||
}
|
||||
public function createSetterClassMethod(string $propertyName, Type $type) : ClassMethod
|
||||
{
|
||||
$methodBuilder = new MethodBuilder('set' . \ucfirst($propertyName));
|
||||
$methodBuilder->makePublic();
|
||||
$variable = new Variable($propertyName);
|
||||
$param = $this->createParamWithType($variable, $type);
|
||||
$methodBuilder->addParam($param);
|
||||
$propertyFetch = new PropertyFetch(new Variable(self::THIS), $propertyName);
|
||||
$assign = new Assign($propertyFetch, $variable);
|
||||
$methodBuilder->addStmt($assign);
|
||||
if ($this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::VOID_TYPE)) {
|
||||
$methodBuilder->setReturnType(new Name('void'));
|
||||
}
|
||||
return $methodBuilder->getNode();
|
||||
}
|
||||
/**
|
||||
* @param Expr[] $exprs
|
||||
*/
|
||||
|
@ -412,23 +365,6 @@ final class NodeFactory
|
|||
}
|
||||
return $this->createBooleanAndFromNodes($newNodes);
|
||||
}
|
||||
/**
|
||||
* @api
|
||||
*/
|
||||
public function createClassConstant(string $name, Expr $expr, int $modifier) : ClassConst
|
||||
{
|
||||
$normalizedExpr = BuilderHelpers::normalizeValue($expr);
|
||||
$const = new Const_($name, $normalizedExpr);
|
||||
$classConst = new ClassConst([$const]);
|
||||
$classConst->flags |= $modifier;
|
||||
// add @var type by default
|
||||
$staticType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($expr);
|
||||
if (!$staticType instanceof MixedType) {
|
||||
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($classConst);
|
||||
$this->phpDocTypeChanger->changeVarType($phpDocInfo, $staticType);
|
||||
}
|
||||
return $classConst;
|
||||
}
|
||||
/**
|
||||
* @param string|int|null $key
|
||||
* @param mixed $item
|
||||
|
@ -484,12 +420,6 @@ final class NodeFactory
|
|||
/** @var BooleanAnd $booleanAnd */
|
||||
return $booleanAnd;
|
||||
}
|
||||
private function createParamWithType(Variable $variable, Type $type) : Param
|
||||
{
|
||||
$param = new Param($variable);
|
||||
$param->type = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($type, TypeKind::PARAM);
|
||||
return $param;
|
||||
}
|
||||
/**
|
||||
* @param string|ObjectReference::* $className
|
||||
* @return \PhpParser\Node\Name|\PhpParser\Node\Name\FullyQualified
|
||||
|
|
|
@ -38,10 +38,10 @@ use Rector\NodeNameResolver\NodeNameResolver;
|
|||
use Rector\NodeRemoval\NodeRemover;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use RectorPrefix202208\Symfony\Contracts\Service\Attribute\Required;
|
||||
use RectorPrefix202208\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use RectorPrefix202208\Symplify\Skipper\Skipper\Skipper;
|
||||
abstract class AbstractRector extends NodeVisitorAbstract implements PhpRectorInterface
|
||||
{
|
||||
|
@ -110,7 +110,7 @@ CODE_SAMPLE;
|
|||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
/**
|
||||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
/**
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
declare (strict_types=1);
|
||||
namespace Rector\Core\StaticReflection\SourceLocator;
|
||||
|
||||
use PhpParser\Builder\Class_;
|
||||
use PHPStan\BetterReflection\Identifier\Identifier;
|
||||
use PHPStan\BetterReflection\Identifier\IdentifierType;
|
||||
use PHPStan\BetterReflection\Reflection\Reflection;
|
||||
|
@ -12,7 +13,6 @@ use PHPStan\BetterReflection\Reflector\Reflector;
|
|||
use PHPStan\BetterReflection\SourceLocator\Located\LocatedSource;
|
||||
use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
|
||||
use Rector\Core\Configuration\RenamedClassesDataCollector;
|
||||
use RectorPrefix202208\Symplify\Astral\ValueObject\NodeBuilder\ClassBuilder;
|
||||
/**
|
||||
* Inspired from \PHPStan\BetterReflection\SourceLocator\Type\StringSourceLocator
|
||||
*/
|
||||
|
@ -51,7 +51,7 @@ final class RenamedClassesSourceLocator implements SourceLocator
|
|||
}
|
||||
private function createFakeReflectionClassFromClassName(string $oldClass) : ReflectionClass
|
||||
{
|
||||
$classBuilder = new ClassBuilder($oldClass);
|
||||
$classBuilder = new Class_($oldClass);
|
||||
$class = $classBuilder->getNode();
|
||||
$fakeLocatedSource = new LocatedSource('virtual', null);
|
||||
$classReflector = new ClassReflector($this);
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInitab21ab5cab660dfc5e1c57fc2f0a31d5::getLoader();
|
||||
return ComposerAutoloaderInitc882d4358abcd96633d7efdc3bcb1930::getLoader();
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user