Skip to content

Commit

Permalink
Add additional checks to the UseAssembler
Browse files Browse the repository at this point in the history
  • Loading branch information
marek-pietrzak-tg committed Sep 22, 2017
1 parent de5c0e1 commit 8c7cfd7
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 1 deletion.
18 changes: 17 additions & 1 deletion src/Phpro/SoapClient/CodeGenerator/Assembler/UseAssembler.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,22 @@ public function assemble(ContextInterface $context)
*/
private function usesTheSameNamespace(ClassGenerator $class)
{
return $this->useName === $class->getNamespaceName();
$namespaceName = (string) $class->getNamespaceName();

if ($this->usesGlobalNamespace($namespaceName)) {
return true;
}

return in_array($namespaceName, [$this->useName, $this->getClassUseNamespaceName()]);
}

private function usesGlobalNamespace(string $namespaceName): bool
{
return '' === $namespaceName && false === strpos($this->useName, '\\');
}

private function getClassUseNamespaceName(): string
{
return substr($this->useName, 0, strrpos($this->useName, '\\'));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,82 @@ class MyType
{
}
CODE;

$this->assertEquals($expected, $code);
}

/**
* @test
*/
function it_does_not_assemble_use_for_the_same_namespace_but_different_class()
{
$assembler = new UseAssembler('MyNamespace\\SomeOtherClass');
$context = $this->createContext();
$assembler->assemble($context);

$code = $context->getClass()->generate();
$expected = <<<CODE
namespace MyNamespace;
class MyType
{
}
CODE;

$this->assertEquals($expected, $code);
}

/**
* @test
*/
function it_does_not_assemble_use_for_the_global_namespace()
{
$assembler = new UseAssembler('SomeOtherClass');
$class = new ClassGenerator('MyType');
$type = new Type('', 'MyType', []);
$context = new TypeContext($class, $type);

$assembler->assemble($context);

$code = $context->getClass()->generate();
$expected = <<<CODE
class MyType
{
}
CODE;

$this->assertEquals($expected, $code);
}


/**
* @test
*/
function it_assembles_use_for_the_different_namespace()
{
$assembler = new UseAssembler('DifferentNamespace\\SomeOtherClass');
$context = $this->createContext();
$assembler->assemble($context);

$code = $context->getClass()->generate();
$expected = <<<CODE
namespace MyNamespace;
use DifferentNamespace\SomeOtherClass;
class MyType
{
}
CODE;
Expand Down

0 comments on commit 8c7cfd7

Please sign in to comment.