diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index bb3edd22acf28745b592709e2fe279ff08fbc6bc..f1a4101887cf0123b1e4f3d45699a3020312ae17 100644
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Core\Authentication;
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerAwareTrait;
use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Crypto\Random;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -404,7 +405,7 @@ abstract class AbstractUserAuthentication implements LoggerAwareInterface
// Make certain that NO user is set initially
$this->user = null;
// Set all possible headers that could ensure that the script is not cached on the client-side
- if ($this->sendNoCacheHeaders && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
+ if ($this->sendNoCacheHeaders && !Environment::isCli()) {
header('Expires: 0');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
$cacheControlHeader = 'no-cache, must-revalidate';
@@ -601,7 +602,7 @@ abstract class AbstractUserAuthentication implements LoggerAwareInterface
}
// Refuse login for _CLI users, if not processing a CLI request type
// (although we shouldn't be here in case of a CLI request type)
- if (strtoupper(substr($loginData['uname'], 0, 5)) === '_CLI_' && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
+ if (strtoupper(substr($loginData['uname'], 0, 5)) === '_CLI_' && !Environment::isCli()) {
throw new \RuntimeException('TYPO3 Fatal Error: You have tried to login using a CLI user. Access prohibited!', 1270853931);
}
}
diff --git a/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php
index 8b5600120ed506d3692d6176490bc145177a74f0..77d5dba959ff22682256cdfe9f4b2168ecc64533 100644
--- a/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/CommandLineUserAuthentication.php
@@ -14,6 +14,7 @@ namespace TYPO3\CMS\Core\Authentication;
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Crypto\Random;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
@@ -40,7 +41,7 @@ class CommandLineUserAuthentication extends BackendUserAuthentication
*/
public function __construct()
{
- if (!(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
+ if (!Environment::isCli()) {
throw new \RuntimeException('Creating a CLI-based user object on non-CLI level is not allowed', 1483971165);
}
if (!$this->isUserAllowedToLogin()) {
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessageRendererResolver.php b/typo3/sysext/core/Classes/Messaging/FlashMessageRendererResolver.php
index 8752cb288a0dd1b45867aedd960b62428cffeff6..e3b9897ba50a2a0859b1574cbe3867cbf4015420 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessageRendererResolver.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessageRendererResolver.php
@@ -15,6 +15,7 @@ namespace TYPO3\CMS\Core\Messaging;
* The TYPO3 project - inspiring people to share!
*/
+use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\Renderer\FlashMessageRendererInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -80,7 +81,7 @@ class FlashMessageRendererResolver
protected function resolveContext(): string
{
$context = '';
- if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) {
+ if (Environment::isCli()) {
$context = 'CLI';
} elseif (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_BE) {
$context = 'BE';
diff --git a/typo3/sysext/core/Classes/Utility/DebugUtility.php b/typo3/sysext/core/Classes/Utility/DebugUtility.php
index a51b8f2fdf0169d0832d4d0a4e11df38a066aa51..1d053f1846e4f7dedc41f77d050eb248120ce8a7 100644
--- a/typo3/sysext/core/Classes/Utility/DebugUtility.php
+++ b/typo3/sysext/core/Classes/Utility/DebugUtility.php
@@ -13,6 +13,8 @@ namespace TYPO3\CMS\Core\Utility;
*
* The TYPO3 project - inspiring people to share!
*/
+
+use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
/**
@@ -46,7 +48,7 @@ class DebugUtility
ob_start();
}
- if (TYPO3_MODE === 'BE' && !self::isCommandLine()) {
+ if (TYPO3_MODE === 'BE' && !Environment::isCli()) {
$debug = self::renderDump($var);
$debugPlain = PHP_EOL . self::renderDump($var, '', true, false);
$script = '
@@ -219,21 +221,11 @@ class DebugUtility
*/
protected static function renderDump($variable, $title = '', $plainText = null, $ansiColors = null)
{
- $plainText = $plainText ?? self::isCommandLine() && self::$plainTextOutput;
- $ansiColors = $ansiColors ?? self::isCommandLine() && self::$ansiColorUsage;
+ $plainText = $plainText ?? Environment::isCli() && self::$plainTextOutput;
+ $ansiColors = $ansiColors ?? Environment::isCli() && self::$ansiColorUsage;
return trim(DebuggerUtility::var_dump($variable, $title, 8, $plainText, $ansiColors, true));
}
- /**
- * Checks some constants to determine if we are in CLI context
- *
- * @return bool
- */
- protected static function isCommandLine()
- {
- return (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI) || PHP_SAPI === 'cli';
- }
-
/**
* Preset plaintext output
*
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index 22925a628dcf4181cb8e313773a3047e73ceb487..58f4cc2d78df261e3e1d2892554f53d64c0445f2 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -2957,7 +2957,7 @@ class GeneralUtility
*/
protected static function isInternalRequestType()
{
- return !defined('TYPO3_REQUESTTYPE') || (defined('TYPO3_REQUESTTYPE') && TYPO3_REQUESTTYPE & (TYPO3_REQUESTTYPE_INSTALL | TYPO3_REQUESTTYPE_CLI));
+ return Environment::isCli() || !defined('TYPO3_REQUESTTYPE') || (defined('TYPO3_REQUESTTYPE') && TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_INSTALL);
}
/**
@@ -3045,7 +3045,7 @@ class GeneralUtility
{
$host = '';
// If not called from the command-line, resolve on getIndpEnv()
- if ($requestHost && !(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
+ if ($requestHost && !Environment::isCli()) {
$host = self::getIndpEnv('HTTP_HOST');
}
if (!$host) {
diff --git a/typo3/sysext/core/Classes/Utility/PathUtility.php b/typo3/sysext/core/Classes/Utility/PathUtility.php
index 717dee3f2a2130fc19664177ed36da9198d2d3d5..075bb37effeaf1f6580e5d2c04fd2b9dfbcb4a1b 100644
--- a/typo3/sysext/core/Classes/Utility/PathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/PathUtility.php
@@ -44,7 +44,7 @@ class PathUtility
if (self::isAbsolutePath($targetPath)) {
if (strpos($targetPath, PATH_site) === 0) {
$targetPath = self::stripPathSitePrefix($targetPath);
- if (!(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
+ if (!Environment::isCli()) {
$targetPath = GeneralUtility::getIndpEnv('TYPO3_SITE_PATH') . $targetPath;
}
}
@@ -54,7 +54,7 @@ class PathUtility
// Make an absolute path out of it
$targetPath = GeneralUtility::resolveBackPath(self::dirname(Environment::getCurrentScript()) . '/' . $targetPath);
$targetPath = self::stripPathSitePrefix($targetPath);
- if (!(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
+ if (!Environment::isCli()) {
$targetPath = GeneralUtility::getIndpEnv('TYPO3_SITE_PATH') . $targetPath;
}
}
diff --git a/typo3/sysext/install/ext_localconf.php b/typo3/sysext/install/ext_localconf.php
index 59fc523923eeb634bb634e423df8925a73664e1d..a8eb1bf86e1cf7a100c9cf9e83d3ec809a52b5e6 100644
--- a/typo3/sysext/install/ext_localconf.php
+++ b/typo3/sysext/install/ext_localconf.php
@@ -86,7 +86,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['pr
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['security'][] = \TYPO3\CMS\Install\Report\SecurityStatusReport::class;
// Only add the environment status report if not in CLI mode
-if (!(TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_CLI)) {
+if (!\TYPO3\CMS\Core\Core\Environment::isCli()) {
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['system'][] = \TYPO3\CMS\Install\Report\EnvironmentStatusReport::class;
}