Skip to content
This repository was archived by the owner on Mar 6, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion lib/Adapter/TolerantParser/TolerantUpdater.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

use Microsoft\PhpParser\Node\SourceFileNode;
use Microsoft\PhpParser\Node\Statement\ClassDeclaration;
use Microsoft\PhpParser\Node\Statement\TraitDeclaration;
use Microsoft\PhpParser\Node\Statement\InlineHtml;
use Microsoft\PhpParser\Node\Statement\NamespaceDefinition;
use Microsoft\PhpParser\Node\Statement\NamespaceUseDeclaration;
Expand All @@ -21,6 +22,7 @@
use Phpactor\CodeBuilder\Adapter\TolerantParser\Updater\ClassUpdater;
use Microsoft\PhpParser\Node\Statement\InterfaceDeclaration;
use Phpactor\CodeBuilder\Adapter\TolerantParser\Updater\InterfaceUpdater;
use Phpactor\CodeBuilder\Adapter\TolerantParser\Updater\TraitUpdater;

class TolerantUpdater implements Updater
{
Expand Down Expand Up @@ -54,6 +56,11 @@ class TolerantUpdater implements Updater
*/
private $interfaceUpdater;

/**
* @var TraitUpdater
*/
private $traitUpdater;

/**
* @var UseStatementUpdater
*/
Expand All @@ -66,6 +73,7 @@ public function __construct(Renderer $renderer, TextFormat $textFormat = null, P
$this->renderer = $renderer;
$this->classUpdater = new ClassUpdater($renderer);
$this->interfaceUpdater = new InterfaceUpdater($renderer);
$this->traitUpdater = new TraitUpdater($renderer);
$this->useStatementUpdater = new UseStatementUpdater($renderer);
}

Expand Down Expand Up @@ -110,8 +118,10 @@ private function updateNamespace(Edits $edits, SourceCode $prototype, SourceFile
private function updateClasses(Edits $edits, SourceCode $prototype, SourceFileNode $node)
{
$classNodes = [];
$traitNodes = [];
$interfaceNodes = [];
$lastStatement = null;

foreach ($node->statementList as $classNode) {
$lastStatement = $classNode;

Expand All @@ -124,6 +134,11 @@ private function updateClasses(Edits $edits, SourceCode $prototype, SourceFileNo
$name = $classNode->name->getText($node->getFileContents());
$interfaceNodes[$name] = $classNode;
}

if ($classNode instanceof TraitDeclaration) {
$name = $classNode->name->getText($node->getFileContents());
$traitNodes[$name] = $classNode;
}
}

foreach ($prototype->classes()->in(array_keys($classNodes)) as $classPrototype) {
Expand All @@ -134,13 +149,18 @@ private function updateClasses(Edits $edits, SourceCode $prototype, SourceFileNo
$this->interfaceUpdater->updateInterface($edits, $classPrototype, $interfaceNodes[$classPrototype->name()]);
}

foreach ($prototype->traits()->in(array_keys($traitNodes)) as $traitPrototype) {
$this->traitUpdater->updateTrait($edits, $traitPrototype, $traitNodes[$traitPrototype->name()]);
}

if (substr($lastStatement->getText(), -1) !== PHP_EOL) {
$edits->after($lastStatement, PHP_EOL);
}

$classes = array_merge(
iterator_to_array($prototype->classes()->notIn(array_keys($classNodes))),
iterator_to_array($prototype->interfaces()->notIn(array_keys($interfaceNodes)))
iterator_to_array($prototype->interfaces()->notIn(array_keys($interfaceNodes))),
iterator_to_array($prototype->traits()->notIn(array_keys($traitNodes)))
);

$index = 0;
Expand Down
94 changes: 94 additions & 0 deletions lib/Adapter/TolerantParser/Updater/ClassLikeUpdater.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?php

namespace Phpactor\CodeBuilder\Adapter\TolerantParser\Updater;

use Microsoft\PhpParser\Node;
use Microsoft\PhpParser\Node\Expression\AssignmentExpression;
use Microsoft\PhpParser\Node\Expression\Variable;
use Microsoft\PhpParser\Node\MethodDeclaration;
use Microsoft\PhpParser\Node\PropertyDeclaration;
use Phpactor\CodeBuilder\Adapter\TolerantParser\Edits;
use Phpactor\CodeBuilder\Domain\Prototype\ClassLikePrototype;
use Phpactor\CodeBuilder\Domain\Prototype\Type;
use Phpactor\CodeBuilder\Domain\Renderer;

abstract class ClassLikeUpdater
{
/**
* @var Renderer
*/
protected $renderer;

/**
* @var MethodUpdater
*/
protected $methodUpdater;

public function __construct(Renderer $renderer)
{
$this->renderer = $renderer;
$this->methodUpdater = new ClassMethodUpdater($renderer);
}

protected function resolvePropertyName(Node $property)
{
if ($property instanceof Variable) {
return $property->getName();
}

if ($property instanceof AssignmentExpression) {
return $this->resolvePropertyName($property->leftOperand);
}

throw new \InvalidArgumentException(sprintf(
'Do not know how to resolve property element of type "%s"',
get_class($property)
));
}

abstract protected function memberDeclarations(Node $node): array;

protected function updateProperties(Edits $edits, ClassLikePrototype $classPrototype, Node $classMembers)
{
if (count($classPrototype->properties()) === 0) {
return;
}

$lastProperty = $classMembers->openBrace;
$memberDeclarations = $this->memberDeclarations($classMembers);

$nextMember = null;
$existingPropertyNames = [];

foreach ($memberDeclarations as $memberNode) {
if (null === $nextMember) {
$nextMember = $memberNode;
}

if ($memberNode instanceof PropertyDeclaration) {
foreach ($memberNode->propertyElements->getElements() as $property) {
$existingPropertyNames[] = $this->resolvePropertyName($property);
}
$lastProperty = $memberNode;
$nextMember = next($memberDeclarations) ?: $nextMember;
prev($memberDeclarations);
}
}

foreach ($classPrototype->properties()->notIn($existingPropertyNames) as $property) {
// if property type exists then the last property has a docblock - add a line break
if ($lastProperty instanceof PropertyDeclaration && $property->type() != Type::none()) {
$edits->after($lastProperty, PHP_EOL);
}

$edits->after(
$lastProperty,
PHP_EOL . $edits->indent($this->renderer->render($property), 1)
);

if ($classPrototype->properties()->isLast($property) && $nextMember instanceof MethodDeclaration) {
$edits->after($lastProperty, PHP_EOL);
}
}
}
}
109 changes: 19 additions & 90 deletions lib/Adapter/TolerantParser/Updater/ClassUpdater.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,18 @@

namespace Phpactor\CodeBuilder\Adapter\TolerantParser\Updater;

use Phpactor\CodeBuilder\Domain\Prototype\ClassPrototype;
use Microsoft\PhpParser\Node\Statement\ClassDeclaration;
use Phpactor\CodeBuilder\Domain\Prototype\ExtendsClass;
use Phpactor\CodeBuilder\Adapter\TolerantParser\Edits;
use Phpactor\CodeBuilder\Domain\Prototype\ImplementsInterfaces;
use Phpactor\CodeBuilder\Domain\Renderer;
use Microsoft\PhpParser\Node;
use Microsoft\PhpParser\Node\ClassConstDeclaration;
use Microsoft\PhpParser\Node\MethodDeclaration;
use Microsoft\PhpParser\Node\PropertyDeclaration;
use Microsoft\PhpParser\Node;
use Microsoft\PhpParser\Node\Expression\Variable;
use Microsoft\PhpParser\Node\Expression\AssignmentExpression;
use Phpactor\CodeBuilder\Domain\Prototype\Type;
use Microsoft\PhpParser\Node\Statement\ClassDeclaration;
use Phpactor\CodeBuilder\Adapter\TolerantParser\Edits;
use Phpactor\CodeBuilder\Domain\Prototype\ClassPrototype;
use Phpactor\CodeBuilder\Domain\Prototype\ExtendsClass;
use Phpactor\CodeBuilder\Domain\Prototype\ImplementsInterfaces;

class ClassUpdater
class ClassUpdater extends ClassLikeUpdater
{
/**
* @var Renderer
*/
private $renderer;

/**
* @var MethodUpdater
*/
private $methodUpdater;


public function __construct(Renderer $renderer)
{
$this->renderer = $renderer;
$this->methodUpdater = new ClassMethodUpdater($renderer);
}

public function updateClass(Edits $edits, ClassPrototype $classPrototype, ClassDeclaration $classNode)
{
if (false === $classPrototype->applyUpdate()) {
Expand All @@ -43,8 +22,8 @@ public function updateClass(Edits $edits, ClassPrototype $classPrototype, ClassD

$this->updateExtends($edits, $classPrototype, $classNode);
$this->updateImplements($edits, $classPrototype, $classNode);
$this->updateConstants($edits, $classPrototype, $classNode);
$this->updateProperties($edits, $classPrototype, $classNode);
$this->updateConstants($edits, $classPrototype, $classNode->classMembers);
$this->updateProperties($edits, $classPrototype, $classNode->classMembers);

$this->methodUpdater->updateMethods($edits, $classPrototype, $classNode);
}
Expand Down Expand Up @@ -91,17 +70,18 @@ private function updateImplements(Edits $edits, ClassPrototype $classPrototype,
$edits->replace($classNode->classInterfaceClause, ' implements ' . $names);
}

private function updateConstants(Edits $edits, ClassPrototype $classPrototype, ClassDeclaration $classNode)
protected function updateConstants(Edits $edits, ClassPrototype $classPrototype, Node $classMembers)
{
if (count($classPrototype->constants()) === 0) {
return;
}

$lastConstant = $classNode->classMembers->openBrace;
$nextMember = null;
$lastConstant = $classMembers->openBrace;
$memberDeclarations = $classMembers->classMemberDeclarations;

$memberDeclarations = $classNode->classMembers->classMemberDeclarations;
$nextMember = null;
$existingConstantNames = [];

foreach ($memberDeclarations as $memberNode) {
if (null === $nextMember) {
$nextMember = $memberNode;
Expand Down Expand Up @@ -138,62 +118,11 @@ private function updateConstants(Edits $edits, ClassPrototype $classPrototype, C
}
}

private function updateProperties(Edits $edits, ClassPrototype $classPrototype, ClassDeclaration $classNode)
{
if (count($classPrototype->properties()) === 0) {
return;
}

$lastProperty = $classNode->classMembers->openBrace;
$nextMember = null;

$memberDeclarations = $classNode->classMembers->classMemberDeclarations;
$existingPropertyNames = [];
foreach ($memberDeclarations as $memberNode) {
if (null === $nextMember) {
$nextMember = $memberNode;
}

if ($memberNode instanceof PropertyDeclaration) {
foreach ($memberNode->propertyElements->getElements() as $property) {
$existingPropertyNames[] = $this->resolvePropertyName($property);
}
$lastProperty = $memberNode;
$nextMember = next($memberDeclarations) ?: $nextMember;
prev($memberDeclarations);
}
}

foreach ($classPrototype->properties()->notIn($existingPropertyNames) as $property) {
// if property type exists then the last property has a docblock - add a line break
if ($lastProperty instanceof PropertyDeclaration && $property->type() != Type::none()) {
$edits->after($lastProperty, PHP_EOL);
}

$edits->after(
$lastProperty,
PHP_EOL . $edits->indent($this->renderer->render($property), 1)
);

if ($classPrototype->properties()->isLast($property) && $nextMember instanceof MethodDeclaration) {
$edits->after($lastProperty, PHP_EOL);
}
}
}

private function resolvePropertyName(Node $property)
/**
* @return Node[]
*/
protected function memberDeclarations(Node $node): array
{
if ($property instanceof Variable) {
return $property->getName();
}

if ($property instanceof AssignmentExpression) {
return $this->resolvePropertyName($property->leftOperand);
}

throw new \InvalidArgumentException(sprintf(
'Do not know how to resolve property elemnt of type "%s"',
get_class($property)
));
return $node->classMemberDeclarations;
}
}
30 changes: 30 additions & 0 deletions lib/Adapter/TolerantParser/Updater/TraitUpdater.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

namespace Phpactor\CodeBuilder\Adapter\TolerantParser\Updater;

use Microsoft\PhpParser\Node;
use Microsoft\PhpParser\Node\Statement\TraitDeclaration;
use Phpactor\CodeBuilder\Adapter\TolerantParser\Edits;
use Phpactor\CodeBuilder\Domain\Prototype\TraitPrototype;

class TraitUpdater extends ClassLikeUpdater
{
public function updateTrait(Edits $edits, TraitPrototype $classPrototype, TraitDeclaration $classNode)
{
if (false === $classPrototype->applyUpdate()) {
return;
}

$this->updateProperties($edits, $classPrototype, $classNode->traitMembers);

$this->methodUpdater->updateMethods($edits, $classPrototype, $classNode);
}

/**
* @return Node[]
*/
protected function memberDeclarations(Node $node): array
{
return $node->traitMemberDeclarations;
}
}
15 changes: 7 additions & 8 deletions lib/Adapter/WorseReflection/WorseBuilderFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@ public function fromSource($source): SourceCodeBuilder
continue;
}

// TODO: traits not currently supported
// if ($class->isTrait()) {
// $this->build('trait', $builder, $class);
// continue;
// }
if ($class->isTrait()) {
$this->build('trait', $builder, $class);
continue;
}
}

$builder->snapshot();
Expand All @@ -69,7 +68,7 @@ private function build(string $type, SourceCodeBuilder $builder, ReflectionClass
$classBuilder = $builder->$type($reflectionClass->name()->short());
$builder->namespace($reflectionClass->name()->namespace());

if ($reflectionClass->isClass()) {
if ($reflectionClass->isClass() || $reflectionClass->isTrait()) {
// TODO: Worse reflection doesn't support ->belongingTo properties
foreach ($reflectionClass->properties()->belongingTo($reflectionClass->name()) as $property) {
$this->buildProperty($classBuilder, $property);
Expand All @@ -81,7 +80,7 @@ private function build(string $type, SourceCodeBuilder $builder, ReflectionClass
}
}

private function buildProperty(ClassBuilder $classBuilder, ReflectionProperty $property)
private function buildProperty(ClassLikeBuilder $classBuilder, ReflectionProperty $property)
{
$propertyBuilder = $classBuilder->property($property->name());
$propertyBuilder->visibility((string) $property->visibility());
Expand Down Expand Up @@ -146,7 +145,7 @@ private function resolveClassMemberType(ClassLikeBuilder $classBuilder, ClassNam
private function resolveTypeNameFromNameImports(Type $type, NameImports $imports)
{
$typeName = $type->short();

foreach ($imports as $alias => $import) {
if ($type->short() == $import->head()) {
$typeName = $alias;
Expand Down
Loading