From 9b2da13e3aebfba819a65f673f848ab044961ed7 Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Wed, 31 May 2023 16:22:36 +0100 Subject: [PATCH] Use the SprinkleManager --- src/Jobs/JobInspector.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Jobs/JobInspector.php b/src/Jobs/JobInspector.php index 196db6e..51c1fe9 100644 --- a/src/Jobs/JobInspector.php +++ b/src/Jobs/JobInspector.php @@ -85,15 +85,18 @@ class JobInspector */ protected function getJobDefinition(ResourceInstance $file) { + /** @var \UserFrosting\System\Sprinkle\SprinkleManager */ + $sprinkleManager = $this->ci->sprinkleManager; + // Format the sprinkle name for the namespace $sprinkleName = $file->getLocation()->getName(); - $sprinkleName = Str::studly($sprinkleName); + $sprinkleNS = $sprinkleManager->getSprinkleClassNamespace($sprinkleName); // Getting base path, name and class name $basePath = str_replace($file->getBasename(), '', $file->getBasePath()); $name = $basePath . $file->getFilename(); $className = str_replace('/', '\\', $basePath) . $file->getFilename(); - $classPath = "\\UserFrosting\\Sprinkle\\$sprinkleName\\Worker\\Jobs\\$className"; + $classPath = "\\$sprinkleNS\\Worker\\Jobs\\$className"; // Exclude known helper classes if ($className == "JobInterface" || $className == "JobBase" || $className == "JobInspector") {