Skip to content

Prevent vendor class name overlap #1681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 1.x
Choose a base branch
from
Open

Prevent vendor class name overlap #1681

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8237e7d
Prevent vendor class name overlap
pkly Apr 7, 2025
680e56c
Also require the suggested class to exist to try to suggest it
pkly Apr 8, 2025
a047aa5
Merge branch 'symfony:1.x' into main
pkly Apr 28, 2025
276260a
Merge branch 'symfony:1.x' into main
pkly May 14, 2025
5d539e4
Merge branch 'symfony:1.x' into main
pkly Jul 21, 2025
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
17 changes: 16 additions & 1 deletion src/Generator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,19 +181,34 @@ public function getFileContentsForPendingOperation(string $targetPath): string
public function createClassNameDetails(string $name, string $namespacePrefix, string $suffix = '', string $validationErrorMessage = ''): ClassNameDetails
{
$fullNamespacePrefix = $this->namespacePrefix.'\\'.$namespacePrefix;
$suggestedClassName = null;
if ('\\' === $name[0]) {
// class is already "absolute" - leave it alone (but strip opening \)
$className = substr($name, 1);
} else {
$className = Str::asClassName($name, $suffix);
$suggestedClassName = rtrim($fullNamespacePrefix, '\\').'\\'.$className;

try {
Validator::classDoesNotExist($className);
$className = rtrim($fullNamespacePrefix, '\\').'\\'.$className;
$className = $suggestedClassName;
$suggestedClassName = null;
} catch (RuntimeCommandException) {
}
}

if (null !== $suggestedClassName && class_exists($suggestedClassName)) {
Validator::validateClassName($suggestedClassName, $validationErrorMessage);

// if this is a custom class, we may be completely different than the namespace prefix
// the best way can do, is find the PSR4 prefix and use that
if (!str_starts_with($suggestedClassName, $fullNamespacePrefix)) {
$fullNamespacePrefix = $this->fileManager->getNamespacePrefixForClass($suggestedClassName);
}

return new ClassNameDetails($suggestedClassName, $fullNamespacePrefix, $suffix);
}

Validator::validateClassName($className, $validationErrorMessage);

// if this is a custom class, we may be completely different than the namespace prefix
Expand Down
Loading