diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
index 178163cb112c9967c842087cad5cd9bb204bf14c..e95a952ec07d84c7a97219f1c1b8e694c21c1f6a 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php
@@ -30,6 +30,7 @@ use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
use TYPO3\CMS\Core\Resource\ResourceFactory;
+use TYPO3\CMS\Core\Type\Bitmask\Permission;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
@@ -273,7 +274,7 @@ class ShortcutToolbarItem implements ToolbarItemInterface
if ($pageRow === null) {
continue;
}
- if (!$backendUser->doesUserHaveAccess($pageRow, ($perms = 1))) {
+ if (!$backendUser->doesUserHaveAccess($pageRow, $perms = Permission::PAGE_SHOW)) {
continue;
}
}
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
index e8fcfedadd0defca7d07a95e9a8f8fdd293d0a64..29b6087e9c2d7b4b520d475a14d8434bf96a4c4d 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
@@ -387,7 +387,7 @@ class ElementHistoryController
);
$rollbackUrl = '';
if ($rollbackUid) {
- $rollbackUrl = $this->buildUrl(['rollbackFields' => ($table . ':' . $rollbackUid . ':' . $fN)]);
+ $rollbackUrl = $this->buildUrl(['rollbackFields' => $table . ':' . $rollbackUid . ':' . $fN]);
}
$lines[] = [
'title' => $languageService->sL(BackendUtility::getItemLabel($table, $fN)),
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index 374e555f2cb9040e60aebdfc09ac19c5e5c5e8cf..5913c6f5241e5ad9670ced33a4dc5eddd55ff637 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -1437,7 +1437,7 @@ class EditDocumentController
sprintf(
$lang->getLL('undoLastChange'),
BackendUtility::calcAge(
- ($GLOBALS['EXEC_TIME'] - $undoButtonR['tstamp']),
+ $GLOBALS['EXEC_TIME'] - $undoButtonR['tstamp'],
$lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
)
)
diff --git a/typo3/sysext/backend/Classes/Controller/Page/NewMultiplePagesController.php b/typo3/sysext/backend/Classes/Controller/Page/NewMultiplePagesController.php
index 2fe38892c19369426ddd1af31e6e54122307f1a8..f3a3d64a9c32026b5561846f64fad155ce638073 100644
--- a/typo3/sysext/backend/Classes/Controller/Page/NewMultiplePagesController.php
+++ b/typo3/sysext/backend/Classes/Controller/Page/NewMultiplePagesController.php
@@ -152,7 +152,7 @@ class NewMultiplePagesController
$subPages = $this->getSubPagesOfPage($pageUid);
$lastPage = end($subPages);
if (isset($lastPage['uid']) && MathUtility::canBeInterpretedAsInteger($lastPage['uid'])) {
- $firstPid = -(int)($lastPage['uid']);
+ $firstPid = -(int)$lastPage['uid'];
}
}
diff --git a/typo3/sysext/backend/Classes/Controller/Page/TreeController.php b/typo3/sysext/backend/Classes/Controller/Page/TreeController.php
index 88478d3fc4afb00f638afca24e7704e979407468..d0b942c41bf560cecbb2e90ba2da5c5b3733a5a8 100644
--- a/typo3/sysext/backend/Classes/Controller/Page/TreeController.php
+++ b/typo3/sysext/backend/Classes/Controller/Page/TreeController.php
@@ -302,7 +302,7 @@ class TreeController
'backgroundColor' => htmlspecialchars($backgroundColor),
'stopPageTree' => $stopPageTree,
'class' => $this->resolvePageCssClassNames($page),
- 'readableRootline' => ($depth === 0 && $this->showMountPathAboveMounts ? $this->getMountPointPath($pageId) : ''),
+ 'readableRootline' => $depth === 0 && $this->showMountPathAboveMounts ? $this->getMountPointPath($pageId) : '',
'isMountPoint' => $depth === 0,
'mountPoint' => $entryPoint,
'workspaceId' => $page['t3ver_oid'] ?: $pageId,
diff --git a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
index f81ba31f6f08b39a944ab5f61a576ebeaf5d9b79..6c87305bd5a9b90a1c6c58be28329b7165c74c64 100644
--- a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
+++ b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
@@ -349,7 +349,7 @@ class BackendModuleRepository implements \TYPO3\CMS\Core\SingletonInterface
*/
protected function getModuleIcon($moduleKey, $moduleData)
{
- $iconIdentifier = !(empty($moduleData['iconIdentifier']))
+ $iconIdentifier = !empty($moduleData['iconIdentifier'])
? $moduleData['iconIdentifier']
: 'module-icon-' . $moduleKey;
$iconRegistry = GeneralUtility::makeInstance(IconRegistry::class);
diff --git a/typo3/sysext/backend/Classes/Form/AbstractNode.php b/typo3/sysext/backend/Classes/Form/AbstractNode.php
index a73dcbbda8b73b63c9348739feac065929537495..af2a3c4bb03764a682e15f4109bdb092d0ce7125 100644
--- a/typo3/sysext/backend/Classes/Form/AbstractNode.php
+++ b/typo3/sysext/backend/Classes/Form/AbstractNode.php
@@ -179,9 +179,9 @@ abstract class AbstractNode implements NodeInterface, LoggerAwareInterface
$validationRules[] = $newValidationRule;
}
if (!empty($config['maxitems']) || !empty($config['minitems'])) {
- $minItems = (isset($config['minitems'])) ? (int)$config['minitems'] : 0;
- $maxItems = (isset($config['maxitems'])) ? (int)$config['maxitems'] : 99999;
- $type = ($config['type']) ?: 'range';
+ $minItems = isset($config['minitems']) ? (int)$config['minitems'] : 0;
+ $maxItems = isset($config['maxitems']) ? (int)$config['maxitems'] : 99999;
+ $type = $config['type'] ?: 'range';
$validationRules[] = [
'type' => $type,
'minItems' => $minItems,
diff --git a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
index 7b2500d94c1b80a6d24a363908e07db83b8b09f6..9e665e05e8baeb961318bb597432f70a9a3e2ad3 100644
--- a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
@@ -444,7 +444,7 @@ class InlineRecordContainer extends AbstractContainer
$cells['info'] = '<span class="btn btn-default disabled">' . $this->iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
} else {
$cells['info'] = '
- <a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.TYPO3.InfoWindow.showItem(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($uid) . '); return false;')) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:showInfo')) . '">
+ <a class="btn btn-default" href="#" onclick="' . htmlspecialchars('top.TYPO3.InfoWindow.showItem(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($uid) . '); return false;') . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:showInfo')) . '">
' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '
</a>';
}
@@ -460,7 +460,7 @@ class InlineRecordContainer extends AbstractContainer
$style = ' style="' . $inlineConfig['inline']['inlineNewButtonStyle'] . '"';
}
$cells['new'] = '
- <a class="btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'] . '" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($languageService->sL(('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:new' . ($isPagesTable ? 'Page' : 'Record')))) . '" ' . $style . '>
+ <a class="btn btn-default inlineNewButton ' . $this->inlineData['config'][$nameObject]['md5'] . '" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:new' . ($isPagesTable ? 'Page' : 'Record'))) . '" ' . $style . '>
' . $this->iconFactory->getIcon('actions-' . ($isPagesTable ? 'page-new' : 'add'), Icon::SIZE_SMALL)->render() . '
</a>';
}
@@ -547,14 +547,14 @@ class InlineRecordContainer extends AbstractContainer
GeneralUtility::quoteJSvalue($hiddenField) . ')';
$className = 't3js-' . $nameObjectFtId . '_disabled';
if ($rec[$hiddenField]) {
- $title = htmlspecialchars($languageService->sL(('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:unHide' . ($isPagesTable ? 'Page' : ''))));
+ $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:unHide' . ($isPagesTable ? 'Page' : '')));
$cells['hide'] = '
<a class="btn btn-default hiddenHandle ' . $className . '" href="#" onclick="
' . htmlspecialchars($onClick) . '"' . 'title="' . $title . '">
' . $this->iconFactory->getIcon('actions-edit-unhide', Icon::SIZE_SMALL)->render() . '
</a>';
} else {
- $title = htmlspecialchars($languageService->sL(('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:hide' . ($isPagesTable ? 'Page' : ''))));
+ $title = htmlspecialchars($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:hide' . ($isPagesTable ? 'Page' : '')));
$cells['hide'] = '
<a class="btn btn-default hiddenHandle ' . $className . '" href="#" onclick="
' . htmlspecialchars($onClick) . '"' . 'title="' . $title . '">
diff --git a/typo3/sysext/backend/Classes/Form/FieldWizard/SelectIcons.php b/typo3/sysext/backend/Classes/Form/FieldWizard/SelectIcons.php
index ee2a49e55f892d68f857f86b5f805c5883d51389..90bc263d808332634a1b7d323b4c617ed4770c1a 100644
--- a/typo3/sysext/backend/Classes/Form/FieldWizard/SelectIcons.php
+++ b/typo3/sysext/backend/Classes/Form/FieldWizard/SelectIcons.php
@@ -59,7 +59,7 @@ class SelectIcons extends AbstractNode
$html[] = '<div class="t3js-forms-select-single-icons icon-list">';
$html[] = '<div class="row">';
foreach ($selectIcons as $i => $selectIcon) {
- $active = ($selectIcon['active']) ? ' active' : '';
+ $active = $selectIcon['active'] ? ' active' : '';
$html[] = '<div class="item' . $active . '">';
if (is_array($selectIcon)) {
$html[] = '<a href="#" title="' . htmlspecialchars($selectIcon['title'], ENT_COMPAT, 'UTF-8', false) . '" data-select-index="' . htmlspecialchars((string)$selectIcon['index']) . '">';
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
index 806e3d992d74a3899e11419508f29032af36b341..2fee53eccfd8739190058a92e6c7087c62f22f50 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
@@ -795,7 +795,7 @@ abstract class AbstractItemProvider
: $pluginFieldName;
$excludeArrayTable[] = [
'labels' => trim($translatedTable . ' ' . $labelPrefix . ' ' . $extIdent, ': ') . ':' . $fieldLabel,
- 'sectionHeader' => trim(($translatedTable . ' ' . $labelPrefix . ' ' . $extIdent), ':'),
+ 'sectionHeader' => trim($translatedTable . ' ' . $labelPrefix . ' ' . $extIdent, ':'),
'table' => $table,
'tableField' => $tableField,
'extIdent' => $extIdent,
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
index 287e51834ef3729a76f89754e9f531d9d60c52f2..a3906f9f270e39f8c3e3a85aa8e616524a7c49d7 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
@@ -136,7 +136,7 @@ class TcaInputPlaceholders implements FormDataProviderInterface
}
$relatedFormData = $this->getRelatedFormData($foreignTableName, $possibleUids[0], $fieldNameArray[0]);
if (!empty($GLOBALS['TCA'][$result['tableName']]['ctrl']['languageField'])
- && (isset($result['databaseRow'][$GLOBALS['TCA'][$result['tableName']]['ctrl']['languageField']]))
+ && isset($result['databaseRow'][$GLOBALS['TCA'][$result['tableName']]['ctrl']['languageField']])
) {
$relatedFormData['currentSysLanguage'] = $result['databaseRow'][$GLOBALS['TCA'][$result['tableName']]['ctrl']['languageField']][0];
}
diff --git a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
index 41f4d34e4dc1c2bb8ef38e9d178ad46db3618852..2205feababc34348d63c91b7ed61ad89937ca38d 100644
--- a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
+++ b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
@@ -233,8 +233,8 @@ class FormResultCompiler
if (!empty($rtePopupWindowSize)) {
list($rtePopupWindowWidth, $rtePopupWindowHeight) = GeneralUtility::trimExplode('x', $rtePopupWindowSize);
}
- $rtePopupWindowWidth = !empty($rtePopupWindowWidth) ? (int)$rtePopupWindowWidth : ($popupWindowWidth);
- $rtePopupWindowHeight = !empty($rtePopupWindowHeight) ? (int)$rtePopupWindowHeight : ($popupWindowHeight);
+ $rtePopupWindowWidth = !empty($rtePopupWindowWidth) ? (int)$rtePopupWindowWidth : $popupWindowWidth;
+ $rtePopupWindowHeight = !empty($rtePopupWindowHeight) ? (int)$rtePopupWindowHeight : $popupWindowHeight;
// Make textareas resizable and flexible ("autogrow" in height)
$textareaSettings = [
diff --git a/typo3/sysext/backend/Classes/Module/ModuleLoader.php b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
index 8c28ca7158a70c5f589383e02ea97918a0c982d5..94db1533dc6fd7e3097cbed8f9d71e240c623cd6 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleLoader.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
@@ -167,7 +167,7 @@ class ModuleLoader
}
$finalModuleConfiguration['name'] = $name;
// Language processing. This will add module labels and image reference to the internal ->moduleLabels array of the LANG object.
- $this->addLabelsForModule($name, ($finalModuleConfiguration['labels'] ?? $setupInformation['labels']));
+ $this->addLabelsForModule($name, $finalModuleConfiguration['labels'] ?? $setupInformation['labels']);
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
if (isset($setupInformation['configuration']['routeTarget'])) {
diff --git a/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php b/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php
index 126aea53a3f367ecb01569c9314cc471ccbb9bf3..845882833f8cbf77c65fcfb3e906d0f00cef4783 100644
--- a/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php
+++ b/typo3/sysext/backend/Classes/Provider/PageTsBackendLayoutDataProvider.php
@@ -170,8 +170,8 @@ class PageTsBackendLayoutDataProvider implements DataProviderInterface
{
if (!empty($data['config.']['backend_layout.']) && is_array($data['config.']['backend_layout.'])) {
$backendLayout['uid'] = substr($identifier, 0, -1);
- $backendLayout['title'] = ($data['title']) ? $data['title'] : $backendLayout['uid'];
- $backendLayout['icon'] = ($data['icon']) ? $data['icon'] : '';
+ $backendLayout['title'] = $data['title'] ? $data['title'] : $backendLayout['uid'];
+ $backendLayout['icon'] = $data['icon'] ?: '';
// Convert PHP array back to plain TypoScript so it can be procecced
$config = \TYPO3\CMS\Core\Utility\ArrayUtility::flatten($data['config.']);
$backendLayout['config'] = '';
diff --git a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
index 58e7263bef9e947421aa6a6f07f459255498a119..47ca710c48fb88f6f7d617eacfef08db2149bf98 100644
--- a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
@@ -528,7 +528,7 @@ abstract class AbstractRecordList
} else {
$htmlCode = '<a href="#"';
if ($launchViewParameter !== '') {
- $htmlCode .= ' onclick="' . htmlspecialchars(('top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;')) . '"';
+ $htmlCode .= ' onclick="' . htmlspecialchars('top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;') . '"';
}
$htmlCode .= ' title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references') . ' (' . $references . ')') . '">';
$htmlCode .= $references;
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index 1d6495183f726eb0f2b7c7c1cfca5e8e22d068ff..c61bbbef59c5893a846617767ad90c2fd28301e3 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -1239,7 +1239,7 @@ class BackendUtility
$fileReference = ResourceFactory::getInstance()->getFileReferenceObject(
$referenceUid,
[],
- ($workspaceId === 0)
+ $workspaceId === 0
);
$fileReferences[$fileReference->getUid()] = $fileReference;
} catch (\TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException $e) {
@@ -2174,7 +2174,7 @@ class BackendUtility
) {
$ageSuffix = ' (' . ($GLOBALS['EXEC_TIME'] - $value > 0 ? '-' : '')
. self::calcAge(
- abs(($GLOBALS['EXEC_TIME'] - $value)),
+ abs($GLOBALS['EXEC_TIME'] - $value),
$lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.minutesHoursDaysYears')
)
. ')';
@@ -3254,7 +3254,7 @@ class BackendUtility
$queryBuilder->expr()->gt(
'sys_lockedrecords.tstamp',
$queryBuilder->createNamedParameter(
- ($GLOBALS['EXEC_TIME'] - 2 * 3600),
+ $GLOBALS['EXEC_TIME'] - 2 * 3600,
\PDO::PARAM_INT
)
)
@@ -4255,12 +4255,12 @@ class BackendUtility
$lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:extension.copyright') . ' ' .
sprintf(
$lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:details.link'),
- ('<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . TYPO3_URL_GENERAL . '</a>')
+ '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . TYPO3_URL_GENERAL . '</a>'
) . ' ' .
strip_tags($warrantyNote, '<a>') . ' ' .
sprintf(
$lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:free.software'),
- ('<a href="' . TYPO3_URL_LICENSE . '" target="_blank">'),
+ '<a href="' . TYPO3_URL_LICENSE . '" target="_blank">',
'</a> '
)
. $lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_login.xlf:keep.notice');
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index b1a8ff0266ed76df963c45d95ba0363b35105ae2..7286a906794eddd8185e8c93db9192e03e843eee 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -1305,7 +1305,14 @@ class PageLayoutView implements LoggerAwareInterface
// "View page" icon is added:
$viewLink = '';
if (!VersionState::cast($this->getPageLayoutController()->pageinfo['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)) {
- $onClick = BackendUtility::viewOnClick($this->id, '', BackendUtility::BEgetRootLine($this->id), '', '', ('&L=' . $lP));
+ $onClick = BackendUtility::viewOnClick(
+ $this->id,
+ '',
+ BackendUtility::BEgetRootLine($this->id),
+ '',
+ '',
+ '&L=' . $lP
+ );
$viewLink = '<a href="#" class="btn btn-default btn-sm" onclick="' . htmlspecialchars($onClick) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">' . $this->iconFactory->getIcon('actions-view', Icon::SIZE_SMALL)->render() . '</a>';
}
// Language overlay page header:
@@ -1412,8 +1419,8 @@ class PageLayoutView implements LoggerAwareInterface
}
$out .= '
<tr>
- <td valign="top" class="t3-grid-cell">' . implode(('</td>' . '
- <td valign="top" class="t3-grid-cell">'), $cCont) . '</td>
+ <td valign="top" class="t3-grid-cell">' . implode('</td>' . '
+ <td valign="top" class="t3-grid-cell">', $cCont) . '</td>
</tr>';
}
}
@@ -3757,7 +3764,7 @@ class PageLayoutView implements LoggerAwareInterface
case 'info':
// "Info": (All records)
$code = '<a href="#" onclick="' . htmlspecialchars(
- ('top.TYPO3.InfoWindow.showItem(\'' . $table . '\', \'' . $row['uid'] . '\'); return false;')
+ 'top.TYPO3.InfoWindow.showItem(\'' . $table . '\', \'' . $row['uid'] . '\'); return false;'
) . '" title="' . htmlspecialchars($lang->getLL('showInfo')) . '">' . $code . '</a>';
break;
default:
@@ -4458,7 +4465,7 @@ class PageLayoutView implements LoggerAwareInterface
$htmlCode = '<a href="#"';
if ($launchViewParameter !== '') {
$htmlCode .= ' onclick="' . htmlspecialchars(
- ('top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;')
+ 'top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;'
) . '"';
}
$htmlCode .= ' title="' . htmlspecialchars(
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index efd619a612fa7a540c14e53b54d82bdb6cbe6392..74cf4798d625f3fd5e5e1947da451db0955b712a 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -666,7 +666,7 @@ class BackendUserAuthentication extends AbstractUserAuthentication
// Checking value:
switch ((string)$authMode) {
case 'explicitAllow':
- if (!GeneralUtility::inList($this->groupData['explicit_allowdeny'], ($testValue . ':ALLOW'))) {
+ if (!GeneralUtility::inList($this->groupData['explicit_allowdeny'], $testValue . ':ALLOW')) {
$out = false;
}
break;
@@ -683,7 +683,10 @@ class BackendUserAuthentication extends AbstractUserAuthentication
if ((string)$iCfg[1] === (string)$value && $iCfg[4]) {
switch ((string)$iCfg[4]) {
case 'EXPL_ALLOW':
- if (!GeneralUtility::inList($this->groupData['explicit_allowdeny'], ($testValue . ':ALLOW'))) {
+ if (!GeneralUtility::inList(
+ $this->groupData['explicit_allowdeny'],
+ $testValue . ':ALLOW'
+ )) {
$out = false;
}
break;
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index 60038ad85ad3fc2c5cab16c9098b81bb3c17bfab..27ddeb297a8948b4f6899dec12973aeecc56ff46 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -183,7 +183,13 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
if ($this->isCacheFileExpired($pathAndFilename)) {
return false;
}
- $dataSize = (int)file_get_contents($pathAndFilename, null, null, (filesize($pathAndFilename) - self::DATASIZE_DIGITS), self::DATASIZE_DIGITS);
+ $dataSize = (int)file_get_contents(
+ $pathAndFilename,
+ null,
+ null,
+ filesize($pathAndFilename) - self::DATASIZE_DIGITS,
+ self::DATASIZE_DIGITS
+ );
return file_get_contents($pathAndFilename, null, null, 0, $dataSize);
}
@@ -203,7 +209,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
if ($entryIdentifier !== basename($entryIdentifier)) {
throw new \InvalidArgumentException('The specified entry identifier must not contain a path segment.', 1282073034);
}
- return !$this->isCacheFileExpired(($this->cacheDirectory . $entryIdentifier . $this->cacheEntryFileExtension));
+ return !$this->isCacheFileExpired($this->cacheDirectory . $entryIdentifier . $this->cacheEntryFileExtension);
}
/**
@@ -255,7 +261,13 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
continue;
}
$cacheEntryPathAndFilename = $directoryIterator->getPathname();
- $index = (int)file_get_contents($cacheEntryPathAndFilename, null, null, (filesize($cacheEntryPathAndFilename) - self::DATASIZE_DIGITS), self::DATASIZE_DIGITS);
+ $index = (int)file_get_contents(
+ $cacheEntryPathAndFilename,
+ null,
+ null,
+ filesize($cacheEntryPathAndFilename) - self::DATASIZE_DIGITS,
+ self::DATASIZE_DIGITS
+ );
$metaData = file_get_contents($cacheEntryPathAndFilename, null, null, $index);
$expiryTime = (int)substr($metaData, 0, self::EXPIRYTIME_LENGTH);
if ($expiryTime !== 0 && $expiryTime < $now) {
@@ -315,7 +327,13 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
if (file_exists($cacheEntryPathAndFilename) === false) {
return true;
}
- $index = (int)file_get_contents($cacheEntryPathAndFilename, null, null, (filesize($cacheEntryPathAndFilename) - self::DATASIZE_DIGITS), self::DATASIZE_DIGITS);
+ $index = (int)file_get_contents(
+ $cacheEntryPathAndFilename,
+ null,
+ null,
+ filesize($cacheEntryPathAndFilename) - self::DATASIZE_DIGITS,
+ self::DATASIZE_DIGITS
+ );
$expiryTime = (int)file_get_contents($cacheEntryPathAndFilename, null, null, $index, self::EXPIRYTIME_LENGTH);
return $expiryTime !== 0 && $expiryTime < $GLOBALS['EXEC_TIME'];
}
diff --git a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
index 06d90ff32e3a95cf603a682a391d2dcf191209a3..2173fd2ac46f7554d10990e993160d96a31459ae 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
@@ -506,7 +506,7 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
foreach ($identifierToTagsKeys as $identifierToTagsKey) {
list(, $identifier) = explode(':', $identifierToTagsKey);
// Check if the data entry still exists
- if (!$this->redis->exists((self::IDENTIFIER_DATA_PREFIX . $identifier))) {
+ if (!$this->redis->exists(self::IDENTIFIER_DATA_PREFIX . $identifier)) {
$tagsToRemoveIdentifierFrom = $this->redis->sMembers($identifierToTagsKey);
$queue = $this->redis->multi(\Redis::PIPELINE);
$queue->delete($identifierToTagsKey);
diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
index dac3185fc262e05314ae2dfba7d78f86baca6855..b65fb7b52a214941d34823111704c43061a05be7 100644
--- a/typo3/sysext/core/Classes/Charset/CharsetConverter.php
+++ b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
@@ -370,7 +370,7 @@ class CharsetConverter implements SingletonInterface
$mByte = $this->parsedCharsets[$charset]['utf8'][$buf];
// If the local number is greater than 255 we will need to split the byte (16bit word assumed) in two chars.
if ($mByte > 255) {
- $outStr .= chr(($mByte >> 8 & 255)) . chr(($mByte & 255));
+ $outStr .= chr($mByte >> 8 & 255) . chr($mByte & 255);
} else {
$outStr .= chr($mByte);
}
@@ -604,12 +604,12 @@ class CharsetConverter implements SingletonInterface
$ord = $ord << 1;
// ... and with 8th bit - if that is set, then there are still bytes in sequence.
if ($ord & 128) {
- $binBuf .= substr('00000000' . decbin(ord(substr($str, ($b + 1), 1))), -6);
+ $binBuf .= substr('00000000' . decbin(ord(substr($str, $b + 1, 1))), -6);
} else {
break;
}
}
- $binBuf = substr(('00000000' . decbin(ord($str[0]))), -(6 - $b)) . $binBuf;
+ $binBuf = substr('00000000' . decbin(ord($str[0])), -(6 - $b)) . $binBuf;
$int = bindec($binBuf);
} else {
$int = $ord;
diff --git a/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php b/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php
index c8565dce1698c511ff2c200ab2fb46d22556bc0d..c79e2db4d7e6b7add4627ecef02af2a41b93c4ac 100644
--- a/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php
+++ b/typo3/sysext/core/Classes/Configuration/ExtensionConfiguration.php
@@ -470,7 +470,7 @@ class ExtensionConfiguration
if (strpos($line, '/*') === 0) {
$this->commentSet = 1;
}
- if (!$this->commentSet && ($line)) {
+ if (!$this->commentSet && $line) {
if ($line[0] !== '}' && $line[0] !== '#' && $line[0] !== '/') {
// If not brace-end or comment
// Find object name string until we meet an operator
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 0e8c570a5e43eb1504ee1c63ece9b975fe78ea84..810322a04d86a4f4933a74ad27205d8a3b2357f0 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -623,7 +623,7 @@ class Bootstrap
public static function initializeBackendRouter()
{
// See if the Routes.php from all active packages have been built together already
- $cacheIdentifier = 'BackendRoutesFromPackages_' . sha1((TYPO3_version . PATH_site . 'BackendRoutesFromPackages'));
+ $cacheIdentifier = 'BackendRoutesFromPackages_' . sha1(TYPO3_version . PATH_site . 'BackendRoutesFromPackages');
/** @var $codeCache \TYPO3\CMS\Core\Cache\Frontend\FrontendInterface */
$codeCache = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class)->getCache('cache_core');
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 8bff844a1bff9332516c7fe472b1eaabfa9fabc3..087ab381a796dd1444dc75c415b6398095513a6f 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -2354,7 +2354,7 @@ class DataHandler implements LoggerAwareInterface
if ($this->alternativeFilePath[$theFile]) {
// If alternative File Path is set for the file, then it was an import
// don't import the file if it already exists
- if (@is_file((PATH_site . $this->alternativeFilePath[$theFile]))) {
+ if (@is_file(PATH_site . $this->alternativeFilePath[$theFile])) {
$theFile = PATH_site . $this->alternativeFilePath[$theFile];
} elseif (@is_file($theFile)) {
$dest = dirname(PATH_site . $this->alternativeFilePath[$theFile]);
@@ -3998,8 +3998,8 @@ class DataHandler implements LoggerAwareInterface
$this->versionizeRecord(
$v['table'],
$v['id'],
- ($workspaceOptions['label'] ?? 'Auto-created for WS #' . $this->BE_USER->workspace),
- ($workspaceOptions['delete'] ?? false)
+ $workspaceOptions['label'] ?? 'Auto-created for WS #' . $this->BE_USER->workspace,
+ $workspaceOptions['delete'] ?? false
);
// Otherwise just use plain copyRecord() to create placeholders etc.
} else {
diff --git a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
index 56a092bfc3d3c62bb660f1c915090d7e4412da19..9299ce1cc1121360fe3137e25e90a728832b8a96 100644
--- a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
+++ b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapProcessor.php
@@ -514,9 +514,9 @@ class DataMapProcessor
$foreignTableName = $configuration['config']['foreign_table'];
$fieldNames = [
- 'language' => ($GLOBALS['TCA'][$foreignTableName]['ctrl']['languageField'] ?? null),
- 'parent' => ($GLOBALS['TCA'][$foreignTableName]['ctrl']['transOrigPointerField'] ?? null),
- 'source' => ($GLOBALS['TCA'][$foreignTableName]['ctrl']['translationSource'] ?? null),
+ 'language' => $GLOBALS['TCA'][$foreignTableName]['ctrl']['languageField'] ?? null,
+ 'parent' => $GLOBALS['TCA'][$foreignTableName]['ctrl']['transOrigPointerField'] ?? null,
+ 'source' => $GLOBALS['TCA'][$foreignTableName]['ctrl']['translationSource'] ?? null,
];
$isTranslatable = (!empty($fieldNames['language']) && !empty($fieldNames['parent']));
diff --git a/typo3/sysext/core/Classes/Database/QueryGenerator.php b/typo3/sysext/core/Classes/Database/QueryGenerator.php
index ece16b33b7d1b4fef20e29f3a9a2a684da0423e2..5d207e2f3b27df42620396b37bd0c03f529633ba 100644
--- a/typo3/sysext/core/Classes/Database/QueryGenerator.php
+++ b/typo3/sysext/core/Classes/Database/QueryGenerator.php
@@ -949,7 +949,7 @@ class QueryGenerator
$webMountPageTreePrefix = ',';
}
$webMountPageTree .= $webMountPageTreePrefix
- . $this->getTreeList($webMount, 999, ($begin = 0), $perms_clause);
+ . $this->getTreeList($webMount, 999, 0, $perms_clause);
}
if ($from_table === 'pages') {
$queryBuilder->where(
@@ -1033,7 +1033,7 @@ class QueryGenerator
}
if (is_array($v['sub'])) {
$out[] = '<div class="' . $indent . '">';
- $out[] = $this->printCodeArray($v['sub'], ($recursionLevel + 1));
+ $out[] = $this->printCodeArray($v['sub'], $recursionLevel + 1);
$out[] = '</div>';
}
@@ -1277,7 +1277,10 @@ class QueryGenerator
}
switch ($conf['type']) {
case 'newlevel':
- $qs .= LF . $pad . trim($conf['operator']) . ' (' . $this->getQuery($queryConfig[$key]['nl'], ($pad . ' ')) . LF . $pad . ')';
+ $qs .= LF . $pad . trim($conf['operator']) . ' (' . $this->getQuery(
+ $queryConfig[$key]['nl'],
+ $pad . ' '
+ ) . LF . $pad . ')';
break;
case 'userdef':
$qs .= LF . $pad . $this->getUserDefQuery($conf, $first);
@@ -1637,7 +1640,7 @@ class QueryGenerator
$webMountPageTreePrefix = ',';
}
$webMountPageTree .= $webMountPageTreePrefix
- . $this->getTreeList($webMount, 999, ($begin = 0), $perms_clause);
+ . $this->getTreeList($webMount, 999, $begin = 0, $perms_clause);
}
// createNamedParameter() is not used here because the SQL fragment will only include
// the :dcValueX placeholder when the query is returned as a string. The value for the
diff --git a/typo3/sysext/core/Classes/Database/QueryView.php b/typo3/sysext/core/Classes/Database/QueryView.php
index 0c6ea848cb6c20bc8e30e2ba377d535583917d97..8232a0f640086687c0b250bfe93998d95dbf10df 100644
--- a/typo3/sysext/core/Classes/Database/QueryView.php
+++ b/typo3/sysext/core/Classes/Database/QueryView.php
@@ -162,8 +162,8 @@ class QueryView
->execute();
$opt[] = '<option value="0">__Save to Action:__</option>';
while ($row = $statement->fetch()) {
- $opt[] = '<option value="-' . (int)$row['uid'] . '">' . htmlspecialchars(($row['title']
- . ' [' . (int)$row['uid'] . ']')) . '</option>';
+ $opt[] = '<option value="-' . (int)$row['uid'] . '">' . htmlspecialchars($row['title']
+ . ' [' . (int)$row['uid'] . ']') . '</option>';
}
}
$markup = [];
@@ -1088,7 +1088,7 @@ class QueryView
$webMountPageTreePrefix = ',';
}
$webMountPageTree .= $webMountPageTreePrefix
- . $this->getTreeList($webMount, 999, ($begin = 0), $perms_clause);
+ . $this->getTreeList($webMount, 999, $begin = 0, $perms_clause);
}
if ($from_table === 'pages') {
$queryBuilder->where(
diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 82afec8d9afb888304369abe6ee0e60ad390468a..40ff6c3b4ef31f16137b12587c3198fd4bf75a7a 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -1095,7 +1095,7 @@ class ReferenceIndex implements LoggerAwareInterface
$dataHandler->process_datamap();
// Return errors if any:
if (!empty($dataHandler->errorLog)) {
- return LF . 'DataHandler:' . implode((LF . 'DataHandler:'), $dataHandler->errorLog);
+ return LF . 'DataHandler:' . implode(LF . 'DataHandler:', $dataHandler->errorLog);
}
}
}
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index 7537bc5c1d0c7f353566098c68ee16765450c12c..433dd004f342e2784c2de86efc03c988ea4dd084 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -1234,7 +1234,7 @@ class RelationHandler
}
$queryBuilder = $connection->createQueryBuilder();
$queryBuilder->getRestrictions()->removeAll();
- $queryBuilder->select(...(GeneralUtility::trimExplode(',', $fields, true)))
+ $queryBuilder->select(...GeneralUtility::trimExplode(',', $fields, true))
->from($table)
->where($queryBuilder->expr()->in(
'uid',
diff --git a/typo3/sysext/core/Classes/Error/ErrorHandler.php b/typo3/sysext/core/Classes/Error/ErrorHandler.php
index 27f0c9aee59997dbe33b7694fb86c56045a9d039..12baf2a5c1618e76cba8ef8e4af8f1ab6e749517 100644
--- a/typo3/sysext/core/Classes/Error/ErrorHandler.php
+++ b/typo3/sysext/core/Classes/Error/ErrorHandler.php
@@ -202,7 +202,7 @@ class ErrorHandler implements ErrorHandlerInterface, LoggerAwareInterface
'error' => $severity,
'details_nr' => 0,
'details' => str_replace('%', '%%', $logMessage),
- 'log_data' => (empty($data) ? '' : serialize($data)),
+ 'log_data' => empty($data) ? '' : serialize($data),
'IP' => (string)GeneralUtility::getIndpEnv('REMOTE_ADDR'),
'tstamp' => $GLOBALS['EXEC_TIME'],
'workspace' => $workspace
diff --git a/typo3/sysext/core/Classes/Html/HtmlParser.php b/typo3/sysext/core/Classes/Html/HtmlParser.php
index cf4912f9ef12fb03c4e9e4078ed56b44e9e2e08d..17be2550d6fba91e2d9870f0793b3959bd8b3e54 100644
--- a/typo3/sysext/core/Classes/Html/HtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/HtmlParser.php
@@ -381,7 +381,7 @@ class HtmlParser
continue;
}
// Comment ends in the middle of the token: add comment and proceed with rest of the token
- $newContent[$c++] = '<' . substr($tok, 0, ($eocPos + 3));
+ $newContent[$c++] = '<' . substr($tok, 0, $eocPos + 3);
$tok = substr($tok, $eocPos + 3);
$inComment = false;
$skipTag = true;
@@ -404,7 +404,7 @@ class HtmlParser
continue;
}
// Start and end of comment are both in the current token. Add comment and proceed with rest of the token
- $newContent[$c++] = '<' . substr($tok, 0, ($eocPos + 3));
+ $newContent[$c++] = '<' . substr($tok, 0, $eocPos + 3);
$tok = substr($tok, $eocPos + 3);
$skipTag = true;
} elseif (substr($tok, 0, 10) === '![CDATA[*/') {
diff --git a/typo3/sysext/core/Classes/Html/RteHtmlParser.php b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
index 33399a693b8e2a68aec6cab0a98e303a38a6dfc3..21c44f3b57ca1ffeeef37dcc1f2d8637efeada3a 100644
--- a/typo3/sysext/core/Classes/Html/RteHtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
@@ -697,7 +697,7 @@ class RteHtmlParser extends HtmlParser implements LoggerAwareInterface
default:
// usually <hx> tags and <table> tags where no other block elements are within the tags
// Eliminate true linebreaks inside block element tags
- $blockSplit[$k] = preg_replace(('/[' . LF . ']+/'), ' ', $blockSplit[$k]);
+ $blockSplit[$k] = preg_replace('/[' . LF . ']+/', ' ', $blockSplit[$k]);
}
} else {
// NON-block:
diff --git a/typo3/sysext/core/Classes/Http/MiddlewareStackResolver.php b/typo3/sysext/core/Classes/Http/MiddlewareStackResolver.php
index 4d4b03917b671e1f583607a23724c4a12557e14d..107d7eee8c5222168a14ae6077bcf12ddc8c3b46 100644
--- a/typo3/sysext/core/Classes/Http/MiddlewareStackResolver.php
+++ b/typo3/sysext/core/Classes/Http/MiddlewareStackResolver.php
@@ -138,6 +138,6 @@ class MiddlewareStackResolver
*/
protected function getCacheIdentifier(string $stackName): string
{
- return 'middlewares_' . $stackName . '_' . sha1((TYPO3_version . PATH_site));
+ return 'middlewares_' . $stackName . '_' . sha1(TYPO3_version . PATH_site);
}
}
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index 67d3463ccee73525841f3cf4483175007cdea901..b2055a741220044411cc09627fe220d17f283d47 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -690,7 +690,7 @@ class GraphicalFunctions
$sign = cos($angle) < 0 ? -1 : 1;
$len1 = $sign * $factor * $straightBB[0];
$len2 = $sign * $BB[0];
- $result[0] = $w - ceil(($len2 * $factor + (1 - $factor) * $len1));
+ $result[0] = $w - ceil($len2 * $factor + (1 - $factor) * $len1);
$factor = abs(sin($angle));
$sign = sin($angle) < 0 ? -1 : 1;
$len1 = $sign * $factor * $straightBB[0];
@@ -1343,13 +1343,13 @@ 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 * pi() / $iterations * ($a + 1)) * 100 * $distance);
if ($yOff) {
- $yOff = (int)(ceil(abs(($yOff / 100))) * ($yOff / abs($yOff)));
+ $yOff = (int)(ceil(abs($yOff / 100)) * ($yOff / abs($yOff)));
}
- $xOff = round(cos((2 * pi() / $iterations * ($a + 1))) * 100 * $distance);
+ $xOff = round(cos(2 * pi() / $iterations * ($a + 1)) * 100 * $distance);
if ($xOff) {
- $xOff = (int)(ceil(abs(($xOff / 100))) * ($xOff / abs($xOff)));
+ $xOff = (int)(ceil(abs($xOff / 100)) * ($xOff / abs($xOff)));
}
$res[$a] = [$xOff, $yOff];
}
diff --git a/typo3/sysext/core/Classes/Imaging/IconRegistry.php b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
index 531a333ce1d09f7e8c9949b0105df3d4f5f70d16..e8fe819414f9b93e3acab038f3fb4c1e72ad69aa 100644
--- a/typo3/sysext/core/Classes/Imaging/IconRegistry.php
+++ b/typo3/sysext/core/Classes/Imaging/IconRegistry.php
@@ -574,7 +574,7 @@ class IconRegistry implements SingletonInterface
*/
protected function getCachedBackendIcons()
{
- $cacheIdentifier = 'BackendIcons_' . sha1((TYPO3_version . PATH_site . 'BackendIcons'));
+ $cacheIdentifier = 'BackendIcons_' . sha1(TYPO3_version . PATH_site . 'BackendIcons');
/** @var \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend $assetsCache */
$assetsCache = GeneralUtility::makeInstance(CacheManager::class)->getCache('assets');
$cacheEntry = $assetsCache->get($cacheIdentifier);
diff --git a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
index ba5fed651ee32ae1073f83fa9dd42cf502363e0c..c4cc9fe40fdaa1d9d69d5f9f9b09b2772296caa2 100644
--- a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
@@ -591,7 +591,7 @@ class DatabaseIntegrityCheck
if (@is_dir($path) && @is_readable($path)) {
$d = dir($path);
while ($entry = $d->read()) {
- if (@is_file(($path . '/' . $entry))) {
+ if (@is_file($path . '/' . $entry)) {
if (isset($fileArr[$entry])) {
if ($fileArr[$entry] > 1) {
$temp = $this->whereIsFileReferenced($folder, $entry);
@@ -604,7 +604,7 @@ class DatabaseIntegrityCheck
unset($fileArr[$entry]);
} else {
// Contains workaround for direct references
- if (!strstr($entry, 'index.htm') && !preg_match(('/^' . preg_quote($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '/') . '/'), $folder)) {
+ if (!strstr($entry, 'index.htm') && !preg_match('/^' . preg_quote($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '/') . '/', $folder)) {
$output['noReferences'][] = [$path, $entry];
}
}
diff --git a/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php b/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php
index bb1120462e5e0d58280278d6512bc6a377aa46ce..537a4815710393e87f80483345690a98d4c36e06 100644
--- a/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php
+++ b/typo3/sysext/core/Classes/LinkHandling/LegacyLinkNotationConverter.php
@@ -94,7 +94,7 @@ class LegacyLinkNotationConverter
list($rootFileDat) = explode('?', rawurldecode($linkParameter));
$containsSlash = strpos($rootFileDat, '/') !== false;
$pathInfo = pathinfo($rootFileDat);
- $fileExtension = strtolower(($pathInfo['extension'] ?? ''));
+ $fileExtension = strtolower($pathInfo['extension'] ?? '');
if (!$containsSlash
&& trim($rootFileDat)
&& (
diff --git a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
index f98e8e419ed8392aecbde3961adeabfeccd9d740..de189462d87b415d98570d60e4f8d7d4698ab235 100644
--- a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
@@ -68,7 +68,7 @@ class SyslogWriter extends AbstractWriter
$this->facilities['local7'] = LOG_LOCAL7;
}
parent::__construct($options);
- if (!openlog('TYPO3', (LOG_ODELAY | LOG_PID), $this->facility)) {
+ if (!openlog('TYPO3', LOG_ODELAY | LOG_PID, $this->facility)) {
$facilityName = array_search($this->facility, $this->facilities);
throw new \RuntimeException('Could not open syslog for facility ' . $facilityName, 1321722682);
}
diff --git a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
index 9e320380f34b1d7beaefdf20de3c3084be56d539..395c55fc77086a0bb71d3c9e92269340878360f1 100644
--- a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
+++ b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
@@ -277,7 +277,7 @@ class Rfc822AddressesParser
// Now we have the first address, we can reliably check for a
// group by searching for a colon that's not escaped or in
// quotes or angle brackets.
- if (count(($parts = explode(':', $string))) > 1) {
+ if (count($parts = explode(':', $string)) > 1) {
$string2 = $this->_splitCheck($parts, ':');
return $string2 !== $string;
}
@@ -565,7 +565,7 @@ class Rfc822AddressesParser
$comment = $this->_splitCheck($parts, ')');
$comments[] = $comment;
// +2 is for the brackets
- $_mailbox = substr($_mailbox, strpos($_mailbox, ('(' . $comment)) + strlen($comment) + 2);
+ $_mailbox = substr($_mailbox, strpos($_mailbox, '(' . $comment) + strlen($comment) + 2);
} else {
break;
}
diff --git a/typo3/sysext/core/Classes/Package/PackageManager.php b/typo3/sysext/core/Classes/Package/PackageManager.php
index 6cf004ccec50b59bb1ba16e60a65192825ee1699..c48a3774f16a0ab7e41cab1224301d552b42feb0 100644
--- a/typo3/sysext/core/Classes/Package/PackageManager.php
+++ b/typo3/sysext/core/Classes/Package/PackageManager.php
@@ -225,7 +225,7 @@ class PackageManager implements \TYPO3\CMS\Core\SingletonInterface
protected function loadPackageStates()
{
$forcePackageStatesRewrite = false;
- $this->packageStatesConfiguration = @include($this->packageStatesPathAndFilename) ?: [];
+ $this->packageStatesConfiguration = @include $this->packageStatesPathAndFilename ?: [];
if (!isset($this->packageStatesConfiguration['version']) || $this->packageStatesConfiguration['version'] < 4) {
$this->packageStatesConfiguration = [];
} elseif ($this->packageStatesConfiguration['version'] === 4) {
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index 98b4d73753c570efeb3ffda4245cd47f5cb0b750..543bdf82370fe36c544c227e85620ef40f559eec 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -2104,10 +2104,10 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
if (!empty($this->jsLibs)) {
foreach ($this->jsLibs as $properties) {
$properties['file'] = $this->getStreamlinedFileName($properties['file']);
- $async = ($properties['async']) ? ' async="async"' : '';
- $defer = ($properties['defer']) ? ' defer="defer"' : '';
- $integrity = ($properties['integrity']) ? ' integrity="' . htmlspecialchars($properties['integrity']) . '"' : '';
- $crossorigin = ($properties['crossorigin']) ? ' crossorigin="' . htmlspecialchars($properties['crossorigin']) . '"' : '';
+ $async = $properties['async'] ? ' async="async"' : '';
+ $defer = $properties['defer'] ? ' defer="defer"' : '';
+ $integrity = $properties['integrity'] ? ' integrity="' . htmlspecialchars($properties['integrity']) . '"' : '';
+ $crossorigin = $properties['crossorigin'] ? ' crossorigin="' . htmlspecialchars($properties['crossorigin']) . '"' : '';
$tag = '<script src="' . htmlspecialchars($properties['file']) . '" type="' . htmlspecialchars($properties['type']) . '"' . $async . $defer . $integrity . $crossorigin . '></script>';
if ($properties['allWrap']) {
$wrapArr = explode($properties['splitChar'] ?: '|', $properties['allWrap'], 2);
@@ -2148,10 +2148,10 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface
if (!empty($this->jsFiles)) {
foreach ($this->jsFiles as $file => $properties) {
$file = $this->getStreamlinedFileName($file);
- $async = ($properties['async']) ? ' async="async"' : '';
- $defer = ($properties['defer']) ? ' defer="defer"' : '';
- $integrity = ($properties['integrity']) ? ' integrity="' . htmlspecialchars($properties['integrity']) . '"' : '';
- $crossorigin = ($properties['crossorigin']) ? ' crossorigin="' . htmlspecialchars($properties['crossorigin']) . '"' : '';
+ $async = $properties['async'] ? ' async="async"' : '';
+ $defer = $properties['defer'] ? ' defer="defer"' : '';
+ $integrity = $properties['integrity'] ? ' integrity="' . htmlspecialchars($properties['integrity']) . '"' : '';
+ $crossorigin = $properties['crossorigin'] ? ' crossorigin="' . htmlspecialchars($properties['crossorigin']) . '"' : '';
$tag = '<script src="' . htmlspecialchars($file) . '" type="' . htmlspecialchars($properties['type']) . '"' . $async . $defer . $integrity . $crossorigin . '></script>';
if ($properties['allWrap']) {
$wrapArr = explode($properties['splitChar'] ?: '|', $properties['allWrap'], 2);
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index ff3c1aaaf60e14679b7c910269027b03ce1eb933..21ff4d75d9cdaa57e38f78c9be2103b06570bc87 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -2129,7 +2129,7 @@ class ResourceStorage implements ResourceStorageInterface
public function deleteFolder($folderObject, $deleteRecursively = false)
{
$isEmpty = $this->driver->isFolderEmpty($folderObject->getIdentifier());
- $this->assureFolderDeletePermission($folderObject, ($deleteRecursively && !$isEmpty));
+ $this->assureFolderDeletePermission($folderObject, $deleteRecursively && !$isEmpty);
if (!$isEmpty && !$deleteRecursively) {
throw new \RuntimeException('Could not delete folder "' . $folderObject->getIdentifier() . '" because it is not empty.', 1325952534);
}
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 9ca5a2b064a0772b6a30b1b6161a5c8548de75ad..6f5a2edf9262ce803a2fec525d4b46b211290299 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -459,7 +459,7 @@ class ExtendedTemplateService extends TemplateService
$theValue = $arr[$key];
if ($this->fixedLgd) {
$imgBlocks = ceil(1 + strlen($depthData) / 77);
- $lgdChars = 68 - ceil(strlen(('[' . $key . ']')) * 0.8) - $imgBlocks * 3;
+ $lgdChars = 68 - ceil(strlen('[' . $key . ']') * 0.8) - $imgBlocks * 3;
$theValue = $this->ext_fixed_lgd($theValue, $lgdChars);
}
// The value has matched the search string
@@ -765,7 +765,7 @@ class ExtendedTemplateService extends TemplateService
if ($chars >= 4) {
if (strlen($string) > $chars) {
if (strlen($string) > 24 && preg_match('/^##[a-z0-9]{6}_B##$/', substr($string, 0, 12))) {
- $string = GeneralUtility::fixed_lgd_cs(substr($string, 12, -12), ($chars - 3));
+ $string = GeneralUtility::fixed_lgd_cs(substr($string, 12, -12), $chars - 3);
$marker = substr(md5($string), 0, 6);
return '##' . $marker . '_B##' . $string . '##' . $marker . '_E##';
}
@@ -801,7 +801,7 @@ class ExtendedTemplateService extends TemplateService
foreach ($cArr as $k => $v) {
$lln = $k + $this->ext_lineNumberOffset + 1;
if ($ln) {
- $lineNum = $this->ext_lnBreakPointWrap($lln, str_replace(' ', ' ', sprintf(('% ' . $n . 'd'), $lln))) . ': ';
+ $lineNum = $this->ext_lnBreakPointWrap($lln, str_replace(' ', ' ', sprintf('% ' . $n . 'd', $lln))) . ': ';
}
$v = htmlspecialchars($v);
if ($crop) {
@@ -1490,9 +1490,9 @@ class ExtendedTemplateService extends TemplateService
$col[] = hexdec($var[4]);
$col[] = hexdec($var[5]);
}
- $var = substr(('0' . dechex($col[0])), -1) . substr(('0' . dechex($col[1])), -1) . substr(('0' . dechex($col[2])), -1);
+ $var = substr('0' . dechex($col[0]), -1) . substr('0' . dechex($col[1]), -1) . substr('0' . dechex($col[2]), -1);
if ($useFulHex) {
- $var .= substr(('0' . dechex($col[3])), -1) . substr(('0' . dechex($col[4])), -1) . substr(('0' . dechex($col[5])), -1);
+ $var .= substr('0' . dechex($col[3]), -1) . substr('0' . dechex($col[4]), -1) . substr('0' . dechex($col[5]), -1);
}
$var = '#' . strtoupper($var);
}
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index 6a46cd9244a69e37e88d8a8794c51d56e2bb4cc3..f8c9c50525b7b67e7a04294fd877b25e0cd0e275 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -1463,7 +1463,7 @@ class TypoScriptParser
$nR = MathUtility::forceIntegerInRange(hexdec(substr($color, 1, 2)) + $R, 0, 255);
$nG = MathUtility::forceIntegerInRange(hexdec(substr($color, 3, 2)) + $G, 0, 255);
$nB = MathUtility::forceIntegerInRange(hexdec(substr($color, 5, 2)) + $B, 0, 255);
- return '#' . substr(('0' . dechex($nR)), -2) . substr(('0' . dechex($nG)), -2) . substr(('0' . dechex($nB)), -2);
+ return '#' . substr('0' . dechex($nR), -2) . substr('0' . dechex($nG), -2) . substr('0' . dechex($nB), -2);
}
/**
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index 5f134cd7fded7cd8ee423e4f56ebdbc7b17261df..4c83259f9a13a8ca8f64b399e72dc5f9ffbbbd41 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -900,8 +900,8 @@ class TemplateService
$subrow = [
'constants' => $this->getTypoScriptSourceFileContent($ISF_filePath, 'constants'),
'config' => $this->getTypoScriptSourceFileContent($ISF_filePath, 'setup'),
- 'include_static' => @file_exists(($ISF_filePath . 'include_static.txt')) ? implode(',', array_unique(GeneralUtility::intExplode(',', file_get_contents($ISF_filePath . 'include_static.txt')))) : '',
- 'include_static_file' => @file_exists(($ISF_filePath . 'include_static_file.txt')) ? implode(',', array_unique(explode(',', file_get_contents($ISF_filePath . 'include_static_file.txt')))) : '',
+ 'include_static' => @file_exists($ISF_filePath . 'include_static.txt') ? implode(',', array_unique(GeneralUtility::intExplode(',', file_get_contents($ISF_filePath . 'include_static.txt')))) : '',
+ 'include_static_file' => @file_exists($ISF_filePath . 'include_static_file.txt') ? implode(',', array_unique(explode(',', file_get_contents($ISF_filePath . 'include_static_file.txt')))) : '',
'title' => $ISF_file,
'uid' => $mExtKey
];
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
index 95c0ad930fb430f5e652a1fbf65ae576e4e84f12..6a0ce7f8f8d1bc1fdb2cf4680472c0f7f0fff792 100644
--- a/typo3/sysext/core/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -108,11 +108,11 @@ class ArrayUtility
// Write to $resultArray (by reference!) if types and value match
$callback = function (&$value, $key) use ($needle, &$resultArray) {
if ($value === $needle) {
- ($resultArray[$key] = $value);
+ $resultArray[$key] = $value;
} elseif (is_array($value)) {
- ($subArrayMatches = static::filterByValueRecursive($needle, $value));
+ $subArrayMatches = static::filterByValueRecursive($needle, $value);
if (!empty($subArrayMatches)) {
- ($resultArray[$key] = $subArrayMatches);
+ $resultArray[$key] = $subArrayMatches;
}
}
};
@@ -439,7 +439,7 @@ class ArrayUtility
throw new \RuntimeException('Objects are not supported', 1342294987);
}
}
- $lines .= str_repeat(' ', ($level - 1)) . ']' . ($level - 1 == 0 ? '' : ',' . LF);
+ $lines .= str_repeat(' ', $level - 1) . ']' . ($level - 1 == 0 ? '' : ',' . LF);
return $lines;
}
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index a3e549900f5b68d331d073c08ed31f3118bf045e..41836ca9c682cc7a2530ba45281c019201193912 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -1660,7 +1660,7 @@ tt_content.' . $key . $suffix . ' {
&& ($file !== '..')
&& (substr($file, -4, 4) === '.php')
) {
- $tcaOfTable = require($tcaConfigurationDirectory . '/' . $file);
+ $tcaOfTable = require $tcaConfigurationDirectory . '/' . $file;
if (is_array($tcaOfTable)) {
// TCA table name is filename without .php suffix, eg 'sys_notes', not 'sys_notes.php'
$tcaTableName = substr($file, 0, -4);
@@ -1686,7 +1686,7 @@ tt_content.' . $key . $suffix . ' {
&& ($file !== '..')
&& (substr($file, -4, 4) === '.php')
) {
- require($tcaOverridesPathForPackage . '/' . $file);
+ require $tcaOverridesPathForPackage . '/' . $file;
}
}
}
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index ba84253625816927ac5127ad3e4b32f7e2abc1e3..72c59e88197b3f4bbbc99a61cbe5e18c24043a87 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -725,7 +725,10 @@ class GeneralUtility
// Keys shorter than block size are zero-padded
$key = str_pad($secret, $hashBlocksize, chr(0));
}
- $hmac = call_user_func($hashAlgorithm, ($key ^ $opad) . pack('H*', call_user_func($hashAlgorithm, (($key ^ $ipad) . $input))));
+ $hmac = call_user_func($hashAlgorithm, ($key ^ $opad) . pack('H*', call_user_func(
+ $hashAlgorithm,
+ ($key ^ $ipad) . $input
+ )));
}
return $hmac;
}
@@ -1516,10 +1519,10 @@ class GeneralUtility
if (empty($v)) {
$content = '';
} else {
- $content = $nl . self::array2xml($v, $NSprefix, ($level + 1), '', $spaceInd, $subOptions, [
+ $content = $nl . self::array2xml($v, $NSprefix, $level + 1, '', $spaceInd, $subOptions, [
'parentTagName' => $tagName,
'grandParentTagName' => $stackData['parentTagName'],
- 'path' => ($clearStackPath ? '' : $stackData['path'] . '/' . $tagName)
+ 'path' => $clearStackPath ? '' : $stackData['path'] . '/' . $tagName
]) . ($spaceInd >= 0 ? str_pad('', ($level + 1) * $indentN, $indentChar) : '');
}
// Do not set "type = array". Makes prettier XML but means that empty arrays are not restored with xml2array
@@ -1942,9 +1945,9 @@ class GeneralUtility
while (($file = readdir($handle)) !== false) {
$recursionResult = null;
if ($file !== '.' && $file !== '..') {
- if (@is_file(($path . '/' . $file))) {
+ if (@is_file($path . '/' . $file)) {
$recursionResult = static::fixPermissions($path . '/' . $file);
- } elseif (@is_dir(($path . '/' . $file))) {
+ } elseif (@is_dir($path . '/' . $file)) {
$recursionResult = static::fixPermissions($path . '/' . $file, true);
}
if (isset($recursionResult) && !$recursionResult) {
@@ -2231,7 +2234,7 @@ class GeneralUtility
foreach ($allowedFileExtensionArray as $allowedFileExtension) {
if (
($extensionList === ',,' || stripos($extensionList, ',' . substr($entry, strlen($allowedFileExtension) * -1, strlen($allowedFileExtension)) . ',') !== false)
- && ($excludePattern === '' || !preg_match(('/^' . $excludePattern . '$/'), $entry))
+ && ($excludePattern === '' || !preg_match('/^' . $excludePattern . '$/', $entry))
) {
if ($order !== 'mtime') {
$files[] = $entry;
@@ -2279,7 +2282,7 @@ class GeneralUtility
$dirs = self::get_dirs($path);
if ($recursivityLevels > 0 && is_array($dirs)) {
foreach ($dirs as $subdirs) {
- if ((string)$subdirs !== '' && ($excludePattern === '' || !preg_match(('/^' . $excludePattern . '$/'), $subdirs))) {
+ if ((string)$subdirs !== '' && ($excludePattern === '' || !preg_match('/^' . $excludePattern . '$/', $subdirs))) {
$fileArr = self::getAllFilesAndFoldersInPath($fileArr, $path . $subdirs . '/', $extList, $regDirs, $recursivityLevels - 1, $excludePattern);
}
}
@@ -2387,7 +2390,7 @@ class GeneralUtility
// If the total amount of post data is smaller (!) than the upload_max_filesize directive,
// then this is the real limit in PHP
$phpUploadLimit = $phpPostLimit > 0 && $phpPostLimit < $phpUploadLimit ? $phpPostLimit : $phpUploadLimit;
- return floor(($phpUploadLimit)) / 1024;
+ return floor($phpUploadLimit) / 1024;
}
/**
@@ -3922,7 +3925,7 @@ class GeneralUtility
public static function getDeprecationLogFileName()
{
static::writeDeprecationLogFileEntry(__METHOD__ . ' is deprecated since TYPO3 v9.0, will be removed in TYPO3 v10.0');
- return PATH_typo3conf . 'deprecation_' . self::shortMD5((PATH_site . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) . '.log';
+ return PATH_typo3conf . 'deprecation_' . self::shortMD5(PATH_site . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']) . '.log';
}
/**
diff --git a/typo3/sysext/core/Classes/Utility/MathUtility.php b/typo3/sysext/core/Classes/Utility/MathUtility.php
index 51a0b4ae7d1d5fa0f6bcf25483da883267dfe36a..32a73aae1fda2fa18866e388d1675bf1a5f6d230 100644
--- a/typo3/sysext/core/Classes/Utility/MathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/MathUtility.php
@@ -175,10 +175,10 @@ class MathUtility
$valueLenC = strcspn($string, ')');
if ($valueLenC == strlen($string) || $valueLenC < $valueLenO) {
$value = self::calculateWithPriorityToAdditionAndSubtraction(substr($string, 0, $valueLenC));
- $string = $value . substr($string, ($valueLenC + 1));
+ $string = $value . substr($string, $valueLenC + 1);
return $string;
}
- $string = substr($string, 0, $valueLenO) . self::calculateWithParentheses(substr($string, ($valueLenO + 1)));
+ $string = substr($string, 0, $valueLenO) . self::calculateWithParentheses(substr($string, $valueLenO + 1));
// Security:
$securC--;
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
index c777c17a791462690655785d54954130962f3221..f956025f87a3024eb9501328a8a76fd962031741 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
@@ -291,7 +291,13 @@ class FileBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
$pathAndFilename = 'vfs://Foo/Cache/Data/UnitTestCache/' . $entryIdentifier;
$this->assertFileExists($pathAndFilename);
- $retrievedData = file_get_contents($pathAndFilename, null, null, (strlen($data) + \TYPO3\CMS\Core\Cache\Backend\FileBackend::EXPIRYTIME_LENGTH), 9);
+ $retrievedData = file_get_contents(
+ $pathAndFilename,
+ null,
+ null,
+ strlen($data) + \TYPO3\CMS\Core\Cache\Backend\FileBackend::EXPIRYTIME_LENGTH,
+ 9
+ );
$this->assertEquals('Tag1 Tag2', $retrievedData);
}
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
index b39a2ce1ef187ab98c175925972cf9001823e09f..218b705d8e498f8bcf965a4eeef4ed08fe946751 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/RedisBackendTest.php
@@ -515,7 +515,7 @@ class RedisBackendTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
$this->backend->set($identifier, $data);
$uncompresedStoredData = '';
try {
- $uncompresedStoredData = @gzuncompress($this->redis->get(('identData:' . $identifier)));
+ $uncompresedStoredData = @gzuncompress($this->redis->get('identData:' . $identifier));
} catch (\Exception $e) {
}
$this->assertEquals($data, $uncompresedStoredData, 'Original and compressed data don\'t match');
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php b/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
index 911fb2ac6b369b86d421f0f16b6bc84d5d58b152..be8d4ea3db4d71dd363df56980be7c5492841e1d 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
@@ -48,7 +48,7 @@ class AbstractConditionMatcherTest extends \TYPO3\TestingFramework\Core\Unit\Uni
*/
protected function setUp()
{
- require_once('Fixtures/ConditionMatcherUserFuncs.php');
+ require_once 'Fixtures/ConditionMatcherUserFuncs.php';
GeneralUtility::flushInternalRuntimeCaches();
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
index 39394dc77e2279a6adcb4bc2507e0617d265869b..822dd4e8438940be128a48c66fd9830e39532880 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
@@ -136,7 +136,7 @@ class PackageManagerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
$packageManager->_set('packages', []);
$packageManager->_call('scanAvailablePackages');
- $packageStates = require('vfs://Test/Configuration/PackageStates.php');
+ $packageStates = require 'vfs://Test/Configuration/PackageStates.php';
$actualPackageKeys = array_keys($packageStates['packages']);
$this->assertEquals(sort($expectedPackageKeys), sort($actualPackageKeys));
}
@@ -190,7 +190,7 @@ class PackageManagerTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
$packageManager->_call('scanAvailablePackages');
$packageManager->_call('sortAndSavePackageStates');
- $packageStates = require('vfs://Test/Configuration/PackageStates.php');
+ $packageStates = require 'vfs://Test/Configuration/PackageStates.php';
$this->assertEquals('Application/' . $packageKey . '/', $packageStates['packages'][$packageKey]['packagePath']);
}
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index 5d9a5e8aebb65acfd7350125c62f589b45185a9e..05cce1215e259722559d6d261498faf8527e0c4a 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -2966,7 +2966,7 @@ class GeneralUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
$baseDirectory = PATH_site . 'typo3temp/var/tests/';
$existingDirectory = $this->getUniqueId('test_existing_') . '/';
$newSubDirectory = $this->getUniqueId('test_new_');
- @mkdir(($baseDirectory . $existingDirectory));
+ @mkdir($baseDirectory . $existingDirectory);
$this->testFilesToDelete[] = $baseDirectory . $existingDirectory;
chmod($baseDirectory . $existingDirectory, 482);
GeneralUtility::mkdir_deep($baseDirectory . $existingDirectory . $newSubDirectory);
diff --git a/typo3/sysext/documentation/Classes/Domain/Repository/TableManualRepository.php b/typo3/sysext/documentation/Classes/Domain/Repository/TableManualRepository.php
index d115ef60eaafa7ebe4cd304e6a1835515e19840f..b5500da73c67afa280e926829bb07926301fb4ae 100644
--- a/typo3/sysext/documentation/Classes/Domain/Repository/TableManualRepository.php
+++ b/typo3/sysext/documentation/Classes/Domain/Repository/TableManualRepository.php
@@ -47,7 +47,7 @@ class TableManualRepository
// Load descriptions for table $table
$this->getLanguageService()->loadSingleTableDescription($table);
- if (is_array($GLOBALS['TCA_DESCR'][$table]['columns']) && ($this->accessService->checkAccess('tables_select', $table))) {
+ if (is_array($GLOBALS['TCA_DESCR'][$table]['columns']) && $this->accessService->checkAccess('tables_select', $table)) {
// Reserved for header of table
$parts[0] = '';
// Traverse table columns as listed in TCA_DESCR
diff --git a/typo3/sysext/documentation/Classes/Utility/MiscUtility.php b/typo3/sysext/documentation/Classes/Utility/MiscUtility.php
index 5eda4f6ea8ab29468b075e9f0cc0a244b731c9c1..ddcccd42c7cdbf56718406fa3a3ac6bd0a8b74ca 100644
--- a/typo3/sysext/documentation/Classes/Utility/MiscUtility.php
+++ b/typo3/sysext/documentation/Classes/Utility/MiscUtility.php
@@ -33,7 +33,7 @@ class MiscUtility
$_EXTKEY = $extensionKey;
$EM_CONF = [];
$extPath = ExtensionManagementUtility::extPath($extensionKey);
- include($extPath . 'ext_emconf.php');
+ include $extPath . 'ext_emconf.php';
$release = $EM_CONF[$_EXTKEY]['version'];
list($major, $minor, $_) = explode('.', $release, 3);
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
index bdd4e029811a420ba7b61fe650b7b5d72725eb60..bfeb6c7f10237a24e2102e67efb337e8ad9419a8 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
@@ -175,7 +175,7 @@ class CommandController implements CommandControllerInterface
throw new InvalidArgumentTypeException(sprintf('The argument type for parameter $%s of method %s->%s() could not be detected.', $parameterName, static::class, $this->commandMethodName), 1306755296);
}
$defaultValue = ($parameterInfo['defaultValue'] ?? null);
- $this->arguments->addNewArgument($parameterName, $dataType, ($parameterInfo['optional'] === false), $defaultValue);
+ $this->arguments->addNewArgument($parameterName, $dataType, $parameterInfo['optional'] === false, $defaultValue);
}
}
diff --git a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
index 14d136e4d00850bc3d302b6f47060523c20f914c..a3ecd8d2f6bb631af8e36c5b6254bd0872a1e390 100644
--- a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
@@ -99,7 +99,7 @@ class DebuggerUtility
if (is_string($value)) {
$croppedValue = strlen($value) > 2000 ? substr($value, 0, 2000) . '...' : $value;
if ($plainText) {
- $dump = self::ansiEscapeWrap(('"' . implode((PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, ($level + 1))), str_split($croppedValue, 76)) . '"'), '33', $ansiColors) . ' (' . strlen($value) . ' chars)';
+ $dump = self::ansiEscapeWrap('"' . implode(PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, $level + 1), str_split($croppedValue, 76)) . '"', '33', $ansiColors) . ' (' . strlen($value) . ' chars)';
} else {
$lines = str_split($croppedValue, 76);
$lines = array_map('htmlspecialchars', $lines);
@@ -294,7 +294,7 @@ class DebuggerUtility
$domainObjectType = 'object';
}
if ($plainText) {
- $dump .= ' ' . self::ansiEscapeWrap((($persistenceType ? $persistenceType . ' ' : '') . $domainObjectType), '42;30', $ansiColors);
+ $dump .= ' ' . self::ansiEscapeWrap(($persistenceType ? $persistenceType . ' ' : '') . $domainObjectType, '42;30', $ansiColors);
} else {
$dump .= '<span class="extbase-debug-ptype">' . ($persistenceType ? $persistenceType . ' ' : '') . $domainObjectType . '</span>';
}
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
index 2e7c7b111ad0e3eaf2758a4cb63dda9ff97d1b0e..2b293928db73af580b91420466c1ae7df3364a1a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
@@ -93,7 +93,7 @@ class CountTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCa
$query->setLimit($this->numberOfRecordsInFixture+1);
$query->setOffset(6);
- $this->assertSame(($this->numberOfRecordsInFixture - 6), $query->count());
+ $this->assertSame($this->numberOfRecordsInFixture - 6, $query->count());
}
/**
@@ -104,7 +104,7 @@ class CountTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCa
$query = $this->postRepository->createQuery();
$query->setLimit($this->numberOfRecordsInFixture+1);
- $query->setOffset(($this->numberOfRecordsInFixture + 5));
+ $query->setOffset($this->numberOfRecordsInFixture + 5);
$this->assertSame(0, $query->count());
}
@@ -129,7 +129,7 @@ class CountTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCa
$query = $this->postRepository->createQuery();
$query
- ->setOffset(($this->numberOfRecordsInFixture - 3))
+ ->setOffset($this->numberOfRecordsInFixture - 3)
->setLimit(4);
$this->assertSame(3, $query->count());
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
index 836d9cccae60d8aafcde592e4725cdeb131d7939..d417ca0004a3a493e5fc144a9bb3ca5903a73272 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
@@ -176,7 +176,7 @@ class RelationTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTes
->from('tx_blogexample_domain_model_post')
->execute()
->fetchColumn(0);
- $this->assertEquals(($countPostsOriginal - 1), $countPosts);
+ $this->assertEquals($countPostsOriginal - 1, $countPosts);
$queryBuilder->resetQueryParts();
$post = $queryBuilder
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
index 95a6a478a5e44bfa509a790d5edc6dc6ba2122fa..a8f053d18b1f8f2fc641c2d03fa4530374e2d452 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
@@ -101,7 +101,7 @@ class RequestBuilderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
$this->requestBuilder->_set('configurationManager', $this->mockConfigurationManager);
$this->mockObjectManager->expects($this->any())->method('get')->with(\TYPO3\CMS\Extbase\Mvc\Web\Request::class)->will($this->returnValue($this->mockRequest));
$this->requestBuilder->_set('objectManager', $this->mockObjectManager);
- $pluginNamespace = 'tx_' . strtolower(($this->configuration['extensionName'] . '_' . $this->configuration['pluginName']));
+ $pluginNamespace = 'tx_' . strtolower($this->configuration['extensionName'] . '_' . $this->configuration['pluginName']);
$this->mockExtensionService->expects($this->any())->method('getPluginNamespace')->will($this->returnValue($pluginNamespace));
$this->requestBuilder->_set('extensionService', $this->mockExtensionService);
$this->mockEnvironmentService->expects($this->any())->method('getServerRequestMethod')->will($this->returnValue('GET'));
diff --git a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
index e0a672030bd511a54f860a06424206a87b35b3af..a922a897419443ca73368965f227f74a0d334a6e 100644
--- a/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
@@ -100,7 +100,7 @@ class DispatcherTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
{
$arguments = [];
$mockSlot = function () use (&$arguments) {
- ($arguments = func_get_args());
+ $arguments = func_get_args();
};
$this->signalSlotDispatcher->connect('Foo', 'bar', $mockSlot, null, false);
$this->signalSlotDispatcher->dispatch('Foo', 'bar', ['bar', 'quux']);
@@ -295,7 +295,7 @@ class DispatcherTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
{
$arguments = [];
$mockSlot = function () use (&$arguments) {
- ($arguments = func_get_args());
+ $arguments = func_get_args();
};
$mockObjectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
$this->signalSlotDispatcher->connect('SignalClassName', 'methodName', $mockSlot, null, true);
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
index 171c6306aa07a06f56dbbe1562121e798f2a7f34..5396e9013c3f9f29e5741577a6d342ceca112cf6 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
@@ -59,12 +59,12 @@ class RepositoryRepositoryTest extends \TYPO3\TestingFramework\Core\Unit\UnitTes
{
$mockModelOne = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
$mockModelOne
- ->expects(($this->once()))
+ ->expects($this->once())
->method('getTitle')
->will($this->returnValue('foo'));
$mockModelTwo = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Model\Repository::class)->getMock();
$mockModelTwo
- ->expects(($this->once()))
+ ->expects($this->once())
->method('getTitle')
->will($this->returnValue('TYPO3.org Main Repository'));
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index ac6028df151c5eb41cff432f2ae7c113e8f88ede..6d83e5d502fbff87b16cb8227fb4ce3213755277 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -279,7 +279,7 @@ class FrontendEditPanel
} else {
$cf1 = ($cf2 = '');
}
- $out = '<a href="#" class="typo3-editPanel-btn typo3-editPanel-btn-default" onclick="' . htmlspecialchars(($cf1 . 'document.' . $formName . '[\'TSFE_EDIT[cmd]\'].value=\'' . $cmd . '\'; document.' . $formName . '.submit();' . $cf2 . ' return false;')) . '">' . $string . '</a>';
+ $out = '<a href="#" class="typo3-editPanel-btn typo3-editPanel-btn-default" onclick="' . htmlspecialchars($cf1 . 'document.' . $formName . '[\'TSFE_EDIT[cmd]\'].value=\'' . $cmd . '\'; document.' . $formName . '.submit();' . $cf2 . ' return false;') . '">' . $string . '</a>';
}
return $out;
}
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 536ed20b4969042f87c9eaf26a6a58932a91719b..3ea2cbcd6c0bd983029566c017cb9da403d655dc 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -947,7 +947,7 @@ class FileList
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
$href = (string)$uriBuilder->buildUriFromRoute('file_FilelistList', ['id' => $folderObject->getCombinedIdentifier()]);
- $onclick = ' onclick="' . htmlspecialchars(('top.document.getElementsByName("navigation")[0].contentWindow.Tree.highlightActiveItem("file","folder' . GeneralUtility::md5int($folderObject->getCombinedIdentifier()) . '_"+top.fsMod.currentBank)')) . '"';
+ $onclick = ' onclick="' . htmlspecialchars('top.document.getElementsByName("navigation")[0].contentWindow.Tree.highlightActiveItem("file","folder' . GeneralUtility::md5int($folderObject->getCombinedIdentifier()) . '_"+top.fsMod.currentBank)') . '"';
// Sometimes $code contains plain HTML tags. In such a case the string should not be modified!
if ((string)$title === strip_tags($title)) {
return '<a href="' . htmlspecialchars($href) . '"' . $onclick . ' title="' . htmlspecialchars($title) . '">' . $title . '</a>';
@@ -1256,10 +1256,18 @@ class FileList
$cutIcon = $this->iconFactory->getIcon('actions-edit-cut-release', Icon::SIZE_SMALL)->render();
}
- $cells[] = '<a class="btn btn-default" href="' . htmlspecialchars($this->clipObj->selUrlFile($fullIdentifier, 1, ($isSel === 'copy'))) . '" title="' . $copyTitle . '">' . $copyIcon . '</a>';
+ $cells[] = '<a class="btn btn-default" href="' . htmlspecialchars($this->clipObj->selUrlFile(
+ $fullIdentifier,
+ 1,
+ $isSel === 'copy'
+ )) . '" title="' . $copyTitle . '">' . $copyIcon . '</a>';
// we can only cut if file can be moved
if ($fileOrFolderObject->checkActionPermission('move')) {
- $cells[] = '<a class="btn btn-default" href="' . htmlspecialchars($this->clipObj->selUrlFile($fullIdentifier, 0, ($isSel === 'cut'))) . '" title="' . $cutTitle . '">' . $cutIcon . '</a>';
+ $cells[] = '<a class="btn btn-default" href="' . htmlspecialchars($this->clipObj->selUrlFile(
+ $fullIdentifier,
+ 0,
+ $isSel === 'cut'
+ )) . '" title="' . $cutTitle . '">' . $cutIcon . '</a>';
} else {
$cells[] = $this->spaceIcon;
}
@@ -1546,7 +1554,7 @@ class FileList
$htmlCode = '<a href="#"';
if ($launchViewParameter !== '') {
$htmlCode .= ' onclick="' . htmlspecialchars(
- ('top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;')
+ 'top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;'
) . '"';
}
$htmlCode .= ' title="' . htmlspecialchars(
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
index 1fd1e38567648ea404d87f42b6523794767f9240..012b72a672ccecf0885e0a02e8f1db758308ddd5 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
@@ -121,7 +121,7 @@ class CObjectViewHelper extends AbstractViewHelper
$lastSegment = array_pop($pathSegments);
$setup = static::getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
foreach ($pathSegments as $segment) {
- if (!array_key_exists(($segment . '.'), $setup)) {
+ if (!array_key_exists($segment . '.', $setup)) {
throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception('TypoScript object path "' . htmlspecialchars($typoscriptObjectPath) . '" does not exist', 1253191023);
}
$setup = $setup[$segment . '.'];
diff --git a/typo3/sysext/form/Classes/Controller/FormEditorController.php b/typo3/sysext/form/Classes/Controller/FormEditorController.php
index 6f94d940a97083c36cc6b010df628efe4fafb469..cf60953b6415f9aebbca767f7d80a41679d6c44e 100644
--- a/typo3/sysext/form/Classes/Controller/FormEditorController.php
+++ b/typo3/sysext/form/Classes/Controller/FormEditorController.php
@@ -104,7 +104,7 @@ class FormEditorController extends AbstractBackendController
$popupWindowWidth = 700;
$popupWindowHeight = 750;
- $popupWindowSize = ($this->getBackendUser()->getTSConfigVal('options.popupWindowSize'))
+ $popupWindowSize = $this->getBackendUser()->getTSConfigVal('options.popupWindowSize')
? trim($this->getBackendUser()->getTSConfigVal('options.popupWindowSize'))
: null;
if (!empty($popupWindowSize)) {
diff --git a/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php b/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
index 6bbd7731f31e71fca7259c24caa99d5111464d6a..dec2fae4fa3799a78c80580e4fe414910d828daa 100644
--- a/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
+++ b/typo3/sysext/form/Classes/Domain/Finishers/ConfirmationFinisher.php
@@ -98,7 +98,7 @@ class ConfirmationFinisher extends AbstractFinisher
$lastSegment = array_pop($pathSegments);
$setup = $this->typoScriptSetup;
foreach ($pathSegments as $segment) {
- if (!array_key_exists(($segment . '.'), $setup)) {
+ if (!array_key_exists($segment . '.', $setup)) {
throw new FinisherException(
sprintf('TypoScript object path "%s" does not exist', $typoscriptObjectPath),
1489238980
diff --git a/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php b/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
index 54a8d96e310723aa5f60167291cd192706d92315..275dcec936598e25414945bdd8e81f126bdc788e 100644
--- a/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
+++ b/typo3/sysext/form/Classes/Domain/Runtime/FormRuntime.php
@@ -304,7 +304,7 @@ class FormRuntime implements RootRenderableInterface, \ArrayAccess
}
$elementsCount = count($this->currentPage->getElements());
- $randomElementNumber = mt_rand(0, ($elementsCount - 1));
+ $randomElementNumber = mt_rand(0, $elementsCount - 1);
$honeypotName = substr(str_shuffle('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'), 0, mt_rand(5, 26));
$referenceElement = $this->currentPage->getElements()[$randomElementNumber];
diff --git a/typo3/sysext/form/Classes/Service/TranslationService.php b/typo3/sysext/form/Classes/Service/TranslationService.php
index 9ad0d4108a511b1681ac41b0b039258e2cfe5d53..77aa7138c760460e5c89e6f19d3e57064c642134 100644
--- a/typo3/sysext/form/Classes/Service/TranslationService.php
+++ b/typo3/sysext/form/Classes/Service/TranslationService.php
@@ -272,7 +272,7 @@ class TranslationService implements SingletonInterface
}
$translatedValue = $this->processTranslationChain($translationKeyChain, $language, $arguments);
- $translatedValue = (empty($translatedValue)) ? $optionValue : $translatedValue;
+ $translatedValue = empty($translatedValue) ? $optionValue : $translatedValue;
return $translatedValue;
}
@@ -360,7 +360,7 @@ class TranslationService implements SingletonInterface
}
$translatedValue = $this->processTranslationChain($translationKeyChain, $language, $arguments);
- $optionLabel = (empty($translatedValue)) ? $optionLabel : $translatedValue;
+ $optionLabel = empty($translatedValue) ? $optionLabel : $translatedValue;
}
$translatedValue = $defaultValue;
} elseif ($property === 'fluidAdditionalAttributes' && is_array($defaultValue)) {
@@ -373,7 +373,7 @@ class TranslationService implements SingletonInterface
}
$translatedValue = $this->processTranslationChain($translationKeyChain, $language, $arguments);
- $propertyValue = (empty($translatedValue)) ? $propertyValue : $translatedValue;
+ $propertyValue = empty($translatedValue) ? $propertyValue : $translatedValue;
}
$translatedValue = $defaultValue;
} else {
@@ -385,7 +385,7 @@ class TranslationService implements SingletonInterface
}
$translatedValue = $this->processTranslationChain($translationKeyChain, $language, $arguments);
- $translatedValue = (empty($translatedValue)) ? $defaultValue : $translatedValue;
+ $translatedValue = empty($translatedValue) ? $defaultValue : $translatedValue;
}
return $translatedValue;
@@ -447,7 +447,7 @@ class TranslationService implements SingletonInterface
}
$translatedValue = $this->processTranslationChain($translationKeyChain, $language, $arguments);
- $translatedValue = (empty($translatedValue)) ? $defaultValue : $translatedValue;
+ $translatedValue = empty($translatedValue) ? $defaultValue : $translatedValue;
return $translatedValue;
}
diff --git a/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php b/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php
index d8c1c195adb0de728332de8a28153192f251a379..66ef905b156a1a221f19170ab2d318bcc69c34e8 100644
--- a/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php
+++ b/typo3/sysext/frontend/Classes/AdminPanel/PreviewModule.php
@@ -121,7 +121,7 @@ class PreviewModule extends AbstractModule
($this->getBackendUser()->uc['TSFE_adminConfig']['preview_simulateUserGroup'] ===
$row['uid'] ? ' selected="selected"' : '') .
'>';
- $output[] = htmlspecialchars(($row['title'] . ' [' . $row['uid'] . ']'));
+ $output[] = htmlspecialchars($row['title'] . ' [' . $row['uid'] . ']');
$output[] = '</option>';
}
$output[] = ' </select>';
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index be8481dde3e36b98631ae5e1f97ce19026857bef..32532960b34d3a6488848d40417ac33c46643585 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -1061,7 +1061,7 @@ class ContentObjectRenderer
'altParams' => $altParam,
'border' => $this->getBorderAttr(' border="' . (int)$conf['border'] . '"'),
'sourceCollection' => $sourceCollection,
- 'selfClosingTagSlash' => (!empty($tsfe->xhtmlDoctype) ? ' /' : ''),
+ 'selfClosingTagSlash' => !empty($tsfe->xhtmlDoctype) ? ' /' : '',
];
$theValue = $this->templateService->substituteMarkerArray($imageTagTemplate, $imageTagValues, '###|###', true, true);
@@ -3248,9 +3248,9 @@ class ContentObjectRenderer
$comment = htmlspecialchars($this->insertData($parts[1]));
$output = LF
. str_pad('', $indent, TAB) . '<!-- ' . $comment . ' [begin] -->' . LF
- . str_pad('', ($indent + 1), TAB) . $content . LF
+ . str_pad('', $indent + 1, TAB) . $content . LF
. str_pad('', $indent, TAB) . '<!-- ' . $comment . ' [end] -->' . LF
- . str_pad('', ($indent + 1), TAB);
+ . str_pad('', $indent + 1, TAB);
return $output;
}
@@ -3555,7 +3555,7 @@ class ContentObjectRenderer
? $this->stdWrap($conf['icon.']['ext'], $conf['icon.']['ext.'])
: $conf['icon.']['ext'];
$iconExt = !empty($conf['icon.']['ext']) ? '.' . $conf['icon.']['ext'] : '.gif';
- $icon = @is_file(($iconPath . $fI['fileext'] . $iconExt))
+ $icon = @is_file($iconPath . $fI['fileext'] . $iconExt)
? $iconPath . $fI['fileext'] . $iconExt
: $iconPath . 'default' . $iconExt;
$icon = PathUtility::stripPathSitePrefix($icon);
@@ -3835,7 +3835,7 @@ class ContentObjectRenderer
$modifiers = substr($search, $startModifiers + 1);
// remove "e" (eval-modifier), which would otherwise allow to run arbitrary PHP-code
$modifiers = str_replace('e', '', $modifiers);
- $search = substr($search, 0, ($startModifiers + 1)) . $modifiers;
+ $search = substr($search, 0, $startModifiers + 1) . $modifiers;
}
if (empty($useOptionSplitReplace)) {
$content = preg_replace($search, $replace, $content);
@@ -4437,7 +4437,7 @@ class ContentObjectRenderer
$res = '<a href="' . htmlspecialchars($linkUrl) . '"'
. ($target !== '' ? ' target="' . htmlspecialchars($target) . '"' : '')
- . $aTagParams . $this->extLinkATagParams(('http://' . $parts[0]), 'url') . '>';
+ . $aTagParams . $this->extLinkATagParams('http://' . $parts[0], 'url') . '>';
$wrap = isset($conf['wrap.']) ? $this->stdWrap($conf['wrap'], $conf['wrap.']) : $conf['wrap'];
if ((string)$conf['ATagBeforeWrap'] !== '') {
@@ -6872,7 +6872,7 @@ class ContentObjectRenderer
$matchEnd = '(\\s*,|\\s*$)/';
$necessaryFields = ['uid', 'pid'];
$wsFields = ['t3ver_state'];
- if (isset($GLOBALS['TCA'][$table]) && !preg_match(($matchStart . '\\*' . $matchEnd), $selectPart) && !preg_match('/(count|max|min|avg|sum)\\([^\\)]+\\)/i', $selectPart)) {
+ if (isset($GLOBALS['TCA'][$table]) && !preg_match($matchStart . '\\*' . $matchEnd, $selectPart) && !preg_match('/(count|max|min|avg|sum)\\([^\\)]+\\)/i', $selectPart)) {
foreach ($necessaryFields as $field) {
$match = $matchStart . $field . $matchEnd;
if (!preg_match($match, $selectPart)) {
diff --git a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
index 143f286c52c3739d23deb35c572727a022c1b79a..9f17c9e9b503fef1d101968c0c7553d744f90ceb 100644
--- a/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
+++ b/typo3/sysext/frontend/Classes/Controller/ShowImageController.php
@@ -155,7 +155,7 @@ EOF;
];
$this->imageTag = str_replace(array_keys($imageTagMarkers), array_values($imageTagMarkers), $this->imageTag);
$markerArray = [
- '###TITLE###' => ($this->file->getProperty('title') ?: $this->title),
+ '###TITLE###' => $this->file->getProperty('title') ?: $this->title,
'###IMAGE###' => $this->imageTag,
'###BODY###' => $this->bodyTag
];
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index 029f25a2b1b63dad64efbdc6d729127612d4569f..bcc95b0150aca54f202740bd4542d75b8d82308c 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -889,7 +889,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
if (GeneralUtility::_GP('FE_SESSION_KEY')) {
$fe_sParts = explode('-', GeneralUtility::_GP('FE_SESSION_KEY'));
// If the session key hash check is OK:
- if (md5(($fe_sParts[0] . '/' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) === (string)$fe_sParts[1]) {
+ if (md5($fe_sParts[0] . '/' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']) === (string)$fe_sParts[1]) {
$cookieName = FrontendUserAuthentication::getCookieName();
$_COOKIE[$cookieName] = $fe_sParts[0];
if (isset($_SERVER['HTTP_COOKIE'])) {
@@ -2346,7 +2346,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
if ($debugCacheTime) {
$dateFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'];
$timeFormat = $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'];
- $this->content .= LF . '<!-- Cached page generated ' . date(($dateFormat . ' ' . $timeFormat), $row['tstamp']) . '. Expires ' . date(($dateFormat . ' ' . $timeFormat), $row['expires']) . ' -->';
+ $this->content .= LF . '<!-- Cached page generated ' . date($dateFormat . ' ' . $timeFormat, $row['tstamp']) . '. Expires ' . date($dateFormat . ' ' . $timeFormat, $row['expires']) . ' -->';
}
}
$this->getTimeTracker()->pull();
diff --git a/typo3/sysext/frontend/Classes/Middleware/FrontendUserAuthenticator.php b/typo3/sysext/frontend/Classes/Middleware/FrontendUserAuthenticator.php
index e2df00ef0269e89a117495e1ab5c46e580d7f474..87cd9dd1889868da627041ff639bfaadd0e61fc9 100644
--- a/typo3/sysext/frontend/Classes/Middleware/FrontendUserAuthenticator.php
+++ b/typo3/sysext/frontend/Classes/Middleware/FrontendUserAuthenticator.php
@@ -86,7 +86,7 @@ class FrontendUserAuthenticator implements MiddlewareInterface
): ServerRequestInterface {
list($sessionId, $hash) = explode('-', $frontendSessionKey);
// If the session key hash check is OK, set the cookie
- if (md5(($sessionId . '/' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'])) === (string)$hash) {
+ if (md5($sessionId . '/' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']) === (string)$hash) {
$cookieName = FrontendUserAuthentication::getCookieName();
// keep the global cookie overwriting for now, as long as FrontendUserAuthentication does not
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index 2d0b0756f7d22c7695d37e6335e07e3c423e1a2d..bae36916de61a90044b653762c6ceb35ff75ff9a 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -95,7 +95,7 @@ class PageGenerator
}
$headerComment = $tsfe->config['config']['headerComment'];
if (trim($headerComment)) {
- $pageRenderer->addInlineComment(TAB . str_replace(LF, (LF . TAB), trim($headerComment)) . LF);
+ $pageRenderer->addInlineComment(TAB . str_replace(LF, LF . TAB, trim($headerComment)) . LF);
}
// Setting charset:
$theCharset = $tsfe->metaCharset;
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index 3a09f2f0e614ee2bf6b081d9e9e2f64e80975349..9cd08fd4ad702c4cc5ce33f01da1574dc1bc4ee5 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -266,7 +266,7 @@ class PageRepository implements LoggerAwareInterface
implode(
'-',
[
- ($disableGroupAccessCheck ? '' : $this->where_groupAccess),
+ $disableGroupAccessCheck ? '' : $this->where_groupAccess,
$this->where_hid_del,
$this->sys_language_uid
]
diff --git a/typo3/sysext/impexp/Classes/Import.php b/typo3/sysext/impexp/Classes/Import.php
index 06672692da29dda54c6b0b539060c5b4a8712037..32c68066586e4fbd71ec7c0878bdeac1b12e0700 100644
--- a/typo3/sysext/impexp/Classes/Import.php
+++ b/typo3/sysext/impexp/Classes/Import.php
@@ -1434,7 +1434,7 @@ class Import extends ImportExport
if ($rteOrigName && GeneralUtility::isFirstPartOfStr($dirPrefix, 'uploads/')) {
// RTE:
// First, find unique RTE file name:
- if (@is_dir((PATH_site . $dirPrefix))) {
+ if (@is_dir(PATH_site . $dirPrefix)) {
// From the "original" RTE filename, produce a new "original" destination filename which is unused.
// Even if updated, the image should be unique. Currently the problem with this is that it leaves a lot of unused RTE images...
$fileProcObj = $this->getFileProcObj();
@@ -1628,8 +1628,8 @@ class Import extends ImportExport
foreach ($filePathParts as $dirname) {
$pathAcc .= '/' . $dirname;
if (strlen($dirname)) {
- if (!@is_dir((PATH_site . $this->fileadminFolderName . $pathAcc))) {
- if (!GeneralUtility::mkdir((PATH_site . $this->fileadminFolderName . $pathAcc))) {
+ if (!@is_dir(PATH_site . $this->fileadminFolderName . $pathAcc)) {
+ if (!GeneralUtility::mkdir(PATH_site . $this->fileadminFolderName . $pathAcc)) {
$this->error('ERROR: Directory could not be created....B');
return false;
}
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index 2d0c050cc279435e5672371e0d7777134756e46d..c8d43a22d2bbfd0129092c044e77b85d50fc5699 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -858,7 +858,7 @@ abstract class ImportExport
$cfg = $this->softrefCfg[$tokenID];
if ($cfg['mode'] === 'editable') {
return (strlen($cfg['title']) ? '<strong>' . htmlspecialchars($cfg['title']) . '</strong><br/>' : '') . htmlspecialchars($cfg['description']) . '<br/>
- <input type="text" name="tx_impexp[softrefInputValues][' . $tokenID . ']" value="' . htmlspecialchars(($this->softrefInputValues[$tokenID] ?? $cfg['defValue'])) . '" />';
+ <input type="text" name="tx_impexp[softrefInputValues][' . $tokenID . ']" value="' . htmlspecialchars($this->softrefInputValues[$tokenID] ?? $cfg['defValue']) . '" />';
}
}
@@ -885,7 +885,7 @@ abstract class ImportExport
// Get current value:
$value = $this->softrefCfg[$cfg['subst']['tokenID']]['mode'];
// Render options selector:
- $selectorbox = $this->renderSelectBox(('tx_impexp[softrefCfg][' . $cfg['subst']['tokenID'] . '][mode]'), $value, $optValues) . '<br/>';
+ $selectorbox = $this->renderSelectBox('tx_impexp[softrefCfg][' . $cfg['subst']['tokenID'] . '][mode]', $value, $optValues) . '<br/>';
if ($value === 'editable') {
$descriptionField = '';
// Title:
@@ -1108,7 +1108,7 @@ abstract class ImportExport
$opt[] = '<option value="' . htmlspecialchars($k) . '"' . $sel . '>' . htmlspecialchars($v) . '</option>';
}
if (!$isSelFlag && (string)$value !== '') {
- $opt[] = '<option value="' . htmlspecialchars($value) . '" selected="selected">' . htmlspecialchars(('[\'' . $value . '\']')) . '</option>';
+ $opt[] = '<option value="' . htmlspecialchars($value) . '" selected="selected">' . htmlspecialchars('[\'' . $value . '\']') . '</option>';
}
return '<select name="' . $prefix . '">' . implode('', $opt) . '</select>';
}
@@ -1163,7 +1163,7 @@ abstract class ImportExport
} else {
$output = 'Match';
}
- return '<strong class="text-nowrap">[' . htmlspecialchars(($table . ':' . $importRecord['uid'] . ' => ' . $databaseRecord['uid'])) . ']:</strong> ' . $output;
+ return '<strong class="text-nowrap">[' . htmlspecialchars($table . ':' . $importRecord['uid'] . ' => ' . $databaseRecord['uid']) . ']:</strong> ' . $output;
}
return 'ERROR: One of the inputs were not an array!';
}
@@ -1180,7 +1180,7 @@ abstract class ImportExport
if (GeneralUtility::isFirstPartOfStr($string, 'RTEmagicC_')) {
// Find original file:
$pI = pathinfo(substr($string, strlen('RTEmagicC_')));
- $filename = substr($pI['basename'], 0, -strlen(('.' . $pI['extension'])));
+ $filename = substr($pI['basename'], 0, -strlen('.' . $pI['extension']));
$origFilePath = 'RTEmagicP_' . $filename;
return $origFilePath;
}
diff --git a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
index ceb1050ab981a2b32e82b35d3c1b2a43e1e00616..0009f6663072bcd337a47fe35f73f1b6fdf03717 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
@@ -221,8 +221,8 @@ class AdministrationController extends ActionController
->getQueryBuilderForTable('index_stat_word')
->expr();
- $last24hours = $expressionBuilder->gt('tstamp', ($GLOBALS['EXEC_TIME'] - 86400));
- $last30days = $expressionBuilder->gt('tstamp', ($GLOBALS['EXEC_TIME'] - 30 * 86400));
+ $last24hours = $expressionBuilder->gt('tstamp', $GLOBALS['EXEC_TIME'] - 86400);
+ $last30days = $expressionBuilder->gt('tstamp', $GLOBALS['EXEC_TIME'] - 30 * 86400);
$this->view->assignMultiple([
'pageUid' => $this->pageUid,
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
index 36c4023a925e2a400cb8cf7069cd01d40a578865..329e18d84d21acbefbfc70bf850b42357c037adc 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -604,7 +604,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
return $row['order_val'] . ' ' . LocalizationUtility::translate('result.ratingMatches', 'IndexedSearch');
break;
case 'rank_first':
- return ceil(MathUtility::forceIntegerInRange((255 - $row['order_val']), 1, 255) / 255 * 100) . '%';
+ return ceil(MathUtility::forceIntegerInRange(255 - $row['order_val'], 1, 255) / 255 * 100) . '%';
break;
case 'rank_flag':
if ($this->firstRow['order_val2']) {
@@ -794,11 +794,17 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
} elseif ($summaryLgd > $summaryMax || !isset($parts[$k + 1])) {
// In case summary length is exceed OR if there are no more entries at all:
if ($strLen > $postPreLgd) {
- $output[$k] = preg_replace('/[[:space:]][^[:space:]]+$/', '', GeneralUtility::fixed_lgd_cs($parts[$k], ($postPreLgd - $postPreLgd_offset))) . $divider;
+ $output[$k] = preg_replace('/[[:space:]][^[:space:]]+$/', '', GeneralUtility::fixed_lgd_cs(
+ $parts[$k],
+ $postPreLgd - $postPreLgd_offset
+ )) . $divider;
}
} else {
if ($strLen > $postPreLgd * 2) {
- $output[$k] = preg_replace('/[[:space:]][^[:space:]]+$/', '', GeneralUtility::fixed_lgd_cs($parts[$k], ($postPreLgd - $postPreLgd_offset))) . $divider . preg_replace('/^[^[:space:]]+[[:space:]]/', '', GeneralUtility::fixed_lgd_cs($parts[$k], -($postPreLgd - $postPreLgd_offset)));
+ $output[$k] = preg_replace('/[[:space:]][^[:space:]]+$/', '', GeneralUtility::fixed_lgd_cs(
+ $parts[$k],
+ $postPreLgd - $postPreLgd_offset
+ )) . $divider . preg_replace('/^[^[:space:]]+[[:space:]]/', '', GeneralUtility::fixed_lgd_cs($parts[$k], -($postPreLgd - $postPreLgd_offset)));
}
}
$summaryLgd += mb_strlen($output[$k], 'utf-8');
@@ -1581,7 +1587,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
{
$numberOfResults = (int)$numberOfResults;
- return (in_array($numberOfResults, $this->availableResultsNumbers)) ?
+ return in_array($numberOfResults, $this->availableResultsNumbers) ?
$numberOfResults : $this->defaultResultNumber;
}
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index 7cec12b87bf1c62fe774c37dfc0caefc113d363e..03be2307b0cc44bc8f7baae6b695507970b7bfe3 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -249,7 +249,7 @@ class IndexSearchRepository
// or not (depends on possible right problems)
$row['show_resume'] = $this->checkResume($row);
$phashGr = !in_array($row['phash_grouping'], $grouping_phashes);
- $chashGr = !in_array(($row['contentHash'] . '.' . $row['data_page_id']), $grouping_chashes);
+ $chashGr = !in_array($row['contentHash'] . '.' . $row['data_page_id'], $grouping_chashes);
if ($phashGr && $chashGr) {
// Only if the resume may be shown are we going to filter out duplicates...
if ($row['show_resume'] || $this->displayForbiddenRecords) {
@@ -749,7 +749,7 @@ class IndexSearchRepository
->from('index_fulltext', 'IFT')
->where(
QueryHelper::stripLogicalOperatorPrefix($likePart),
- $queryBuilder->expr()->eq('ISEC.phash', $queryBuilder->quoteIdentifier(('IFT.phash'))),
+ $queryBuilder->expr()->eq('ISEC.phash', $queryBuilder->quoteIdentifier('IFT.phash')),
QueryHelper::stripLogicalOperatorPrefix($this->sectionTableWhere())
)
->groupBy('ISEC.phash')
diff --git a/typo3/sysext/indexed_search/Classes/FileContentParser.php b/typo3/sysext/indexed_search/Classes/FileContentParser.php
index 31c75e953cab83424bfde06c58410ada22576a20..9b380e0e1a6f7d3abc630ca9ae9869032aacb657 100644
--- a/typo3/sysext/indexed_search/Classes/FileContentParser.php
+++ b/typo3/sysext/indexed_search/Classes/FileContentParser.php
@@ -95,7 +95,7 @@ class FileContentParser
// PDF
if ($indexerConfig['pdftools']) {
$pdfPath = rtrim($indexerConfig['pdftools'], '/') . '/';
- if (@is_file(($pdfPath . 'pdftotext' . $exe)) && @is_file(($pdfPath . 'pdfinfo' . $exe))) {
+ if (@is_file($pdfPath . 'pdftotext' . $exe) && @is_file($pdfPath . 'pdfinfo' . $exe)) {
$this->app['pdfinfo'] = $pdfPath . 'pdfinfo' . $exe;
$this->app['pdftotext'] = $pdfPath . 'pdftotext' . $exe;
// PDF mode:
@@ -112,7 +112,7 @@ class FileContentParser
// Catdoc
if ($indexerConfig['catdoc']) {
$catdocPath = rtrim($indexerConfig['catdoc'], '/') . '/';
- if (@is_file(($catdocPath . 'catdoc' . $exe))) {
+ if (@is_file($catdocPath . 'catdoc' . $exe)) {
$this->app['catdoc'] = $catdocPath . 'catdoc' . $exe;
$extOK = true;
} else {
@@ -128,7 +128,7 @@ class FileContentParser
// ppthtml
if ($indexerConfig['ppthtml']) {
$ppthtmlPath = rtrim($indexerConfig['ppthtml'], '/') . '/';
- if (@is_file(($ppthtmlPath . 'ppthtml' . $exe))) {
+ if (@is_file($ppthtmlPath . 'ppthtml' . $exe)) {
$this->app['ppthtml'] = $ppthtmlPath . 'ppthtml' . $exe;
$extOK = true;
} else {
@@ -143,7 +143,7 @@ class FileContentParser
// Xlhtml
if ($indexerConfig['xlhtml']) {
$xlhtmlPath = rtrim($indexerConfig['xlhtml'], '/') . '/';
- if (@is_file(($xlhtmlPath . 'xlhtml' . $exe))) {
+ if (@is_file($xlhtmlPath . 'xlhtml' . $exe)) {
$this->app['xlhtml'] = $xlhtmlPath . 'xlhtml' . $exe;
$extOK = true;
} else {
@@ -181,7 +181,7 @@ class FileContentParser
// Oasis OpenDocument Text
if ($indexerConfig['unzip']) {
$unzipPath = rtrim($indexerConfig['unzip'], '/') . '/';
- if (@is_file(($unzipPath . 'unzip' . $exe))) {
+ if (@is_file($unzipPath . 'unzip' . $exe)) {
$this->app['unzip'] = $unzipPath . 'unzip' . $exe;
$extOK = true;
} else {
@@ -195,7 +195,7 @@ class FileContentParser
// Catdoc
if ($indexerConfig['unrtf']) {
$unrtfPath = rtrim($indexerConfig['unrtf'], '/') . '/';
- if (@is_file(($unrtfPath . 'unrtf' . $exe))) {
+ if (@is_file($unrtfPath . 'unrtf' . $exe)) {
$this->app['unrtf'] = $unrtfPath . 'unrtf' . $exe;
$extOK = true;
} else {
diff --git a/typo3/sysext/indexed_search/Classes/Lexer.php b/typo3/sysext/indexed_search/Classes/Lexer.php
index a926ab5c0fa7dbff8860c6f1ceeae701fc7781bd..2d2ed8e62d594a0235e32a217aaac90e715df02c 100644
--- a/typo3/sysext/indexed_search/Classes/Lexer.php
+++ b/typo3/sysext/indexed_search/Classes/Lexer.php
@@ -88,7 +88,11 @@ class Lexer
if ($len) {
$this->addWords($words, $wordString, $start, $len);
if ($this->debug) {
- $this->debugString .= '<span style="color:red">' . htmlspecialchars(substr($wordString, $pos, ($start - $pos))) . '</span>' . htmlspecialchars(substr($wordString, $start, $len));
+ $this->debugString .= '<span style="color:red">' . htmlspecialchars(substr(
+ $wordString,
+ $pos,
+ $start - $pos
+ )) . '</span>' . htmlspecialchars(substr($wordString, $start, $len));
}
$pos = $start + $len;
} else {
diff --git a/typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php b/typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php
index 0c665f287a3876d473050dc0a6dd74ca93a41293..16a4fb539bf167f41ea0918eba333dd767399a10 100644
--- a/typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php
+++ b/typo3/sysext/indexed_search/Classes/Utility/DoubleMetaPhoneUtility.php
@@ -136,7 +136,7 @@ class DoubleMetaPhoneUtility
break;
case 'C':
// various gremanic
- if ($this->current > 1 && !$this->IsVowel($this->original, ($this->current - 2)) && $this->StringAt($this->original, $this->current - 1, 3, ['ACH']) && (substr($this->original, $this->current + 2, 1) !== 'I' && (substr($this->original, $this->current + 2, 1) !== 'E' || $this->StringAt($this->original, $this->current - 2, 6, ['BACHER', 'MACHER'])))) {
+ if ($this->current > 1 && !$this->IsVowel($this->original, $this->current - 2) && $this->StringAt($this->original, $this->current - 1, 3, ['ACH']) && (substr($this->original, $this->current + 2, 1) !== 'I' && (substr($this->original, $this->current + 2, 1) !== 'E' || $this->StringAt($this->original, $this->current - 2, 6, ['BACHER', 'MACHER'])))) {
$this->primary .= 'K';
$this->secondary .= 'K';
$this->current += 2;
@@ -194,7 +194,12 @@ class DoubleMetaPhoneUtility
break;
}
// e.g. 'czerny'
- if ($this->StringAt($this->original, $this->current, 2, ['CZ']) && !$this->StringAt($this->original, ($this->current - 2), 4, ['WICZ'])) {
+ if ($this->StringAt($this->original, $this->current, 2, ['CZ']) && !$this->StringAt(
+ $this->original,
+ $this->current - 2,
+ 4,
+ ['WICZ']
+ )) {
$this->primary .= 'S';
$this->secondary .= 'X';
$this->current += 2;
@@ -210,7 +215,12 @@ class DoubleMetaPhoneUtility
// double 'C', but not McClellan'
if ($this->StringAt($this->original, $this->current, 2, ['CC']) && !($this->current == 1 && $this->original[0] === 'M')) {
// 'bellocchio' but not 'bacchus'
- if ($this->StringAt($this->original, $this->current + 2, 1, ['I', 'E', 'H']) && !$this->StringAt($this->original, ($this->current + 2), 2, ['HU'])) {
+ if ($this->StringAt($this->original, $this->current + 2, 1, ['I', 'E', 'H']) && !$this->StringAt(
+ $this->original,
+ $this->current + 2,
+ 2,
+ ['HU']
+ )) {
// 'accident', 'accede', 'succeed'
if ($this->current == 1 && substr($this->original, $this->current - 1, 1) === 'A' || $this->StringAt($this->original, $this->current - 1, 5, ['UCCEE', 'UCCES'])) {
$this->primary .= 'KS';
@@ -253,7 +263,12 @@ class DoubleMetaPhoneUtility
if ($this->StringAt($this->original, $this->current + 1, 2, [' C', ' Q', ' G'])) {
$this->current += 3;
} else {
- if ($this->StringAt($this->original, $this->current + 1, 1, ['C', 'K', 'Q']) && !$this->StringAt($this->original, ($this->current + 1), 2, ['CE', 'CI'])) {
+ if ($this->StringAt($this->original, $this->current + 1, 1, ['C', 'K', 'Q']) && !$this->StringAt(
+ $this->original,
+ $this->current + 1,
+ 2,
+ ['CE', 'CI']
+ )) {
$this->current += 2;
} else {
$this->current += 1;
@@ -297,7 +312,7 @@ class DoubleMetaPhoneUtility
break;
case 'G':
if (substr($this->original, $this->current + 1, 1) === 'H') {
- if ($this->current > 0 && !$this->IsVowel($this->original, ($this->current - 1))) {
+ if ($this->current > 0 && !$this->IsVowel($this->original, $this->current - 1)) {
$this->primary .= 'K';
$this->secondary .= 'K';
$this->current += 2;
@@ -339,7 +354,7 @@ class DoubleMetaPhoneUtility
$this->secondary .= 'N';
} else {
// not e.g. 'cagney'
- if (!$this->StringAt($this->original, ($this->current + 2), 2, ['EY']) && substr($this->original, $this->current + 1) !== 'Y' && !$this->SlavoGermanic($this->original)) {
+ if (!$this->StringAt($this->original, $this->current + 2, 2, ['EY']) && substr($this->original, $this->current + 1) !== 'Y' && !$this->SlavoGermanic($this->original)) {
$this->primary .= 'N';
$this->secondary .= 'KN';
} else {
@@ -377,7 +392,12 @@ class DoubleMetaPhoneUtility
break;
}
// -ger-, -gy-
- if (($this->StringAt($this->original, $this->current + 1, 2, ['ER']) || substr($this->original, $this->current + 1, 1) === 'Y') && !$this->StringAt($this->original, 0, 6, ['DANGER', 'RANGER', 'MANGER']) && !$this->StringAt($this->original, ($this->current - 1), 1, ['E', 'I']) && !$this->StringAt($this->original, ($this->current - 1), 3, ['RGY', 'OGY'])) {
+ if (($this->StringAt($this->original, $this->current + 1, 2, ['ER']) || substr($this->original, $this->current + 1, 1) === 'Y') && !$this->StringAt($this->original, 0, 6, ['DANGER', 'RANGER', 'MANGER']) && !$this->StringAt(
+ $this->original,
+ $this->current - 1,
+ 1,
+ ['E', 'I']
+ ) && !$this->StringAt($this->original, $this->current - 1, 3, ['RGY', 'OGY'])) {
$this->primary .= 'K';
$this->secondary .= 'J';
$this->current += 2;
@@ -447,7 +467,12 @@ class DoubleMetaPhoneUtility
$this->primary .= 'J';
$this->secondary .= '';
} else {
- if (!$this->StringAt($this->original, ($this->current + 1), 1, ['L', 'T', 'K', 'S', 'N', 'M', 'B', 'Z']) && !$this->StringAt($this->original, ($this->current - 1), 1, ['S', 'K', 'L'])) {
+ if (!$this->StringAt($this->original, $this->current + 1, 1, ['L', 'T', 'K', 'S', 'N', 'M', 'B', 'Z']) && !$this->StringAt(
+ $this->original,
+ $this->current - 1,
+ 1,
+ ['S', 'K', 'L']
+ )) {
$this->primary .= 'J';
$this->secondary .= 'J';
}
@@ -536,7 +561,12 @@ class DoubleMetaPhoneUtility
break;
case 'R':
// french e.g. 'rogier', but exclude 'hochmeier'
- if ($this->current == $this->last && !$this->SlavoGermanic($this->original) && $this->StringAt($this->original, $this->current - 2, 2, ['IE']) && !$this->StringAt($this->original, ($this->current - 4), 2, ['ME', 'MA'])) {
+ if ($this->current == $this->last && !$this->SlavoGermanic($this->original) && $this->StringAt($this->original, $this->current - 2, 2, ['IE']) && !$this->StringAt(
+ $this->original,
+ $this->current - 4,
+ 2,
+ ['ME', 'MA']
+ )) {
$this->primary .= '';
$this->secondary .= 'R';
} else {
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
index 2219e30b85d408d141f43869bf116118f930a8f5..1a7eed035beab122b680bc4a09c5a1822d607151 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
@@ -116,7 +116,7 @@ class PageBrowsingViewHelper extends AbstractViewHelper
// next link
if ($currentPage < $pageCount - 1) {
$label = LocalizationUtility::translate('displayResults.next', 'IndexedSearch');
- $content .= '<li>' . self::makecurrentPageSelector_link($label, ($currentPage + 1), $freeIndexUid) . '</li>';
+ $content .= '<li>' . self::makecurrentPageSelector_link($label, $currentPage + 1, $freeIndexUid) . '</li>';
}
return '<ul class="tx-indexedsearch-browsebox">' . $content . '</ul>';
}
diff --git a/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
index 5836b8844580a0ed9de52ab6bdb5b588dd48e51e..4f121f17e61be5774c931913de87420a9e2bd55f 100644
--- a/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
+++ b/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
@@ -91,7 +91,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
*/
public function main()
{
- $pageId = (int)(GeneralUtility::_GP('id'));
+ $pageId = (int)GeneralUtility::_GP('id');
/** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
@@ -338,7 +338,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
$line['icon'] = $this->iconFactory->getIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $identifier), Icon::SIZE_SMALL)->render();
$line['title'] = 'ID: ' . $identifier;
$line['pageTitle'] = GeneralUtility::fixed_lgd_cs($pageArray[$identifier], 30);
- $line['includedFiles'] = ($pageArray[$identifier . '_']['includeLines'] === 0 ? '' : $pageArray[($identifier . '_')]['includeLines']);
+ $line['includedFiles'] = ($pageArray[$identifier . '_']['includeLines'] === 0 ? '' : $pageArray[$identifier . '_']['includeLines']);
$line['lines'] = ($pageArray[$identifier . '_']['writtenLines'] === 0 ? '' : $pageArray[$identifier . '_']['writtenLines']);
} else {
$line['link'] = '';
diff --git a/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php b/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php
index 034d402b40adc759d50966fdd74162b910742e9e..2b9acc9c5305563c8169cf337383364a4290a8a9 100644
--- a/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php
+++ b/typo3/sysext/install/Classes/FolderStructure/DefaultPermissionsCheck.php
@@ -58,16 +58,16 @@ class DefaultPermissionsCheck
$octal = '0' . $GLOBALS['TYPO3_CONF_VARS']['SYS'][$which];
$dec = octdec($octal);
$perms = [
- 'ox' => (($dec & 001) == 001),
- 'ow' => (($dec & 002) == 002),
- 'or' => (($dec & 004) == 004),
- 'gx' => (($dec & 010) == 010),
- 'gw' => (($dec & 020) == 020),
- 'gr' => (($dec & 040) == 040),
- 'ux' => (($dec & 0100) == 0100),
- 'uw' => (($dec & 0200) == 0200),
- 'ur' => (($dec & 0400) == 0400),
- 'setgid' => (($dec & 02000) == 02000),
+ 'ox' => ($dec & 001) == 001,
+ 'ow' => ($dec & 002) == 002,
+ 'or' => ($dec & 004) == 004,
+ 'gx' => ($dec & 010) == 010,
+ 'gw' => ($dec & 020) == 020,
+ 'gr' => ($dec & 040) == 040,
+ 'ux' => ($dec & 0100) == 0100,
+ 'uw' => ($dec & 0200) == 0200,
+ 'ur' => ($dec & 0400) == 0400,
+ 'setgid' => ($dec & 02000) == 02000,
];
$extraMessage = '';
$groupPermissions = false;
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index 4984c958429627eced0f53566bcc05b77d36a648..a7154dbda430d354580cbbbc9fd360a3d55ba115 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -103,10 +103,13 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
}
}
} else {
- if (!is_writable((PATH_site . $relPath))) {
+ if (!is_writable(PATH_site . $relPath)) {
switch ($requirementLevel) {
case 0:
- $message .= sprintf($languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_directoryShouldBeWritable'), (PATH_site . $relPath)) . '<br />';
+ $message .= sprintf(
+ $languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_directoryShouldBeWritable'),
+ PATH_site . $relPath
+ ) . '<br />';
if ($severity < Status::WARNING) {
$value = $languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_recommendedWritableDirectory');
$severity = Status::WARNING;
@@ -114,7 +117,10 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
break;
case 2:
$value = $languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_requiredWritableDirectory');
- $message .= sprintf($languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_directoryMustBeWritable'), (PATH_site . $relPath)) . '<br />';
+ $message .= sprintf(
+ $languageService->sL('LLL:EXT:install/Resources/Private/Language/Report/locallang.xlf:status_directoryMustBeWritable'),
+ PATH_site . $relPath
+ ) . '<br />';
$severity = Status::ERROR;
break;
default:
diff --git a/typo3/sysext/install/Classes/Updates/BackendLayoutIconUpdateWizard.php b/typo3/sysext/install/Classes/Updates/BackendLayoutIconUpdateWizard.php
index 78b5fd99256786acb9c9649bc534918a9bbb86d5..e76e977311a31184892a8a85c0f5dd3ac0441ee1 100644
--- a/typo3/sysext/install/Classes/Updates/BackendLayoutIconUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/BackendLayoutIconUpdateWizard.php
@@ -277,13 +277,13 @@ class BackendLayoutIconUpdateWizard extends AbstractUpdate
$fields = [
'fieldname' => $this->fieldToMigrate,
'table_local' => 'sys_file',
- 'pid' => ($this->table === 'pages' ? $row['uid'] : $row['pid']),
+ 'pid' => $this->table === 'pages' ? $row['uid'] : $row['pid'],
'uid_foreign' => $row['uid'],
'uid_local' => $fileUid,
'tablenames' => $this->table,
'crdate' => time(),
'tstamp' => time(),
- 'sorting' => ($i + 256),
+ 'sorting' => $i + 256,
'sorting_foreign' => $i,
];
diff --git a/typo3/sysext/install/Classes/Updates/FrontendUserImageUpdateWizard.php b/typo3/sysext/install/Classes/Updates/FrontendUserImageUpdateWizard.php
index fa62b98b046b42ad18cf397a5779346626f3cb72..3520094fd3831ed436fb3b1d3af5b961dc84e6d4 100644
--- a/typo3/sysext/install/Classes/Updates/FrontendUserImageUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/FrontendUserImageUpdateWizard.php
@@ -323,13 +323,13 @@ class FrontendUserImageUpdateWizard extends AbstractUpdate
$fields = [
'fieldname' => $this->fieldToMigrate,
'table_local' => 'sys_file',
- 'pid' => ($this->table === 'pages' ? $row['uid'] : $row['pid']),
+ 'pid' => $this->table === 'pages' ? $row['uid'] : $row['pid'],
'uid_foreign' => $row['uid'],
'uid_local' => $fileUid,
'tablenames' => $this->table,
'crdate' => time(),
'tstamp' => time(),
- 'sorting' => ($i + 256),
+ 'sorting' => $i + 256,
'sorting_foreign' => $i,
];
diff --git a/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php b/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php
index 4e9e93c5ac620cf8735d27d5c813bab3b9349fa3..d3cc6a9ba23f344d7c99f0b75ad8461a57268913 100644
--- a/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php
@@ -98,7 +98,7 @@ class SeparateSysHistoryFromSysLogUpdate extends AbstractUpdate
'userid' => $row['userid'],
'sys_log_uid' => 0,
'history_data' => json_encode($row['history_data'] !== null ? unserialize($row['history_data'], ['allowed_classes' => false]) : []),
- 'originaluserid' => (empty($logData['originalUser']) ? null : $logData['originalUser'])
+ 'originaluserid' => empty($logData['originalUser']) ? null : $logData['originalUser']
];
$connection->update(
'sys_history',
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
index e790f562089e5ff4713cfb4029023c03c24e56ba..843da0586e0e8295301d246b991ca340cae784c9 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
@@ -123,7 +123,7 @@ class CoreVersionServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
false
);
$instance->expects($this->any())->method('getMajorVersion')->will($this->returnValue('7'));
- $instance->expects($this->any())->method('getVersionMatrix')->will($this->returnValue(require($versionMatrixFixtureFile)));
+ $instance->expects($this->any())->method('getVersionMatrix')->will($this->returnValue(require $versionMatrixFixtureFile));
$this->assertSame('3dc156eed4b99577232f537d798a8691493f8a83', $instance->getTarGzSha1OfVersion('7.2.0'));
}
@@ -448,7 +448,7 @@ class CoreVersionServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
false
);
$instance->expects($this->once())->method('getMajorVersion')->will($this->returnValue('7'));
- $instance->expects($this->once())->method('getVersionMatrix')->will($this->returnValue(require($versionMatrixFixtureFile)));
+ $instance->expects($this->once())->method('getVersionMatrix')->will($this->returnValue(require $versionMatrixFixtureFile));
$this->assertSame(1398968665, $instance->_call('getReleaseTimestampOfVersion', '7.3.1'));
}
@@ -469,7 +469,7 @@ class CoreVersionServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
false
);
$instance->expects($this->once())->method('getMajorVersion')->will($this->returnValue('2'));
- $instance->expects($this->once())->method('getVersionMatrix')->will($this->returnValue(require($versionMatrixFixtureFile)));
+ $instance->expects($this->once())->method('getVersionMatrix')->will($this->returnValue(require $versionMatrixFixtureFile));
$instance->_call('ensureVersionExistsInMatrix', '2.0.42');
}
@@ -490,7 +490,7 @@ class CoreVersionServiceTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestC
false
);
$instance->expects($this->once())->method('getMajorVersion')->will($this->returnValue('7'));
- $instance->expects($this->once())->method('getVersionMatrix')->will($this->returnValue(require($versionMatrixFixtureFile)));
+ $instance->expects($this->once())->method('getVersionMatrix')->will($this->returnValue(require $versionMatrixFixtureFile));
$instance->_call('ensureVersionExistsInMatrix', '7.2.5');
}
}
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
index 1317e12a9eec73ce7fa80623962ef1128dbb21b2..87047e55157c07c29a449255d7028cb9d1ad89a9 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
@@ -258,7 +258,7 @@ class ValidatorTask extends AbstractTask
$this->setCliArguments();
$this->templateService = GeneralUtility::makeInstance(MarkerBasedTemplateService::class);
$successfullyExecuted = true;
- if (!file_exists(($file = GeneralUtility::getFileAbsFileName($this->emailTemplateFile)))
+ if (!file_exists($file = GeneralUtility::getFileAbsFileName($this->emailTemplateFile))
&& !empty($this->email)
) {
if ($this->emailTemplateFile === 'EXT:linkvalidator/res/mailtemplate.html') {
diff --git a/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php b/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php
index ac6dd2736061d6dba8c147b212663d4b0a935dec..3ea622b7d654b23ad978a7b92dee582cf5ed3353 100644
--- a/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/MissingFilesCommand.php
@@ -169,7 +169,7 @@ If you want to get more detailed information, use the --verbose option.')
// Traverse the references and check if the files exists
while ($record = $result->fetch()) {
$fileName = $record['ref_string'];
- if (empty($record['softref_key']) && !@is_file((PATH_site . $fileName))) {
+ if (empty($record['softref_key']) && !@is_file(PATH_site . $fileName)) {
$missingReferences[$fileName][$record['hash']] = $this->formatReferenceIndexEntryToString($record);
}
}
@@ -202,7 +202,7 @@ If you want to get more detailed information, use the --verbose option.')
// Traverse the references and check if the files exists
while ($record = $result->fetch()) {
$fileName = $record['ref_string'];
- if (!@is_file((PATH_site . $fileName))) {
+ if (!@is_file(PATH_site . $fileName)) {
$missingReferences[] = $fileName . ' - ' . $record['hash'] . ' - ' . $this->formatReferenceIndexEntryToString($record);
}
}
diff --git a/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php b/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php
index 365c716322322e7d478dfd7bce72350ce0117af3..8497d5e7a43ea8ab4f6340c4f75689c49f365d44 100644
--- a/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/RteImagesCommand.php
@@ -328,7 +328,7 @@ If you want to get more detailed information, use the --verbose option.')
$dirPrefix = dirname($fileName) . '/';
$rteOrigName = basename($fileInfo['original']);
// If filename looks like an RTE file, and the directory is in "uploads/", then process as a RTE file!
- if ($rteOrigName && strpos($dirPrefix, 'uploads/') === 0 && @is_dir((PATH_site . $dirPrefix))) {
+ if ($rteOrigName && strpos($dirPrefix, 'uploads/') === 0 && @is_dir(PATH_site . $dirPrefix)) {
// From the "original" RTE filename, produce a new "original" destination filename which is unused.
$origDestName = $fileProcObj->getUniqueName($rteOrigName, PATH_site . $dirPrefix);
// Create copy file name
diff --git a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
index 59b1eef5dbb96625ad2240a48d4d47da23389063..7a06bfab4259f19ae3d23099782b42bc73792ac2 100644
--- a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
+++ b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
@@ -442,7 +442,7 @@ class DatabaseIntegrityController
if (is_array($admin->lRecords[$t])) {
foreach ($admin->lRecords[$t] as $data) {
if (!GeneralUtility::inList($admin->lostPagesList, $data['pid'])) {
- $lr .= '<div class="record"><a href="' . htmlspecialchars(((string)$uriBuilder->buildUriFromRoute('system_dbint') . '&SET[function]=records&fixLostRecords_table=' . $t . '&fixLostRecords_uid=' . $data['uid'])) . '" title="' . htmlspecialchars($lang->getLL('fixLostRecord')) . '">' . $this->iconFactory->getIcon('status-dialog-error', Icon::SIZE_SMALL)->render() . '</a>uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) . '</div>';
+ $lr .= '<div class="record"><a href="' . htmlspecialchars((string)$uriBuilder->buildUriFromRoute('system_dbint') . '&SET[function]=records&fixLostRecords_table=' . $t . '&fixLostRecords_uid=' . $data['uid']) . '" title="' . htmlspecialchars($lang->getLL('fixLostRecord')) . '">' . $this->iconFactory->getIcon('status-dialog-error', Icon::SIZE_SMALL)->render() . '</a>uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) . '</div>';
} else {
$lr .= '<div class="record-noicon">uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) . '</div>';
}
diff --git a/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php b/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
index 2729b11f923b1e6b5211a6c6f9b0862ab8b8946e..add119a1c6b7fd0c33b1730e22ae3e93e1a90df7 100644
--- a/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
+++ b/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
@@ -110,7 +110,7 @@ class ArrayBrowser
$output .= '<li' . ($isResult ? ' class="active"' : '') . '>';
if ($isArray && !$this->expAll) {
$goto = 'a' . substr(md5($depth), 0, 6);
- $output .= '<a class="list-tree-control' . ($isExpanded ? ' list-tree-control-open' : ' list-tree-control-closed') . '" id="' . $goto . '" href="' . htmlspecialchars(((string)$uriBuilder->buildUriFromRoutePath(GeneralUtility::_GP('route')) . '&node[' . $depth . ']=' . ($isExpanded ? 0 : 1) . '#' . $goto)) . '"><i class="fa"></i></a> ';
+ $output .= '<a class="list-tree-control' . ($isExpanded ? ' list-tree-control-open' : ' list-tree-control-closed') . '" id="' . $goto . '" href="' . htmlspecialchars((string)$uriBuilder->buildUriFromRoutePath(GeneralUtility::_GP('route')) . '&node[' . $depth . ']=' . ($isExpanded ? 0 : 1) . '#' . $goto) . '"><i class="fa"></i></a> ';
}
$output .= '<span class="list-tree-group">';
$output .= $this->wrapArrayKey($key, $depth, !$isArray ? $value : '');
@@ -151,8 +151,8 @@ class ArrayBrowser
. (!MathUtility::canBeInterpretedAsInteger($theValue) ? '\''
. addslashes($theValue) . '\'' : $theValue) . '; ';
$label = '<a class="list-tree-label" href="'
- . htmlspecialchars(((string)$uriBuilder->buildUriFromRoutePath(GeneralUtility::_GP('route'))
- . '&varname=' . urlencode($variableName)))
+ . htmlspecialchars((string)$uriBuilder->buildUriFromRoutePath(GeneralUtility::_GP('route'))
+ . '&varname=' . urlencode($variableName))
. '#varname">' . $label . '</a>';
}
return '<span class="list-tree-label">' . $label . '</span>';
diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
index 425eaeb44281a5c4e00e71607bc23142a649d28d..d9657e600c5f9c527e936d6929ae4962929dff01 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
@@ -1085,7 +1085,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList
break;
case 'info':
// "Info": (All records)
- $code = '<a href="#" onclick="' . htmlspecialchars(('top.TYPO3.InfoWindow.showItem(\'' . $table . '\', \'' . $row['uid'] . '\'); return false;')) . '" title="' . htmlspecialchars($lang->getLL('showInfo')) . '">' . $code . '</a>';
+ $code = '<a href="#" onclick="' . htmlspecialchars('top.TYPO3.InfoWindow.showItem(\'' . $table . '\', \'' . $row['uid'] . '\'); return false;') . '" title="' . htmlspecialchars($lang->getLL('showInfo')) . '">' . $code . '</a>';
break;
default:
// Output the label now:
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index 7728024230299a553cf811b2a51c07d82cf30fb7..e8188ec61121fbb2e0cbba729668148b7f8e019b 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -703,7 +703,7 @@ class DatabaseRecordList
}
}
// Cache
- $buttons['cache'] = '<a href="' . htmlspecialchars(($this->listURL() . '&clear_cache=1')) . '" title="'
+ $buttons['cache'] = '<a href="' . htmlspecialchars($this->listURL() . '&clear_cache=1') . '" title="'
. htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.clear_cache')) . '">'
. $this->iconFactory->getIcon('actions-system-cache-clear', Icon::SIZE_SMALL)->render() . '</a>';
if ($this->table && (!isset($module->modTSconfig['properties']['noExportRecordsLinks'])
@@ -711,7 +711,7 @@ class DatabaseRecordList
&& !$module->modTSconfig['properties']['noExportRecordsLinks']))
) {
// CSV
- $buttons['csv'] = '<a href="' . htmlspecialchars(($this->listURL() . '&csv=1')) . '" title="'
+ $buttons['csv'] = '<a href="' . htmlspecialchars($this->listURL() . '&csv=1') . '" title="'
. htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.csv')) . '">'
. $this->iconFactory->getIcon('actions-document-export-csv', Icon::SIZE_SMALL)->render() . '</a>';
// Export
@@ -1117,7 +1117,7 @@ class DatabaseRecordList
// Render collapse button if in multi table mode
$collapseIcon = '';
if (!$this->table) {
- $href = htmlspecialchars(($this->listURL() . '&collapse[' . $table . ']=' . ($tableCollapsed ? '0' : '1')));
+ $href = htmlspecialchars($this->listURL() . '&collapse[' . $table . ']=' . ($tableCollapsed ? '0' : '1'));
$title = $tableCollapsed
? htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.expandTable'))
: htmlspecialchars($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.collapseTable'));
@@ -1243,7 +1243,7 @@ class DatabaseRecordList
$hasMore = $this->totalItems > $this->itemsLimitSingleTable;
$colspan = $this->showIcon ? count($this->fieldArray) + 1 : count($this->fieldArray);
$rowOutput .= '<tr><td colspan="' . $colspan . '">
- <a href="' . htmlspecialchars(($this->listURL() . '&table=' . rawurlencode($table))) . '" class="btn btn-default">'
+ <a href="' . htmlspecialchars($this->listURL() . '&table=' . rawurlencode($table)) . '" class="btn btn-default">'
. '<span class="t3-icon fa fa-chevron-down"></span> <i>[1 - ' . $countOnFirstPage . ($hasMore ? '+' : '') . ']</i></a>
</td></tr>';
}
@@ -1607,7 +1607,7 @@ class DatabaseRecordList
$lang->getLL('clip_deleteMarked')
);
// The "Select all" link:
- $onClick = htmlspecialchars(('checkOffCB(' . GeneralUtility::quoteJSvalue(implode(',', $this->CBnames)) . ', this); return false;'));
+ $onClick = htmlspecialchars('checkOffCB(' . GeneralUtility::quoteJSvalue(implode(',', $this->CBnames)) . ', this); return false;');
$cells['markAll'] = '<a class="btn btn-default" rel="" href="#" onclick="' . $onClick . '" title="'
. htmlspecialchars($lang->getLL('clip_markRecords')) . '">'
. $this->iconFactory->getIcon('actions-document-select', Icon::SIZE_SMALL)->render() . '</a>';
@@ -1843,7 +1843,11 @@ class DatabaseRecordList
} else {
$lastElementNumber = $this->totalItems;
}
- $rangeIndicator = '<li><span>' . sprintf($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:rangeIndicator'), ($this->firstElementNumber + 1), $lastElementNumber) . '</span></li>';
+ $rangeIndicator = '<li><span>' . sprintf(
+ $this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_mod_web_list.xlf:rangeIndicator'),
+ $this->firstElementNumber + 1,
+ $lastElementNumber
+ ) . '</span></li>';
$titleColumn = $this->fieldArray[0];
$data = [
@@ -2228,7 +2232,13 @@ class DatabaseRecordList
}
$cells['copy'] = '<a class="btn btn-default" href="#" onclick="'
- . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB($table, $row['uid'], 1, ($isSel === 'copy'), ['returnUrl' => ''])) . ');')
+ . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB(
+ $table,
+ $row['uid'],
+ 1,
+ $isSel === 'copy',
+ ['returnUrl' => '']
+ )) . ');')
. '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.copy')) . '">'
. $copyIcon->render() . '</a>';
@@ -2245,7 +2255,13 @@ class DatabaseRecordList
if ($table === 'pages') {
if ($permsEdit) {
$cells['cut'] = '<a class="btn btn-default" href="#" onclick="'
- . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB($table, $row['uid'], 0, ($isSel === 'cut'), ['returnUrl' => ''])) . ');')
+ . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB(
+ $table,
+ $row['uid'],
+ 0,
+ $isSel === 'cut',
+ ['returnUrl' => '']
+ )) . ');')
. '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut')) . '">'
. $cutIcon->render() . '</a>';
} else {
@@ -2254,7 +2270,13 @@ class DatabaseRecordList
} else {
if ($this->calcPerms & Permission::CONTENT_EDIT) {
$cells['cut'] = '<a class="btn btn-default" href="#" onclick="'
- . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB($table, $row['uid'], 0, ($isSel === 'cut'), ['returnUrl' => ''])) . ');')
+ . htmlspecialchars('return jumpSelf(' . GeneralUtility::quoteJSvalue($this->clipObj->selUrlDB(
+ $table,
+ $row['uid'],
+ 0,
+ $isSel === 'cut',
+ ['returnUrl' => '']
+ )) . ');')
. '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:cm.cut')) . '">'
. $cutIcon->render() . '</a>';
} else {
@@ -3582,7 +3604,7 @@ class DatabaseRecordList
case 'info':
// "Info": (All records)
$code = '<a href="#" onclick="' . htmlspecialchars(
- ('top.TYPO3.InfoWindow.showItem(' . GeneralUtility::quoteJSvalue($table) . ', ' . (int)$row['uid'] . '); return false;')
+ 'top.TYPO3.InfoWindow.showItem(' . GeneralUtility::quoteJSvalue($table) . ', ' . (int)$row['uid'] . '); return false;'
) . '" title="' . htmlspecialchars($lang->getLL('showInfo')) . '">' . $code . '</a>';
break;
default:
@@ -4293,7 +4315,7 @@ class DatabaseRecordList
$htmlCode = '<a href="#"';
if ($launchViewParameter !== '') {
$htmlCode .= ' onclick="' . htmlspecialchars(
- ('top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;')
+ 'top.TYPO3.InfoWindow.showItem(' . $launchViewParameter . '); return false;'
) . '"';
}
$htmlCode .= ' title="' . htmlspecialchars(
diff --git a/typo3/sysext/reports/Classes/Status.php b/typo3/sysext/reports/Classes/Status.php
index 5d544717e373d6f4d4be20addb68a24d711306da..3bdf87d66cfdeca14a15736da7310f1c27fcc676 100644
--- a/typo3/sysext/reports/Classes/Status.php
+++ b/typo3/sysext/reports/Classes/Status.php
@@ -121,7 +121,7 @@ class Status
self::ERROR => 'ERR'
];
// Max length 80 characters
- $stringRepresentation = str_pad(('[' . $severity[$this->severity] . ']'), 7) . str_pad($this->title, 40) . ' - ' . substr($this->value, 0, 30);
+ $stringRepresentation = str_pad('[' . $severity[$this->severity] . ']', 7) . str_pad($this->title, 40) . ' - ' . substr($this->value, 0, 30);
return $stringRepresentation;
}
}
diff --git a/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php b/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
index 1fe0306ec7ebb04d855eac9faa62f073e1d12518..182ba103a376e6da6737295f8f5b2c7bb3b629b7 100644
--- a/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
+++ b/typo3/sysext/rsaauth/Classes/Storage/SplitStorage.php
@@ -137,7 +137,7 @@ class SplitStorage extends AbstractStorage
->where(
$queryBuilder->expr()->lt(
'crdate',
- $queryBuilder->createNamedParameter(($GLOBALS['EXEC_TIME'] - 30 * 60), \PDO::PARAM_INT)
+ $queryBuilder->createNamedParameter($GLOBALS['EXEC_TIME'] - 30 * 60, \PDO::PARAM_INT)
)
)
->execute();
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index 8a2155641db4d04472fdfa657c36c6749404ec5b..4f9a3342ebf53b22f871f53697132fa8e66f23a9 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -710,7 +710,7 @@ class SetupModuleController
$languageCode = '
<select id="field_lang" name="data[lang]" class="form-control">' . implode('', $languageOptions) . '
</select>';
- if ($controller->beUser->uc['lang'] && !@is_dir((PATH_typo3conf . 'l10n/' . $controller->beUser->uc['lang']))) {
+ if ($controller->beUser->uc['lang'] && !@is_dir(PATH_typo3conf . 'l10n/' . $controller->beUser->uc['lang'])) {
// TODO: The text constants have to be moved into language files
$languageUnavailableWarning = 'The selected language "' . htmlspecialchars($this->getLanguageService()->getLL('lang_' . $controller->beUser->uc['lang'])) . '" is not available before the language files are installed. <br /> ' . ($controller->beUser->isAdmin() ? 'You can use the Language module to easily download new language files.' : 'Please ask your system administrator to do this.');
$languageCode = '<br /><span class="label label-danger">' . $languageUnavailableWarning . '</span><br /><br />' . $languageCode;
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index abfa619d32072e1029c71fa4132996e641dad7ee..2b46b7b66b7e35008cc41680e0c368e03d906e82 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -534,7 +534,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface
$link = '<a href="' . htmlspecialchars($href) . '">' . htmlspecialchars($username) . '</a>';
// Link to delete the user record
$link .= '
- <a href="' . htmlspecialchars(($href . '&delete=1')) . '" class="t3js-confirm-trigger" data-title="' . htmlspecialchars($this->getLanguageService()->getLL('lDelete_warning_title')) . '" data-message="' . htmlspecialchars($this->getLanguageService()->getLL('lDelete_warning')) . '">'
+ <a href="' . htmlspecialchars($href . '&delete=1') . '" class="t3js-confirm-trigger" data-title="' . htmlspecialchars($this->getLanguageService()->getLL('lDelete_warning_title')) . '" data-message="' . htmlspecialchars($this->getLanguageService()->getLL('lDelete_warning')) . '">'
. $this->iconFactory->getIcon('actions-edit-delete', Icon::SIZE_SMALL)->render() .
'</a>';
return $link;
diff --git a/typo3/sysext/t3editor/Classes/T3editor.php b/typo3/sysext/t3editor/Classes/T3editor.php
index 9b7c9ec37015ba072f886562b67322dd8dc65229..ba241ebe6c24b96d9dc792e714a814184661d64c 100644
--- a/typo3/sysext/t3editor/Classes/T3editor.php
+++ b/typo3/sysext/t3editor/Classes/T3editor.php
@@ -113,7 +113,7 @@ class T3editor implements SingletonInterface
$configurationPath = $package->getPackagePath() . 'Configuration/Backend/T3editor';
$modesFileNameForPackage = $configurationPath . '/Modes.php';
if (is_file($modesFileNameForPackage)) {
- $definedModes = require_once($modesFileNameForPackage);
+ $definedModes = require_once $modesFileNameForPackage;
if (is_array($definedModes)) {
$this->configuration['modes'] = array_merge($this->configuration['modes'], $definedModes);
}
@@ -121,7 +121,7 @@ class T3editor implements SingletonInterface
$addonsFileNameForPackage = $configurationPath . '/Addons.php';
if (is_file($addonsFileNameForPackage)) {
- $definedAddons = require_once($addonsFileNameForPackage);
+ $definedAddons = require_once $addonsFileNameForPackage;
if (is_array($definedAddons)) {
$this->configuration['addons'] = array_merge($this->configuration['addons'], $definedAddons);
}
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index 648f7871deaef20b11ed373fe0704d19f25860fd..3c5d5db095a3b2dc0cc7d4d1d86a8c4177c0c17e 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -212,7 +212,7 @@ class TaskModuleController extends BaseScriptClass
$assigns = [];
$assigns['reports'] = $this->indexAction();
- $assigns['taskClass'] = strtolower(str_replace('\\', '-', htmlspecialchars(($extKey . '-' . $taskClass))));
+ $assigns['taskClass'] = strtolower(str_replace('\\', '-', htmlspecialchars($extKey . '-' . $taskClass)));
$assigns['actionContent'] = $actionContent;
// Rendering of the output via fluid
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index 3795a33285ff5b4dec4fdd0a512b2c8186a4d9d1..762093be88487d34bce3c52506eca2b80342c3ba 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -389,9 +389,9 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
$uriBuilder = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Routing\UriBuilder::class);
$aHref = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
if ($onlyKey) {
- $title = '<a href="' . htmlspecialchars(($aHref . '&e[' . $onlyKey . ']=1&SET[function]=TYPO3\\CMS\\Tstemplate\\Controller\\TypoScriptTemplateInformationModuleFunctionController')) . '">' . htmlspecialchars($title) . '</a>';
+ $title = '<a href="' . htmlspecialchars($aHref . '&e[' . $onlyKey . ']=1&SET[function]=TYPO3\\CMS\\Tstemplate\\Controller\\TypoScriptTemplateInformationModuleFunctionController') . '">' . htmlspecialchars($title) . '</a>';
} else {
- $title = '<a href="' . htmlspecialchars(($aHref . '&e[constants]=1&e[config]=1&SET[function]=TYPO3\\CMS\\Tstemplate\\Controller\\TypoScriptTemplateInformationModuleFunctionController')) . '">' . htmlspecialchars($title) . '</a>';
+ $title = '<a href="' . htmlspecialchars($aHref . '&e[constants]=1&e[config]=1&SET[function]=TYPO3\\CMS\\Tstemplate\\Controller\\TypoScriptTemplateInformationModuleFunctionController') . '">' . htmlspecialchars($title) . '</a>';
}
return $title;
}
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index ea6e4c29a017ec69167bf4d36c774ecaf97b50db..9d0f9c78dd0cffa15082edc7990143b3e1ea4b86 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -306,10 +306,10 @@ class ViewModuleController
foreach ($modTSconfig['properties']['previewFrameWidths.'] as $item => $conf) {
$data = [
'key' => substr($item, 0, -1),
- 'label' => ($conf['label'] ?? null),
- 'type' => ($conf['type'] ?? 'unknown'),
- 'width' => ((isset($conf['width']) && (int)$conf['width'] > 0 && strpos($conf['width'], '%') === false) ? (int)$conf['width'] : null),
- 'height' => ((isset($conf['height']) && (int)$conf['height'] > 0 && strpos($conf['height'], '%') === false) ? (int)$conf['height'] : null),
+ 'label' => $conf['label'] ?? null,
+ 'type' => $conf['type'] ?? 'unknown',
+ 'width' => (isset($conf['width']) && (int)$conf['width'] > 0 && strpos($conf['width'], '%') === false) ? (int)$conf['width'] : null,
+ 'height' => (isset($conf['height']) && (int)$conf['height'] > 0 && strpos($conf['height'], '%') === false) ? (int)$conf['height'] : null,
];
$width = (int)substr($item, 0, -1);
if (!isset($data['width']) && $width > 0) {
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index a5774a03ae24c585a682285738abd03f23fd0c65..b7ee0c86380d242c87b139bf901a33ae3e13186d 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -118,7 +118,14 @@ class PreviewController
$queryString = GeneralUtility::implodeArrayForUrl('', $queryParameters);
// fetch the next and previous stage
- $workspaceItemsArray = $this->workspaceService->selectVersionsInWorkspace($this->stageService->getWorkspaceId(), 1, -99, $this->pageId, 0, 'tables_modify');
+ $workspaceItemsArray = $this->workspaceService->selectVersionsInWorkspace(
+ $this->stageService->getWorkspaceId(),
+ $filter = 1,
+ $stage = -99,
+ $this->pageId,
+ $recursionLevel = 0,
+ $selectionType = 'tables_modify'
+ );
list(, $nextStage) = $this->stageService->getNextStageForElementCollection($workspaceItemsArray);
list(, $previousStage) = $this->stageService->getPreviousStageForElementCollection($workspaceItemsArray);
$availableWorkspaces = $this->workspaceService->getAvailableWorkspaces();
diff --git a/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php b/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
index f6b46dcd8f56a197aad5ab2ca03bcdee9d40715c..23ea6b7830b73705636a73168e6374894f32ab54 100644
--- a/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/Controller/Remote/ActionHandler.php
@@ -374,7 +374,7 @@ class ActionHandler extends AbstractHandler
$uc = (!empty($preselectedBackendUser['uc']) ? unserialize($preselectedBackendUser['uc']) : []);
$recipients[$preselectedBackendUser['email']] = [
'email' => $preselectedBackendUser['email'],
- 'lang' => ($uc['lang'] ?? $preselectedBackendUser['lang'])
+ 'lang' => $uc['lang'] ?? $preselectedBackendUser['lang']
];
}
}
@@ -415,7 +415,14 @@ class ActionHandler extends AbstractHandler
$workspaceService = GeneralUtility::makeInstance(WorkspaceService::class);
/** @var $stageService StagesService */
$stageService = GeneralUtility::makeInstance(StagesService::class);
- $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace($stageService->getWorkspaceId(), ($filter = 1), ($stage = -99), $pageId, ($recursionLevel = 0), ($selectionType = 'tables_modify'));
+ $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace(
+ $stageService->getWorkspaceId(),
+ $filter = 1,
+ $stage = -99,
+ $pageId,
+ $recursionLevel = 0,
+ $selectionType = 'tables_modify'
+ );
foreach ($workspaceItemsArray as $tableName => $items) {
foreach ($items as $item) {
$cmdMapArray[$tableName][$item['uid']]['version']['action'] = 'clearWSID';
@@ -668,7 +675,7 @@ class ActionHandler extends AbstractHandler
}
$result['comments'] = [
'type' => 'textarea',
- 'value' => ($nextStage->isInternal() ? '' : $nextStage->getDefaultComment())
+ 'value' => $nextStage->isInternal() ? '' : $nextStage->getDefaultComment()
];
return $result;
@@ -746,10 +753,24 @@ class ActionHandler extends AbstractHandler
public function sendPageToPreviousStage($id)
{
$workspaceService = GeneralUtility::makeInstance(WorkspaceService::class);
- $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace($this->stageService->getWorkspaceId(), ($filter = 1), ($stage = -99), $id, ($recursionLevel = 0), ($selectionType = 'tables_modify'));
+ $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace(
+ $this->stageService->getWorkspaceId(),
+ $filter = 1,
+ $stage = -99,
+ $id,
+ $recursionLevel = 0,
+ $selectionType = 'tables_modify'
+ );
list($currentStage, $previousStage) = $this->getStageService()->getPreviousStageForElementCollection($workspaceItemsArray);
// get only the relevant items for processing
- $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace($this->stageService->getWorkspaceId(), ($filter = 1), $currentStage['uid'], $id, ($recursionLevel = 0), ($selectionType = 'tables_modify'));
+ $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace(
+ $this->stageService->getWorkspaceId(),
+ $filter = 1,
+ $currentStage['uid'],
+ $id,
+ $recursionLevel = 0,
+ $selectionType = 'tables_modify'
+ );
$stageFormFields = $this->getSentToStageWindow($previousStage['uid']);
$result = array_merge($stageFormFields, [
'title' => 'Status message: Page send to next stage - ID: ' . $id . ' - Next stage title: ' . $previousStage['title'],
@@ -767,10 +788,24 @@ class ActionHandler extends AbstractHandler
public function sendPageToNextStage($id)
{
$workspaceService = GeneralUtility::makeInstance(WorkspaceService::class);
- $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace($this->stageService->getWorkspaceId(), ($filter = 1), ($stage = -99), $id, ($recursionLevel = 0), ($selectionType = 'tables_modify'));
+ $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace(
+ $this->stageService->getWorkspaceId(),
+ $filter = 1,
+ $stage = -99,
+ $id,
+ $recursionLevel = 0,
+ $selectionType = 'tables_modify'
+ );
list($currentStage, $nextStage) = $this->getStageService()->getNextStageForElementCollection($workspaceItemsArray);
// get only the relevant items for processing
- $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace($this->stageService->getWorkspaceId(), ($filter = 1), $currentStage['uid'], $id, ($recursionLevel = 0), ($selectionType = 'tables_modify'));
+ $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace(
+ $this->stageService->getWorkspaceId(),
+ $filter = 1,
+ $currentStage['uid'],
+ $id,
+ $recursionLevel = 0,
+ $selectionType = 'tables_modify'
+ );
$stageFormFields = $this->getSentToStageWindow($nextStage['uid']);
$result = array_merge($stageFormFields, [
'title' => 'Status message: Page send to next stage - ID: ' . $id . ' - Next stage title: ' . $nextStage['title'],
@@ -793,7 +828,14 @@ class ActionHandler extends AbstractHandler
/** @var WorkspaceService $workspaceService */
$workspaceService = GeneralUtility::makeInstance(WorkspaceService::class);
// fetch the next and previous stage
- $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace($stageService->getWorkspaceId(), ($filter = 1), ($stage = -99), $id, ($recursionLevel = 0), ($selectionType = 'tables_modify'));
+ $workspaceItemsArray = $workspaceService->selectVersionsInWorkspace(
+ $stageService->getWorkspaceId(),
+ $filter = 1,
+ $stage = -99,
+ $id,
+ $recursionLevel = 0,
+ $selectionType = 'tables_modify'
+ );
list(, $nextStage) = $stageService->getNextStageForElementCollection($workspaceItemsArray);
list(, $previousStage) = $stageService->getPreviousStageForElementCollection($workspaceItemsArray);
diff --git a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
index 57979b3719ddad4173072c8d55eea1f8da54fded..4a2637e5b6604dddf55dca4b37143d73b3553f12 100644
--- a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
@@ -91,7 +91,7 @@ class DataHandlerHook
$commandIsProcessed = true;
$action = (string)$value['action'];
$comment = !empty($value['comment']) ? $value['comment'] : '';
- $notificationAlternativeRecipients = (isset($value['notificationAlternativeRecipients'])) && is_array($value['notificationAlternativeRecipients']) ? $value['notificationAlternativeRecipients'] : [];
+ $notificationAlternativeRecipients = isset($value['notificationAlternativeRecipients']) && is_array($value['notificationAlternativeRecipients']) ? $value['notificationAlternativeRecipients'] : [];
switch ($action) {
case 'new':
$dataHandler->versionizeRecord($table, $id, $value['label']);
diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
index a04db98fe09fe12cae615e077f84b1ca5187948b..b45155d95be4a028cb0ff0cbcd80e70ae0d4ff57 100644
--- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php
+++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
@@ -263,7 +263,7 @@ class GridDataService implements LoggerAwareInterface
$end = ($start + $limit < $dataArrayCount ? $start + $limit : $dataArrayCount);
// Ensure that there are numerical indexes
- $this->dataArray = array_values(($this->dataArray));
+ $this->dataArray = array_values($this->dataArray);
for ($i = $start; $i < $end; $i++) {
$dataArrayPart[] = $this->dataArray[$i];
}
@@ -541,7 +541,7 @@ class GridDataService implements LoggerAwareInterface
{
$fieldName = null;
- if (!(empty($GLOBALS['TCA'][$table]['ctrl']['enablecolumns'][$type]))) {
+ if (!empty($GLOBALS['TCA'][$table]['ctrl']['enablecolumns'][$type])) {
$fieldName = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns'][$type];
}
diff --git a/typo3/sysext/workspaces/Classes/Service/StagesService.php b/typo3/sysext/workspaces/Classes/Service/StagesService.php
index a51c91be655fb88b60e531f17a31cf5dcc35c8ff..8c3d2d952728e0772eeeae910901f2ff4f510b5b 100644
--- a/typo3/sysext/workspaces/Classes/Service/StagesService.php
+++ b/typo3/sysext/workspaces/Classes/Service/StagesService.php
@@ -250,7 +250,7 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
'label' => $stageRecord->getTitle(),
];
if (!$stageRecord->isExecuteStage()) {
- $stage['title'] = $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "' . $stageRecord->getTitle() . '"';
+ $stage['title'] = $GLOBALS['LANG']->sL($this->pathToLocallang . ':actionSendToStage') . ' "' . $stageRecord->getTitle() . '"';
} else {
$stage['title'] = $GLOBALS['LANG']->sL($this->pathToLocallang . ':publish_execute_action_option');
}
@@ -316,7 +316,7 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
$workspaceStageRecs = $this->getStagesForWS();
if (is_array($workspaceStageRecs) && !empty($workspaceStageRecs)) {
reset($workspaceStageRecs);
- while (($workspaceStageRecKey = key($workspaceStageRecs)) !== null) {
+ while (!is_null($workspaceStageRecKey = key($workspaceStageRecs))) {
$workspaceStageRec = current($workspaceStageRecs);
if ($workspaceStageRec['uid'] == $stageId) {
$nextStage = next($workspaceStageRecs);
@@ -328,7 +328,7 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
if ($nextStage === false) {
$nextStage[] = [
'uid' => self::STAGE_EDIT_ID,
- 'title' => $GLOBALS['LANG']->sL(($this->pathToLocallang . ':actionSendToStage')) . ' "'
+ 'title' => $GLOBALS['LANG']->sL($this->pathToLocallang . ':actionSendToStage') . ' "'
. $GLOBALS['LANG']->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang_mod_user_ws.xlf:stage_editing') . '"'
];
}
@@ -383,7 +383,7 @@ class StagesService implements \TYPO3\CMS\Core\SingletonInterface
$workspaceStageRecs = $this->getStagesForWS();
if (is_array($workspaceStageRecs) && !empty($workspaceStageRecs)) {
end($workspaceStageRecs);
- while (($workspaceStageRecKey = key($workspaceStageRecs)) !== null) {
+ while (!is_null($workspaceStageRecKey = key($workspaceStageRecs))) {
$workspaceStageRec = current($workspaceStageRecs);
if ($workspaceStageRec['uid'] == $stageId) {
$prevStage = prev($workspaceStageRecs);