kitodo / kitodo-publication

Classes/Controller/SearchController.php

Braces +12 added lines, -24 removed lines

@@ -26,8 +26,7 @@ 
 /**
  * SearchController
  */
-class SearchController extends \EWW\Dpf\Controller\AbstractSearchController
-{
+class SearchController extends \EWW\Dpf\Controller\AbstractSearchController {
 
     /**
      * documentRepository
@@ -81,8 +80,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $workingCopies['noneTemporary'] = $this->documentRepository->getObjectIdentifiers(FALSE);
         $workingCopies['temporary'] = $this->documentRepository->getObjectIdentifiers(TRUE);
         $this->view->assign('workingCopies', $workingCopies);
@@ -107,8 +105,7 @@ 
      * get next search results
      * @return array ElasticSearch results
      */
-    public function nextResultsAction()
-    {
+    public function nextResultsAction() {
         try {
             $sessionVars = $GLOBALS["TSFE"]->getSessionData("tx_dpf");
             if (!$sessionVars['resultCount']) {
@@ -155,8 +152,7 @@ 
     /**
      * extended search action
      */
-    public function extendedSearchAction()
-    {
+    public function extendedSearchAction() {
         // show extended search template
         $objectIdentifiers = $this->documentRepository->getObjectIdentifiers();
 
@@ -174,8 +170,7 @@ 
     /**
      * gets a list of latest documents
      */
-    public function latestAction()
-    {
+    public function latestAction() {
         try {
             $query = $this->searchLatest();
 
@@ -210,8 +205,7 @@ 
      * action search
      * @return void
      */
-    public function searchAction()
-    {
+    public function searchAction() {
         $this->session->setListAction($this->getCurrentAction(), $this->getCurrentController());
 
         try {
@@ -286,8 +280,7 @@ 
      * @param  string $documentObjectIdentifier
      * @return void
      */
-    public function importForEditingAction($documentObjectIdentifier)
-    {
+    public function importForEditingAction($documentObjectIdentifier) {
         $this->session->setListAction($this->getCurrentAction(), $this->getCurrentController());
 
         /** @var \EWW\Dpf\Services\Transfer\DocumentTransferManager $documentTransferManager */
@@ -325,8 +318,7 @@ 
      * @param  string $documentObjectIdentifier
      * @return void
      */
-    public function showDetailsAction($documentObjectIdentifier)
-    {
+    public function showDetailsAction($documentObjectIdentifier) {
         if ($documentObjectIdentifier) {
             /** @var  \EWW\Dpf\Domain\Model\Document $document */
             $document = $this->documentRepository->findWorkingCopyByObjectIdentifier($documentObjectIdentifier);
@@ -346,8 +338,7 @@ 
      * @param  string $documentObjectIdentifier
      * @return void
      */
-    public function importAction($documentObjectIdentifier)
-    {
+    public function importAction($documentObjectIdentifier) {
         $documentTransferManager = $this->objectManager->get(DocumentTransferManager::class);
         $remoteRepository        = $this->objectManager->get(FedoraRepository::class);
         $documentTransferManager->setRemoteRepository($remoteRepository);
@@ -390,8 +381,7 @@ 
      * @param  string $documentObjectIdentifier
      * @return void
      */
-    public function updateIndexAction($documentObjectIdentifier)
-    {
+    public function updateIndexAction($documentObjectIdentifier) {
         $document = $this->documentRepository->findByObjectIdentifier($documentObjectIdentifier);
 
         if (is_a($document, Document::class)) {
@@ -411,8 +401,7 @@ 
      * @param  \EWW\Dpf\Domain\Model\Document $document
      * @return void
      */
-    public function doubletCheckAction(\EWW\Dpf\Domain\Model\Document $document)
-    {
+    public function doubletCheckAction(\EWW\Dpf\Domain\Model\Document $document) {
         $this->authorizationChecker->denyAccessUnlessGranted(DocumentVoter::DOUBLET_CHECK, $document);
 
         try {
@@ -495,8 +484,7 @@ 
      * returns the query to get latest documents
      * @return mixed
      */
-    public function searchLatest()
-    {
+    public function searchLatest() {
         $client = $this->clientRepository->findAll()->current();
 
         // get the latest documents /CREATED_DATE

Classes/Controller/WorkspaceController.php

Braces +20 added lines, -39 removed lines

@@ -26,8 +26,7 @@ 
 /**
  * Controller for the "workspace"/"my publications" area.
  */
-class WorkspaceController  extends AbstractController
-{
+class WorkspaceController  extends AbstractController {
     const MAXIMUM_NUMBER_OF_LINKS = 5;
     const DEFAULT_SORT_FIELD = 'title';
     const DEFAULT_SORT_ORDER = 'asc';
@@ -168,11 +167,10 @@ 
      *
      * @return void
      */
-    protected function listWorkspaceAction($checkedDocumentIdentifiers = [])
-    {
+    protected function listWorkspaceAction($checkedDocumentIdentifiers = []) {
         if ($this->security->getUserRole() === Security::ROLE_LIBRARIAN) {
             $this->view->assign('isWorkspace', true);
-        } elseif ($this->security->getUserRole() === Security::ROLE_RESEARCHER){
+        } elseif ($this->security->getUserRole() === Security::ROLE_RESEARCHER) {
             $this->view->assign('isWorkspace', false);
         } else {
             $message = LocalizationUtility::translate(
@@ -206,8 +204,7 @@ 
      * Batch operations action.
      * @param array $listData
      */
-    public function batchAction($listData)
-    {
+    public function batchAction($listData) {
         if (array_key_exists('action', $listData)) {
             $this->forward($listData['action'], null, null, ['listData' => $listData]);
         }
@@ -218,8 +215,7 @@ 
      * @param array $listData
      * @throws \EWW\Dpf\Exceptions\DocumentMaxSizeErrorException
      */
-    public function batchRegisterAction($listData)
-    {
+    public function batchRegisterAction($listData) {
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
@@ -300,8 +296,7 @@ 
      * Batch operation, remove documents.
      * @param array $listData
      */
-    public function batchRemoveAction($listData)
-    {
+    public function batchRemoveAction($listData) {
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
@@ -350,8 +345,7 @@ 
      * Batch operation, release documents.
      * @param array $listData
      */
-    public function batchReleaseValidatedAction($listData)
-    {
+    public function batchReleaseValidatedAction($listData) {
         $this->batchRelease($listData, true);
     }
 
@@ -359,8 +353,7 @@ 
      * Batch operation, release as unvalidated documents.
      * @param array $listData
      */
-    public function batchReleaseUnvalidatedAction($listData)
-    {
+    public function batchReleaseUnvalidatedAction($listData) {
         $this->batchRelease($listData, false);
     }
 
@@ -372,8 +365,7 @@ 
      * @param array $listData
      * @param bool $validated
      */
-    protected function batchRelease($listData, $validated)
-    {
+    protected function batchRelease($listData, $validated) {
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
@@ -492,8 +484,7 @@ 
      */
     protected function getWorkspaceQuery(
         $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = null, $sortOrder = null
-    )
-    {
+    ) {
         $workspaceFilter = [
             'bool' => [
                 'must' => [
@@ -544,8 +535,7 @@ 
      */
     protected function getMyPublicationsQuery(
         $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = null, $sortOrder = null
-    )
-    {
+    ) {
         $workspaceFilter = [
             'bool' => [
                 'must' => [
@@ -579,8 +569,7 @@ 
      */
     protected function buildQuery(
         $workspaceFilter, $from = 0, $bookmarkIdentifiers = [], $filters = [], $excludeFilters = [], $sortField = null, $sortOrder = null
-    )
-    {
+    ) {
         // The base filter.
         $queryFilter = [
             'bool' => [
@@ -934,8 +923,7 @@ 
     }
 
 
-    protected function getSortScriptUniversityCollection($collection)
-    {
+    protected function getSortScriptUniversityCollection($collection) {
         $script  = "for (int i = 0; i < doc['collections'].length; ++i) {";
         $script .= "    if (doc['collections'][i] == '".$collection."') {";
         $script .= "        return '1';";
@@ -946,8 +934,7 @@ 
         return $script;
     }
 
-    protected function getSortScriptHasFiles()
-    {
+    protected function getSortScriptHasFiles() {
         $script = "if (doc['hasFiles'].value == 'true') {";
         $script .= "    return '1';";
         $script .= "}";
@@ -956,8 +943,7 @@ 
         return $script;
     }
 
-    protected function getSortScriptCreatorRole($feUserUid)
-    {
+    protected function getSortScriptCreatorRole($feUserUid) {
         $script = "if (doc['creator'].value == '".$feUserUid."') {";
         $script .= "    return '1';";
         $script .= "}";
@@ -973,8 +959,7 @@ 
     }
 
 
-    protected function getSortScriptState()
-    {
+    protected function getSortScriptState() {
         $sortStates = [];
         foreach (DocumentWorkflow::PLACES as $state) {
             if (array_key_exists($state, DocumentWorkflow::STATE_TO_SIMPLESTATE_MAPPING)) {
@@ -991,8 +976,7 @@ 
     }
 
 
-    protected function getSortScriptDoctype()
-    {
+    protected function getSortScriptDoctype() {
         $sortDoctypes = [];
         foreach ($this->documentTypeRepository->findAll() as $documentType) {
             if ($documentType->getName() && $documentType->getDisplayname()) {
@@ -1014,8 +998,7 @@ 
      * @param int $stop
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function initIndexAction($start=1, $stop=100)
-    {
+    public function initIndexAction($start=1, $stop=100) {
         /** @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher $signalSlotDispatcher */
         $signalSlotDispatcher = $this->objectManager->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
 
@@ -1070,8 +1053,7 @@ 
      * @param string $documentIdentifier
      * @return void
      */
-    public function uploadFilesAction($documentIdentifier)
-    {
+    public function uploadFilesAction($documentIdentifier) {
         $document = $this->documentManager->read(
             $documentIdentifier,
             $this->security->getUser()->getUID()
@@ -1130,8 +1112,7 @@ 
      *
      * @return int
      */
-    protected function itemsPerPage()
-    {
+    protected function itemsPerPage() {
         $itemsPerPage = $this->session->getWorkspaceItemsPerPage();
         $default = ($this->settings['workspaceItemsPerPage'])? $this->settings['workspaceItemsPerPage'] : 10;
         return ($itemsPerPage)? $itemsPerPage : $default;

Classes/Controller/AbstractDocumentFormController.php

Braces +13 added lines, -26 removed lines

@@ -25,8 +25,7 @@ 
 /**
  * DocumentFormController
  */
-abstract class AbstractDocumentFormController extends AbstractController
-{
+abstract class AbstractDocumentFormController extends AbstractController {
 
     /**
      * documentRepository
@@ -81,8 +80,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $documents = $this->documentRepository->findAll();
 
         $documentTypes = $this->documentTypeRepository->findAll();
@@ -127,8 +125,7 @@ 
      *
      * @return void
      */
-    public function initializeNewAction()
-    {
+    public function initializeNewAction() {
 
         $requestArguments = $this->request->getArguments();
 
@@ -156,13 +153,11 @@ 
      * @ignorevalidation $newDocumentForm
      * @return void
      */
-    public function newAction(DocumentForm $newDocumentForm = null)
-    {
+    public function newAction(DocumentForm $newDocumentForm = null) {
         $this->view->assign('documentForm', $newDocumentForm);
     }
 
-    public function initializeCreateAction()
-    {
+    public function initializeCreateAction() {
 
         $requestArguments = $this->request->getArguments();
 
@@ -196,8 +191,7 @@ 
      * @param \EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm
      * @return void
      */
-    public function createAction(DocumentForm $newDocumentForm)
-    {
+    public function createAction(DocumentForm $newDocumentForm) {
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
         /* @var $newDocument \EWW\Dpf\Domain\Model\Document */
@@ -246,8 +240,7 @@ 
 
     }
 
-    public function initializeEditAction()
-    {
+    public function initializeEditAction() {
         $requestArguments = $this->request->getArguments();
 
         if (array_key_exists('document', $requestArguments)) {
@@ -277,13 +270,11 @@ 
      * @ignorevalidation $documentForm
      * @return void
      */
-    public function editAction(DocumentForm $documentForm)
-    {
+    public function editAction(DocumentForm $documentForm) {
         $this->view->assign('documentForm', $documentForm);
     }
 
-    public function initializeUpdateAction()
-    {
+    public function initializeUpdateAction() {
         $requestArguments = $this->request->getArguments();
 
         if ($this->request->hasArgument('documentData')) {
@@ -316,8 +307,7 @@ 
      * @param \EWW\Dpf\Domain\Model\DocumentForm $documentForm
      * @return void
      */
-    public function updateAction(DocumentForm $documentForm)
-    {
+    public function updateAction(DocumentForm $documentForm) {
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
         /* @var $updateDocument \EWW\Dpf\Domain\Model\Document */
@@ -358,18 +348,15 @@ 
      *
      * @return void
      */
-    public function cancelAction()
-    {
+    public function cancelAction() {
         $this->redirectToList();
     }
 
-    protected function redirectAfterUpdate()
-    {
+    protected function redirectAfterUpdate() {
         $this->redirect('list');
     }
 
-    protected function redirectToList($message = null)
-    {
+    protected function redirectToList($message = null) {
         $this->redirect('list');
     }
 

Classes/Controller/DocumentController.php

Braces +17 added lines, -34 removed lines

@@ -35,8 +35,7 @@ 
 /**
  * DocumentController
  */
-class DocumentController extends AbstractController
-{
+class DocumentController extends AbstractController {
 
     /**
      * documentRepository
@@ -135,8 +134,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -151,8 +149,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function logoutAction()
-    {
+    public function logoutAction() {
         $cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
         $uri = $cObj->typolink_URL([
             'parameter' => $this->settings['loginPage'],
@@ -390,8 +387,7 @@ 
      * @param string $reason
      * @return void
      */
-    public function discardAction(Document $document, $tstamp, $reason = NULL)
-    {
+    public function discardAction(Document $document, $tstamp, $reason = NULL) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::DISCARD, $document)) {
             if (
                 $this->editingLockService->isLocked(
@@ -419,8 +415,7 @@ 
      * @param string $reason
      * @return void
      */
-    public function postponeAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp, $reason = NULL)
-    {
+    public function postponeAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp, $reason = NULL) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::POSTPONE, $document)) {
             if (
                 $this->editingLockService->isLocked(
@@ -449,8 +444,7 @@ 
      * @param integer $tstamp
      * @return void
      */
-    public function deleteLocallyAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp)
-    {
+    public function deleteLocallyAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp) {
         if ($document->getObjectIdentifier()) {
             $voterAttribute = DocumentVoter::DELETE_WORKING_COPY;
         } else {
@@ -527,8 +521,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return void
      */
-    public function duplicateAction(\EWW\Dpf\Domain\Model\Document $document)
-    {
+    public function duplicateAction(\EWW\Dpf\Domain\Model\Document $document) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::DUPLICATE, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_duplicate.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
@@ -595,8 +588,7 @@ 
      * @param integer $tstamp
      * @return void
      */
-    public function releasePublishAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp)
-    {
+    public function releasePublishAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::RELEASE_PUBLISH, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_ingest.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
@@ -616,8 +608,7 @@ 
      * @param integer $tstamp
      * @return void
      */
-    public function releaseActivateAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp)
-    {
+    public function releaseActivateAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::RELEASE_ACTIVATE, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_activate.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
@@ -635,8 +626,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return void
      */
-    public function registerAction(\EWW\Dpf\Domain\Model\Document $document)
-    {
+    public function registerAction(\EWW\Dpf\Domain\Model\Document $document) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::REGISTER, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_register.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
@@ -674,8 +664,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return void
      */
-    public function showDetailsAction(Document $document)
-    {
+    public function showDetailsAction(Document $document) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::SHOW_DETAILS, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_showDetails.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
@@ -701,8 +690,7 @@ 
     }
 
 
-    public function cancelListTaskAction()
-    {
+    public function cancelListTaskAction() {
         $this->redirectToDocumentList();
     }
     
@@ -745,8 +733,7 @@ 
     /**
      * initializeAction
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -772,8 +759,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    protected function redirectToDocumentList($message = null)
-    {
+    protected function redirectToDocumentList($message = null) {
         list($action, $controller, $redirectUri) = $this->session->getListAction();
 
         if ($redirectUri) {
@@ -788,8 +774,7 @@ 
      *
      * @return mixed
      */
-    protected function getStoragePID()
-    {
+    protected function getStoragePID() {
         return $this->settings['persistence']['classes']['EWW\Dpf\Domain\Model\Document']['newRecordStoragePid'];
     }
 
@@ -800,8 +785,7 @@ 
      * @param string $severity
      * @param string $defaultMessage
      */
-    protected function flashMessage(\EWW\Dpf\Domain\Model\Document $document, $key, $severity, $defaultMessage = "")
-    {
+    protected function flashMessage(\EWW\Dpf\Domain\Model\Document $document, $key, $severity, $defaultMessage = "") {
         // Show success or failure of the action in a flash message
         if ($document) {
             $args[] = $document->getTitle();
@@ -828,8 +812,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    protected function updateDocument(\EWW\Dpf\Domain\Model\Document $document, $workflowTransition, $reason)
-    {
+    protected function updateDocument(\EWW\Dpf\Domain\Model\Document $document, $workflowTransition, $reason) {
         switch ($workflowTransition) {
             case DocumentWorkflow::TRANSITION_DISCARD:
                 $messageKeyPart = 'document_discard';

Classes/Controller/AbstractSearchController.php

Braces +8 added lines, -16 removed lines

@@ -17,8 +17,7 @@ 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use EWW\Dpf\Services\ElasticSearch\ElasticSearch;
 
-abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController
-{
+abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController {
     // search terms
     private static $terms   = ['_id', 'OWNER_ID', 'submitter', 'project'];
 
@@ -31,8 +30,7 @@ 
      * @param  array $query elasticsearch search query
      * @return array        results
      */
-    public function getResultList($query, $type)
-    {
+    public function getResultList($query, $type) {
 
         $elasticSearch = $this->objectManager->get(ElasticSearch::class);
         $results = $elasticSearch->search($query, $type);
@@ -45,8 +43,7 @@ 
      * @param  string $searchString
      * @return array query
      */
-    public function searchFulltext($searchString)
-    {
+    public function searchFulltext($searchString) {
         // don't return query if searchString is empty
         if (empty($searchString)) {
             return null;
@@ -71,8 +68,7 @@ 
      * build array for elasticsearch
      * @return array Elasticsearch query array
      */
-    public function extendedSearch($searchArray = array())
-    {
+    public function extendedSearch($searchArray = array()) {
 
         $query  = array();
         $filter = array();
@@ -119,8 +115,7 @@ 
      * @param array Elasticsearch query array
      * @return array Elasticsearch queryFilter array
      */
-    public function resultsFilter($query, $showDeleted = false)
-    {
+    public function resultsFilter($query, $showDeleted = false) {
 
         $queryFilter = array();
 
@@ -209,8 +204,7 @@ 
      * @param  bool      $intervalEnd Fills missing values with the maximum possible date if true
      * @return DateTime               Determined date
      */
-    public function convertFormDate($dateString, $intervalEnd = false)
-    {
+    public function convertFormDate($dateString, $intervalEnd = false) {
         try {
             if (strlen($dateString) == 4) {
                 // assuming year
@@ -231,8 +225,7 @@ 
      * @param $string
      * @return mixed
      */
-    private function escapeQuery($string)
-    {
+    private function escapeQuery($string) {
         $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\');
         $string                   = preg_replace_callback(
             '/([' . $luceneReservedCharacters . '])/',
@@ -252,8 +245,7 @@ 
      * @param $date
      * @return string
      */
-    public function formatDate($date)
-    {
+    public function formatDate($date) {
         // convert date from dd.mm.yyy to yyyy-dd-mm
         $date = explode(".", $date);
         return $date[2] . '-' . $date[1] . '-' . $date[0];

Classes/Controller/AjaxBackofficeController.php

Braces +8 added lines, -16 removed lines

@@ -19,8 +19,7 @@ 
 /**
  * AjaxBackofficeController
  */
-class AjaxBackofficeController extends \EWW\Dpf\Controller\AbstractController
-{
+class AjaxBackofficeController extends \EWW\Dpf\Controller\AbstractController {
     /**
      * bookmarkRepository
      *
@@ -36,8 +35,7 @@ 
      * @param string $identifier
      * @return bool
      */
-    public function addBookmarkAction($identifier)
-    {
+    public function addBookmarkAction($identifier) {
         /** @var \EWW\Dpf\Domain\Model\Bookmark $bookmark */
         $bookmark = $this->bookmarkRepository->findBookmark($this->security->getUser()->getUid(), $identifier);
         if (!$bookmark) {
@@ -57,8 +55,7 @@ 
      * @param string $identifier
      * @return bool
      */
-    public function removeBookmarkAction($identifier)
-    {
+    public function removeBookmarkAction($identifier) {
         /** @var \EWW\Dpf\Domain\Model\Bookmark $bookmark */
         $bookmark = $this->bookmarkRepository->findBookmark($this->security->getUser()->getUid(), $identifier);
         if ($bookmark) {
@@ -75,8 +72,7 @@ 
      * @param string $name
      * @param array $values
      */
-    public function addWorkspaceFilterAction($name, $values = [])
-    {
+    public function addWorkspaceFilterAction($name, $values = []) {
         if ($name && $values && is_array($values)) {
             $workspaceFilters = $this->getSessionData('workspaceFilters');
             if ($workspaceFilters && is_array($workspaceFilters)) {
@@ -103,8 +99,7 @@ 
      * @param string $field
      * @param string $order
      */
-    public function addWorkspaceSortAction($field, $order)
-    {
+    public function addWorkspaceSortAction($field, $order) {
         $this->session->setWorkspaceSort($field, $order);
         return;
     }
@@ -113,8 +108,7 @@ 
      * Toggles the filter to exclude discarded documents.
      *
      */
-    public function toggleWorkspaceExcludeDiscardedAction()
-    {
+    public function toggleWorkspaceExcludeDiscardedAction() {
         $this->session->toggleWorkspaceExcludeDiscardedFilter();
         return;
     }
@@ -123,8 +117,7 @@ 
      * Toggles the filter to hide bookmarked documents.
      *
      */
-    public function toggleWorkspaceBookmarksOnlyAction()
-    {
+    public function toggleWorkspaceBookmarksOnlyAction() {
         $this->session->toggleWorkspaceBookmarksOnlyFilter();
         return;
     }
@@ -134,8 +127,7 @@ 
      *
      * @param int $itemsPerPage
      */
-    public function setWorkspaceItemsPerPageAction($itemsPerPage)
-    {
+    public function setWorkspaceItemsPerPageAction($itemsPerPage) {
         $this->session->setWorkspaceItemsPerPage($itemsPerPage);
         return;
     }

Classes/Controller/AbstractController.php

Braces +9 added lines, -18 removed lines

@@ -17,8 +17,7 @@ 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\SignalSlot\Dispatcher;
 
-abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
-{
+abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
     /**
      * authorizationChecker
      *
@@ -60,8 +59,7 @@ 
     protected $session = null;
 
 
-    protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view)
-    {
+    protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view) {
         parent::initializeView($view);
 
         $client = $this->clientRepository->findAll()->current();
@@ -87,8 +85,7 @@ 
      * @param string $key
      * @param string $data
      */
-    public function setSessionData($key, $data)
-    {
+    public function setSessionData($key, $data) {
         if (!empty($GLOBALS['TSFE']) && is_object($GLOBALS['TSFE'])) {
 
             $userGlobals = $GLOBALS['TSFE']->fe_user;
@@ -111,8 +108,7 @@ 
      *
      * @return
      */
-    public function getSessionData($key)
-    {
+    public function getSessionData($key) {
         if (!empty($GLOBALS['TSFE']) && is_object($GLOBALS['TSFE'])) {
 
             $userGlobals = $GLOBALS['TSFE']->fe_user;
@@ -133,8 +129,7 @@ 
      *
      * @return null|string
      */
-    protected function getParametersSafely($parameterName)
-    {
+    protected function getParametersSafely($parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->filterSafelyParameters($this->request->getArgument($parameterName));
         }
@@ -148,8 +143,7 @@ 
      *
      * @return string
      */
-    protected function filterSafelyParameters($param)
-    {
+    protected function filterSafelyParameters($param) {
         if (is_array($param)) {
             foreach ($param as $key => $item) {
                 $param[$key] = $this->filterSafelyParameters($item);
@@ -160,8 +154,7 @@ 
         }
     }
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         parent::initializeAction();
 
         $signalSlotDispatcher = GeneralUtility::makeInstance(Dispatcher::class);
@@ -169,13 +162,11 @@ 
     }
 
 
-    public function getCurrentAction()
-    {
+    public function getCurrentAction() {
         return str_replace('Action', '', $this->actionMethodName);
     }
 
-    public function getCurrentController()
-    {
+    public function getCurrentController() {
         $controllerName = end(explode('\\', get_Class($this)));
         return str_replace('Controller', '', $controllerName);
     }

Classes/Controller/DocumentFormBackofficeController.php

Braces +10 added lines, -20 removed lines

@@ -28,8 +28,7 @@ 
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-class DocumentFormBackofficeController extends AbstractDocumentFormController
-{
+class DocumentFormBackofficeController extends AbstractDocumentFormController {
     /**
      * documentTransferManager
      *
@@ -71,8 +70,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -113,8 +111,7 @@ 
      */
     public function editAction(
         \EWW\Dpf\Domain\Model\DocumentForm $documentForm, bool $suggestMod = false, $activeFileTab = false
-    )
-    {
+    ) {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
         $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
 
@@ -161,8 +158,7 @@ 
      * @param \EWW\Dpf\Domain\Model\DocumentForm $documentForm
      * @param bool $restore
      */
-    public function createSuggestionDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $restore = FALSE)
-    {
+    public function createSuggestionDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $restore = FALSE) {
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
         $hasFilesFlag = true;
@@ -234,8 +230,7 @@ 
     }
 
 
-    public function updateAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm)
-    {
+    public function updateAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm) {
         if ($this->request->getArgument('documentData')['suggestMod']) {
             $restore = $this->request->getArgument('documentData')['suggestRestore'];
             $this->forward('createSuggestionDocument', null, null, ['documentForm' => $documentForm, 'restore' => $restore]);
@@ -268,8 +263,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null)
-    {
+    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null) {
         try {
             /** @var \EWW\Dpf\Domain\Model\Document $document */
             $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
@@ -406,8 +400,7 @@ 
         }
     }
 
-    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm)
-    {
+    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm) {
         /** @var \EWW\Dpf\Helper\DocumentMapper $documentMapper */
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
@@ -473,8 +466,7 @@ 
      *
      * @return void
      */
-    public function cancelEditAction($documentUid = 0, $documentList = false)
-    {
+    public function cancelEditAction($documentUid = 0, $documentList = false) {
         if ($documentList) {
             $this->redirectToDocumentList();
         }
@@ -487,8 +479,7 @@ 
         }
     }
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -502,8 +493,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    protected function redirectToDocumentList($message = null)
-    {
+    protected function redirectToDocumentList($message = null) {
         list($action, $controller, $redirectUri) = $this->session->getListAction();
 
         if ($redirectUri) {

Classes/Security/Security.php

Braces +2 added lines, -4 removed lines

@@ -14,8 +14,7 @@ 
  * The TYPO3 project - inspiring people to share!
  */
 
-class Security
-{
+class Security {
     /**
      * frontendUserRepository
      *
@@ -43,8 +42,7 @@ 
      *
      * @return null|\EWW\Dpf\Domain\Model\FrontendUser
      */
-    public function getUser()
-    {
+    public function getUser() {
         $user = $GLOBALS['TSFE']->fe_user->user;
         if (!empty($user) && is_array($user) && array_key_exists('uid', $user)) {
             return $this->frontendUserRepository->findByUid($GLOBALS['TSFE']->fe_user->user['uid']);