From 2bed04cd18fac9b7e58f651bfe7424e04708a6a2 Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Wed, 31 May 2023 15:59:54 +0100 Subject: [PATCH] Use sprinkle manager --- src/Scheduler/Scheduler.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Scheduler/Scheduler.php b/src/Scheduler/Scheduler.php index 443b07f..b5a734d 100644 --- a/src/Scheduler/Scheduler.php +++ b/src/Scheduler/Scheduler.php @@ -179,15 +179,19 @@ class Scheduler */ protected function getTaskDetails(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\\Scheduler\\Tasks\\$className"; + $classPath = "\\$sprinkleNS\\Scheduler\\Tasks\\$className"; if (!class_exists($classPath)) { throw new \Exception("Task class `$className` not found. Make sure the class has the correct namespace.");