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

move NameResolver to PropertyNaming

Browse Source
This commit is contained in:
TomasVotruba 2017-10-16 17:51:40 +02:00
parent ee6e8ec1f6
commit fb6533f51a
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Builder/Naming/NameResolver.php → src/Naming/PropertyNaming.php
View File

@ -1,10 +1,10 @@
<?php declare(strict_types=1);
namespace Rector\Builder\Naming;
namespace Rector\Naming;
final class NameResolver
final class PropertyNaming
{
public function resolvePropertyNameFromType(string $serviceType): string
public function typeToName(string $serviceType): string
{
$serviceNameParts = explode('\\', $serviceType);
$lastNamePart = array_pop($serviceNameParts);

12
src/Rector/Contrib/Nette/Environment/GetServiceToConstructorInjectionRector.php
View File

@ -5,8 +5,8 @@ namespace Rector\Rector\Contrib\Nette\Environment;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use Rector\Builder\Class_\ClassPropertyCollector;
use Rector\Builder\Naming\NameResolver;
use Rector\Contract\Bridge\ServiceTypeForNameProviderInterface;
use Rector\Naming\PropertyNaming;
use Rector\Node\Attribute;
use Rector\NodeAnalyzer\MethodCallAnalyzer;
use Rector\NodeFactory\NodeFactory;
@ -22,9 +22,9 @@ use Rector\Rector\AbstractRector;
final class GetServiceToConstructorInjectionRector extends AbstractRector
{
/**
* @var NameResolver
* @var PropertyNaming
*/
private $nameResolver;
private $propertyNaming;
/**
* @var ClassPropertyCollector
@ -47,13 +47,13 @@ final class GetServiceToConstructorInjectionRector extends AbstractRector
private $serviceTypeForNameProvider;
public function __construct(
NameResolver $nameResolver,
PropertyNaming $propertyNaming,
ClassPropertyCollector $classPropertyCollector,
NodeFactory $nodeFactory,
MethodCallAnalyzer $methodCallAnalyzer,
ServiceTypeForNameProviderInterface $serviceTypeForNameProvider
) {
$this->nameResolver = $nameResolver;
$this->propertyNaming = $propertyNaming;
$this->classPropertyCollector = $classPropertyCollector;
$this->nodeFactory = $nodeFactory;
$this->methodCallAnalyzer = $methodCallAnalyzer;
@ -77,7 +77,7 @@ final class GetServiceToConstructorInjectionRector extends AbstractRector
return null;
}
$propertyName = $this->nameResolver->resolvePropertyNameFromType($serviceType);
$propertyName = $this->propertyNaming->typeToName($serviceType);
$this->classPropertyCollector->addPropertyForClass(
(string) $methodCallNode->getAttribute(Attribute::CLASS_NAME),

12
src/Rector/Contrib/Symfony/Console/CommandToConstructorInjectionRector.php
View File

@ -7,8 +7,8 @@ use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Name\FullyQualified;
use Rector\Builder\Class_\ClassPropertyCollector;
use Rector\Builder\Naming\NameResolver;
use Rector\Contract\Bridge\ServiceTypeForNameProviderInterface;
use Rector\Naming\PropertyNaming;
use Rector\Node\Attribute;
use Rector\NodeAnalyzer\SymfonyContainerCallsAnalyzer;
use Rector\NodeFactory\NodeFactory;
@ -47,9 +47,9 @@ final class CommandToConstructorInjectionRector extends AbstractRector
private $classPropertyCollector;
/**
* @var NameResolver
* @var PropertyNaming
*/
private $nameResolver;
private $propertyNaming;
/**
* @var NodeFactory
@ -68,13 +68,13 @@ final class CommandToConstructorInjectionRector extends AbstractRector
public function __construct(
ClassPropertyCollector $classPropertyCollector,
NameResolver $nameResolver,
PropertyNaming $propertyNaming,
NodeFactory $nodeFactory,
SymfonyContainerCallsAnalyzer $symfonyContainerCallsAnalyzer,
ServiceTypeForNameProviderInterface $serviceTypeForNameProvider
) {
$this->classPropertyCollector = $classPropertyCollector;
$this->nameResolver = $nameResolver;
$this->propertyNaming = $propertyNaming;
$this->nodeFactory = $nodeFactory;
$this->symfonyContainerCallsAnalyzer = $symfonyContainerCallsAnalyzer;
$this->serviceTypeForNameProvider = $serviceTypeForNameProvider;
@ -108,7 +108,7 @@ final class CommandToConstructorInjectionRector extends AbstractRector
return null;
}
$propertyName = $this->nameResolver->resolvePropertyNameFromType($serviceType);
$propertyName = $this->propertyNaming->typeToName($serviceType);
$this->classPropertyCollector->addPropertyForClass(
(string) $methodCallNode->getAttribute(Attribute::CLASS_NAME),

12
src/Rector/Contrib/Symfony/HttpKernel/GetterToPropertyRector.php
View File

@ -5,8 +5,8 @@ namespace Rector\Rector\Contrib\Symfony\HttpKernel;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use Rector\Builder\Class_\ClassPropertyCollector;
use Rector\Builder\Naming\NameResolver;
use Rector\Contract\Bridge\ServiceTypeForNameProviderInterface;
use Rector\Naming\PropertyNaming;
use Rector\Node\Attribute;
use Rector\NodeAnalyzer\SymfonyContainerCallsAnalyzer;
use Rector\NodeFactory\NodeFactory;
@ -22,9 +22,9 @@ use Rector\Rector\AbstractRector;
final class GetterToPropertyRector extends AbstractRector
{
/**
* @var NameResolver
* @var PropertyNaming
*/
private $nameResolver;
private $propertyNaming;
/**
* @var ClassPropertyCollector
@ -47,13 +47,13 @@ final class GetterToPropertyRector extends AbstractRector
private $serviceTypeForNameProvider;
public function __construct(
NameResolver $nameResolver,
PropertyNaming $propertyNaming,
ClassPropertyCollector $classPropertyCollector,
NodeFactory $nodeFactory,
SymfonyContainerCallsAnalyzer $symfonyContainerCallsAnalyzer,
ServiceTypeForNameProviderInterface $serviceTypeForNameProvider
) {
$this->nameResolver = $nameResolver;
$this->propertyNaming = $propertyNaming;
$this->classPropertyCollector = $classPropertyCollector;
$this->nodeFactory = $nodeFactory;
$this->symfonyContainerCallsAnalyzer = $symfonyContainerCallsAnalyzer;
@ -80,7 +80,7 @@ final class GetterToPropertyRector extends AbstractRector
return null;
}
$propertyName = $this->nameResolver->resolvePropertyNameFromType($serviceType);
$propertyName = $this->propertyNaming->typeToName($serviceType);
$this->classPropertyCollector->addPropertyForClass(
(string) $methodCallNode->getAttribute(Attribute::CLASS_NAME),