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

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -35,7 +35,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * clientRepository
@@ -43,7 +43,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\ClientRepository
      * @inject
      */
-    protected $clientRepository = null;
+    protected $clientRepository = NULL;
 
 
     /**
@@ -52,7 +52,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\ElasticSearch
      * @inject
      */
-    protected $elasticSearch = null;
+    protected $elasticSearch = NULL;
 
 
     /**
@@ -70,7 +70,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
 
     const RESULT_COUNT      = 500;
@@ -146,7 +146,7 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
 
@@ -198,12 +198,12 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
 
         }
 
-        $this->forward("list", null, null, array('results' => $results));
+        $this->forward("list", NULL, NULL, array('results' => $results));
     }
 
     /**
@@ -223,7 +223,7 @@ 
             $sessionVars['resultCount'] = self::RESULT_COUNT;
             $this->setSessionData('tx_dpf', $sessionVars);
 
-            $extSearch = ($args['query']['extSearch']) ? true : false;
+            $extSearch = ($args['query']['extSearch']) ? TRUE : FALSE;
 
             // set sorting
             if ($extSearch) {
@@ -267,16 +267,16 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
 
         if ($extSearch) {
             // redirect to extended search view
-            $this->forward("extendedSearch", null, null, array('results' => $results, 'query' => $args['query']));
+            $this->forward("extendedSearch", NULL, NULL, array('results' => $results, 'query' => $args['query']));
         } else {
             // redirect to list view
-            $this->forward("list", null, null, array('results' => $results, 'query' => $args['query']));
+            $this->forward("list", NULL, NULL, array('results' => $results, 'query' => $args['query']));
         }
     }
 
@@ -311,7 +311,7 @@ 
             $document = $documentTransferManager->retrieve($documentObjectIdentifier, $this->security->getUser()->getUid());
 
             if ($document) {
-                $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+                $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             }
         }
 
@@ -332,7 +332,7 @@ 
             $document = $this->documentRepository->findWorkingCopyByObjectIdentifier($documentObjectIdentifier);
 
             if ($document) {
-                $this->redirect('showDetails', 'Document', null, ['document'=>$document]);
+                $this->redirect('showDetails', 'Document', NULL, ['document'=>$document]);
             }
         }
 
@@ -379,10 +379,10 @@ 
             $message,
             '',
             $severity,
-            true
+            TRUE
         );
 
-        $this->forward('updateIndex', null, null, array('documentObjectIdentifier' => $documentObjectIdentifier));
+        $this->forward('updateIndex', NULL, NULL, array('documentObjectIdentifier' => $documentObjectIdentifier));
     }
 
     /**
@@ -483,10 +483,10 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
 
-            $this->redirect('list', 'Document', null);
+            $this->redirect('list', 'Document', NULL);
         }
 
     }

Classes/Controller/WorkspaceController.php

Spacing +58 added lines, -58 removed lines

@@ -97,7 +97,7 @@ 
      */
     protected function list($from = 0)
     {
-        $bookmarkIdentifiers = array();
+        $bookmarkIdentifiers = array ();
         $bookmarks = $this->bookmarkRepository->findByFeUserUid($this->security->getUser()->getUid());
         foreach ($bookmarks as $bookmark) {
             $bookmarkIdentifiers[] = $bookmark->getDocumentIdentifier();
@@ -145,7 +145,7 @@ 
             list($redirectAction, $redirectController) = $this->session->getListAction();
             $this->redirect(
                 $redirectAction, $redirectController, null,
-                array('message' => [], 'checkedDocumentIdentifiers' => [])
+                array ('message' => [], 'checkedDocumentIdentifiers' => [])
             );
         }
 
@@ -172,7 +172,7 @@ 
     {
         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(
@@ -194,7 +194,7 @@ 
             $currentPage = 1;
         }
 
-        $this->list((empty($currentPage)? 0 : ($currentPage-1) * $this->itemsPerPage()));
+        $this->list((empty($currentPage) ? 0 : ($currentPage - 1) * $this->itemsPerPage()));
 
         $this->view->assign('currentPage', $currentPage);
         $this->view->assign('workspaceListAction', $this->getCurrentAction());
@@ -223,7 +223,7 @@ 
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
-        if (array_key_exists('documentIdentifiers', $listData) && is_array($listData['documentIdentifiers']) ) {
+        if (array_key_exists('documentIdentifiers', $listData) && is_array($listData['documentIdentifiers'])) {
             $checkedDocumentIdentifiers = $listData['documentIdentifiers'];
             foreach ($listData['documentIdentifiers'] as $documentIdentifier) {
 
@@ -293,7 +293,7 @@ 
         list($redirectAction, $redirectController) = $this->session->getListAction();
         $this->redirect(
             $redirectAction, $redirectController, null,
-            array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
+            array ('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
     /**
@@ -305,7 +305,7 @@ 
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
-        if (array_key_exists('documentIdentifiers', $listData) && is_array($listData['documentIdentifiers']) ) {
+        if (array_key_exists('documentIdentifiers', $listData) && is_array($listData['documentIdentifiers'])) {
             $checkedDocumentIdentifiers = $listData['documentIdentifiers'];
             foreach ($listData['documentIdentifiers'] as $documentIdentifier) {
                 $feUserUid = $this->security->getUser()->getUid();
@@ -342,7 +342,7 @@ 
         list($redirectAction, $redirectController) = $this->session->getListAction();
         $this->redirect(
             $redirectAction, $redirectController, null,
-            array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
+            array ('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
 
@@ -377,7 +377,7 @@ 
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
-        if (array_key_exists('documentIdentifiers', $listData) && is_array($listData['documentIdentifiers']) ) {
+        if (array_key_exists('documentIdentifiers', $listData) && is_array($listData['documentIdentifiers'])) {
             $checkedDocumentIdentifiers = $listData['documentIdentifiers'];
             foreach ($listData['documentIdentifiers'] as $documentIdentifier) {
 
@@ -446,15 +446,15 @@ 
                 (sizeof($successful) > 0 ? AbstractMessage::OK : AbstractMessage::WARNING)
             );
 
-            if (sizeof($successful) === 1 ) {
+            if (sizeof($successful) === 1) {
                 $this->addFlashMessage(
-                    "1 ".LocalizationUtility::translate("manager.workspace.bookmarkRemoved.singular", "dpf"),
+                    "1 " . LocalizationUtility::translate("manager.workspace.bookmarkRemoved.singular", "dpf"),
                     '',
                     AbstractMessage::INFO
                 );
             }
 
-            if (sizeof($successful) > 1 ) {
+            if (sizeof($successful) > 1) {
                 $this->addFlashMessage(
                     LocalizationUtility::translate(
                         "manager.workspace.bookmarkRemoved.plural", "dpf", [sizeof($successful)]
@@ -474,7 +474,7 @@ 
         list($redirectAction, $redirectController) = $this->session->getListAction();
         $this->redirect(
             $redirectAction, $redirectController, null,
-            array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
+            array ('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
 
     }
 
@@ -491,7 +491,7 @@ 
      * @return array
      */
     protected function getWorkspaceQuery(
-        $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = null, $sortOrder = null
+        $from = 0, $bookmarkIdentifiers = [], $filters = [], $excludeFilters = [], $sortField = null, $sortOrder = null
     )
     {
         $workspaceFilter = [
@@ -543,7 +543,7 @@ 
      * @return array
      */
     protected function getMyPublicationsQuery(
-        $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = null, $sortOrder = null
+        $from = 0, $bookmarkIdentifiers = [], $filters = [], $excludeFilters = [], $sortField = null, $sortOrder = null
     )
     {
         $workspaceFilter = [
@@ -628,7 +628,7 @@ 
                 'query' => [
                     'bool' => [
                         'must' => [
-                            'match_all' => (object)[]
+                            'match_all' => (object) []
                         ],
                         'filter' => $queryFilter
                     ]
@@ -660,11 +660,11 @@ 
                             'script' => [
                                 'lang' => 'painless',
                                 'source' =>
-                                    "for (int i = 0; i < doc['collections'].length; ++i) {".
-                                    "    if(doc['collections'][i] =='".$this->settings['universityCollection']."') {".
-                                    "        return 'true';".
-                                    "    }".
-                                    "}".
+                                    "for (int i = 0; i < doc['collections'].length; ++i) {" .
+                                    "    if(doc['collections'][i] =='" . $this->settings['universityCollection'] . "') {" .
+                                    "        return 'true';" .
+                                    "    }" .
+                                    "}" .
                                     "return 'false';"
                                 ]
                         ]
@@ -679,23 +679,23 @@ 
                             'script' => [
                                 'lang' => 'painless',
                                 'source' =>
-                                    "if (".
-                                    "    doc['creator'].size() > 0 &&".
-                                    "    doc['creator'].value == '".$this->security->getUser()->getUid()."') {".
-                                    "    return 'self';".
-                                    "}".
-                                    "if (".
-                                    "    doc['creatorRole'].size() > 0 &&".
-                                    "    doc['creatorRole'].value == '".Security::ROLE_LIBRARIAN."'".
-                                    ") {".
-                                    "    return 'librarian';".
-                                    "}".
-                                    "if (".
-                                    "    doc['creatorRole'].size() > 0 &&".
-                                    "    doc['creatorRole'].value == '".Security::ROLE_RESEARCHER."'".
-                                    ") {".
-                                    "    return 'user';".
-                                    "}".
+                                    "if (" .
+                                    "    doc['creator'].size() > 0 &&" .
+                                    "    doc['creator'].value == '" . $this->security->getUser()->getUid() . "') {" .
+                                    "    return 'self';" .
+                                    "}" .
+                                    "if (" .
+                                    "    doc['creatorRole'].size() > 0 &&" .
+                                    "    doc['creatorRole'].value == '" . Security::ROLE_LIBRARIAN . "'" .
+                                    ") {" .
+                                    "    return 'librarian';" .
+                                    "}" .
+                                    "if (" .
+                                    "    doc['creatorRole'].size() > 0 &&" .
+                                    "    doc['creatorRole'].value == '" . Security::ROLE_RESEARCHER . "'" .
+                                    ") {" .
+                                    "    return 'user';" .
+                                    "}" .
                                     "return 'unknown';"
                             ]
                         ]
@@ -920,12 +920,12 @@ 
             ];
         } else {
             if ($sortField == 'title') {
-                $sortField.= ".keyword";
+                $sortField .= ".keyword";
             }
 
             $sort = [
-                (($sortField)? $sortField : self::DEFAULT_SORT_FIELD.".keyword") => [
-                    'order' => (($sortOrder)? $sortOrder : self::DEFAULT_SORT_ORDER)
+                (($sortField) ? $sortField : self::DEFAULT_SORT_FIELD . ".keyword") => [
+                    'order' => (($sortOrder) ? $sortOrder : self::DEFAULT_SORT_ORDER)
                 ]
             ];
         }
@@ -937,7 +937,7 @@ 
     protected function getSortScriptUniversityCollection($collection)
     {
         $script  = "for (int i = 0; i < doc['collections'].length; ++i) {";
-        $script .= "    if (doc['collections'][i] == '".$collection."') {";
+        $script .= "    if (doc['collections'][i] == '" . $collection . "') {";
         $script .= "        return '1';";
         $script .= "    }";
         $script .= "}";
@@ -958,13 +958,13 @@ 
 
     protected function getSortScriptCreatorRole($feUserUid)
     {
-        $script = "if (doc['creator'].value == '".$feUserUid."') {";
+        $script = "if (doc['creator'].value == '" . $feUserUid . "') {";
         $script .= "    return '1';";
         $script .= "}";
-        $script .= "if (doc['creatorRole'].value == '".Security::ROLE_LIBRARIAN."') {";
+        $script .= "if (doc['creatorRole'].value == '" . Security::ROLE_LIBRARIAN . "') {";
         $script .= "return '2';";
         $script .= "}";
-        $script .= "if (doc['creatorRole'].value == '".Security::ROLE_RESEARCHER."') {";
+        $script .= "if (doc['creatorRole'].value == '" . Security::ROLE_RESEARCHER . "') {";
         $script .= "    return '3';";
         $script .= "}";
         $script .= "return '4';";
@@ -979,15 +979,15 @@ 
         foreach (DocumentWorkflow::PLACES as $state) {
             if (array_key_exists($state, DocumentWorkflow::STATE_TO_SIMPLESTATE_MAPPING)) {
                 $simpleState = DocumentWorkflow::STATE_TO_SIMPLESTATE_MAPPING[$state];
-                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:manager.documentList.state.'.$simpleState;
+                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:manager.documentList.state.' . $simpleState;
                 $stateName = LocalizationUtility::translate($key, 'dpf');
-                $sortStates[] = "if (doc['state'].value == '".$state."') return '".$stateName."';";
+                $sortStates[] = "if (doc['state'].value == '" . $state . "') return '" . $stateName . "';";
             }
         }
 
         $sortStates = implode(" ", $sortStates);
 
-        return $sortStates." return '';";
+        return $sortStates . " return '';";
     }
 
 
@@ -996,14 +996,14 @@ 
         $sortDoctypes = [];
         foreach ($this->documentTypeRepository->findAll() as $documentType) {
             if ($documentType->getName() && $documentType->getDisplayname()) {
-                $sortDoctypes[] = "if (doc['doctype'].value == '".$documentType->getName()."')"
-                    ." return '".$documentType->getDisplayname()."';";
+                $sortDoctypes[] = "if (doc['doctype'].value == '" . $documentType->getName() . "')"
+                    ." return '" . $documentType->getDisplayname() . "';";
             }
         }
 
         $sortDoctypes = implode(" ", $sortDoctypes);
 
-        return $sortDoctypes." return '';";
+        return $sortDoctypes . " return '';";
     }
 
 
@@ -1014,7 +1014,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);
@@ -1025,7 +1025,7 @@ 
         $fedoraRepository = $this->objectManager->get(\EWW\Dpf\Services\Transfer\FedoraRepository::class);
         $documentTransferManager->setRemoteRepository($fedoraRepository);
 
-        for($i=$start; $i<$stop; $i++) {
+        for ($i = $start; $i < $stop; $i++) {
             try {
                 $document = $documentTransferManager->retrieve('qucosa:' . $i);
 
@@ -1095,13 +1095,13 @@ 
                     $message = LocalizationUtility::translate(
                         'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_edit.accessDenied',
                         'dpf',
-                        array($document->getTitle())
+                        array ($document->getTitle())
                     );
                 } else {
                     $message = LocalizationUtility::translate(
                         'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_edit.failureBlocked',
                         'dpf',
-                        array($document->getTitle())
+                        array ($document->getTitle())
                     );
                 }
             }
@@ -1119,7 +1119,7 @@ 
         if ($redirectUri) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));;
+            $this->redirect($action, $controller, null, array ('message' => $message)); ;
         }
 
     }
@@ -1133,8 +1133,8 @@ 
     protected function itemsPerPage()
     {
         $itemsPerPage = $this->session->getWorkspaceItemsPerPage();
-        $default = ($this->settings['workspaceItemsPerPage'])? $this->settings['workspaceItemsPerPage'] : 10;
-        return ($itemsPerPage)? $itemsPerPage : $default;
+        $default = ($this->settings['workspaceItemsPerPage']) ? $this->settings['workspaceItemsPerPage'] : 10;
+        return ($itemsPerPage) ? $itemsPerPage : $default;
     }
 
 }

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;

Upper-Lower-Casing +28 added lines, -28 removed lines

@@ -38,7 +38,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -46,7 +46,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * bookmarkRepository
@@ -54,7 +54,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * elasticSearch
@@ -62,7 +62,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\ElasticSearch
      * @inject
      */
-    protected $elasticSearch = null;
+    protected $elasticSearch = NULL;
 
     /**
      * documentManager
@@ -70,7 +70,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * documentValidator
@@ -86,7 +86,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
 
     /**
@@ -144,7 +144,7 @@ 
             $this->session->clearFilter();
             list($redirectAction, $redirectController) = $this->session->getListAction();
             $this->redirect(
-                $redirectAction, $redirectController, null,
+                $redirectAction, $redirectController, NULL,
                 array('message' => [], 'checkedDocumentIdentifiers' => [])
             );
         }
@@ -171,9 +171,9 @@ 
     protected function listWorkspaceAction($checkedDocumentIdentifiers = [])
     {
         if ($this->security->getUserRole() === Security::ROLE_LIBRARIAN) {
-            $this->view->assign('isWorkspace', true);
+            $this->view->assign('isWorkspace', TRUE);
         } elseif ($this->security->getUserRole() === Security::ROLE_RESEARCHER){
-            $this->view->assign('isWorkspace', false);
+            $this->view->assign('isWorkspace', FALSE);
         } else {
             $message = LocalizationUtility::translate(
                 'manager.workspace.accessDenied', 'dpf'
@@ -185,7 +185,7 @@ 
             $this->uriBuilder->getRequest()->getRequestUri()
         );
 
-        $currentPage = null;
+        $currentPage = NULL;
         $pagination = $this->getParametersSafely('@widget_0');
         if ($pagination) {
             $checkedDocumentIdentifiers = [];
@@ -209,7 +209,7 @@ 
     public function batchAction($listData)
     {
         if (array_key_exists('action', $listData)) {
-            $this->forward($listData['action'], null, null, ['listData' => $listData]);
+            $this->forward($listData['action'], NULL, NULL, ['listData' => $listData]);
         }
     }
 
@@ -236,7 +236,7 @@ 
 
                     if ($this->authorizationChecker->isGranted(DocumentVoter::REGISTER, $document)) {
 
-                        if ($this->documentValidator->validate($document, false)) {
+                        if ($this->documentValidator->validate($document, FALSE)) {
 
                             if (
                                 $this->documentManager->update(
@@ -292,7 +292,7 @@ 
 
         list($redirectAction, $redirectController) = $this->session->getListAction();
         $this->redirect(
-            $redirectAction, $redirectController, null,
+            $redirectAction, $redirectController, NULL,
             array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
@@ -341,7 +341,7 @@ 
 
         list($redirectAction, $redirectController) = $this->session->getListAction();
         $this->redirect(
-            $redirectAction, $redirectController, null,
+            $redirectAction, $redirectController, NULL,
             array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
@@ -352,7 +352,7 @@ 
      */
     public function batchReleaseValidatedAction($listData)
     {
-        $this->batchRelease($listData, true);
+        $this->batchRelease($listData, TRUE);
     }
 
     /**
@@ -361,7 +361,7 @@ 
      */
     public function batchReleaseUnvalidatedAction($listData)
     {
-        $this->batchRelease($listData, false);
+        $this->batchRelease($listData, FALSE);
     }
 
 
@@ -404,8 +404,8 @@ 
                         $documentWorkflowTransition = DocumentWorkflow::TRANSITION_RELEASE_ACTIVATE;
                         break;
                     default:
-                        $documentVoterAttribute = null;
-                        $documentWorkflowTransition = null;
+                        $documentVoterAttribute = NULL;
+                        $documentWorkflowTransition = NULL;
                         break;
                 }
 
@@ -473,7 +473,7 @@ 
 
         list($redirectAction, $redirectController) = $this->session->getListAction();
         $this->redirect(
-            $redirectAction, $redirectController, null,
+            $redirectAction, $redirectController, NULL,
             array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
 
     }
@@ -491,7 +491,7 @@ 
      * @return array
      */
     protected function getWorkspaceQuery(
-        $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = null, $sortOrder = null
+        $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = NULL, $sortOrder = NULL
     )
     {
         $workspaceFilter = [
@@ -543,7 +543,7 @@ 
      * @return array
      */
     protected function getMyPublicationsQuery(
-        $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = null, $sortOrder = null
+        $from = 0, $bookmarkIdentifiers = [], $filters= [], $excludeFilters = [], $sortField = NULL, $sortOrder = NULL
     )
     {
         $workspaceFilter = [
@@ -578,7 +578,7 @@ 
      * @return array
      */
     protected function buildQuery(
-        $workspaceFilter, $from = 0, $bookmarkIdentifiers = [], $filters = [], $excludeFilters = [], $sortField = null, $sortOrder = null
+        $workspaceFilter, $from = 0, $bookmarkIdentifiers = [], $filters = [], $excludeFilters = [], $sortField = NULL, $sortOrder = NULL
     )
     {
         // The base filter.
@@ -728,7 +728,7 @@ 
 
             foreach ($filters as $key => $filterValues) {
                 $queryFilterPart = [];
-                if (in_array($key, $validKeys, true)) {
+                if (in_array($key, $validKeys, TRUE)) {
                     if ($key == 'universityCollection') {
                         if ($filterValues && is_array($filterValues)) {
                             if (in_array("true", $filterValues)) {
@@ -1082,14 +1082,14 @@ 
                 $this->redirect(
                     'edit',
                     'DocumentFormBackoffice',
-                    null,
-                    ['document' => $document, 'activeFileTab' => true]);
+                    NULL,
+                    ['document' => $document, 'activeFileTab' => TRUE]);
             } elseif ($this->authorizationChecker->isGranted(DocumentVoter::SUGGEST_MODIFICATION, $document)) {
                 $this->redirect(
                     'edit',
                     'DocumentFormBackoffice',
-                    null,
-                    ['document' => $document, 'suggestMod' => true, 'activeFileTab' => true]);
+                    NULL,
+                    ['document' => $document, 'suggestMod' => TRUE, 'activeFileTab' => TRUE]);
             } else {
                 if ($document->getCreator() !== $this->security->getUser()->getUid()) {
                     $message = LocalizationUtility::translate(
@@ -1119,7 +1119,7 @@ 
         if ($redirectUri) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));;
+            $this->redirect($action, $controller, NULL, array('message' => $message));;
         }
 
     }

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');
     }
 

Upper-Lower-Casing +12 added lines, -12 removed lines

@@ -34,7 +34,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -42,7 +42,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -50,7 +50,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -58,7 +58,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -66,7 +66,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * persistence manager
@@ -156,7 +156,7 @@ 
      * @ignorevalidation $newDocumentForm
      * @return void
      */
-    public function newAction(DocumentForm $newDocumentForm = null)
+    public function newAction(DocumentForm $newDocumentForm = NULL)
     {
         $this->view->assign('documentForm', $newDocumentForm);
     }
@@ -179,11 +179,11 @@ 
             $documentType = $this->documentTypeRepository->findByUid($docTypeUid);
             $virtual = $documentType->getVirtual();
 
-            if (!$formDataReader->uploadError() || $virtual === true) {
+            if (!$formDataReader->uploadError() || $virtual === TRUE) {
                 $this->request->setArguments($requestArguments);
             } else {
                 $t = $docForm->getNewFileNames();
-                $this->redirect('list', 'DocumentForm', null, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
+                $this->redirect('list', 'DocumentForm', NULL, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
             }
         } else {
             $this->redirectToList("UPLOAD_POST_SIZE_ERROR");
@@ -299,11 +299,11 @@ 
             $documentType = $this->documentTypeRepository->findByUid($docTypeUid);
             $virtual = $documentType->getVirtual();
 
-            if (!$formDataReader->uploadError() || $virtual === true) {
+            if (!$formDataReader->uploadError() || $virtual === TRUE) {
                 $this->request->setArguments($requestArguments);
             } else {
                 $t = $docForm->getNewFileNames();
-                $this->redirect('list', 'Document', null, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
+                $this->redirect('list', 'Document', NULL, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
             }
         } else {
             $this->redirectToList("UPLOAD_POST_SIZE_ERROR");
@@ -328,7 +328,7 @@ 
             throw new \EWW\Dpf\Exceptions\DocumentMaxSizeErrorException("Maximum document size exceeded.");
         }
 
-        $updateDocument->setChanged(true);
+        $updateDocument->setChanged(TRUE);
         $this->documentRepository->update($updateDocument);
 
 
@@ -368,7 +368,7 @@ 
         $this->redirect('list');
     }
 
-    protected function redirectToList($message = null)
+    protected function redirectToList($message = NULL)
     {
         $this->redirect('list');
     }

Classes/Controller/DocumentController.php

Spacing +7 added lines, -7 removed lines

@@ -353,7 +353,7 @@ 
                             // check if new document form has more field items as the existing form
                             if ($valueFieldCounter < $fieldCounter && !$checkFieldsForAdding) {
                                 // field added
-                                for ($i = count($valueField); $i < $fieldCounter;$i++) {
+                                for ($i = count($valueField); $i < $fieldCounter; $i++) {
                                     $returnArray['added'][] = $docForm2->getItems()[$keyPage][$keyRepeatPage]->getItems()[$keyGroup][$keyRepeatGroup]->getItems()[$keyField][$i];
 
                                 }
@@ -365,7 +365,7 @@ 
                     if ($valueGroupCounter < count($docForm2->getItems()[$keyPage][$keyRepeatPage]->getItems()[$keyGroup])) {
                         // group added
                         $counter = count($docForm2->getItems()[$keyPage][$keyRepeatPage]->getItems()[$keyGroup]);
-                        for ($i = $valueGroupCounter; $i < $counter;$i++) {
+                        for ($i = $valueGroupCounter; $i < $counter; $i++) {
                             $returnArray['added'][] = $docForm2->getItems()[$keyPage][$keyRepeatPage]->getItems()[$keyGroup][$i];
                         }
                     }
@@ -683,7 +683,7 @@ 
         }
 
         $this->editingLockService->lock(
-            ($document->getObjectIdentifier()? $document->getObjectIdentifier() : $document->getUid()),
+            ($document->getObjectIdentifier() ? $document->getObjectIdentifier() : $document->getUid()),
             $this->security->getUser()->getUid()
         );
 
@@ -738,7 +738,7 @@ 
         $documentForm = $documentMapper->getDocumentForm($document);
 
         $this->view->assign('suggestMod', true);
-        $this->forward('edit','DocumentFormBackoffice',NULL, ['documentForm' => $documentForm, 'suggestMod' => true]);
+        $this->forward('edit', 'DocumentFormBackoffice', NULL, ['documentForm' => $documentForm, 'suggestMod' => true]);
     }
 
 
@@ -870,7 +870,7 @@ 
 
             if ($this->documentManager->update($document, $workflowTransition)) {
 
-                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:'.$messageKeyPart.'.success';
+                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:' . $messageKeyPart . '.success';
                 $this->flashMessage($document, $key, AbstractMessage::OK);
 
                 if ($this->security->getUserRole() === Security::ROLE_LIBRARIAN) {
@@ -899,7 +899,7 @@ 
 
                 $this->redirectToDocumentList();
             } else {
-                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:'.$messageKeyPart.'.failure';
+                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:' . $messageKeyPart . '.failure';
                 $this->flashMessage($document, $key, AbstractMessage::ERROR);
                 $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             }
@@ -910,7 +910,7 @@ 
             if ($exception instanceof DPFExceptionInterface) {
                 $key = $exception->messageLanguageKey();
             } else {
-                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:'.$messageKeyPart.'.failure';
+                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:' . $messageKeyPart . '.failure';
             }
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
             $this->redirectToDocumentList();

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';

Upper-Lower-Casing +32 added lines, -32 removed lines

@@ -44,7 +44,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * inputOptionListRepository
@@ -52,7 +52,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\InputOptionListRepository
      * @inject
      */
-    protected $inputOptionListRepository = null;
+    protected $inputOptionListRepository = NULL;
 
     /**
      * persistence manager
@@ -68,7 +68,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * documentValidator
@@ -105,7 +105,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
 
     /**
@@ -114,7 +114,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     /**
      * documentManager
@@ -122,7 +122,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * bookmarkRepository
@@ -130,7 +130,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * DocumentController constructor.
@@ -196,7 +196,7 @@ 
      * @param Document $document
      * @param bool $acceptAll
      */
-    public function acceptSuggestionAction(\EWW\Dpf\Domain\Model\Document $document, bool $acceptAll = true) {
+    public function acceptSuggestionAction(\EWW\Dpf\Domain\Model\Document $document, bool $acceptAll = TRUE) {
 
         $args = $this->request->getArguments();
 
@@ -219,7 +219,7 @@ 
         if ($acceptAll) {
             // all changes are confirmed
             // copy suggest to origin document
-            $originDocument->copy($document, true);
+            $originDocument->copy($document, TRUE);
 
             if ($originDocument->getTransferStatus() == 'RESTORE') {
                 if ($originDocument->getObjectIdentifier()) {
@@ -243,7 +243,7 @@ 
             $this->documentRepository->remove($document);
 
             // redirect to document
-            $this->redirect('showDetails', 'Document', null, ['document' => $originDocument]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $originDocument]);
         }
 
         $this->redirectToDocumentList();
@@ -294,11 +294,11 @@ 
                 // groups
                 foreach ($valueRepeatPage->getItems() as $keyGroup => $valueGroup) {
 
-                    $checkFieldsForAdding = false;
+                    $checkFieldsForAdding = FALSE;
                     $valueGroupCounter = count($valueGroup);
 
                     if ($valueGroupCounter < count($docForm2->getItems()[$keyPage][$keyRepeatPage]->getItems()[$keyGroup])) {
-                        $checkFieldsForAdding = true;
+                        $checkFieldsForAdding = TRUE;
                     }
 
                     foreach ($valueGroup as $keyRepeatGroup => $valueRepeatGroup) {
@@ -311,7 +311,7 @@ 
                                 $valueFieldCounter = count($valueField);
 
                                 // check if group or field is not existing
-                                $notExisting = false;
+                                $notExisting = FALSE;
                                 try {
                                     $flag = 'page';
                                     $value2 = $docForm2->getItems()[$keyPage];
@@ -321,7 +321,7 @@ 
                                     $value2 = $value2[$keyRepeatGroup]->getItems()[$keyField];
                                     $flag = 'field';
                                 } catch (\Throwable $t) {
-                                    $notExisting = true;
+                                    $notExisting = TRUE;
                                 }
 
                                 $item = NULL;
@@ -404,7 +404,7 @@ 
                 $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_discard.accessDenied';
             }
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -433,7 +433,7 @@ 
                 $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_postpone.accessDenied';
             }
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -469,7 +469,7 @@ 
                 $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_deleteLocally.accessDenied';
             }
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -517,7 +517,7 @@ 
         } else {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_deleteLocally.failureNewVersion';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
         }
     }
 
@@ -532,7 +532,7 @@ 
         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);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -600,11 +600,11 @@ 
         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);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
-        $this->updateDocument($document, DocumentWorkflow::TRANSITION_RELEASE_PUBLISH, null);
+        $this->updateDocument($document, DocumentWorkflow::TRANSITION_RELEASE_PUBLISH, NULL);
 
     }
 
@@ -621,11 +621,11 @@ 
         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);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
-        $this->updateDocument($document, DocumentWorkflow::TRANSITION_RELEASE_ACTIVATE, null);
+        $this->updateDocument($document, DocumentWorkflow::TRANSITION_RELEASE_ACTIVATE, NULL);
 
     }
 
@@ -640,13 +640,13 @@ 
         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);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
         }
 
-        if (!$this->documentValidator->validate($document, false)) {
+        if (!$this->documentValidator->validate($document, FALSE)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_register.missingValues';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
         }
 
         $this->workflow->apply($document, \EWW\Dpf\Domain\Workflow\DocumentWorkflow::TRANSITION_REGISTER);
@@ -665,7 +665,7 @@ 
 
         $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_register.success';
         $this->flashMessage($document, $key, AbstractMessage::OK);
-        $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+        $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
     }
 
     /**
@@ -717,7 +717,7 @@ 
         if (!$this->authorizationChecker->isGranted(DocumentVoter::SUGGEST_RESTORE, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_suggestRestore.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -737,8 +737,8 @@ 
         /* @var $newDocument \EWW\Dpf\Domain\Model\Document */
         $documentForm = $documentMapper->getDocumentForm($document);
 
-        $this->view->assign('suggestMod', true);
-        $this->forward('edit','DocumentFormBackoffice',NULL, ['documentForm' => $documentForm, 'suggestMod' => true]);
+        $this->view->assign('suggestMod', TRUE);
+        $this->forward('edit','DocumentFormBackoffice',NULL, ['documentForm' => $documentForm, 'suggestMod' => TRUE]);
     }
 
 
@@ -772,7 +772,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();
 
@@ -815,7 +815,7 @@ 
             $message,
             '',
             $severity,
-            true
+            TRUE
         );
     }
 

Classes/Controller/AbstractSearchController.php

Indentation +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
         // document must be active
         if($showDeleted == false) {
 
-          //  $queryFilter['body']['query']['bool']['must'][]['term']['STATE'] = 'A';
+            //  $queryFilter['body']['query']['bool']['must'][]['term']['STATE'] = 'A';
 
         };
 

Spacing +19 added lines, -19 removed lines

@@ -54,7 +54,7 @@ 
 
         $searchString = $this->escapeQuery(trim($searchString));
 
-        $query['body']['query']['bool']['should'][0]['query_string']['query']                       = $searchString;
+        $query['body']['query']['bool']['should'][0]['query_string']['query'] = $searchString;
         //$query['body']['query']['bool']['should'][1]['has_child']['query']['query_string']['query'] = $searchString;
         $query['body']['query']['bool']['minimum_should_match'] = "1"; // 1
 
@@ -71,21 +71,21 @@ 
      * build array for elasticsearch
      * @return array Elasticsearch query array
      */
-    public function extendedSearch($searchArray = array())
+    public function extendedSearch($searchArray = array ())
     {
 
-        $query  = array();
-        $filter = array();
+        $query  = array ();
+        $filter = array ();
         foreach ($searchArray as $key => $qry) {
             $qry = trim($qry);
 
             if (!empty($qry) && in_array($key, self::$matches)) {
 
-                $query['body']['query']['bool']['must'][] = array('match' => array($key => $qry));
+                $query['body']['query']['bool']['must'][] = array ('match' => array ($key => $qry));
 
             } elseif (!empty($qry) && in_array($key, self::$terms)) {
 
-                $query['body']['query']['bool']['must'][] = array('term' => array($key => $qry));
+                $query['body']['query']['bool']['must'][] = array ('term' => array ($key => $qry));
 
             } elseif (!empty($qry) && $key == 'from') {
 
@@ -104,7 +104,7 @@ 
 
         if (isset($filter['gte']) || isset($filter['lte'])) {
 
-            $query['body']['query']['bool']['must'][] = array('range' => array('distribution_date' => $filter));
+            $query['body']['query']['bool']['must'][] = array ('range' => array ('distribution_date' => $filter));
 
         }
 
@@ -122,19 +122,19 @@ 
     public function resultsFilter($query, $showDeleted = false)
     {
 
-        $queryFilter = array();
+        $queryFilter = array ();
 
         // Frontend only
         $searchResultsFilter = $this->settings['searchResultsFilter'];
-        if(!empty($searchResultsFilter)) {
+        if (!empty($searchResultsFilter)) {
 
             // add doctypes
-            if($searchResultsFilter['doctype']) {
+            if ($searchResultsFilter['doctype']) {
 
                 $uids = GeneralUtility::trimExplode(',', $searchResultsFilter['doctype']);
                 $documentTypeRepository = $this->documentTypeRepository;
-                $documentTypes = array();
-                foreach($uids as $uid) {
+                $documentTypes = array ();
+                foreach ($uids as $uid) {
                     $documentType = $documentTypeRepository->findByUid($uid);
                     $documentTypes[] = $documentType->getName();
                 };
@@ -142,7 +142,7 @@ 
             }
 
             // add date filter
-            $dateFilter = array();
+            $dateFilter = array ();
             if ($searchResultsFilter['from']) {
 
                 $from     = date('d.m.Y', $searchResultsFilter['from']);
@@ -154,7 +154,7 @@ 
 
             if ($searchResultsFilter['till']) {
 
-                $till          = date('d.m.Y', $searchResultsFilter['till']);
+                $till = date('d.m.Y', $searchResultsFilter['till']);
                 $dateTime = $this->convertFormDate($till, true);
                 $dateFilter['lte'] = $dateTime->format('Y-m-d');
                 unset($searchResultsFilter['till']);
@@ -163,14 +163,14 @@ 
 
             if (isset($dateFilter['gte']) || isset($dateFilter['lte'])) {
 
-                $queryFilter['body']['query']['bool']['must'][] = array('range' => array('distribution_date' => $dateFilter));
+                $queryFilter['body']['query']['bool']['must'][] = array ('range' => array ('distribution_date' => $dateFilter));
 
             }
 
             foreach ($searchResultsFilter as $key => $qry) {
 
-                if(!empty($qry)) {
-                    $queryFilter['body']['query']['bool']['must'][] = array('match' => array($key => $qry));
+                if (!empty($qry)) {
+                    $queryFilter['body']['query']['bool']['must'][] = array ('match' => array ($key => $qry));
                 }
 
             }
@@ -178,7 +178,7 @@ 
         }
 
         // document must be active
-        if($showDeleted == false) {
+        if ($showDeleted == false) {
 
           //  $queryFilter['body']['query']['bool']['must'][]['term']['STATE'] = 'A';
 
@@ -236,7 +236,7 @@ 
         $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\');
         $string                   = preg_replace_callback(
             '/([' . $luceneReservedCharacters . '])/',
-            function ($matches) {
+            function($matches) {
                 return '\\' . $matches[0];
             },
             $string

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];

Upper-Lower-Casing +11 added lines, -11 removed lines

@@ -49,7 +49,7 @@ 
     {
         // don't return query if searchString is empty
         if (empty($searchString)) {
-            return null;
+            return NULL;
         }
 
         $searchString = $this->escapeQuery(trim($searchString));
@@ -61,7 +61,7 @@ 
         // child_type is invalid in elasticsearch 7.5
         //$query['body']['query']['bool']['should'][1]['has_child']['type'] = "datastream"; // 1
 
-        $query = $this->resultsFilter($query, false);
+        $query = $this->resultsFilter($query, FALSE);
 
         return $query;
 
@@ -89,13 +89,13 @@ 
 
             } elseif (!empty($qry) && $key == 'from') {
 
-                if ($dateTime = $this->convertFormDate($qry, false)) {
+                if ($dateTime = $this->convertFormDate($qry, FALSE)) {
                     $filter['gte'] = $dateTime->format('Y-m-d');
                 }
 
             } elseif (!empty($qry) && $key == 'till') {
 
-                if ($dateTime = $this->convertFormDate($qry, true)) {
+                if ($dateTime = $this->convertFormDate($qry, TRUE)) {
                     $filter['lte'] = $dateTime->format('Y-m-d');
                 }
 
@@ -108,7 +108,7 @@ 
 
         }
 
-        $showDeleted = ($searchArray['showDeleted'] == 'true') ? true : false;
+        $showDeleted = ($searchArray['showDeleted'] == 'true') ? TRUE : FALSE;
         $query = $this->resultsFilter($query, $showDeleted);
         return $query;
 
@@ -119,7 +119,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();
@@ -146,7 +146,7 @@ 
             if ($searchResultsFilter['from']) {
 
                 $from     = date('d.m.Y', $searchResultsFilter['from']);
-                $dateTime = $this->convertFormDate($from, false);
+                $dateTime = $this->convertFormDate($from, FALSE);
                 $dateFilter['gte'] = $dateTime->format('Y-m-d');
                 unset($searchResultsFilter['from']);
 
@@ -155,7 +155,7 @@ 
             if ($searchResultsFilter['till']) {
 
                 $till          = date('d.m.Y', $searchResultsFilter['till']);
-                $dateTime = $this->convertFormDate($till, true);
+                $dateTime = $this->convertFormDate($till, TRUE);
                 $dateFilter['lte'] = $dateTime->format('Y-m-d');
                 unset($searchResultsFilter['till']);
 
@@ -178,7 +178,7 @@ 
         }
 
         // document must be active
-        if($showDeleted == false) {
+        if($showDeleted == FALSE) {
 
           //  $queryFilter['body']['query']['bool']['must'][]['term']['STATE'] = 'A';
 
@@ -209,7 +209,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) {
@@ -222,7 +222,7 @@ 
                 return new \DateTime($dateString);
             }
         } catch (\Exception $_) {
-            return false;
+            return FALSE;
         }
     }
 

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;
     }

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
 
     /**
@@ -45,10 +45,10 @@ 
             $bookmark->setDocumentIdentifier($identifier);
             $bookmark->setFeUserUid($this->security->getUser()->getUid());
             $this->bookmarkRepository->add($bookmark);
-            return true;
+            return TRUE;
         }
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -63,10 +63,10 @@ 
         $bookmark = $this->bookmarkRepository->findBookmark($this->security->getUser()->getUid(), $identifier);
         if ($bookmark) {
             $this->bookmarkRepository->remove($bookmark);
-            return true;
+            return TRUE;
         }
 
-        return false;
+        return FALSE;
     }
 
     /**

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);
     }

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
      * @var \EWW\Dpf\Security\AuthorizationChecker
      * @inject
      */
-    protected $authorizationChecker = null;
+    protected $authorizationChecker = NULL;
 
     /**
      * security
@@ -33,7 +33,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
     /**
      * clientRepository
@@ -41,7 +41,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\ClientRepository
      * @inject
      */
-    protected $clientRepository = null;
+    protected $clientRepository = NULL;
 
     /**
      * signalSlotDispatcher
@@ -49,7 +49,7 @@ 
      * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
      * @inject
      */
-    protected $signalSlotDispatcher = null;
+    protected $signalSlotDispatcher = NULL;
 
     /**
      * session
@@ -57,7 +57,7 @@ 
      * @var \EWW\Dpf\Helper\Session
      * @inject
      */
-    protected $session = null;
+    protected $session = NULL;
 
 
     protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view)
@@ -74,7 +74,7 @@ 
                 $message,
                 $messageTitle = '',
                 $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::WARNING,
-                $storeInSession = true
+                $storeInSession = TRUE
             );
         } else {
             $view->assign('client', $client);
@@ -138,7 +138,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->filterSafelyParameters($this->request->getArgument($parameterName));
         }
-        return null;
+        return NULL;
     }
 
     /**

Classes/Controller/DocumentFormBackofficeController.php

Spacing +16 added lines, -16 removed lines

@@ -82,7 +82,7 @@ 
     }
 
     public function arrayRecursiveDiff($aArray1, $aArray2) {
-        $aReturn = array();
+        $aReturn = array ();
 
         foreach ($aArray1 as $mKey => $mValue) {
             if (array_key_exists($mKey, $aArray2)) {
@@ -130,13 +130,13 @@ 
                 $message = LocalizationUtility::translate(
                     'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_edit.accessDenied',
                     'dpf',
-                    array($document->getTitle())
+                    array ($document->getTitle())
                 );
             } else {
                 $message = LocalizationUtility::translate(
                     'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_edit.failureBlocked',
                     'dpf',
-                    array($document->getTitle())
+                    array ($document->getTitle())
                 );
             }
 
@@ -149,7 +149,7 @@ 
         $this->view->assign('suggestMod', $suggestMod);
 
         $this->editingLockService->lock(
-            ($document->getObjectIdentifier()? $document->getObjectIdentifier() : $document->getUid()),
+            ($document->getObjectIdentifier() ? $document->getObjectIdentifier() : $document->getUid()),
             $this->security->getUser()->getUid()
         );
 
@@ -224,10 +224,10 @@ 
             $newDocument->setCreator($this->security->getUser()->getUid());
             $this->documentRepository->add($newDocument);
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::SUCCESS;
-            $this->addFlashMessage("Success", '', $severity,false);
+            $this->addFlashMessage("Success", '', $severity, false);
         } catch (\Throwable $t) {
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR;
-            $this->addFlashMessage("Failed", '', $severity,false);
+            $this->addFlashMessage("Failed", '', $severity, false);
         }
 
         $this->redirectToDocumentList();
@@ -281,7 +281,7 @@ 
                 $message = LocalizationUtility::translate(
                     'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_update.accessDenied',
                     'dpf',
-                    array($document->getTitle())
+                    array ($document->getTitle())
                 );
                 $this->addFlashMessage($message, '', AbstractMessage::ERROR);
                 $this->redirect(
@@ -300,7 +300,7 @@ 
             $workflowTransition = null;
 
             // Convert the temporary copy into a local working copy if needed.
-            if ( $updateDocument->isTemporaryCopy() && $saveMode == 'saveWorkingCopy') {
+            if ($updateDocument->isTemporaryCopy() && $saveMode == 'saveWorkingCopy') {
                 $saveWorkingCopy = true;
                 $updateDocument->setTemporary(false);
                 $workflowTransition = DocumentWorkflow::TRANSITION_IN_PROGRESS;
@@ -323,19 +323,19 @@ 
                 $message = LocalizationUtility::translate(
                     'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_update.success',
                     'dpf',
-                    array($updateDocument->getTitle())
+                    array ($updateDocument->getTitle())
                 );
                 $this->addFlashMessage($message, '', AbstractMessage::OK);
 
                 if ($this->security->getUserRole() === Security::ROLE_LIBRARIAN) {
                     if ($saveWorkingCopy) {
-                        if(
+                        if (
                             $this->bookmarkRepository->addBookmark(
                                 $this->security->getUser()->getUid(), $updateDocument
                             )
                         ) {
                             $this->addFlashMessage(
-                                LocalizationUtility::translate("manager.workspace.bookmarkAdded","dpf"), '',
+                                LocalizationUtility::translate("manager.workspace.bookmarkAdded", "dpf"), '',
                                 AbstractMessage::INFO
                             );
                         }
@@ -354,7 +354,7 @@ 
                                     )
                                 ) {
                                     $this->addFlashMessage(
-                                        LocalizationUtility::translate("manager.workspace.bookmarkRemoved.singular","dpf"), '',
+                                        LocalizationUtility::translate("manager.workspace.bookmarkRemoved.singular", "dpf"), '',
                                         AbstractMessage::INFO
                                     );
                                 }
@@ -370,7 +370,7 @@ 
                 $message = LocalizationUtility::translate(
                     'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_update.failure',
                     'dpf',
-                    array($updateDocument->getTitle())
+                    array ($updateDocument->getTitle())
                 );
                 $this->addFlashMessage($message, '', AbstractMessage::ERROR);
             }
@@ -396,12 +396,12 @@ 
             $exceptionMsg[] = LocalizationUtility::translate(
                 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_update.failure',
                 'dpf',
-                array($updateDocument->getTitle())
+                array ($updateDocument->getTitle())
             );
 
             $exceptionMsg[] = LocalizationUtility::translate($key, 'dpf');
 
-            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity,true);
+            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity, true);
             $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
         }
     }
@@ -509,7 +509,7 @@ 
         if ($redirectUri) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));;
+            $this->redirect($action, $controller, null, array ('message' => $message)); ;
         }
     }
 

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) {

Upper-Lower-Casing +29 added lines, -29 removed lines

@@ -50,7 +50,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * documentManager
@@ -58,7 +58,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * bookmarkRepository
@@ -66,7 +66,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * DocumentController constructor.
@@ -112,7 +112,7 @@ 
      * @return void
      */
     public function editAction(
-        \EWW\Dpf\Domain\Model\DocumentForm $documentForm, bool $suggestMod = false, $activeFileTab = false
+        \EWW\Dpf\Domain\Model\DocumentForm $documentForm, bool $suggestMod = FALSE, $activeFileTab = FALSE
     )
     {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
@@ -141,7 +141,7 @@ 
             }
 
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -165,18 +165,18 @@ 
     {
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
-        $hasFilesFlag = true;
+        $hasFilesFlag = TRUE;
 
         $workingCopy = $this->documentRepository->findByUid($documentForm->getDocumentUid());
 
         if ($workingCopy->isTemporary()) {
-            $workingCopy->setTemporary(false);
+            $workingCopy->setTemporary(FALSE);
             // +++delete+++ $workingCopy->setEditorUid(0);
         }
 
         if (empty($workingCopy->getFileData())) {
             // no files are linked to the document
-            $hasFilesFlag = false;
+            $hasFilesFlag = FALSE;
         }
 
         $newDocument = $this->objectManager->get(Document::class);
@@ -196,7 +196,7 @@ 
             $newDocument->setLinkedUid($document->getUid());
         }
 
-        $newDocument->setSuggestion(true);
+        $newDocument->setSuggestion(TRUE);
         $newDocument->setComment($document->getComment());
 
         if ($restore) {
@@ -224,10 +224,10 @@ 
             $newDocument->setCreator($this->security->getUser()->getUid());
             $this->documentRepository->add($newDocument);
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::SUCCESS;
-            $this->addFlashMessage("Success", '', $severity,false);
+            $this->addFlashMessage("Success", '', $severity,FALSE);
         } catch (\Throwable $t) {
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR;
-            $this->addFlashMessage("Failed", '', $severity,false);
+            $this->addFlashMessage("Failed", '', $severity,FALSE);
         }
 
         $this->redirectToDocumentList();
@@ -238,7 +238,7 @@ 
     {
         if ($this->request->getArgument('documentData')['suggestMod']) {
             $restore = $this->request->getArgument('documentData')['suggestRestore'];
-            $this->forward('createSuggestionDocument', null, null, ['documentForm' => $documentForm, 'restore' => $restore]);
+            $this->forward('createSuggestionDocument', NULL, NULL, ['documentForm' => $documentForm, 'restore' => $restore]);
         }
 
         if ($this->request->hasArgument('saveAndUpdate')) {
@@ -246,7 +246,7 @@ 
         } elseif ($this->request->hasArgument('saveWorkingCopy')) {
             $saveMode = 'saveWorkingCopy';
         } else {
-            $saveMode = null;
+            $saveMode = NULL;
         }
 
         $this->forward(
@@ -268,7 +268,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 */
@@ -286,7 +286,7 @@ 
                 $this->addFlashMessage($message, '', AbstractMessage::ERROR);
                 $this->redirect(
                     'showDetails', 'Document',
-                    null, ['document' => $document]
+                    NULL, ['document' => $document]
                 );
             }
 
@@ -296,13 +296,13 @@ 
             /** @var \EWW\Dpf\Domain\Model\Document $updateDocument */
             $updateDocument = $documentMapper->getDocument($documentForm);
 
-            $saveWorkingCopy = false;
-            $workflowTransition = null;
+            $saveWorkingCopy = FALSE;
+            $workflowTransition = NULL;
 
             // Convert the temporary copy into a local working copy if needed.
             if ( $updateDocument->isTemporaryCopy() && $saveMode == 'saveWorkingCopy') {
-                $saveWorkingCopy = true;
-                $updateDocument->setTemporary(false);
+                $saveWorkingCopy = TRUE;
+                $updateDocument->setTemporary(FALSE);
                 $workflowTransition = DocumentWorkflow::TRANSITION_IN_PROGRESS;
             } elseif ($updateDocument->isTemporaryCopy() && $saveMode == 'saveAndUpdate') {
                 $workflowTransition = DocumentWorkflow::TRANSITION_REMOTE_UPDATE;
@@ -378,7 +378,7 @@ 
             if ($workflowTransition && $workflowTransition === DocumentWorkflow::TRANSITION_REMOTE_UPDATE) {
                 $this->redirectToDocumentList();
             } else {
-                $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
+                $this->redirect('showDetails', 'Document', NULL, ['document' => $updateDocument]);
             }
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
             // A redirect always throws this exception, but in this case, however,
@@ -401,8 +401,8 @@ 
 
             $exceptionMsg[] = LocalizationUtility::translate($key, 'dpf');
 
-            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity,true);
-            $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
+            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity,TRUE);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $updateDocument]);
         }
     }
 
@@ -419,7 +419,7 @@ 
             $args[] = $document->getTitle();
             $message = LocalizationUtility::translate($key, 'dpf', $args);
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -433,7 +433,7 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
 
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
@@ -455,7 +455,7 @@ 
                 implode(" ", $message),
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
 
@@ -473,7 +473,7 @@ 
      *
      * @return void
      */
-    public function cancelEditAction($documentUid = 0, $documentList = false)
+    public function cancelEditAction($documentUid = 0, $documentList = FALSE)
     {
         if ($documentList) {
             $this->redirectToDocumentList();
@@ -483,7 +483,7 @@ 
             /** @var $document \EWW\Dpf\Domain\Model\Document */
             $document = $this->documentRepository->findByUid($documentUid);
 
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
         }
     }
 
@@ -502,14 +502,14 @@ 
      * @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) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));;
+            $this->redirect($action, $controller, NULL, array('message' => $message));;
         }
     }
 

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']);

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     /**
      * frontendUserHelper
@@ -30,7 +30,7 @@ 
      * @var \EWW\Dpf\Helper\FrontendUserHelper
      * @inject
      */
-    protected $frontendUserHelper = null;
+    protected $frontendUserHelper = NULL;
 
 
     const ROLE_ANONYMOUS = "ROLE_ANONYMOUS";