Skip to content
Open
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
4 changes: 2 additions & 2 deletions lib/CodeTransform/Tests/Adapter/AdapterTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

class AdapterTestCase extends TestCase
{
protected function renderer()
protected function renderer(): TwigRenderer
{
return new TwigRenderer();
}

protected function updater()
protected function updater(): TolerantUpdater
{
return new TolerantUpdater($this->renderer());
}
Expand Down
19 changes: 5 additions & 14 deletions lib/Extension/PHPUnit/CodeTransform/GenerateTestMethods.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
namespace Phpactor\Extension\PHPUnit\CodeTransform;

use Generator;
use Phpactor\CodeBuilder\Domain\Builder\SourceCodeBuilder;
use Phpactor\CodeBuilder\Domain\Updater;
use Phpactor\CodeTransform\Adapter\WorseReflection\Refactor\WorseOverrideMethod;
use Phpactor\TextDocument\TextDocument;
use Phpactor\TextDocument\TextEdits;
use Phpactor\WorseReflection\Core\ClassName;
Expand All @@ -22,7 +21,7 @@ class GenerateTestMethods

public function __construct(
private Reflector $reflector,
private Updater $updater,
private WorseOverrideMethod $overrideMethod,
) {
}

Expand Down Expand Up @@ -54,6 +53,8 @@ public function getGeneratableTestMethods(SourceCode $source): Generator

public function generateMethod(TextDocument $document, string $methodName): TextEdits
{
$source = SourceCode::fromTextDocument($document);

Assert::inArray(
$methodName,
self::METHODS_TO_GENERATE,
Expand All @@ -62,16 +63,6 @@ public function generateMethod(TextDocument $document, string $methodName): Text

$class = $this->reflector->reflectClassesIn($document)->classes()->first();

$builder = SourceCodeBuilder::create();
$builder->namespace($class->name()->namespace());
$classBuilder = $builder->class($class->name()->short());

if ($class->methods()->has($methodName)) {
return TextEdits::none();
}

$classBuilder ->method($methodName) ->visibility('public') ->returnType('void') ;

return $this->updater->textEditsFor($builder->build(), $document);
return $this->overrideMethod->overrideMethod($source, (string) $class->name(), $methodName);
}
}
5 changes: 3 additions & 2 deletions lib/Extension/PHPUnit/PHPUnitExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Phpactor\Extension\PHPUnit;

use Phpactor\CodeBuilder\Domain\Updater;
use Phpactor\CodeTransform\Adapter\WorseReflection\Refactor\WorseOverrideMethod;
use Phpactor\Container\ContainerBuilder;
use Phpactor\Container\Container;
use Phpactor\Container\OptionalExtension;
Expand All @@ -18,6 +18,7 @@
use Phpactor\MapResolver\Resolver;
use Phpactor\Extension\PHPUnit\CodeTransform\GenerateTestMethods;
use Phpactor\WorseReflection\Reflector;
use Phpactor\CodeTransform\Domain\Refactor\OverrideMethod;

class PHPUnitExtension implements OptionalExtension
{
Expand Down Expand Up @@ -71,7 +72,7 @@ private function registerServices(ContainerBuilder $container): void
$container->register(GenerateTestMethods::class, function (Container $container) {
return new GenerateTestMethods(
$container->expect(WorseReflectionExtension::SERVICE_REFLECTOR, Reflector::class),
$container->get(Updater::class),
$container->expect(OverrideMethod::class, WorseOverrideMethod::class),
);
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
use PHPUnit\Framework\Attributes\DataProvider;
use Generator;
use InvalidArgumentException;
use Phpactor\CodeBuilder\Adapter\WorseReflection\WorseBuilderFactory;
use Phpactor\CodeTransform\Adapter\WorseReflection\Refactor\WorseOverrideMethod;
use Phpactor\CodeTransform\Domain\SourceCode;
use Phpactor\CodeTransform\Tests\Adapter\WorseReflection\WorseTestCase;
use Phpactor\Extension\PHPUnit\CodeTransform\GenerateTestMethods;
Expand Down Expand Up @@ -117,6 +119,10 @@ public function testGeneratingOtherMethods(): void

private function createTestMethodGenerator(string $source): GenerateTestMethods
{
return new GenerateTestMethods($this->reflectorForWorkspace($source), $this->updater());
$reflector = $this->reflectorForWorkspace($source);
$factory = new WorseBuilderFactory($reflector);
$override = new WorseOverrideMethod($reflector, $factory, $this->updater(), '8.5');

return new GenerateTestMethods($this->reflectorForWorkspace($source), $override);
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
// File: source
<?php

class SomeClass {
class TestClassWithSetup extends TestCase {
public function setUp(): void
{
echo "I should not be overwritten";
}
}

class TestCase {
protected function setUp(): void { }
protected function tearDown(): void { }
}
// File: expected
<?php

class SomeClass {
class TestClassWithSetup extends TestCase {
public function setUp(): void
{
echo "I should not be overwritten";
}
}

class TestCase {
protected function setUp(): void { }
protected function tearDown(): void { }
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
// File: source
<?php

class SomeClass {
<>
class EmptyTestClass extends TestCase {
<>
}

class TestCase {
protected function setUp(): void { }
protected function tearDown(): void { }
}
// File: expected
<?php

class SomeClass {
public function setUp(): void
class EmptyTestClass extends TestCase {
#[\Override]
protected function setUp(): void
{
}


}

class TestCase {
protected function setUp(): void { }
protected function tearDown(): void { }
}
Loading