octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-09 04:32:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup collector deps

Browse Source
This commit is contained in:
TomasVotruba 2020-01-27 23:30:40 +01:00
parent eaa018bb3c
commit 0fcd4a3e6e
4 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/NodeTypeResolver/src/Contract/NodeTypeResolverAwareInterface.php
View File

@ -1,12 +0,0 @@
<?php
declare(strict_types=1);
namespace Rector\NodeTypeResolver\Contract;
use Rector\NodeTypeResolver\NodeTypeResolver;
interface NodeTypeResolverAwareInterface
{
public function setNodeTypeResolver(NodeTypeResolver $nodeTypeResolver): void;
}

6
packages/NodeTypeResolver/src/NodeTypeResolver.php
View File

@ -60,7 +60,6 @@ use PHPStan\Type\UnionType;
use Rector\BetterPhpDocParser\PhpDocParser\BetterPhpDocParser;
use Rector\Exception\ShouldNotHappenException;
use Rector\NodeContainer\ParsedNodesByType;
use Rector\NodeTypeResolver\Contract\NodeTypeResolverAwareInterface;
use Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
@ -465,11 +464,6 @@ final class NodeTypeResolver
foreach ($perNodeTypeResolver->getNodeClasses() as $nodeClass) {
$this->perNodeTypeResolvers[$nodeClass] = $perNodeTypeResolver;
}
// in-code setter injection to drop CompilerPass requirement for 3rd party package install
if ($perNodeTypeResolver instanceof NodeTypeResolverAwareInterface) {
$perNodeTypeResolver->setNodeTypeResolver($this);
}
}
private function ensureRequiredTypeIsStringOrObjectType($requiredType, string $location): void

11
packages/NodeTypeResolver/src/PerNodeTypeResolver/PropertyTypeResolver.php
View File

@ -9,7 +9,6 @@ use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Stmt\Property;
use PHPStan\Type\Type;
use Rector\NodeTypeResolver\Contract\NodeTypeResolverAwareInterface;
use Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
@ -17,13 +16,21 @@ use Rector\NodeTypeResolver\NodeTypeResolver;
/**
* @see \Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\PropertyTypeResolver\PropertyTypeResolverTest
*/
final class PropertyTypeResolver implements PerNodeTypeResolverInterface, NodeTypeResolverAwareInterface
final class PropertyTypeResolver implements PerNodeTypeResolverInterface
{
/**
* @var NodeTypeResolver
*/
private $nodeTypeResolver;
/**
* @required
*/
public function autowirePropertyTypeResolver(NodeTypeResolver $nodeTypeResolver): void
{
$this->nodeTypeResolver = $nodeTypeResolver;
}
/**
* @return string[]
*/

8
packages/NodeTypeResolver/src/PerNodeTypeResolver/VariableTypeResolver.php
View File

@ -11,7 +11,6 @@ use PhpParser\Node\Stmt\Trait_;
use PHPStan\Analyser\Scope;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use Rector\NodeTypeResolver\Contract\NodeTypeResolverAwareInterface;
use Rector\NodeTypeResolver\Contract\PerNodeTypeResolver\PerNodeTypeResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
@ -22,7 +21,7 @@ use Rector\PhpParser\Node\Resolver\NameResolver;
/**
* @see \Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\VariableTypeResolver\VariableTypeResolverTest
*/
final class VariableTypeResolver implements PerNodeTypeResolverInterface, NodeTypeResolverAwareInterface
final class VariableTypeResolver implements PerNodeTypeResolverInterface
{
/**
* @var DocBlockManipulator
@ -86,7 +85,10 @@ final class VariableTypeResolver implements PerNodeTypeResolverInterface, NodeTy
return $this->docBlockManipulator->getVarType($variableNode);
}
public function setNodeTypeResolver(NodeTypeResolver $nodeTypeResolver): void
/**
* @required
*/
public function autowireNodeTypeResolver(NodeTypeResolver $nodeTypeResolver): void
{
$this->nodeTypeResolver = $nodeTypeResolver;
}