From 506e6e53e390676f2b40440a4057fe66c51e4bfc Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Fri, 15 Jun 2018 17:36:52 +0200
Subject: [PATCH] [TASK] Use Environment API in scheduler
Resolves: #85279
Releases: master
Change-Id: I2d63540be1883fb2faea763d72a875800eae1cfa
Reviewed-on: https://review.typo3.org/57236
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Tested-by: Jan Helke <typo3@helke.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
typo3/sysext/scheduler/Classes/Example/TestTask.php | 3 ++-
typo3/sysext/scheduler/Classes/Task/AbstractTask.php | 9 +++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTask.php b/typo3/sysext/scheduler/Classes/Example/TestTask.php
index 0d3d025b8e93..4dbdfac1ff8f 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTask.php
@@ -14,6 +14,7 @@ namespace TYPO3\CMS\Scheduler\Example;
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
@@ -43,7 +44,7 @@ class TestTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
// Get execution information
$exec = $this->getExecution();
// Get call method
- if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) {
+ if (Environment::isCli()) {
$calledBy = 'CLI module dispatcher';
$site = '-';
} else {
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index f14014f1142d..3cc992f216cf 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Scheduler\Task;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
+use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -437,11 +438,6 @@ abstract class AbstractTask implements LoggerAwareInterface
// (we need to know that number, because it is returned at the end of the method)
$numExecutions = count($runningExecutions);
$runningExecutions[$numExecutions] = time();
- // Define the context in which the script is running
- $context = 'BE';
- if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) {
- $context = 'CLI';
- }
GeneralUtility::makeInstance(ConnectionPool::class)
->getConnectionForTable('tx_scheduler_task')
->update(
@@ -449,7 +445,8 @@ abstract class AbstractTask implements LoggerAwareInterface
[
'serialized_executions' => serialize($runningExecutions),
'lastexecution_time' => time(),
- 'lastexecution_context' => $context
+ // Define the context in which the script is running
+ 'lastexecution_context' => Environment::isCli() ? 'CLI' : 'BE'
],
[
'uid' => $this->taskUid
--
GitLab