diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php index 295b1efe44eb37becd802dfc80c10a1f45edc536..840b807c5f5ec5803f0865e46f3ed003c6bbd920 100644 --- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php +++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/ShortcutToolbarItem.php @@ -578,11 +578,12 @@ class ShortcutToolbarItem implements ToolbarItemInterface $resourceFactory = ResourceFactory::getInstance(); $resource = $resourceFactory->getObjectFromCombinedIdentifier($queryParameters['id']); $shortcutName = trim($shortcutNamePrepend . ' ' . $resource->getName()); - } catch (ResourceDoesNotExistException $e) {} + } catch (ResourceDoesNotExistException $e) { + } } else { // Lookup the title of this page and use it as default description $pageId = (int)($shortcut['pid'] ?: ($shortcut['recordid'] ?: $this->getLinkedPageId($url))); - $page = FALSE; + $page = false; if ($pageId) { $page = BackendUtility::getRecord('pages', $pageId); } diff --git a/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php b/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php index f7afb7573df0c2b954d5f27c01a3c8dd93324d96..0b7a111678a066cabc5c528b243382e54169f030 100644 --- a/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php +++ b/typo3/sysext/backend/Classes/Controller/BackendLayoutWizardController.php @@ -94,8 +94,8 @@ class BackendLayoutWizardController extends AbstractModule 'moduleUrl', BackendUtility::getModuleUrl( 'help_CshmanualCshmanual', - array ( - 'tx_cshmanual_help_cshmanualcshmanual' => array ( + array( + 'tx_cshmanual_help_cshmanualcshmanual' => array( 'controller' => 'Help', 'action' => 'detail' ) diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php index e3effbf513709f6bcffe126f9e81acebd6e95bef..3d86866dab3c3554e2039b239870669432bddd42 100644 --- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php +++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php @@ -179,6 +179,4 @@ class ElementHistoryController extends AbstractModule { return $GLOBALS['BE_USER']; } - - } diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php index 122816692a7a70b0db553fb42caa5ef3dccddd15..07bce2ee3613f6ba24beec805951997bb920abe5 100644 --- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php +++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php @@ -1244,7 +1244,7 @@ class EditDocumentController extends AbstractModule ); } if (!in_array((int)$this->pageinfo['doktype'], $excludeDokTypes, true) - || isset($pagesTSconfig['TCEMAIN.']['preview.'][$this->firstEl['table'].'.']['previewPageId']) + || isset($pagesTSconfig['TCEMAIN.']['preview.'][$this->firstEl['table'] . '.']['previewPageId']) ) { $saveAndOpenButton = $buttonBar->makeInputButton() ->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDocShow', true)) @@ -1617,7 +1617,6 @@ class EditDocumentController extends AbstractModule $menuItem->setActive(true); } $languageMenu->addMenuItem($menuItem); - } } $this->moduleTemplate->getDocHeaderComponent()->getMenuRegistry()->addMenu($languageMenu); diff --git a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php index e2ceb30d821c683849c0b51f93fe86c7fa28d9d7..67d91d0d75311866386a58a59d696f898b5b9da9 100644 --- a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php @@ -187,7 +187,6 @@ class EditFileController extends AbstractModule <input type="hidden" name="redirect" value="' . htmlspecialchars($hValue) . '" /> </div> <br />'; - } catch (\Exception $e) { $code .= sprintf( $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.coundNot'), @@ -289,7 +288,6 @@ class EditFileController extends AbstractModule ->setModuleName('file_edit') ->setGetVariables(['target']); $buttonBar->addButton($shortButton); - } /** diff --git a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php index 2733f4b6ecf8efce06c24cee565e3103afc8b03b..bcb5d2dd4487022f00e59803ca3fd30e2822c1ff 100644 --- a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php @@ -26,7 +26,6 @@ use Psr\Http\Message\ServerRequestInterface; */ class RenameFileController extends AbstractModule { - /** * Name of the filemount * @@ -125,7 +124,6 @@ class RenameFileController extends AbstractModule 'RenameFileInlineJavaScript', 'function backToList() {top.goToModule("file_FilelistList");}' ); - } /** diff --git a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php index 3b40bed7db78a5cd26a68c84a4298aed4562af5c..25fb674e14f8469d4141dbc24bd97f2b692aaec0 100644 --- a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php @@ -31,7 +31,6 @@ use Psr\Http\Message\ServerRequestInterface; */ class ReplaceFileController extends AbstractModule { - /** * Document template object * diff --git a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php index fcee072e83e067e916c52a383123ef07fa839e6f..06825329b0e89a2f2a50ec979d9310c96243e2c4 100644 --- a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php +++ b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php @@ -31,7 +31,6 @@ use TYPO3\CMS\Recordlist\Tree\View\DummyLinkParameterProvider; */ class FileSystemNavigationFrameController { - /** * Content accumulates in this variable. * diff --git a/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php b/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php index 93361416db1185e75d4aa4f1dc933c30aace8efa..61994d18a210c700cc569296f66af4ded2dc4230 100644 --- a/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php +++ b/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php @@ -405,7 +405,6 @@ class FormInlineAjaxController } $jsonArray['scriptCall'][] = 'inline.fadeAndRemove(' . GeneralUtility::quoteJSvalue($nameObjectForeignTable . '-' . $transOrigPointerField . '_div') . ');'; } - } // Tell JS to add new HTML of one or multiple (localize all) records to DOM if (!empty($jsonArray['data'])) { @@ -768,7 +767,7 @@ class FormInlineAjaxController if (!isset($parts[2]) || strpos($parts[2], ':') === false) { throw new \UnexpectedValueException( - 'DOM Object ID' . $domObjectId. 'does not contain required information ' + 'DOM Object ID' . $domObjectId . 'does not contain required information ' . 'to extract inline field configuration.', 1446996136 ); diff --git a/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php b/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php index 3ef5c4614fc853d3a71023e11286b0141fce6913..f2de49349e4818cf9f4da0abd7a6d54fc7c90063 100644 --- a/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php +++ b/typo3/sysext/backend/Classes/Controller/LinkBrowserController.php @@ -25,8 +25,8 @@ use TYPO3\CMS\Recordlist\Controller\AbstractLinkBrowserController; /** * Extended controller for link browser */ -class LinkBrowserController extends AbstractLinkBrowserController { - +class LinkBrowserController extends AbstractLinkBrowserController +{ /** * Initialize $this->currentLinkParts * @@ -161,5 +161,4 @@ class LinkBrowserController extends AbstractLinkBrowserController { } return (int)$pageId; } - } diff --git a/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php b/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php index 3780632bd4bbc3f853c24fe00e756780d531a764..751440ac2fd491acfae35d8e1666125ffd94e0a4 100644 --- a/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php +++ b/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php @@ -297,4 +297,4 @@ class LocalizationController { return $GLOBALS['TYPO3_DB']; } -} \ No newline at end of file +} diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php index 510517bb09759f30a6dc12eea1ff14064a46cdbe..a7d2f40c3466903f44735b1f58415c92a23c6627 100755 --- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php +++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php @@ -49,7 +49,6 @@ use TYPO3\CMS\Recordlist\RecordList; */ class PageLayoutController { - /** * Page Id for which to make the listing * @@ -670,7 +669,6 @@ class PageLayoutController $this->makeButtons($this->MOD_SETTINGS['function'] == 0 ? 'quickEdit' : ''); // Create LanguageMenu $this->makeLanguageMenu(); - } else { $this->moduleTemplate->addJavaScriptCode( 'mainJsFunctions', @@ -812,7 +810,7 @@ class PageLayoutController } $redirect = ($uidVal == 'new' ? BackendUtility::getModuleUrl( $this->moduleName, - ['id' => $this->id,'new_unique_uid' => $new_unique_uid,'returnUrl' => $this->returnUrl] + ['id' => $this->id, 'new_unique_uid' => $new_unique_uid, 'returnUrl' => $this->returnUrl] ) : $this->R_URI); $panel .= ' <input type="hidden" name="_serialNumber" value="' . md5(microtime()) . '" /> @@ -1220,7 +1218,6 @@ class PageLayoutController ->setIcon($this->iconFactory->getIcon('actions-document-history-open', Icon::SIZE_SMALL)); $this->buttonBar->addButton($historyButton, ButtonBar::BUTTON_POSITION_LEFT, 3); } - } } } diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php index e31d79286012d9f819a2007ed7ca944637cae513..3198ebd0a122d56a159b32845e52a925ddb5334b 100644 --- a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php +++ b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php @@ -165,7 +165,8 @@ class TableController extends AbstractWizardController . '<div>' . $this->tableWizard() . '</div>'; } else { $this->content .= '<h2>' . $this->getLanguageService()->getLL('table_title', true) . '</h2>' - . '<div><span class="text-danger">' . $this->getLanguageService()->getLL('table_noData', true) . '</span></div>';; + . '<div><span class="text-danger">' . $this->getLanguageService()->getLL('table_noData', true) . '</span></div>'; + ; } $this->content .= '</form>'; // Setting up the buttons and markers for docHeader diff --git a/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php b/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php index e4061a514104d1652b1b1ba9ef29f1c9b158e1f8..3ac655172871eb09cd0232338d55b0ba014f3e47 100644 --- a/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php +++ b/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php @@ -104,5 +104,4 @@ class TabsContainer extends AbstractContainer { return $GLOBALS['LANG']; } - } diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php index ad384727f8f66ad6442a0995696e8e7500a9d31b..2f3ff393f1a1f4b3f60bb4ea30ab3b5298d206fe 100644 --- a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php @@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; */ class SelectTreeElement extends AbstractFormElement { - /** * Default height of the tree in pixels. * diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/InlineOverrideChildTca.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/InlineOverrideChildTca.php index 93639ca60c1a0c1926f9b1418dc2638a0166d21b..4373ab448fac5f1b3c76a2407ccd90f00057885a 100644 --- a/typo3/sysext/backend/Classes/Form/FormDataProvider/InlineOverrideChildTca.php +++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/InlineOverrideChildTca.php @@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Utility\ArrayUtility; */ class InlineOverrideChildTca implements FormDataProviderInterface { - /** * Inline parent TCA may override some TCA of children. * diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaColumnsProcessCommon.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaColumnsProcessCommon.php index 25721092484ab81dbbfc213d722d256c3aebe9bb..76ce41112a94733c24dbd0c7ccbe38dd3a3a8909 100644 --- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaColumnsProcessCommon.php +++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaColumnsProcessCommon.php @@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; */ class TcaColumnsProcessCommon implements FormDataProviderInterface { - /** * Determine which common fields are in use and add those to the list of * columns that must be processed by the next data providers. Common fields diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php index 2981752709e2a73a356ef634dbca89f9b1bbaf23..eff12da297d5a69031b7d279fcb31979de6d5783 100644 --- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php +++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaFlexProcess.php @@ -436,7 +436,6 @@ class TcaFlexProcess implements FormDataProviderInterface } else { $tcaNewColumns[$dataStructureSheetElementName] = $dataStructureSheetElementDefinition; } - } // End of single element handling } diff --git a/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php b/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php index c2c4b9454c20c334b157b3057448035456aef7fc..cfe3e5591f07bcc50b45863f6c9d0825733c8508 100644 --- a/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php +++ b/typo3/sysext/backend/Classes/Template/Components/MetaInformation.php @@ -30,7 +30,6 @@ use TYPO3\CMS\Core\Imaging\IconFactory; */ class MetaInformation { - /** * The recordArray. * Typically this is a page record diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php index 4a5c8f6111e6a0a99cd69fac2b9c4360abc81dc3..e01c1ab94531f4a00eef1c4c80e4b2e7554ebee0 100644 --- a/typo3/sysext/backend/Classes/View/PageLayoutView.php +++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php @@ -35,7 +35,6 @@ use TYPO3\CMS\Fluid\View\StandaloneView; */ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList { - /** * If TRUE, users/groups are shown in the page info box. * @@ -221,14 +220,13 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe $pageRenderer->addInlineLanguageLabelFile('EXT:backend/Resources/Private/Language/locallang_layout.xlf'); $pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/Tooltip'); $pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/Localization'); - } /***************************************** * * Renderings * - *****************************************/ + *****************************************/ /** * Adds the code of a single table * @@ -840,7 +838,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe * * Generic listing of items * - **********************************/ + **********************************/ /** * Creates a standard list of elements from a table. * @@ -1043,7 +1041,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe * * Additional functions; Pages * - **********************************/ + **********************************/ /** * Adds pages-rows to an array, selecting recursively in the page tree. * @@ -1162,7 +1160,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe * * Additional functions; Content Elements * - **********************************/ + **********************************/ /** * Draw header for a content element column: * @@ -1375,7 +1373,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe // NOTE: end-tag for <div class="t3-page-ce-body"> is in getTable_tt_content() return '<div class="t3-page-ce-header ' . ($allowDragAndDrop ? 't3-page-ce-header-draggable t3js-page-ce-draghandle' : '') . '"> <div class="t3-page-ce-header-icons-left">' . implode('', $additionalIcons) . '</div> - <div class="t3-page-ce-header-icons-right">' . ($out ? '<div class="btn-toolbar">' .$out . '</div>' : '') . '</div> + <div class="t3-page-ce-header-icons-right">' . ($out ? '<div class="btn-toolbar">' . $out . '</div>' : '') . '</div> </div> <div class="t3-page-ce-body">'; } @@ -1627,7 +1625,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe foreach ($uidList as $uid) { $uid = (int)$uid; $record = BackendUtility::getRecord($table, $uid, 'title'); - $content .= '<br>' . $record['title'] . ' (' .$uid. ')'; + $content .= '<br>' . $record['title'] . ' (' . $uid . ')'; } return $content; } @@ -1801,7 +1799,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe // If any languages are left, make selector: if (count($langSelItems) > 1) { $url = BackendUtility::getModuleUrl('record_edit', array( - 'edit[pages_language_overlay]['. $id . ']' => 'new', + 'edit[pages_language_overlay][' . $id . ']' => 'new', 'overrideVals[pages_language_overlay][doktype]' => (int)$this->pageRecord['doktype'], 'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI') )); @@ -1846,7 +1844,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe * * Various helper functions * - ********************************/ + ********************************/ /** * Initializes the clipboard for generating paste links @@ -2050,7 +2048,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe * * External renderings * - *****************************************/ + *****************************************/ /** * Creates a menu of the tables that can be listed by this function @@ -2092,7 +2090,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe // ... and to the internal array, activeTables we also add table icon and title (for use elsewhere) $title = $this->getLanguageService()->sL($GLOBALS['TCA'][$tName]['ctrl']['title'], true) . ': ' . $c . ' ' . $this->getLanguageService()->getLL('records', true); - $this->activeTables[$tName] = '<span title="' . $title. '">' + $this->activeTables[$tName] = '<span title="' . $title . '">' . $this->iconFactory->getIconForRecord($tName, array(), Icon::SIZE_SMALL)->render() . '</span>' . ' ' . $this->getLanguageService()->sL($GLOBALS['TCA'][$tName]['ctrl']['title'], true); diff --git a/typo3/sysext/backend/Classes/View/PageTreeView.php b/typo3/sysext/backend/Classes/View/PageTreeView.php index 26e15b4ad6881aba37dbdb6e5011b3ea38d19554..30670ddee0761d99c9a54653882c54edf458232f 100644 --- a/typo3/sysext/backend/Classes/View/PageTreeView.php +++ b/typo3/sysext/backend/Classes/View/PageTreeView.php @@ -338,5 +338,4 @@ class PageTreeView extends BrowseTreeView } return $this->printTree($treeArr); } - } diff --git a/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php b/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php index 528c6bfe01df11b68d116ea0154e3c76401163cf..a01d8d3976deb9802555177821e1eea72ccd3d1b 100644 --- a/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php +++ b/typo3/sysext/backend/Tests/Unit/Controller/PageLayoutControllerTest.php @@ -24,7 +24,6 @@ use TYPO3\CMS\Core\Type\Bitmask\Permission; */ class PageLayoutControllerTest extends UnitTestCase { - /** * @test * @dataProvider pageIsNotLockedForEditorsReturnsCorrectValueDataProvider @@ -61,5 +60,4 @@ class PageLayoutControllerTest extends UnitTestCase 'user does not have permission' => [ false, 0, false, false], ]; } - } diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php index 6bdd8a097edfa59bb8830821659f8d515936f8da..9c4589d87ab2adfacca98f7abcb6a01758386b9f 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php @@ -23,7 +23,7 @@ use TYPO3\CMS\Backend\Form\FormDataGroupInterface; /** * Test case */ -class FormDataComplierTest extends UnitTestCase +class FormDataCompilerTest extends UnitTestCase { /** * @var FormDataCompiler diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php index 30a293bee198b23d65cb12f5cb9e489b6b15e2be..636625a3d9e86a10cabb0fcef79b13a1a82b16ca 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrrideChildTcaTest.php @@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Tests\UnitTestCase; */ class InlineOverrrideChildTcaTest extends UnitTestCase { - /** * @var InlineOverrideChildTca */ diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php index 0ded17c168a457a5f24656e1381234a2e62085af..14fc0d00150cfcf355e5bb4343ac14124c565afb 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php @@ -380,5 +380,4 @@ class TcaCheckboxItemsTest extends UnitTestCase $this->assertSame($expected, $this->subject->addData($input)); $this->subject->addData($input); } - } diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php index 79068d4e2a13eb71a6b88b39e0da34e909cd1784..3c4fdbafeba0223a272a1586df6cd16f1928fae8 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessShowitemTest.php @@ -375,5 +375,4 @@ class TcaColumnsProcessShowitemTest extends UnitTestCase $expected['columnsToProcess'] = [ 'aField' ]; $this->assertSame($expected, $this->subject->addData($input)); } - } diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php index 6ece71edec81ecced00bb793de1980b6e4914aca..5c90f9b5734706a0beabb0492bc99657cbc9a6f9 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php @@ -1191,5 +1191,4 @@ class TcaFlexProcessTest extends UnitTestCase $this->subject->addData($input); } - } diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php index 571ae04fb539c45e3b7ef3bafb932afe8dacf8fe..f9dc596e33ad25cbcf9cdc39a0db29f05b82c3c2 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php @@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Tests\UnitTestCase; */ class TcaInlineIsOnSymmetricSideTest extends UnitTestCase { - /** * @var TcaInlineIsOnSymmetricSide */ diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php index 0aabb6ab295f65c7b958e15662d45e8f067ddc9c..219f50929c0016c048b0edaf0ae03658ffcc973d 100644 --- a/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php +++ b/typo3/sysext/beuser/Classes/Controller/BackendUserActionController.php @@ -211,4 +211,4 @@ class BackendUserActionController extends ActionController { return $GLOBALS['LANG']; } -} \ No newline at end of file +} diff --git a/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php b/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php index 0d1e5264bdc3e97baa96fd9d5eb35118704b7145..e2fa55eed3df4da687a235a44471b9c3898563c3 100644 --- a/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php +++ b/typo3/sysext/core/Classes/FormProtection/FrontendFormProtection.php @@ -133,5 +133,4 @@ class FrontendFormProtection extends AbstractFormProtection { return !empty($this->frontendUser->user['uid']); } - } diff --git a/typo3/sysext/core/Classes/Log/Writer/FileWriter.php b/typo3/sysext/core/Classes/Log/Writer/FileWriter.php index 891bb2c84dfa62815db2aa494c712733068f4424..ca56e3866f7083c5f8655732845e300ba5d0d6d9 100644 --- a/typo3/sysext/core/Classes/Log/Writer/FileWriter.php +++ b/typo3/sysext/core/Classes/Log/Writer/FileWriter.php @@ -82,11 +82,11 @@ class FileWriter extends AbstractWriter */ public function setLogFile($relativeLogFile) { - $logFile = $relativeLogFile; + $logFile = $relativeLogFile; // Skip handling if logFile is a stream resource. This is used by unit tests with vfs:// directories if (false === strpos($logFile, '://') && !PathUtility::isAbsolutePath($logFile)) { $logFile = GeneralUtility::getFileAbsFileName($logFile); - if ($logFile === NULL) { + if ($logFile === null) { throw new InvalidLogWriterConfigurationException('Log file path "' . $relativeLogFile . '" is not valid!', 1444374805); } } diff --git a/typo3/sysext/core/Classes/Migrations/TcaMigration.php b/typo3/sysext/core/Classes/Migrations/TcaMigration.php index 3b9c9f2537eeac657c9b7e93315f5717642eb60c..86a0b04cb05d5e989ff9c4ffcd16ad00839122bb 100644 --- a/typo3/sysext/core/Classes/Migrations/TcaMigration.php +++ b/typo3/sysext/core/Classes/Migrations/TcaMigration.php @@ -575,7 +575,8 @@ class TcaMigration * @param array $tca * @return array Migrated TCA */ - public function migrateSelectFieldIconTable(array $tca) { + public function migrateSelectFieldIconTable(array $tca) + { foreach ($tca as $table => &$tableDefinition) { if (!isset($tableDefinition['columns']) || !is_array($tableDefinition['columns'])) { continue; diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php index 8f9f0eb463c1abe8e54e497350df701e77387f2e..0a92f894b6abaaf79aa35ffc206ef4adc8e0291b 100644 --- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php +++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php @@ -2848,7 +2848,7 @@ class ResourceStorage implements ResourceStorageInterface } try { if (strpos($processingFolder, ':') !== false) { - list ($storageUid, $processingFolderIdentifier) = explode(':', $processingFolder, 2); + list($storageUid, $processingFolderIdentifier) = explode(':', $processingFolder, 2); $storage = ResourceFactory::getInstance()->getStorageObject($storageUid); if ($storage->hasFolder($processingFolderIdentifier)) { $this->processingFolder = $storage->getFolder($processingFolderIdentifier); diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php index 8967a32ab991b61e6150f38967c0a7f70e70f1a9..798c8c229beca45930b3f0b222726de574b1954a 100644 --- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php +++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php @@ -15,8 +15,6 @@ namespace TYPO3\CMS\Core\Utility\File; */ use TYPO3\CMS\Backend\Utility\BackendUtility; -use TYPO3\CMS\Core\Imaging\Icon; -use TYPO3\CMS\Core\Imaging\IconFactory; use TYPO3\CMS\Core\Messaging\FlashMessage; use TYPO3\CMS\Core\Messaging\FlashMessageService; use TYPO3\CMS\Core\Resource\DuplicationBehavior; diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php index 90f017697a58beacde32561fbb50a849c640041f..e3d7c8c6fe08c09e7ec7a55d60031946097a1566 100644 --- a/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php +++ b/typo3/sysext/core/Tests/Functional/DataHandling/FAL/Modify/ActionTest.php @@ -247,5 +247,4 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\FAL\Abstr ->setRecordIdentifier(self::TABLE_Content . ':' . self::VALUE_ContentIdLast)->setRecordField(self::FIELD_ContentImage) ->setTable(self::TABLE_FileReference)->setField('title')->setValues('Taken at T3BOARD', 'This is Kasper')); } - } diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php index f4a7cf32eff38e09875fd9829feff6c113cc8cb5..84032d47e81965d2af9bfe7ec1f7d4e2d5232405 100644 --- a/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php +++ b/typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php @@ -122,5 +122,4 @@ class BackendFormProtectionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase { $this->subject->validateToken('foo', 'bar'); } - } diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php index 0a2fe1c24ced2d0888f2e4f1757b5d577e27166f..a5102df069e5467662d4a6ad87e25d50debc0d02 100644 --- a/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php +++ b/typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php @@ -165,5 +165,4 @@ class FormProtectionFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase { $this->assertFalse($flashMessage->isSessionMessage()); } - } diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php index f6bd074fc09d8b052e8f8b46729430efd345537c..6a0dfef51257b63c06c7f9e08d687b05f6470a69 100644 --- a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php +++ b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php @@ -15,7 +15,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Log\Writer; */ use org\bovigo\vfs\vfsStream; -use org\bovigo\vfs\vfsStreamDirectory; use org\bovigo\vfs\vfsStreamWrapper; /** diff --git a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php index 1274454a16f465c32c14061c396e0def28d17647..2bb55f4fc1b9da16d00bd3b6b71c3b1cd75700a5 100644 --- a/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php +++ b/typo3/sysext/core/Tests/Unit/Migrations/TcaMigrationTest.php @@ -833,7 +833,8 @@ class TcaMigrationTest extends UnitTestCase /** * @return array */ - public function migrateSetsShowIconTableIfMissingDataProvider() { + public function migrateSetsShowIconTableIfMissingDataProvider() + { return [ 'not-a-select-is-kept' => [ [ @@ -960,7 +961,8 @@ class TcaMigrationTest extends UnitTestCase * @param array $givenConfig * @param array $expectedConfig */ - public function migrateSetsShowIconTableIfMissing(array $givenConfig, array $expectedConfig) { + public function migrateSetsShowIconTableIfMissing(array $givenConfig, array $expectedConfig) + { $input = [ 'aTable' => [ 'columns' => [ diff --git a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php index 46eb25d47a86413c04bb76700c308fd1b00dd7df..164e67be16e9fefcfa717134dab61a5cd10c3a64 100644 --- a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php +++ b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php @@ -24,13 +24,11 @@ use TYPO3\CMS\Core\Tests\UnitTestCase; */ class IndexerTest extends UnitTestCase { - /** * @test */ public function isFileTypeSupportedByExtractorReturnsFalesForFileTypeTextAndExtractorLimitedToFileTypeImage() { - $mockStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, [], [], '', false); $mockFile = $this->getMock(File::class, [], [], '', false); $mockFile->expects($this->any())->method('getType')->will($this->returnValue( @@ -58,7 +56,6 @@ class IndexerTest extends UnitTestCase */ public function isFileTypeSupportedByExtractorReturnsTrueForFileTypeImageAndExtractorLimitedToFileTypeImage() { - $mockStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, [], [], '', false); $mockFile = $this->getMock(File::class, [], [], '', false); $mockFile->expects($this->any())->method('getType')->will($this->returnValue( @@ -86,7 +83,6 @@ class IndexerTest extends UnitTestCase */ public function isFileTypeSupportedByExtractorReturnsTrueForFileTypeTextAndExtractorHasNoFileTypeLimitation() { - $mockStorage = $this->getMock(\TYPO3\CMS\Core\Resource\ResourceStorage::class, [], [], '', false); $mockFile = $this->getMock(File::class, [], [], '', false); $mockFile->expects($this->any())->method('getType')->will($this->returnValue( diff --git a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php index c04b8a2c1ad7eb722a5d16bd49967e336998d18b..c2a85c3a0f93f926c28eaf7ac2a4afacd00cc777 100644 --- a/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php +++ b/typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php @@ -50,7 +50,7 @@ class IconViewHelperTest extends ViewHelperBaseTestcase $iconProphecy = $this->prophesize(Icon::class); $iconFactoryProphecy->getIcon('myIdentifier', Icon::SIZE_SMALL, null, IconState::cast(IconState::STATE_DEFAULT))->shouldBeCalled()->willReturn($iconProphecy->reveal()); - $iconProphecy->render(NULL)->shouldBeCalled()->willReturn('htmlFoo'); + $iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo'); $this->assertSame('htmlFoo', $this->viewHelper->render('myIdentifier')); } @@ -65,7 +65,7 @@ class IconViewHelperTest extends ViewHelperBaseTestcase $iconProphecy = $this->prophesize(Icon::class); $iconFactoryProphecy->getIcon('myIdentifier', Icon::SIZE_LARGE, null, IconState::cast(IconState::STATE_DEFAULT))->shouldBeCalled()->willReturn($iconProphecy->reveal()); - $iconProphecy->render(NULL)->shouldBeCalled()->willReturn('htmlFoo'); + $iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo'); $this->assertSame('htmlFoo', $this->viewHelper->render('myIdentifier', Icon::SIZE_LARGE)); } @@ -80,7 +80,7 @@ class IconViewHelperTest extends ViewHelperBaseTestcase $iconProphecy = $this->prophesize(Icon::class); $iconFactoryProphecy->getIcon('myIdentifier', Icon::SIZE_SMALL, null, IconState::cast(IconState::STATE_DISABLED))->shouldBeCalled()->willReturn($iconProphecy->reveal()); - $iconProphecy->render(NULL)->shouldBeCalled()->willReturn('htmlFoo'); + $iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo'); $this->assertSame('htmlFoo', $this->viewHelper->render('myIdentifier', Icon::SIZE_SMALL, null, IconState::cast(IconState::STATE_DISABLED))); } @@ -95,7 +95,7 @@ class IconViewHelperTest extends ViewHelperBaseTestcase $iconProphecy = $this->prophesize(Icon::class); $iconFactoryProphecy->getIcon('myIdentifier', Argument::any(), 'overlayString', IconState::cast(IconState::STATE_DEFAULT))->shouldBeCalled()->willReturn($iconProphecy->reveal()); - $iconProphecy->render(NULL)->shouldBeCalled()->willReturn('htmlFoo'); + $iconProphecy->render(null)->shouldBeCalled()->willReturn('htmlFoo'); $this->assertSame('htmlFoo', $this->viewHelper->render('myIdentifier', Icon::SIZE_LARGE, 'overlayString')); } diff --git a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php index 2e6d0cda3e82d239193135cafde38705d6683916..31cd6733aab58fe14c2d453e4d46a90a41e8a241 100644 --- a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php +++ b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php @@ -1788,7 +1788,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection } if ($where_clause[$k]['func']['field'] !== '') { if ($this->dbmsSpecifics->getSpecific(Specifics\AbstractSpecifics::CAST_FIND_IN_SET)) { - if($where_clause[$k]['func']['table'] !== '') { + if ($where_clause[$k]['func']['table'] !== '') { $where_clause[$k]['func']['field'] = $this->quoteName($v['func']['field']) . ' AS CHAR)'; } else { $where_clause[$k]['func']['field'] = 'CAST(' . $this->quoteName($v['func']['field']) . ' AS CHAR)'; diff --git a/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php b/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php index 42d3f27b0d086b4d11bd4f74239579a0dcdec7c7..87340d4eedc8535de6fcea43ff8f1b09d8551225 100644 --- a/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php +++ b/typo3/sysext/documentation/Classes/ViewHelpers/FormatsViewHelper.php @@ -129,5 +129,4 @@ class FormatsViewHelper extends AbstractViewHelper implements CompilableInterfac } return $iconHtml; } - } diff --git a/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php b/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php index b33f4342ac6474f4b8a1b81fbc1298997a55ac15..79c33b13d1d9a49b9fcaca76cc88d097ba8f2fe9 100644 --- a/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php +++ b/typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php @@ -20,8 +20,8 @@ use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder; /** * Abstract action controller. */ -class AbstractModuleController extends AbstractController { - +class AbstractModuleController extends AbstractController +{ /** * BackendTemplateContainer * @@ -126,4 +126,4 @@ class AbstractModuleController extends AbstractController { $uriBuilder->setRequest($this->request); return $uriBuilder->reset()->uriFor($action, $parameters, $controller); } -} \ No newline at end of file +} diff --git a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php index 51a000b38f42b38171581355c91560ba174e9fe6..cfe76adb137711d25066486bd9441420137db8ae 100644 --- a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php +++ b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php @@ -242,7 +242,8 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface /** * Reset and reload the available extensions */ - public function reloadAvailableExtensions() { + public function reloadAvailableExtensions() + { $this->listUtility->reloadAvailableExtensions(); } diff --git a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php index 89bfc9baeadf495407a4b2206f76903e3410c410..258f21e96a8032cdd112e64f2d8e16f46d7bff75 100644 --- a/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php +++ b/typo3/sysext/extensionmanager/Classes/Utility/ListUtility.php @@ -58,7 +58,7 @@ class ListUtility implements \TYPO3\CMS\Core\SingletonInterface /** * @var array */ - protected $availableExtensions = NULL; + protected $availableExtensions = null; /** * @param \TYPO3\CMS\Extensionmanager\Utility\EmConfUtility $emConfUtility @@ -127,7 +127,8 @@ class ListUtility implements \TYPO3\CMS\Core\SingletonInterface /** * Reset and reload the available extensions */ - public function reloadAvailableExtensions() { + public function reloadAvailableExtensions() + { $this->availableExtensions = null; $this->packageManager->scanAvailablePackages(); $this->getAvailableExtensions(); diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php index 99c602f4874982c8a21bc6489928aee49e06f7a3..d9464ea43f38c8eeb0a458fd081667e9a0e3351f 100644 --- a/typo3/sysext/filelist/Classes/Controller/FileListController.php +++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php @@ -42,7 +42,6 @@ use TYPO3\CMS\Filelist\FileList; */ class FileListController extends ActionController { - /** * Module configuration * diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php index 50421354161387aafb00d8aa880d96a6e98a792a..d5eef7427f4cf1a869ebeac2a95064ebf95e5d3c 100755 --- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php +++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php @@ -55,7 +55,7 @@ class AdminPanelView * * @var bool */ - protected $extFeEditLoaded = FALSE; + protected $extFeEditLoaded = false; /** * Constructor diff --git a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php index aac4a9fe18d92174ae61e04a5ae0b90624a5b768..4c78f314788146701dd270e0e1c99159a47f3507 100644 --- a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php +++ b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php @@ -156,7 +156,6 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr <!-- Edit fields: --> <table border="0" cellpadding="0" cellspacing="1">' . implode('', $lines) . '</table><br />' . $editIcon; $theOutput .= '</div>'; - } else { // Defined global here! $tmpl = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\ExtendedTemplateService::class); diff --git a/typo3/sysext/install/Classes/Updates/AbstractDownloadExtensionUpdate.php b/typo3/sysext/install/Classes/Updates/AbstractDownloadExtensionUpdate.php index dfd28e33d41d253fa8607fcc895beeb8e56e91a3..57c2bc5e9017f41ad08a170ac4d7699f16ce7294 100644 --- a/typo3/sysext/install/Classes/Updates/AbstractDownloadExtensionUpdate.php +++ b/typo3/sysext/install/Classes/Updates/AbstractDownloadExtensionUpdate.php @@ -26,7 +26,6 @@ use TYPO3\CMS\Extensionmanager\Utility\ListUtility; */ abstract class AbstractDownloadExtensionUpdate extends AbstractUpdate { - /** * @var string */ diff --git a/typo3/sysext/install/Classes/Updates/AccessRightParametersUpdate.php b/typo3/sysext/install/Classes/Updates/AccessRightParametersUpdate.php index d6b4e0d2cec729cd25776d248a92e7a9b91812bd..3f7d9ba1f6d21ef888741c516dfad23c724bbe92 100644 --- a/typo3/sysext/install/Classes/Updates/AccessRightParametersUpdate.php +++ b/typo3/sysext/install/Classes/Updates/AccessRightParametersUpdate.php @@ -88,5 +88,4 @@ class AccessRightParametersUpdate extends AbstractUpdate $this->markWizardAsDone(); return true; } - } diff --git a/typo3/sysext/lang/Classes/Controller/LanguageController.php b/typo3/sysext/lang/Classes/Controller/LanguageController.php index de88559edb919ddec9d3790062d93eb55848c859..d962bf65d3667248006794109da72cc9c9d25904 100644 --- a/typo3/sysext/lang/Classes/Controller/LanguageController.php +++ b/typo3/sysext/lang/Classes/Controller/LanguageController.php @@ -264,12 +264,12 @@ class LanguageController extends ActionController /** @var Menu $menu */ $menu = GeneralUtility::makeInstance(Menu::class); $menu->setIdentifier('_languageMenu'); - $menu->setLabel($this->getLanguageService()->sL('LLL:EXT:lang/locallang_general.xlf:LGL.language', TRUE)); + $menu->setLabel($this->getLanguageService()->sL('LLL:EXT:lang/locallang_general.xlf:LGL.language', true)); /** @var MenuItem $languageListMenuItem */ $languageListMenuItem = GeneralUtility::makeInstance(MenuItem::class); $action = 'listLanguages'; - $isActive = $this->request->getControllerActionName() === $action ? TRUE : FALSE; + $isActive = $this->request->getControllerActionName() === $action ? true : false; $languageListMenuItem->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang.xlf:header.languages')); $uri = $uriBuilder->reset()->uriFor('listLanguages', array(), 'Language'); $languageListMenuItem->setHref($uri)->setActive($isActive); @@ -277,7 +277,7 @@ class LanguageController extends ActionController /** @var MenuItem $translationMenuItem */ $translationMenuItem = GeneralUtility::makeInstance(MenuItem::class); $action = 'listTranslations'; - $isActive = $this->request->getControllerActionName() === $action ? TRUE : FALSE; + $isActive = $this->request->getControllerActionName() === $action ? true : false; $translationMenuItem->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang.xlf:header.translations')); $uri = $uriBuilder->reset()->uriFor('listTranslations', array(), 'Language'); $translationMenuItem->setHref($uri)->setActive($isActive); diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php index fc821d78b12e38f32761651a2c67b2b8d635b144..05bad020fda9efd72a3a84be730fd24ce5c2f000 100644 --- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php +++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php @@ -228,7 +228,7 @@ class DatabaseIntegrityView extends BaseScriptClass $shortCutButton = $buttonBar->makeShortcutButton() ->setModuleName($this->moduleName) ->setDisplayName($this->MOD_MENU['function'][$this->MOD_SETTINGS['function']]) - ->setSetVariables(['function','search','search_query_makeQuery']); + ->setSetVariables(['function', 'search', 'search_query_makeQuery']); $buttonBar->addButton($shortCutButton, ButtonBar::BUTTON_POSITION_RIGHT, 2); $this->getModuleMenu(); @@ -501,6 +501,4 @@ class DatabaseIntegrityView extends BaseScriptClass { return $this->moduleTemplate; } - - } diff --git a/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php b/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php index 270a5225dde67d5acf32536996735c594a2af63c..d81c635966951fd114336302e88df76540473902 100644 --- a/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php +++ b/typo3/sysext/recordlist/Classes/Controller/AbstractLinkBrowserController.php @@ -625,7 +625,8 @@ abstract class AbstractLinkBrowserController * * @return array */ - public function getConfiguration() { + public function getConfiguration() + { return []; } diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php index fc477afeff91c3eec87e17df51185ef784f85d15..3b80c6cc319ec5012a3d4011c13f149d2abf975f 100644 --- a/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php +++ b/typo3/sysext/recordlist/Classes/LinkHandler/AbstractLinkHandler.php @@ -85,7 +85,8 @@ abstract class AbstractLinkHandler * @param string[] $fieldDefinitions Array of link attribute field definitions * @return string[] */ - public function modifyLinkAttributes(array $fieldDefinitions) { + public function modifyLinkAttributes(array $fieldDefinitions) + { return $fieldDefinitions; } diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php index ff865ca48673c62968e7494e4b879d06074791df..1f0ee5db0126f35c9bb80302267f41ccda00ecab 100644 --- a/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php +++ b/typo3/sysext/recordlist/Classes/LinkHandler/PageLinkHandler.php @@ -312,7 +312,8 @@ class PageLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac * @param string[] $fieldDefinitions Array of link attribute field definitions * @return string[] */ - public function modifyLinkAttributes(array $fieldDefinitions) { + public function modifyLinkAttributes(array $fieldDefinitions) + { $configuration = $this->linkBrowser->getConfiguration(); if (!empty($configuration['pageIdSelector.']['enabled'])) { $fieldDefinitions['pageIdSelector'] = ' diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php index 97548e83ea192aaeab66aa3a692a6e24a0a3b8ee..c4caa0f6b57f2874a98ef7929780d2d835fb50e3 100644 --- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php +++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php @@ -37,7 +37,6 @@ use TYPO3\CMS\Core\Utility\MathUtility; */ class AbstractDatabaseRecordList extends AbstractRecordList { - /** * Specify a list of tables which are the only ones allowed to be displayed. * @@ -590,7 +589,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList * * Various helper functions * - ******************************/ + ******************************/ /** * Setting the field names to display in extended list. * Sets the internal variable $this->setFields @@ -734,8 +733,8 @@ class AbstractDatabaseRecordList extends AbstractRecordList } elseif ($fieldConfig['type'] == 'text' || $fieldConfig['type'] == 'flex' || ($fieldConfig['type'] == 'input' && (!$fieldConfig['eval'] || !preg_match('/date|time|int/', $fieldConfig['eval'])))) { - $condition = $fieldName . ' LIKE \'%' . $this->searchString . '%\''; - $whereParts[] = $condition; + $condition = $fieldName . ' LIKE \'%' . $this->searchString . '%\''; + $whereParts[] = $condition; } } } diff --git a/typo3/sysext/reports/Classes/Controller/ReportController.php b/typo3/sysext/reports/Classes/Controller/ReportController.php index 1d677ad5f7c88cf46717843a42b0ffec3f3162b3..0033a3e2655df2ad7b6893f9b4e128a05ad43ebb 100644 --- a/typo3/sysext/reports/Classes/Controller/ReportController.php +++ b/typo3/sysext/reports/Classes/Controller/ReportController.php @@ -26,7 +26,6 @@ use TYPO3\CMS\Reports\ReportInterface; */ class ReportController extends ActionController { - /** * @var BackendTemplateView */ diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php index 4802e5f49c39ce7c4c9de78cdd94bd19ac0b1053..0b50cb9f3357a7104355b94c6e948481b2150586 100644 --- a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php +++ b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php @@ -570,7 +570,8 @@ class BrowseLinksController extends AbstractLinkBrowserController * * @return array */ - public function getConfiguration() { + public function getConfiguration() + { return $this->buttonConfig; } diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php index f4eee942c0872104aab4349eb00b10442c329d5d..e86f0e1b64bdaa180e0f18a1942fb627aa3b8ca3 100644 --- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php +++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php @@ -986,13 +986,13 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas $table[] = '<thead><tr>' . '<th><a href="#" id="checkall" title="' . $this->getLanguageService()->getLL('label.checkAll', true) . '" class="icon">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-document-select', Icon::SIZE_SMALL)->render() . '</a></th>' - . '<th>' . $this->getLanguageService()->getLL('label.id', true). '</th>' - . '<th>' . $this->getLanguageService()->getLL('task', true). '</th>' - . '<th>' . $this->getLanguageService()->getLL('label.type', true). '</th>' - . '<th>' . $this->getLanguageService()->getLL('label.frequency', true). '</th>' - . '<th>' . $this->getLanguageService()->getLL('label.parallel', true). '</th>' - . '<th>' . $this->getLanguageService()->getLL('label.lastExecution', true). '</th>' - . '<th>' . $this->getLanguageService()->getLL('label.nextExecution', true). '</th>' + . '<th>' . $this->getLanguageService()->getLL('label.id', true) . '</th>' + . '<th>' . $this->getLanguageService()->getLL('task', true) . '</th>' + . '<th>' . $this->getLanguageService()->getLL('label.type', true) . '</th>' + . '<th>' . $this->getLanguageService()->getLL('label.frequency', true) . '</th>' + . '<th>' . $this->getLanguageService()->getLL('label.parallel', true) . '</th>' + . '<th>' . $this->getLanguageService()->getLL('label.lastExecution', true) . '</th>' + . '<th>' . $this->getLanguageService()->getLL('label.nextExecution', true) . '</th>' . '<th></th>' . '</tr></thead>'; @@ -1018,7 +1018,8 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas $table[] = '<tr><td colspan="9">' . $groupText . '</td></tr>'; } - foreach ($taskGroup['tasks'] as $schedulerRecord) {// Define action icons + foreach ($taskGroup['tasks'] as $schedulerRecord) { + // Define action icons $link = htmlspecialchars($this->moduleUri . '&CMD=edit&tx_scheduler[uid]=' . $schedulerRecord['uid']); $editAction = '<a class="btn btn-default" href="' . $link . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_common.xlf:edit', true) . '" class="icon">' . $this->moduleTemplate->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL)->render() . '</a>'; @@ -1659,5 +1660,4 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas { return $GLOBALS['TYPO3_DB']; } - } diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php index 351703ed66f01e72460dd7331d052b59d5254a81..baf984a7f40a4cba7ea2259ee9833930436541b3 100644 --- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php +++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php @@ -532,6 +532,4 @@ class TaskModuleController extends BaseScriptClass { return $this->moduleTemplate; } - - } diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php index 960eb0ec91e473346777c6a6c263ed7e8d5f3c9d..6c172c9151af8112f6e3f0363d3302ebd1944736 100644 --- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php +++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php @@ -359,7 +359,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends AbstractFu $out .= ' <input class="btn btn-default" type="submit" name="add_property" value="' . $lang->getLL('addButton') . '" />'; $out .= '</div>'; $theOutput .= '<div style="padding-top: 20px;"></div>'; - $theOutput .= '<h3>'. $lang->getLL('addProperty', true) . '</h3>'; + $theOutput .= '<h3>' . $lang->getLL('addProperty', true) . '</h3>'; $theOutput .= $out; // clear $out = '<div class="form-group">'; diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php index e9fe030dc756b7173d9628930ab3fc1d5fc7c6d1..b37a29423abd76418e445a3d603f53103c1c1396 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php @@ -376,5 +376,4 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D // Switch back to draft workspace $this->backendUser->workspace = static::VALUE_WorkspaceId; } - } diff --git a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php index d556dd951ad527d726ebc94f63cc103a2a255008..163ca1e15f1876921f83053848a9a8fea62a2ee0 100644 --- a/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php +++ b/typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php @@ -462,5 +462,4 @@ class ActionTest extends \TYPO3\CMS\Workspaces\Tests\Functional\DataHandling\Reg // $this->assertThat($responseSectionsDraft, $this->getRequestSectionDoesNotHaveRecordConstraint() // ->setTable(static::TABLE_Page)->setField('title')->setValues('Testing #1')); } - } diff --git a/typo3/sysext/workspaces/Tests/Unit/ExtDirect/ExtDirectServerTest.php b/typo3/sysext/workspaces/Tests/Unit/ExtDirect/ExtDirectServerTest.php index 1a3fb9f75c1b91789e3fe3843bbf2614ee36fd6f..660353988271d3a4dd9ff21a5900093b5a4a61dd 100644 --- a/typo3/sysext/workspaces/Tests/Unit/ExtDirect/ExtDirectServerTest.php +++ b/typo3/sysext/workspaces/Tests/Unit/ExtDirect/ExtDirectServerTest.php @@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility; */ class ExtDirectServerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase { - /** * @var \TYPO3\CMS\Workspaces\ExtDirect\ExtDirectServer */ @@ -49,7 +48,8 @@ class ExtDirectServerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase /** * Tear down. */ - protected function tearDown() { + protected function tearDown() + { parent::tearDown(); unset($this->subject); unset($this->fileReferenceProphecies); @@ -58,7 +58,8 @@ class ExtDirectServerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase /** * @return array */ - public function prepareFileReferenceDifferencesAreCorrectDataProvider() { + public function prepareFileReferenceDifferencesAreCorrectDataProvider() + { return array( // without thumbnails 'unchanged wo/thumbnails' => array('1,2,3,4', '1,2,3,4', false, null), @@ -123,7 +124,8 @@ class ExtDirectServerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase * @dataProvider prepareFileReferenceDifferencesAreCorrectDataProvider * @test */ - public function prepareFileReferenceDifferencesAreCorrect($fileFileReferenceList, $versionFileReferenceList, $useThumbnails, array $expected = null) { + public function prepareFileReferenceDifferencesAreCorrect($fileFileReferenceList, $versionFileReferenceList, $useThumbnails, array $expected = null) + { $liveFileReferences = $this->getFileReferenceProphecies($fileFileReferenceList); $versionFileReferences = $this->getFileReferenceProphecies($versionFileReferenceList); @@ -141,7 +143,8 @@ class ExtDirectServerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase * @param string $idList List of ids * @return FileReference[]|ObjectProphecy[] */ - protected function getFileReferenceProphecies($idList) { + protected function getFileReferenceProphecies($idList) + { $fileReferenceProphecies = array(); $ids = GeneralUtility::trimExplode(',', $idList, true); @@ -156,7 +159,8 @@ class ExtDirectServerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase * @param int $id * @return ObjectProphecy|FileReference */ - protected function getFileReferenceProphecy($id) { + protected function getFileReferenceProphecy($id) + { if (isset($this->fileReferenceProphecies[$id])) { return $this->fileReferenceProphecies[$id]; } @@ -175,5 +179,4 @@ class ExtDirectServerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase $this->fileReferenceProphecies[$id] = $fileReferenceProphecy->reveal(); return $this->fileReferenceProphecies[$id]; } - }