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

[Builder] add PropertyBuilder

Browse Source
This commit is contained in:
TomasVotruba 2017-07-16 19:39:30 +02:00
parent 95d105512a
commit 31e354945e
2 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/Builder/PropertyBuilder.php Normal file
View File

@ -0,0 +1,50 @@
<?php declare(strict_types=1);
namespace Rector\Builder;
use Nette\Utils\Arrays;
use PhpParser\BuilderFactory;
use PhpParser\Comment\Doc;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Property;
final class PropertyBuilder
{
/**
* @var BuilderFactory
*/
private $builderFactory;
public function __construct(BuilderFactory $builderFactory)
{
$this->builderFactory = $builderFactory;
}
public function addPropertyToClass(Class_ $classNode, string $propertyType, string $propertyName): void
{
// 9. add a property
$propertyBuilder = $this->builderFactory->property($propertyName)
->makePrivate()
->setDocComment(new Doc('/**' . PHP_EOL . ' * @var ' . $propertyType . PHP_EOL . ' */'));
$this->addProperty($classNode, $propertyBuilder->getNode());
}
private function addProperty(Class_ $classNode, Property $propertyNode): void
{
foreach ($classNode->stmts as $key => $classElementNode) {
if ($classElementNode instanceof Property || $classElementNode instanceof ClassMethod) {
Arrays::insertBefore(
$classNode->stmts,
$key,
['before_' . $key => $propertyNode]
);
return;
}
}
$classNode->stmts[] = $propertyNode;
}
}

41
src/Reconstructor/DependencyInjection/NamedServicesToConstructorReconstructor.php
View File

@ -2,9 +2,6 @@
namespace Rector\Reconstructor\DependencyInjection;
use Nette\Utils\Arrays;
use PhpParser\BuilderFactory;
use PhpParser\Comment\Doc;
use PhpParser\Node;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\PropertyFetch;
@ -12,8 +9,8 @@ use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Property;
use Rector\Builder\ConstructorMethodBuilder;
use Rector\Builder\PropertyBuilder;
use Rector\Contract\Dispatcher\ReconstructorInterface;
use Rector\Tests\Reconstructor\DependencyInjection\NamedServicesToConstructorReconstructor\Source\LocalKernel;
use Symfony\Component\DependencyInjection\ContainerInterface;
@ -27,14 +24,14 @@ final class NamedServicesToConstructorReconstructor implements ReconstructorInte
private $constructorMethodBuilder;
/**
* @var BuilderFactory
* @var PropertyBuilder
*/
private $builderFactory;
private $propertyBuilder;
public function __construct(ConstructorMethodBuilder $constructorMethodBuilder, BuilderFactory $builderFactory)
public function __construct(ConstructorMethodBuilder $constructorMethodBuilder, PropertyBuilder $propertyBuilder)
{
$this->constructorMethodBuilder = $constructorMethodBuilder;
$this->builderFactory = $builderFactory;
$this->propertyBuilder = $propertyBuilder;
}
public function isCandidate(Node $node): bool
@ -46,7 +43,7 @@ final class NamedServicesToConstructorReconstructor implements ReconstructorInte
}
/**
* @param Class_|Node $classNode
* @param Class_ $classNode
*/
public function reconstruct(Node $classNode): void
{
@ -116,13 +113,8 @@ final class NamedServicesToConstructorReconstructor implements ReconstructorInte
// 8. add this property to constructor
$this->constructorMethodBuilder->addPropertyAssignToClass($classNode, $serviceType, $propertyName);
// 9. add a property
$propertyBuilder = $this->builderFactory->property($propertyName)
->makePrivate()
->setDocComment(new Doc('/**' . PHP_EOL . ' * @var ' . $serviceType . PHP_EOL . ' */'));
$propertyNode = $propertyBuilder->getNode();
$this->addProperty($classNode, $propertyNode);
// 9. add a property to class
$this->propertyBuilder->addPropertyToClass($classNode, $serviceType, $propertyName);
}
}
}
@ -149,21 +141,4 @@ final class NamedServicesToConstructorReconstructor implements ReconstructorInte
return lcfirst($lastNamePart);
}
private function addProperty(Class_ $classNode, Property $propertyNode): void
{
foreach ($classNode->stmts as $key => $classElementNode) {
if ($classElementNode instanceof Property || $classElementNode instanceof ClassMethod) {
Arrays::insertBefore(
$classNode->stmts,
$key,
['before_' . $key => $propertyNode]
);
return;
}
}
$classNode->stmts[] = $propertyNode;
}
}