Use the SprinkleManager
This commit is contained in:
@@ -85,15 +85,18 @@ class JobInspector
|
|||||||
*/
|
*/
|
||||||
protected function getJobDefinition(ResourceInstance $file)
|
protected function getJobDefinition(ResourceInstance $file)
|
||||||
{
|
{
|
||||||
|
/** @var \UserFrosting\System\Sprinkle\SprinkleManager */
|
||||||
|
$sprinkleManager = $this->ci->sprinkleManager;
|
||||||
|
|
||||||
// Format the sprinkle name for the namespace
|
// Format the sprinkle name for the namespace
|
||||||
$sprinkleName = $file->getLocation()->getName();
|
$sprinkleName = $file->getLocation()->getName();
|
||||||
$sprinkleName = Str::studly($sprinkleName);
|
$sprinkleNS = $sprinkleManager->getSprinkleClassNamespace($sprinkleName);
|
||||||
|
|
||||||
// Getting base path, name and class name
|
// Getting base path, name and class name
|
||||||
$basePath = str_replace($file->getBasename(), '', $file->getBasePath());
|
$basePath = str_replace($file->getBasename(), '', $file->getBasePath());
|
||||||
$name = $basePath . $file->getFilename();
|
$name = $basePath . $file->getFilename();
|
||||||
$className = str_replace('/', '\\', $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
|
// Exclude known helper classes
|
||||||
if ($className == "JobInterface" || $className == "JobBase" || $className == "JobInspector") {
|
if ($className == "JobInterface" || $className == "JobBase" || $className == "JobInspector") {
|
||||||
|
|||||||
Reference in New Issue
Block a user