Skip to content

Commit b8375ac

Browse files
committed
PhpNamespace::simplifyName() fixed relative path evaluation [Closes #94]
1 parent fa374ae commit b8375ac

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/PhpGenerator/PhpNamespace.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public function simplifyName(string $name, string $of = self::NAME_NORMAL): stri
203203
}
204204

205205
if (isset($shortest, $relative) && strlen($shortest) < strlen($relative)) {
206-
return $relative;
206+
return $shortest;
207207
}
208208

209209
return $relative ?? $shortest ?? ($this->name ? '\\' : '') . $name;

tests/PhpGenerator/PhpNamespace.aliases.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ $namespace->addUse('Bar\C');
165165
$namespace->addUse('C');
166166
Assert::same('C1', $namespace->simplifyName('C'));
167167

168+
$namespace = new PhpNamespace('Foo\Bar');
169+
$namespace->addUse('Foo\Bar\Baz\Qux');
170+
Assert::same('Qux', $namespace->simplifyName('Foo\Bar\Baz\Qux'));
171+
168172
$namespace = new PhpNamespace('Foo');
169173
$namespace->addUseFunction('Bar\c');
170174
$namespace->addUseFunction('c');

0 commit comments

Comments
 (0)