Commit 453a8a2c authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] CGL: Fix a series of minor indentation issues

Apply various minor indentation CGL fixes, as suggested
by scrutinizer-ci, mostly related to places where indentation
is done with 1 or 3 spaces instead of 4.

Change-Id: Ie3345c7391c0735e8074fd633dd9523616a6b82d
Resolves: #83555
Releases: master
Reviewed-on: https://review.typo3.org/55350


Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 7b94e2a6
......@@ -517,8 +517,8 @@ abstract class AbstractMenuContentObject
}
/**
* @return string The HTML for the menu
*/
* @return string The HTML for the menu
*/
public function writeMenu()
{
return '';
......
......@@ -4513,7 +4513,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
*
* @param int $targetPid Target page id
* @return mixed Return domain data or NULL
*/
*/
public function getDomainDataForPid($targetPid)
{
// Using array_key_exists() here, nice $result can be NULL
......
......@@ -273,7 +273,7 @@ class RequestHandler implements RequestHandlerInterface
$response->getBody()->write($this->controller->content);
}
GeneralUtility::makeInstance(LogManager::class)
->getLogger(get_class())->debug('END of FRONTEND session', ['_FLUSH' => true]);
->getLogger(get_class())->debug('END of FRONTEND session', ['_FLUSH' => true]);
return $response;
}
......
......@@ -476,14 +476,14 @@ class AdminPanelView
->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class));
$optionCount = $queryBuilder->count('fe_groups.uid')
->from('fe_groups')
->from('pages')
->where(
$queryBuilder->expr()->eq('pages.uid', $queryBuilder->quoteIdentifier('fe_groups.pid')),
$this->getBackendUser()->getPagePermsClause(Permission::PAGE_SHOW)
)
->execute()
->fetchColumn(0);
->from('fe_groups')
->from('pages')
->where(
$queryBuilder->expr()->eq('pages.uid', $queryBuilder->quoteIdentifier('fe_groups.pid')),
$this->getBackendUser()->getPagePermsClause(Permission::PAGE_SHOW)
)
->execute()
->fetchColumn(0);
if ($optionCount > 0) {
$result = $queryBuilder->select('fe_groups.uid', 'fe_groups.title')
->from('fe_groups')
......
......@@ -471,8 +471,8 @@ class Import extends ImportExport
unset($this->dat['records']['sys_file_reference:' . $sysFileReferenceUid]);
$this->error(
'Error: sys_file_reference record ' . (int)$sysFileReferenceUid
. ' with relation to sys_file record ' . (int)$fileReferenceRecord['uid_local']
. ', which is not part of the import data, was not imported.'
. ' with relation to sys_file record ' . (int)$fileReferenceRecord['uid_local']
. ', which is not part of the import data, was not imported.'
);
}
}
......@@ -503,7 +503,7 @@ class Import extends ImportExport
*
* @param int $oldFileUid
* @param int $newFileUid
*/
*/
protected function fixUidLocalInSysFileReferenceRecords($oldFileUid, $newFileUid)
{
if (!isset($this->dat['header']['records']['sys_file_reference'])) {
......
......@@ -123,16 +123,16 @@ class ImportExportTask implements TaskInterface
}
// Owner
$description[] = $lang->getLL('task.owner') . ': '
. (
$presetCfg['user_uid'] === $GLOBALS['BE_USER']->user['uid']
. (
$presetCfg['user_uid'] === $GLOBALS['BE_USER']->user['uid']
? $lang->getLL('task.own')
: '[' . htmlspecialchars($usernames[$presetCfg['user_uid']]['username']) . ']'
);
);
// Page & path
if ($configuration['pagetree']['id']) {
$description[] = $lang->getLL('task.page') . ': ' . $configuration['pagetree']['id'];
$description[] = $lang->getLL('task.path') . ': ' . htmlspecialchars(
BackendUtility::getRecordPath($configuration['pagetree']['id'], $clause, 20)
BackendUtility::getRecordPath($configuration['pagetree']['id'], $clause, 20)
);
} else {
$description[] = $lang->getLL('single-record');
......
......@@ -610,10 +610,10 @@ class IndexSearchRepository
case '10':
// Sounds like
/**
* Indexer object
*
* @var Indexer
*/
* Indexer object
*
* @var Indexer
*/
$indexerObj = GeneralUtility::makeInstance(Indexer::class);
// Perform metaphone search
$storeMetaphoneInfoAsWords = !$this->isTableUsed('index_words');
......
......@@ -188,8 +188,8 @@ class InfoModuleController extends BaseScriptClass
// CSH
$cshButton = $buttonBar->makeHelpButton()
->setModuleName('xMOD_csh_corebe')
->setFieldName('pagetree_overview');
->setModuleName('xMOD_csh_corebe')
->setFieldName('pagetree_overview');
$buttonBar->addButton($cshButton);
}
......
......@@ -30,8 +30,8 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
abstract class AbstractElementBrowser
{
/**
* @var DocumentTemplate
*/
* @var DocumentTemplate
*/
protected $doc;
/**
......
......@@ -58,8 +58,8 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
protected $elements = [];
/**
* @var string
*/
* @var string
*/
protected $searchWord;
/**
......
......@@ -1241,8 +1241,8 @@ class AbstractDatabaseRecordList extends AbstractRecordList
}
} else {
GeneralUtility::makeInstance(LogManager::class)
->getLogger(__CLASS__)
->error('TCA is broken for the table "' . $table . '": no required "columns" entry in TCA.');
->getLogger(__CLASS__)
->error('TCA is broken for the table "' . $table . '": no required "columns" entry in TCA.');
}
}
return $fieldListArr;
......
......@@ -1907,8 +1907,8 @@ class DatabaseRecordList
if ($table === 'pages' || $table === 'tt_content') {
$onClick = $this->getOnClickForRow($table, $row);
$viewAction = '<a class="btn btn-default" href="#" onclick="'
. htmlspecialchars(
$onClick
. htmlspecialchars(
$onClick
) . '" title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.showPage')) . '">';
if ($table === 'pages') {
$viewAction .= $this->iconFactory->getIcon('actions-view-page', Icon::SIZE_SMALL)->render();
......@@ -2032,17 +2032,17 @@ class DatabaseRecordList
if ($row[$hiddenField]) {
$params = 'data[' . $table . '][' . $rowUid . '][' . $hiddenField . ']=0';
$hideAction = '<a class="btn btn-default t3js-record-hide" data-state="hidden" href="#"'
. ' data-params="' . htmlspecialchars($params) . '"'
. ' title="' . $unhideTitle . '"'
. ' data-toggle-title="' . $hideTitle . '">'
. $this->iconFactory->getIcon('actions-edit-unhide', Icon::SIZE_SMALL)->render() . '</a>';
. ' data-params="' . htmlspecialchars($params) . '"'
. ' title="' . $unhideTitle . '"'
. ' data-toggle-title="' . $hideTitle . '">'
. $this->iconFactory->getIcon('actions-edit-unhide', Icon::SIZE_SMALL)->render() . '</a>';
} else {
$params = 'data[' . $table . '][' . $rowUid . '][' . $hiddenField . ']=1';
$hideAction = '<a class="btn btn-default t3js-record-hide" data-state="visible" href="#"'
. ' data-params="' . htmlspecialchars($params) . '"'
. ' title="' . $hideTitle . '"'
. ' data-toggle-title="' . $unhideTitle . '">'
. $this->iconFactory->getIcon('actions-edit-hide', Icon::SIZE_SMALL)->render() . '</a>';
. ' data-params="' . htmlspecialchars($params) . '"'
. ' title="' . $hideTitle . '"'
. ' data-toggle-title="' . $unhideTitle . '">'
. $this->iconFactory->getIcon('actions-edit-hide', Icon::SIZE_SMALL)->render() . '</a>';
}
}
$this->addActionToCellGroup($cells, $hideAction, 'hide');
......@@ -3713,8 +3713,8 @@ class DatabaseRecordList
}
} else {
GeneralUtility::makeInstance(LogManager::class)
->getLogger(__CLASS__)
->error('TCA is broken for the table "' . $table . '": no required "columns" entry in TCA.');
->getLogger(__CLASS__)
->error('TCA is broken for the table "' . $table . '": no required "columns" entry in TCA.');
}
}
return $fieldListArr;
......
......@@ -79,7 +79,7 @@ class IconViewHelper extends AbstractBackendViewHelper
}
return '<img src="' . htmlspecialchars(PathUtility::getAbsoluteWebPath($icon))
. '" width="16" height="16" title="' . htmlspecialchars($title)
. '" alt="' . htmlspecialchars($title) . '" />';
. '" width="16" height="16" title="' . htmlspecialchars($title)
. '" alt="' . htmlspecialchars($title) . '" />';
}
}
......@@ -821,11 +821,11 @@ class SetupModuleController
}
return '<div class="form-inline"><div class="form-group"><p>'
. '<label for="field_simulate" style="margin-right: 20px;">'
. htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:simulate'))
. '</label>'
. $this->simulateSelector
. '</p></div></div>';
. '<label for="field_simulate" style="margin-right: 20px;">'
. htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:setup/Resources/Private/Language/locallang.xlf:simulate'))
. '</label>'
. $this->simulateSelector
. '</p></div></div>';
}
/**
......
......@@ -1024,7 +1024,7 @@ class WorkspaceService implements SingletonInterface
$movePointerParameter = $queryBuilder->createNamedParameter(
VersionState::MOVE_POINTER,
\PDO::PARAM_INT
\PDO::PARAM_INT
);
$workspaceIdParameter = $queryBuilder->createNamedParameter(
$workspaceId,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment