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.

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

[5.x] Prevent autoloading addon files causing exception when called early #10875

Merged
merged 2 commits into from
Oct 1, 2024
Merged

[5.x] Prevent autoloading addon files causing exception when called early #10875

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81d3d7b
Ensure we don't autoload commands until the app is booted
ryanmitchell Oct 1, 2024
b730e62
fix differently
jasonvarga Oct 1, 2024
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
10 changes: 9 additions & 1 deletion src/Providers/AddonServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,15 @@ protected function bootFieldsets()

protected function autoloadFilesFromFolder($folder, $requiredClass)
{
$addon = $this->getAddon();
try {
$addon = $this->getAddon();
} catch (NotBootedException $e) {
// This would be thrown if a developer has tried to call a method
// that triggers autoloading before Statamic has booted. Perhaps
// they have placed it in the boot method instead of bootAddon.
return [];
}

$path = $addon->directory().$addon->autoload().'/'.$folder;

if (! $this->app['files']->exists($path)) {
Expand Down
Loading