Skip to content

Commit ae119ec

Browse files
committed
Remove deprecations.
1 parent f7d144a commit ae119ec

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

src/Controller/Admin/QueueProcessesController.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ public function index() {
5353
* @return \Cake\Http\Response|null|void
5454
*/
5555
public function view(?int $id = null) {
56-
$queueProcess = $this->QueueProcesses->get($id, [
57-
'contain' => [],
58-
]);
56+
$queueProcess = $this->QueueProcesses->get($id);
5957

6058
$this->set(compact('queueProcess'));
6159
}
@@ -68,9 +66,7 @@ public function view(?int $id = null) {
6866
* @return \Cake\Http\Response|null|void Redirects on successful edit, renders view otherwise.
6967
*/
7068
public function edit(?int $id = null) {
71-
$queueProcess = $this->QueueProcesses->get($id, [
72-
'contain' => [],
73-
]);
69+
$queueProcess = $this->QueueProcesses->get($id);
7470
if ($this->request->is(['patch', 'post', 'put'])) {
7571
$queueProcess = $this->QueueProcesses->patchEntity($queueProcess, $this->request->getData());
7672
if ($this->QueueProcesses->save($queueProcess)) {

src/Controller/Admin/QueuedJobsController.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ public function stats(?string $jobType = null): void {
112112
* @return \Cake\Http\Response|null|void
113113
*/
114114
public function view(?int $id = null) {
115-
$queuedJob = $this->QueuedJobs->get((int)$id, [
116-
'contain' => ['WorkerProcesses'],
117-
]);
115+
$queuedJob = $this->QueuedJobs->get((int)$id,
116+
contain: ['WorkerProcesses'],
117+
);
118118

119119
if ($this->request->getParam('_ext') && $this->request->getParam('_ext') === 'json' && $this->request->getQuery('download')) {
120120
$this->response = $this->response->withDownload('queued-job-' . $id . '.json');
@@ -201,9 +201,7 @@ public function import() {
201201
* @return \Cake\Http\Response|null|void Redirects on successful edit, renders view otherwise.
202202
*/
203203
public function edit(?int $id = null) {
204-
$queuedJob = $this->QueuedJobs->get($id, [
205-
'contain' => [],
206-
]);
204+
$queuedJob = $this->QueuedJobs->get($id);
207205
if ($queuedJob->completed) {
208206
$this->Flash->error(__d('queue', 'The queued job is already completed.'));
209207

templates/Admin/QueuedJobs/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<?php foreach ($queuedJobs as $queuedJob): ?>
5656
<tr>
5757
<td><?= h($queuedJob->job_task) ?></td>
58-
<td><?= h($queuedJob->job_group) ?: '---' ?></td>
58+
<td><?= h($queuedJob->job_group) ?: '---' ?></td>
5959
<td>
6060
<?= h($queuedJob->reference) ?: '---' ?>
6161
<?php if ($queuedJob->data) {

0 commit comments

Comments
 (0)