From ffede9f9564c58033916039303d4aef371fd3cd6 Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Sun, 17 Jun 2018 17:01:21 +0200
Subject: [PATCH] [TASK] Use PHP_SAPI, PHP_VERSION and M_PI constant instead of
functons calls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Resolves: #85293
Releases: master
Change-Id: Ifabbb20c1ef4ad482df676fe9999dcbdf18eb704
Reviewed-on: https://review.typo3.org/57249
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Rudy Gnodde <rgn@windinternet.nl>
Reviewed-by: Jörg Bösche <typo3@joergboesche.de>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
---
typo3/install/index.php | 2 +-
typo3/sysext/backend/Resources/Private/Php/backend.php | 2 +-
typo3/sysext/core/Classes/Console/CommandApplication.php | 2 +-
typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php | 6 +++---
.../Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php | 4 ++--
typo3/sysext/frontend/Resources/Private/Php/frontend.php | 2 +-
typo3/sysext/install/Classes/SystemEnvironment/Check.php | 2 +-
typo3/sysext/install/Resources/Private/Php/install.php | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/typo3/install/index.php b/typo3/install/index.php
index d1dee35ebd64..34ad236755c5 100644
--- a/typo3/install/index.php
+++ b/typo3/install/index.php
@@ -1,7 +1,7 @@
<?php
// Exit early if php requirement is not satisfied.
-if (version_compare(PHP_VERSION, '7.2.0', '<')) {
+if (PHP_VERSION_ID < 70200) {
die('This version of TYPO3 CMS requires PHP 7.2 or above');
}
diff --git a/typo3/sysext/backend/Resources/Private/Php/backend.php b/typo3/sysext/backend/Resources/Private/Php/backend.php
index 352dbc9512bf..737d56ac4cd8 100644
--- a/typo3/sysext/backend/Resources/Private/Php/backend.php
+++ b/typo3/sysext/backend/Resources/Private/Php/backend.php
@@ -13,7 +13,7 @@
*/
// Exit early if php requirement is not satisfied.
-if (version_compare(PHP_VERSION, '7.2.0', '<')) {
+if (PHP_VERSION_ID < 70200) {
die('This version of TYPO3 CMS requires PHP 7.2 or above');
}
diff --git a/typo3/sysext/core/Classes/Console/CommandApplication.php b/typo3/sysext/core/Classes/Console/CommandApplication.php
index 6941bd66d707..36c43e636333 100644
--- a/typo3/sysext/core/Classes/Console/CommandApplication.php
+++ b/typo3/sysext/core/Classes/Console/CommandApplication.php
@@ -57,7 +57,7 @@ class CommandApplication implements ApplicationInterface
*/
protected function checkEnvironmentOrDie()
{
- if (php_sapi_name() !== 'cli') {
+ if (PHP_SAPI !== 'cli') {
die('Not called from a command line interface (e.g. a shell or scheduler).' . LF);
}
}
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index 202dcf62f212..0ca004b83551 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -676,7 +676,7 @@ class GraphicalFunctions
*/
public function txtPosition($conf, $workArea, $BB)
{
- $angle = (int)$conf['angle'] / 180 * pi();
+ $angle = (int)$conf['angle'] / 180 * M_PI;
$conf['angle'] = 0;
$straightBB = $this->calcBBox($conf);
// offset, align, valign, workarea
@@ -1341,11 +1341,11 @@ class GraphicalFunctions
$res = [];
if ($distance && $iterations) {
for ($a = 0; $a < $iterations; $a++) {
- $yOff = round(sin(2 * pi() / $iterations * ($a + 1)) * 100 * $distance);
+ $yOff = round(sin(2 * M_PI / $iterations * ($a + 1)) * 100 * $distance);
if ($yOff) {
$yOff = (int)(ceil(abs($yOff / 100)) * ($yOff / abs($yOff)));
}
- $xOff = round(cos(2 * pi() / $iterations * ($a + 1)) * 100 * $distance);
+ $xOff = round(cos(2 * M_PI / $iterations * ($a + 1)) * 100 * $distance);
if ($xOff) {
$xOff = (int)(ceil(abs($xOff / 100)) * ($xOff / abs($xOff)));
}
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
index f5e2a49f0311..271390d995fa 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
@@ -34,7 +34,7 @@ class NumberViewHelperTest extends ViewHelperBaseTestcase
$this->injectDependenciesIntoViewHelper($this->viewHelper);
$this->viewHelper->setRenderChildrenClosure(
function () {
- return pi();
+ return M_PI;
}
);
}
@@ -88,7 +88,7 @@ class NumberViewHelperTest extends ViewHelperBaseTestcase
public function formatNumberWithThousandsSeparator()
{
$this->viewHelper->setRenderChildrenClosure(function () {
- return pi() * 1000;
+ return M_PI * 1000;
});
$this->setArgumentsUnderTest(
$this->viewHelper,
diff --git a/typo3/sysext/frontend/Resources/Private/Php/frontend.php b/typo3/sysext/frontend/Resources/Private/Php/frontend.php
index 7fddec21d072..4681a4a5cf39 100644
--- a/typo3/sysext/frontend/Resources/Private/Php/frontend.php
+++ b/typo3/sysext/frontend/Resources/Private/Php/frontend.php
@@ -13,7 +13,7 @@
*/
// Exit early if php requirement is not satisfied.
-if (version_compare(PHP_VERSION, '7.2.0', '<')) {
+if (PHP_VERSION_ID < 70200) {
die('This version of TYPO3 CMS requires PHP 7.2 or above');
}
diff --git a/typo3/sysext/install/Classes/SystemEnvironment/Check.php b/typo3/sysext/install/Classes/SystemEnvironment/Check.php
index 6b63986e125f..407be99918ff 100644
--- a/typo3/sysext/install/Classes/SystemEnvironment/Check.php
+++ b/typo3/sysext/install/Classes/SystemEnvironment/Check.php
@@ -250,7 +250,7 @@ class Check implements CheckInterface
protected function checkPhpVersion()
{
$minimumPhpVersion = '7.2.0';
- $currentPhpVersion = phpversion();
+ $currentPhpVersion = PHP_VERSION;
if (version_compare($currentPhpVersion, $minimumPhpVersion) < 0) {
$this->messageQueue->enqueue(new FlashMessage(
'Your PHP version ' . $currentPhpVersion . ' is too old. TYPO3 CMS does not run'
diff --git a/typo3/sysext/install/Resources/Private/Php/install.php b/typo3/sysext/install/Resources/Private/Php/install.php
index 7ce212a20a76..b0a70eeab749 100644
--- a/typo3/sysext/install/Resources/Private/Php/install.php
+++ b/typo3/sysext/install/Resources/Private/Php/install.php
@@ -94,7 +94,7 @@
*/
// Exit early if php requirement is not satisfied.
-if (version_compare(PHP_VERSION, '7.2.0', '<')) {
+if (PHP_VERSION_ID < 70200) {
die('This version of TYPO3 CMS requires PHP 7.2 or above');
}
--
GitLab