Merge pull request #380 from fabsn182/patch-1

Fixed TaskFinder failing to find tasks if app directory is not 'src'
dereuromark · Jun 2, 2023 · 0657b84 · 0657b84
2 parents 26014bf + ccfcd97
commit 0657b84
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Queue/TaskFinder.php b/src/Queue/TaskFinder.php
@@ -94,10 +94,15 @@ protected function getTasks(string $path, ?string $plugin = null): array {
 		foreach ($iterator as $file) {
 			$path = str_replace(DS, '/', $file[0]);
 			$pos = strpos($path, 'src/Queue/Task/');
-			if (!$pos) {
-				continue;
+			if ($pos) {
+				$name = substr($path, $pos + strlen('src/Queue/Task/'), -8);
+			} else {
+				$pos = strpos($path, APP_DIR . '/Queue/Task/');
+				if (!$pos) {
+					continue;
+				}
+				$name = substr($path, $pos + strlen(APP_DIR . '/Queue/Task/'), -8);
 			}
-			$name = substr($path, $pos + strlen('src/Queue/Task/'), -8);
 
 			$namespace = $plugin ? str_replace('/', '\\', $plugin) : Configure::read('App.namespace');