Skip to content
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
3 changes: 3 additions & 0 deletions src/Objects/ClassConstObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ private function renderClassName($class): string {
if ($class instanceof \PhpParser\Node\Name\FullyQualified) {
return '\\' . ltrim((string) $class, '\\');
}
if ($this->typeLookup !== null) {
return $this->typeLookup->getAbsoluteType($class);
}

return (string) $class;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Objects/NamespaceConstObject.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ private function renderClassName($class): string {
return '\\' . ltrim((string) $class, '\\');
}

return (string) $class;
return $this->typeLookup->getAbsoluteType($class);
}
}
49 changes: 49 additions & 0 deletions tests/run.php
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,53 @@ function build(?Alias $item, Other $other = null): ?Alias {}
], $signatures);
}

function testSignatureSearchResolvesImportedClassConstantFetchesInValues(): void {
$root = createRepository('class-const-fetch-resolution', [
'src/Config.php' => <<<'PHP'
<?php
namespace Demo;
use Vendor\Config as Alias;
class Settings {
public const MODE = Alias::DEFAULT_MODE;
}
const CURRENT_MODE = Alias::DEFAULT_MODE;
PHP,
]);

$signatures = getSignaturesForFiles($root, ['src/Config.php']);
assertSameList('Imported class aliases should resolve in class constant fetch values.', [
'\Demo\CURRENT_MODE = \Vendor\Config::DEFAULT_MODE',
'\Demo\Settings->__construct()',
'\Demo\Settings::MODE = \Vendor\Config::DEFAULT_MODE',
], $signatures);
}

function testClassConstantFetchAliasChangesAffectDiffs(): void {
$root = createRepository('class-const-fetch-alias-diff', [
'src/Config.php' => <<<'PHP'
<?php
namespace Demo;
use Vendor\Config as Alias;
class Settings {
public const MODE = Alias::DEFAULT_MODE;
}
PHP,
]);

writeFile($root . '/src/Config.php', <<<'PHP'
<?php
namespace Demo;
use Vendor\Fallback as Alias;
class Settings {
public const MODE = Alias::DEFAULT_MODE;
}
PHP
);

$diff = new SemVerDiff($root, [], []);
assertSameValue('Changing an imported class alias used in a class constant fetch should affect the diff result.', 'MAJOR', $diff->diff('HEAD', 'WC')->getIncrement());
}

function testSignatureSearchResolvesImportedConstantsInDefaultsAndValues(): void {
$root = createRepository('const-import-resolution', [
'src/Config.php' => <<<'PHP'
Expand Down Expand Up @@ -1947,6 +1994,8 @@ function testCliParsingAndDefaults(): void {

testTraitUseSignatureModelsRenderCurrentStrings();
testNamespaceConstantSignatureModelsRenderCurrentStrings();
testSignatureSearchResolvesImportedClassConstantFetchesInValues();
testClassConstantFetchAliasChangesAffectDiffs();
testSignatureSearchResolvesImportedConstantsInDefaultsAndValues();
testSignatureSearchFormatsMagicConstants();
testMagicConstantChangesAffectDiffs();
Expand Down
Loading