Skip to content
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.

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

fix: [FileLocator] Cannot declare class XXX, because the name is already in use #8745

Merged
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
15 changes: 14 additions & 1 deletion system/Autoloader/FileLocator.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ class FileLocator implements FileLocatorInterface
*/
protected $autoloader;

/**
* List of classnames that did not exist.
*
* @var list<class-string>
*/
private array $invalidClassnames = [];

public function __construct(Autoloader $autoloader)
{
$this->autoloader = $autoloader;
Expand Down Expand Up @@ -288,14 +295,20 @@ public function findQualifiedNameFromPath(string $path)
),
'\\'
);

// Remove the file extension (.php)
$className = mb_substr($className, 0, -4);

if (in_array($className, $this->invalidClassnames, true)) {
continue;
}

// Check if this exists
if (class_exists($className)) {
return $className;
}

// If the class does not exist, it is an invalid classname.
$this->invalidClassnames[] = $className;
}
}

Expand Down
Loading