Apply conservative Rector cleanup

Author: dereuromark

src/Command/AddCommand.php

@@ -59,7 +59,7 @@ public function execute(Arguments $args, ConsoleIo $io) {
 		$taskName = $args->getArgument('task');
 		if (!$taskName) {
 			$io->out(count($tasks) . ' tasks available:');
-			foreach ($tasks as $task => $className) {
+			foreach (array_keys($tasks) as $task) {
 				$io->out(' - ' . $task);
 			}
 

src/Command/BakeQueueTaskCommand.php

@@ -86,12 +86,12 @@ protected function generateTaskTestContent(string $name, string $namespace): str
 		}
 		$taskClassNamespace = $namespace . '\Queue\\Task\\' . str_replace(DS, '\\', $name);
 
-		if (strpos($name, '/') !== false) {
+		if (str_contains($name, '/')) {
 			$parts = explode('/', $name);
 			$name = array_pop($parts);
 		}
 
-		$content = <<<TXT
+		return <<<TXT
 <?php
 
 namespace $namespace\Test\TestCase\Queue\Task$subNamespace;
@@ -122,8 +122,6 @@ public function testRun(): void {
 }
 
 TXT;
-
-		return $content;
 	}
 
 	/**
@@ -148,7 +146,7 @@ public function templateData(Arguments $arguments): array {
 		$namespace .= '\\Queue\\Task';
 
 		$namespacePart = null;
-		if (strpos($name, '/') !== false) {
+		if (str_contains($name, '/')) {
 			$parts = explode('/', $name);
 			$name = array_pop($parts);
 			$namespacePart = implode('\\', $parts);

src/Command/InfoCommand.php

@@ -59,7 +59,7 @@ public function execute(Arguments $args, ConsoleIo $io) {
 		$addableTasks = $this->getAddableTasks();
 
 		$io->out(count($tasks) . ' tasks available:');
-		foreach ($tasks as $task => $className) {
+		foreach (array_keys($tasks) as $task) {
 			if (array_key_exists($task, $addableTasks)) {
 				$task .= ' <info>[addable via CLI]</info>';
 			}

src/Controller/Admin/LoadHelperTrait.php

@@ -28,11 +28,7 @@ protected function loadHelpers(): void {
 		}
 
 		// Configure helper: prefer Shim, fallback to Queue's own
-		if (Plugin::isLoaded('Shim')) {
-			$helpers[] = 'Shim.Configure';
-		} else {
-			$helpers[] = 'Queue.Configure';
-		}
+		$helpers[] = Plugin::isLoaded('Shim') ? 'Shim.Configure' : 'Queue.Configure';
 
 		if (Configure::read('Icon.sets') && class_exists(IconHelper::class)) {
 			$helpers[] = 'Templating.Icon';

src/Controller/Admin/QueueAppController.php

@@ -111,8 +111,6 @@ public function beforeFilter(EventInterface $event): void {
 
 		try {
 			$allowed = $gate($this->request) === true;
-		} catch (ForbiddenException $e) {
-			throw $e;
 		} catch (Throwable $e) {
 			Log::warning(sprintf('Queue.adminAccess threw %s: %s', $e::class, $e->getMessage()));
 

src/Controller/Admin/QueueController.php

@@ -118,28 +118,7 @@ public function index() {
 
 		$configurations = (array)Configure::read('Queue');
 
-		$this->set(compact(
-			'new',
-			'current',
-			'data',
-			'pendingDetails',
-			'scheduledDetails',
-			'pendingDetailsTruncated',
-			'scheduledDetailsTruncated',
-			'detailsLimit',
-			'totalPending',
-			'status',
-			'tasks',
-			'addableTasks',
-			'taskDescriptions',
-			'servers',
-			'workers',
-			'pendingJobs',
-			'scheduledJobs',
-			'runningJobs',
-			'failedJobs',
-			'configurations',
-		));
+		$this->set(['new' => $new, 'current' => $current, 'data' => $data, 'pendingDetails' => $pendingDetails, 'scheduledDetails' => $scheduledDetails, 'pendingDetailsTruncated' => $pendingDetailsTruncated, 'scheduledDetailsTruncated' => $scheduledDetailsTruncated, 'detailsLimit' => $detailsLimit, 'totalPending' => $totalPending, 'status' => $status, 'tasks' => $tasks, 'addableTasks' => $addableTasks, 'taskDescriptions' => $taskDescriptions, 'servers' => $servers, 'workers' => $workers, 'pendingJobs' => $pendingJobs, 'scheduledJobs' => $scheduledJobs, 'runningJobs' => $runningJobs, 'failedJobs' => $failedJobs, 'configurations' => $configurations]);
 	}
 
 	/**
@@ -249,7 +228,7 @@ public function processes() {
 		$terminated = $QueueProcesses->find()->where(['terminate' => true])->all()->toArray();
 		$key = $QueueProcesses->buildServerString();
 
-		$this->set(compact('terminated', 'processes', 'key'));
+		$this->set(['terminated' => $terminated, 'processes' => $processes, 'key' => $key]);
 	}
 
 	/**
@@ -307,7 +286,7 @@ protected function refererRedirect(array|string $default) {
 		if (is_array($url)) {
 			throw new NotFoundException('Invalid array in query string');
 		}
-		if ($url && (mb_substr($url, 0, 1) !== '/' || mb_substr($url, 0, 2) === '//')) {
+		if ($url && (mb_substr((string) $url, 0, 1) !== '/' || mb_substr((string) $url, 0, 2) === '//')) {
 			$url = null;
 		}
 

src/Controller/Admin/QueueProcessesController.php

@@ -48,7 +48,7 @@ public function initialize(): void {
 	public function index() {
 		$queueProcesses = $this->paginate();
 
-		$this->set(compact('queueProcesses'));
+		$this->set(['queueProcesses' => $queueProcesses]);
 	}
 
 	/**
@@ -61,7 +61,7 @@ public function index() {
 	public function view(?int $id = null) {
 		$queueProcess = $this->QueueProcesses->get($id);
 
-		$this->set(compact('queueProcess'));
+		$this->set(['queueProcess' => $queueProcess]);
 	}
 
 	/**
@@ -84,7 +84,7 @@ public function edit(?int $id = null) {
 			$this->Flash->error(__d('queue', 'The queue process could not be saved. Please, try again.'));
 		}
 
-		$this->set(compact('queueProcess'));
+		$this->set(['queueProcess' => $queueProcess]);
 	}
 
 	/**
@@ -100,7 +100,7 @@ public function terminate(?int $id = null) {
 			$queueProcess->terminate = true;
 			$this->QueueProcesses->saveOrFail($queueProcess);
 			$this->Flash->success(__d('queue', 'The queue process has been deleted.'));
-		} catch (Exception $exception) {
+		} catch (Exception) {
 			$this->Flash->error(__d('queue', 'The queue process could not be deleted. Please, try again.'));
 		}
 

src/Controller/Admin/QueuedJobsController.php

@@ -75,15 +75,15 @@ public function index() {
 		}
 		$queuedJobs = $this->paginate($query);
 
-		$this->set(compact('queuedJobs'));
+		$this->set(['queuedJobs' => $queuedJobs]);
 
 		if (Configure::read('Queue.isSearchEnabled') !== false && Plugin::isLoaded('Search')) {
 			$jobTypes = $this->QueuedJobs->find()->where()->find(
 				'list',
 				keyField: 'job_task',
 				valueField: 'job_task',
 			)->distinct('job_task')->toArray();
-			$this->set(compact('jobTypes'));
+			$this->set(['jobTypes' => $jobTypes]);
 		}
 	}
 
@@ -112,7 +112,7 @@ public function stats(): void {
 			keyField: 'job_task',
 			valueField: 'job_task',
 		)->distinct('job_task')->toArray();
-		$this->set(compact('stats', 'jobTypes', 'jobType'));
+		$this->set(['stats' => $stats, 'jobTypes' => $jobTypes, 'jobType' => $jobType]);
 	}
 
 	/**
@@ -153,7 +153,7 @@ public function heatmap(): void {
 			valueField: 'job_task',
 		)->distinct('job_task')->toArray();
 
-		$this->set(compact('heatmapData', 'jobTypes', 'jobType', 'metric', 'days'));
+		$this->set(['heatmapData' => $heatmapData, 'jobTypes' => $jobTypes, 'jobType' => $jobType, 'metric' => $metric, 'days' => $days]);
 	}
 
 	/**
@@ -173,7 +173,7 @@ public function view(?int $id = null) {
 			$this->response = $this->response->withDownload('queued-job-' . $id . '.json');
 		}
 
-		$this->set(compact('queuedJob'));
+		$this->set(['queuedJob' => $queuedJob]);
 		$this->viewBuilder()->setOption('serialize', ['queuedJob']);
 	}
 
@@ -286,7 +286,7 @@ public function edit(?int $id = null) {
 			$this->Flash->error(__d('queue', 'The queued job could not be saved. Please try again.'));
 		}
 
-		$this->set(compact('queuedJob'));
+		$this->set(['queuedJob' => $queuedJob]);
 	}
 
 	/**
@@ -322,7 +322,7 @@ public function data(?int $id = null) {
 			}
 		}
 
-		$this->set(compact('queuedJob'));
+		$this->set(['queuedJob' => $queuedJob]);
 	}
 
 	/**
@@ -407,7 +407,7 @@ public function test() {
 		$taskFinder = new TaskFinder();
 		$allTasks = $taskFinder->all();
 		$tasks = [];
-		foreach ($allTasks as $task => $className) {
+		foreach (array_keys($allTasks) as $task) {
 			if (!str_starts_with($task, 'Queue.')) {
 				continue;
 			}
@@ -440,7 +440,7 @@ public function test() {
 			$this->Flash->error(__d('queue', 'The job could not be queued. Please try again.'));
 		}
 
-		$this->set(compact('tasks', 'queuedJob'));
+		$this->set(['tasks' => $tasks, 'queuedJob' => $queuedJob]);
 	}
 
 	/**
@@ -458,7 +458,7 @@ public function migrate() {
 			->toArray();
 
 		$tasks = [];
-		foreach ($allTasks as $task => $className) {
+		foreach (array_keys($allTasks) as $task) {
 			if (!str_starts_with($task, 'Queue.')) {
 				continue;
 			}
@@ -488,7 +488,7 @@ public function migrate() {
 			return $this->redirect(['action' => 'migrate']);
 		}
 
-		$this->set(compact('tasks'));
+		$this->set(['tasks' => $tasks]);
 	}
 
 }

src/Generator/Task/QueuedJobTask.php

@@ -24,7 +24,7 @@ public function collect(): array {
 		$list = [];
 
 		$names = $this->collectQueuedJobTasks();
-		foreach ($names as $name => $className) {
+		foreach (array_keys($names) as $name) {
 			$list[$name] = "'$name'";
 		}
 
@@ -44,9 +44,8 @@ public function collect(): array {
 	 */
 	protected function collectQueuedJobTasks(): array {
 		$taskFinder = new TaskFinder();
-		$tasks = $taskFinder->all();
 
-		return $tasks;
+		return $taskFinder->all();
 	}
 
 }

src/Mailer/Transport/SimpleQueueTransport.php

@@ -58,7 +58,7 @@ public function send(Message $message): array {
 
 		foreach ($settings as $setting => $value) {
 			/** @phpstan-ignore-next-line */
-			if (array_key_exists(0, $value) && ($value[0] === null || $value[0] === [])) {
+			if ($value[0] === null || $value[0] === []) {
 				unset($settings[$setting]);
 			}
 		}