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
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
20 changes: 19 additions & 1 deletion lib/Adapter/WorseReflection/Transformer/AddMissingProperties.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,13 @@
use Phpactor\WorseReflection\Reflector;
use Phpactor\WorseReflection\Core\SourceCode as WorseSourceCode;
use Phpactor\CodeBuilder\Domain\Updater;
use Phpactor\CodeBuilder\Domain\Builder\ClassLikeBuilder;
use Phpactor\CodeBuilder\Domain\Builder\ClassBuilder;
use Phpactor\CodeBuilder\Domain\Builder\TraitBuilder;
use Phpactor\CodeBuilder\Domain\Builder\SourceCodeBuilder;
use Phpactor\CodeBuilder\Domain\Code;
use Phpactor\WorseReflection\Core\Reflection\ReflectionClass;
use Phpactor\WorseReflection\Core\Reflection\ReflectionClassLike;

class AddMissingProperties implements Transformer
{
Expand Down Expand Up @@ -44,7 +48,7 @@ public function transform(SourceCode $code): SourceCode

/** @var ReflectionClass $class */
foreach ($classes as $class) {
$classBuilder = $sourceBuilder->class($class->name()->short());
$classBuilder = $this->resolveClassBuilder($sourceBuilder, $class);

foreach ($class->methods()->belongingTo($class->name()) as $method) {
$frame = $method->frame();
Expand Down Expand Up @@ -72,4 +76,18 @@ public function transform(SourceCode $code): SourceCode

return SourceCode::fromString($code);
}

/**
* @return TraitBuilder|ClassBuilder
*/
private function resolveClassBuilder(SourceCodeBuilder $sourceBuilder, ReflectionClassLike $class): ClassLikeBuilder
{
$name = $class->name()->short();

if ($class->isTrait()) {
return $sourceBuilder->trait($name);
}

return $sourceBuilder->class($name);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,36 @@ public function hello($string)
EOT

],
'It adds missing trait properties within the Trait' => [
<<<'EOT'
<?php

trait Foobar
{
public function hello()
{
$this->hello = 'goodbye';
}
}
EOT
,
<<<'EOT'
<?php

trait Foobar
{
/**
* @var string
*/
private $hello;

public function hello()
{
$this->hello = 'goodbye';
}
}
EOT
],
];
}
}