kitodo / kitodo-publication

Classes/ViewHelpers/ShowStatusViewHelper.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         }
 
         return \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
-            "manager.documentList.state.".$aliasState,
+            "manager.documentList.state." . $aliasState,
             'dpf',
             $arguments = null
         );

Braces +3 added lines, -6 removed lines

@@ -16,10 +16,8 @@ 
 
 use EWW\Dpf\Domain\Workflow\DocumentWorkflow;
 
-class ShowStatusViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper
-{
-    public function initializeArguments()
-    {
+class ShowStatusViewHelper extends \TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper {
+    public function initializeArguments() {
         parent::initializeArguments();
 
         $this->registerArgument('status', 'string', 'The document state', true);
@@ -29,8 +27,7 @@ 
      * Maps the internal states to more user friendly and localized state names.
      * @return string
      */
-    public function render()
-    {
+    public function render() {
         $status = $this->arguments['status'];
 
         $aliasState = DocumentWorkflow::getAliasStateByLocalOrRepositoryState($status);

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

@@ -22,7 +22,7 @@ 
     {
         parent::initializeArguments();
 
-        $this->registerArgument('status', 'string', 'The document state', true);
+        $this->registerArgument('status', 'string', 'The document state', TRUE);
     }
 
     /**
@@ -43,7 +43,7 @@ 
         return \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
             "manager.documentList.state.".$aliasState,
             'dpf',
-            $arguments = null
+            $arguments = NULL
         );
     }
 }

Classes/Controller/DocumentController.php

Spacing +8 added lines, -8 removed lines

@@ -402,7 +402,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];
 
                                 }
@@ -414,7 +414,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];
                         }
                     }
@@ -663,7 +663,7 @@ 
 
         $newDocument->setState(DocumentWorkflow::STATE_NEW_NONE);
 
-        $copyTitle = LocalizationUtility::translate("manager.workspace.title.copy", "dpf").$document->getTitle();
+        $copyTitle = LocalizationUtility::translate("manager.workspace.title.copy", "dpf") . $document->getTitle();
 
         $newDocument->setTitle($copyTitle);
 
@@ -804,7 +804,7 @@ 
         }
 
         $this->editingLockService->lock(
-            ($document->getObjectIdentifier()? $document->getObjectIdentifier() : $document->getUid()),
+            ($document->getObjectIdentifier() ? $document->getObjectIdentifier() : $document->getUid()),
             $this->security->getUser()->getUid()
         );
 
@@ -871,7 +871,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]);
     }
 
 
@@ -1008,7 +1008,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) {
@@ -1037,7 +1037,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]);
             }
@@ -1048,7 +1048,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 +19 added lines, -38 removed lines

@@ -35,8 +35,7 @@ 
 /**
  * DocumentController
  */
-class DocumentController extends AbstractController
-{
+class DocumentController extends AbstractController {
 
     /**
      * documentRepository
@@ -151,8 +150,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -167,8 +165,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'],
@@ -439,8 +436,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(
@@ -468,8 +464,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(
@@ -498,8 +493,7 @@ 
      * @param int $documentTypeUid
      * @return void
      */
-    public function changeDocumentTypeAction(\EWW\Dpf\Domain\Model\Document $document, $documentTypeUid = 0)
-    {
+    public function changeDocumentTypeAction(\EWW\Dpf\Domain\Model\Document $document, $documentTypeUid = 0) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::UPDATE, $document)) {
             if (
             $this->editingLockService->isLocked(
@@ -544,8 +538,7 @@ 
      * @param string $reason
      * @return void
      */
-    public function deleteLocallySuggestionAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp, $reason = "")
-    {
+    public function deleteLocallySuggestionAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp, $reason = "") {
         $this->redirect(
             'deleteLocally',
             'Document',
@@ -567,8 +560,7 @@ 
      * @param string $reason
      * @return void
      */
-    public function deleteLocallyAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp, $reason = "")
-    {
+    public function deleteLocallyAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp, $reason = "") {
         if (empty($document->getObjectIdentifier()) || $document->isSuggestion()) {
             $voterAttribute = DocumentVoter::DELETE_LOCALLY;
         } else {
@@ -649,8 +641,7 @@ 
      * @param Document $document
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
-    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);
@@ -706,8 +697,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);
@@ -729,8 +719,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);
@@ -748,8 +737,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);
@@ -795,8 +783,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);
@@ -834,8 +821,7 @@ 
     }
 
 
-    public function cancelListTaskAction()
-    {
+    public function cancelListTaskAction() {
         $this->redirectToDocumentList();
     }
     
@@ -878,8 +864,7 @@ 
     /**
      * initializeAction
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -910,8 +895,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->getStoredAction();
 
         if ($redirectUri) {
@@ -926,8 +910,7 @@ 
      *
      * @return mixed
      */
-    protected function getStoragePID()
-    {
+    protected function getStoragePID() {
         return $this->settings['persistence']['classes']['EWW\Dpf\Domain\Model\Document']['newRecordStoragePid'];
     }
 
@@ -938,8 +921,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();
@@ -966,8 +948,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 +40 added lines, -40 removed lines

@@ -45,7 +45,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -53,7 +53,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * inputOptionListRepository
@@ -61,7 +61,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\InputOptionListRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $inputOptionListRepository = null;
+    protected $inputOptionListRepository = NULL;
 
     /**
      * persistence manager
@@ -77,7 +77,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * documentValidator
@@ -93,7 +93,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DepositLicenseLogRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $depositLicenseLogRepository = null;
+    protected $depositLicenseLogRepository = NULL;
 
     /**
      * workflow
@@ -122,7 +122,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
 
     /**
@@ -131,7 +131,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     /**
      * documentManager
@@ -139,7 +139,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * bookmarkRepository
@@ -147,7 +147,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * DocumentController constructor.
@@ -213,7 +213,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) {
 
         /** @var DocumentMapper $documentMapper */
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
@@ -234,7 +234,7 @@ 
         if ($acceptAll) {
             // all changes are confirmed
             // copy suggest to origin document
-            $originDocument->copy($document, true);
+            $originDocument->copy($document, TRUE);
 
             if ($document->getRemoteState() != DocumentWorkflow::REMOTE_STATE_NONE) {
                 if ($document->getLocalState() != DocumentWorkflow::LOCAL_STATE_IN_PROGRESS) {
@@ -292,7 +292,7 @@ 
             );
 
             // redirect to document
-            $this->redirect('showDetails', 'Document', null, ['document' => $originDocument]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $originDocument]);
         }
 
         $this->redirectToDocumentList();
@@ -343,11 +343,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) {
@@ -360,7 +360,7 @@ 
                                 $valueFieldCounter = count($valueField);
 
                                 // check if group or field is not existing
-                                $notExisting = false;
+                                $notExisting = FALSE;
                                 try {
                                     $flag = 'page';
                                     $value2 = $docForm2->getItems()[$keyPage];
@@ -370,7 +370,7 @@ 
                                     $value2 = $value2[$keyRepeatGroup]->getItems()[$keyField];
                                     $flag = 'field';
                                 } catch (\Throwable $t) {
-                                    $notExisting = true;
+                                    $notExisting = TRUE;
                                 }
 
                                 $item = NULL;
@@ -454,7 +454,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;
         }
 
@@ -483,7 +483,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;
         }
 
@@ -513,7 +513,7 @@ 
                 $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_update.accessDenied';
             }
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -527,12 +527,12 @@ 
             $internalFormat->setDocumentType($documentType->getName());
             $document->setXmlData($internalFormat->getXml());
 
-            $this->updateDocument($document, '', null);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->updateDocument($document, '', NULL);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
         } else {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_update.failure';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
     }
@@ -550,7 +550,7 @@ 
         $this->redirect(
             'deleteLocally',
             'Document',
-            null,
+            NULL,
             [
                 'document' => $document,
                 'tstamp' => $tstamp,
@@ -588,7 +588,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;
         }
 
@@ -641,7 +641,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]);
         }
     }
 
@@ -655,7 +655,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;
         }
 
@@ -712,11 +712,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);
 
         /** @var Notifier $notifier */
         $notifier = $this->objectManager->get(Notifier::class);
@@ -735,11 +735,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);
         
     }
     
@@ -754,13 +754,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);
@@ -787,7 +787,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]);
     }
 
     /**
@@ -820,7 +820,7 @@ 
         }
 
         $mapper = $this->objectManager->get(DocumentMapper::class);
-        $documentForm = $mapper->getDocumentForm($document, false);
+        $documentForm = $mapper->getDocumentForm($document, FALSE);
 
         $documentTypes = [0 => ''];
         foreach ($this->documentTypeRepository->getDocumentTypesAlphabetically() as $documentType) {
@@ -851,7 +851,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;
         }
 
@@ -871,8 +871,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]);
     }
 
 
@@ -911,7 +911,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->getStoredAction();
 
@@ -954,7 +954,7 @@ 
             $message,
             '',
             $severity,
-            true
+            TRUE
         );
     }
 

Classes/Controller/DocumentFormBackofficeController.php

Spacing +11 added lines, -11 removed lines

@@ -92,7 +92,7 @@ 
     }
 
     public function arrayRecursiveDiff($aArray1, $aArray2) {
-        $aReturn = array();
+        $aReturn = array ();
 
         foreach ($aArray1 as $mKey => $mValue) {
             if (array_key_exists($mKey, $aArray2)) {
@@ -146,13 +146,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())
                 );
             }
 
@@ -165,7 +165,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()
         );
 
@@ -286,7 +286,7 @@ 
 
         } catch (\Throwable $t) {
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR;
-            $this->addFlashMessage("Failed", '', $severity,false);
+            $this->addFlashMessage("Failed", '', $severity, false);
         }
 
         $this->redirectToDocumentList();
@@ -348,7 +348,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);
 
@@ -376,7 +376,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;
@@ -428,7 +428,7 @@ 
                 $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);
 
@@ -482,7 +482,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);
             }
@@ -516,7 +516,7 @@ 
             $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');
@@ -645,7 +645,7 @@ 
         if ($redirectUri) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));
+            $this->redirect($action, $controller, null, array ('message' => $message));
         }
     }
 }

Braces +11 added lines, -22 removed lines

@@ -30,8 +30,7 @@ 
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-class DocumentFormBackofficeController extends AbstractDocumentFormController
-{
+class DocumentFormBackofficeController extends AbstractDocumentFormController {
     /**
      * documentTransferManager
      *
@@ -81,8 +80,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -129,8 +127,7 @@ 
         $activeGroup = '',
         $activeGroupIndex = 0,
         $addCurrentFeUser = true
-    )
-    {
+    ) {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
         $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
 
@@ -179,8 +176,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;
@@ -293,8 +289,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]);
@@ -331,8 +326,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, $backToList = false)
-    {
+    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null, $backToList = false) {
         try {
             /** @var \EWW\Dpf\Domain\Model\Document $document */
             $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
@@ -531,8 +525,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);
 
@@ -598,8 +591,7 @@ 
      *
      * @return void
      */
-    public function cancelEditAction($documentUid = 0, $backToList = false)
-    {
+    public function cancelEditAction($documentUid = 0, $backToList = false) {
         if (empty($documentUid) || $backToList) {
             $this->redirectToDocumentList();
         }
@@ -617,14 +609,12 @@ 
      *
      * @return void
      */
-    public function cancelNewAction()
-    {
+    public function cancelNewAction() {
         $this->redirect('list');
     }
 
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -638,8 +628,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->getStoredAction();
 
         if ($redirectUri) {

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

@@ -52,7 +52,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * documentManager
@@ -60,7 +60,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * bookmarkRepository
@@ -68,7 +68,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * clientConfigurationManager
@@ -125,10 +125,10 @@ 
      */
     public function editAction(
         \EWW\Dpf\Domain\Model\DocumentForm $documentForm,
-        bool $suggestMod = false,
+        bool $suggestMod = FALSE,
         $activeGroup = '',
         $activeGroupIndex = 0,
-        $addCurrentFeUser = true
+        $addCurrentFeUser = TRUE
     )
     {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
@@ -157,7 +157,7 @@ 
             }
 
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -183,17 +183,17 @@ 
     {
         $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);
         }
 
         if (empty($workingCopy->getFileData())) {
             // no files are linked to the document
-            $hasFilesFlag = false;
+            $hasFilesFlag = FALSE;
         }
 
         $newDocument = $this->objectManager->get(Document::class);
@@ -213,7 +213,7 @@ 
             $newDocument->setLinkedUid($document->getUid());
         }
 
-        $newDocument->setSuggestion(true);
+        $newDocument->setSuggestion(TRUE);
         $newDocument->setComment($document->getComment());
 
         if ($restore) {
@@ -250,7 +250,7 @@ 
                     ''
                 );
             }
-            $this->addFlashMessage($flashMessage, '', AbstractMessage::OK, true);
+            $this->addFlashMessage($flashMessage, '', AbstractMessage::OK, TRUE);
 
             $notifier = $this->objectManager->get(Notifier::class);
             $notifier->sendAdminNewSuggestionNotification($newDocument);
@@ -286,7 +286,7 @@ 
 
         } catch (\Throwable $t) {
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR;
-            $this->addFlashMessage("Failed", '', $severity,false);
+            $this->addFlashMessage("Failed", '', $severity,FALSE);
         }
 
         $this->redirectToDocumentList();
@@ -297,7 +297,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]);
         }
 
         $backToList = $this->request->getArgument('documentData')['backToList'];
@@ -307,7 +307,7 @@ 
         } elseif ($this->request->hasArgument('saveWorkingCopy')) {
             $saveMode = 'saveWorkingCopy';
         } else {
-            $saveMode = null;
+            $saveMode = NULL;
         }
 
         $this->forward(
@@ -331,7 +331,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, $backToList = false)
+    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = NULL, $backToList = FALSE)
     {
         try {
             /** @var \EWW\Dpf\Domain\Model\Document $document */
@@ -353,8 +353,8 @@ 
                 $this->addFlashMessage($message, '', AbstractMessage::ERROR);
 
                 $this->redirect('cancelEdit',
-                    null,
-                    null,
+                    NULL,
+                    NULL,
                     ['documentUid' => $document->getUid(), 'backToList' => $backToList]
                 );
                 /*
@@ -372,13 +372,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;
@@ -491,8 +491,8 @@ 
                 $this->redirectToDocumentList();
             } else {
                 $this->redirect('cancelEdit',
-                    null,
-                    null,
+                    NULL,
+                    NULL,
                     ['documentUid' => $updateDocument->getUid(), 'backToList' => $backToList]
                 );
                 // $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
@@ -517,13 +517,13 @@ 
 
             $exceptionMsg[] = LocalizationUtility::translate($key, 'dpf');
 
-            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity, true);
+            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity, TRUE);
             $this->redirect('cancelEdit',
-                null,
-                null,
+                NULL,
+                NULL,
                 ['documentUid' => $updateDocument->getUid(), 'backToList' => $backToList]
             );
-            $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $updateDocument]);
         }
     }
 
@@ -540,7 +540,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;
         }
 
@@ -554,7 +554,7 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
 
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
@@ -576,7 +576,7 @@ 
                 implode(" ", $message),
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
 
@@ -594,7 +594,7 @@ 
      *
      * @return void
      */
-    public function cancelEditAction($documentUid = 0, $backToList = false)
+    public function cancelEditAction($documentUid = 0, $backToList = FALSE)
     {
         if (empty($documentUid) || $backToList) {
             $this->redirectToDocumentList();
@@ -602,7 +602,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]);
     }
 
     /**
@@ -634,14 +634,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->getStoredAction();
 
         if ($redirectUri) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));
+            $this->redirect($action, $controller, NULL, array('message' => $message));
         }
     }
 }

Classes/Controller/WorkspaceController.php

Braces +15 added lines, -30 removed lines

@@ -27,8 +27,7 @@ 
 /**
  * Controller for the "workspace"/"my publications" area.
  */
-class WorkspaceController extends AbstractController
-{
+class WorkspaceController extends AbstractController {
     /**
      * FrontendUserRepository
      *
@@ -121,8 +120,7 @@ 
     protected $fisDataService = null;
 
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -217,8 +215,7 @@ 
      *
      * @return void
      */
-    protected function listWorkspaceAction($checkedDocumentIdentifiers = [])
-    {
+    protected function listWorkspaceAction($checkedDocumentIdentifiers = []) {
         $args = $this->request->getArguments();
         if ($args['refresh']) {
             $workspaceSessionData = $this->session->getWorkspaceData();
@@ -264,8 +261,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]);
         }
@@ -276,8 +272,7 @@ 
      * @param array $listData
      * @throws \EWW\Dpf\Exceptions\DocumentMaxSizeErrorException
      */
-    public function batchRegisterAction($listData)
-    {
+    public function batchRegisterAction($listData) {
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
@@ -359,8 +354,7 @@ 
      * Batch operation, set documents to "In progress".
      * @param array $listData
      */
-    public function batchSetInProgressAction($listData)
-    {
+    public function batchSetInProgressAction($listData) {
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
@@ -429,8 +423,7 @@ 
      * Batch operation, remove documents.
      * @param array $listData
      */
-    public function batchRemoveAction($listData)
-    {
+    public function batchRemoveAction($listData) {
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
@@ -479,8 +472,7 @@ 
      * Batch operation, release documents.
      * @param array $listData
      */
-    public function batchReleaseValidatedAction($listData)
-    {
+    public function batchReleaseValidatedAction($listData) {
         $this->batchRelease($listData, true);
     }
 
@@ -488,8 +480,7 @@ 
      * Batch operation, release as unvalidated documents.
      * @param array $listData
      */
-    public function batchReleaseUnvalidatedAction($listData)
-    {
+    public function batchReleaseUnvalidatedAction($listData) {
         $this->batchRelease($listData, false);
     }
 
@@ -501,8 +492,7 @@ 
      * @param array $listData
      * @param bool $validated
      */
-    protected function batchRelease($listData, $validated)
-    {
+    protected function batchRelease($listData, $validated) {
         $successful = [];
         $checkedDocumentIdentifiers = [];
 
@@ -619,8 +609,7 @@ 
      */
     protected function getWorkspaceQuery(
         $from = 0, $bookmarkIdentifiers = [], $filters = [], $excludeFilters = [], $sortField = null, $sortOrder = null
-    )
-    {
+    ) {
         $workspaceFilter = [
             'bool' => [
                 'must' => [
@@ -671,8 +660,7 @@ 
      */
     protected function getMyPublicationsQuery(
         $from = 0, $bookmarkIdentifiers = [], $filters = [], $excludeFilters = [], $sortField = null, $sortOrder = null
-    )
-    {
+    ) {
         $workspaceFilter = [
             'bool' => [
                 'must' => [
@@ -730,8 +718,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);
 
@@ -797,8 +784,7 @@ 
      * @param int $activeGroupIndex
      * @return void
      */
-    public function editDocumentAction($documentIdentifier, $activeGroup = '', $activeGroupIndex = 0)
-    {
+    public function editDocumentAction($documentIdentifier, $activeGroup = '', $activeGroupIndex = 0) {
         $document = $this->documentManager->read(
             $documentIdentifier,
             $this->security->getUser()->getUID()
@@ -868,8 +854,7 @@ 
      *
      * @return int
      */
-    protected function itemsPerPage()
-    {
+    protected function itemsPerPage() {
         /** @var SearchSessionData $workspaceData */
         $workspaceData = $this->session->getWorkspaceData();
         $itemsPerPage = $workspaceData->getItemsPerPage();

Spacing +20 added lines, -20 removed lines

@@ -182,7 +182,7 @@ 
             list($redirectAction, $redirectController) = $this->session->getStoredAction();
             $this->redirect(
                 $redirectAction, $redirectController, null,
-                array('message' => [], 'checkedDocumentIdentifiers' => [])
+                array ('message' => [], 'checkedDocumentIdentifiers' => [])
             );
         }
 
@@ -252,7 +252,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());
@@ -281,7 +281,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) {
 
@@ -352,7 +352,7 @@ 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
             $redirectAction, $redirectController, null,
-            array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
+            array ('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
     /**
@@ -364,7 +364,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) {
 
@@ -422,7 +422,7 @@ 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
             $redirectAction, $redirectController, null,
-            array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
+            array ('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
     /**
@@ -434,7 +434,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();
@@ -471,7 +471,7 @@ 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
             $redirectAction, $redirectController, null,
-            array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
+            array ('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
 
@@ -506,7 +506,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) {
 
@@ -573,15 +573,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)]
@@ -601,7 +601,7 @@ 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
             $redirectAction, $redirectController, null,
-            array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
+            array ('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
 
     }
 
@@ -691,7 +691,7 @@ 
             ]
         ];
 
-        $fisPersIdFilter =  [
+        $fisPersIdFilter = [
             'bool' => [
                 'must' => [
                     [
@@ -744,7 +744,7 @@ 
         for ($i = $start; $i < $stop; $i++) {
             try {
                 $document = $documentTransferManager->retrieve(
-                    $this->settings['fedoraPidNamespace'].':' . $i
+                    $this->settings['fedoraPidNamespace'] . ':' . $i
                 );
 
                 if ($document instanceof Document) {
@@ -835,13 +835,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())
                     );
                 }
             }
@@ -859,7 +859,7 @@ 
         if ($redirectUri) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));
+            $this->redirect($action, $controller, null, array ('message' => $message));
         }
 
     }
@@ -876,8 +876,8 @@ 
         $workspaceData = $this->session->getWorkspaceData();
         $itemsPerPage = $workspaceData->getItemsPerPage();
 
-        $default = ($this->settings['workspaceItemsPerPage'])? $this->settings['workspaceItemsPerPage'] : 10;
-        return ($itemsPerPage)? $itemsPerPage : $default;
+        $default = ($this->settings['workspaceItemsPerPage']) ? $this->settings['workspaceItemsPerPage'] : 10;
+        return ($itemsPerPage) ? $itemsPerPage : $default;
     }
 
 }

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

@@ -43,7 +43,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -51,7 +51,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * bookmarkRepository
@@ -59,7 +59,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * elasticSearch
@@ -67,7 +67,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\ElasticSearch
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $elasticSearch = null;
+    protected $elasticSearch = NULL;
 
 
     /**
@@ -76,7 +76,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\QueryBuilder
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $queryBuilder = null;
+    protected $queryBuilder = NULL;
 
 
     /**
@@ -85,7 +85,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * documentValidator
@@ -101,7 +101,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
 
     /**
@@ -118,7 +118,7 @@ 
      * @var \EWW\Dpf\Services\FeUser\FisDataService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fisDataService = null;
+    protected $fisDataService = NULL;
 
 
     public function initializeAction()
@@ -181,7 +181,7 @@ 
             $this->session->setWorkspaceData($workspaceSessionData);
             list($redirectAction, $redirectController) = $this->session->getStoredAction();
             $this->redirect(
-                $redirectAction, $redirectController, null,
+                $redirectAction, $redirectController, NULL,
                 array('message' => [], 'checkedDocumentIdentifiers' => [])
             );
         }
@@ -229,9 +229,9 @@ 
         }
 
         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'
@@ -243,7 +243,7 @@ 
             $this->uriBuilder->getRequest()->getRequestUri()
         );
 
-        $currentPage = null;
+        $currentPage = NULL;
         $pagination = $this->getParametersSafely('@widget_0');
         if ($pagination) {
             $checkedDocumentIdentifiers = [];
@@ -267,7 +267,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]);
         }
     }
 
@@ -351,7 +351,7 @@ 
 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
-            $redirectAction, $redirectController, null,
+            $redirectAction, $redirectController, NULL,
             array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
@@ -376,7 +376,7 @@ 
 
                     if ($this->authorizationChecker->isGranted(DocumentVoter::UPDATE, $document)) {
 
-                        $document->setTemporary(false);
+                        $document->setTemporary(FALSE);
 
                             if (
                                 $this->documentManager->update(
@@ -421,7 +421,7 @@ 
 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
-            $redirectAction, $redirectController, null,
+            $redirectAction, $redirectController, NULL,
             array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
@@ -470,7 +470,7 @@ 
 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
-            $redirectAction, $redirectController, null,
+            $redirectAction, $redirectController, NULL,
             array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
     }
 
@@ -481,7 +481,7 @@ 
      */
     public function batchReleaseValidatedAction($listData)
     {
-        $this->batchRelease($listData, true);
+        $this->batchRelease($listData, TRUE);
     }
 
     /**
@@ -490,7 +490,7 @@ 
      */
     public function batchReleaseUnvalidatedAction($listData)
     {
-        $this->batchRelease($listData, false);
+        $this->batchRelease($listData, FALSE);
     }
 
 
@@ -533,8 +533,8 @@ 
                         $documentWorkflowTransition = DocumentWorkflow::TRANSITION_RELEASE_ACTIVATE;
                         break;
                     default:
-                        $documentVoterAttribute = null;
-                        $documentWorkflowTransition = null;
+                        $documentVoterAttribute = NULL;
+                        $documentWorkflowTransition = NULL;
                         break;
                 }
 
@@ -600,7 +600,7 @@ 
 
         list($redirectAction, $redirectController) = $this->session->getStoredAction();
         $this->redirect(
-            $redirectAction, $redirectController, null,
+            $redirectAction, $redirectController, NULL,
             array('message' => $message, 'checkedDocumentIdentifiers' =>  $checkedDocumentIdentifiers));
 
     }
@@ -618,7 +618,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 = [
@@ -670,7 +670,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 = [
@@ -811,7 +811,7 @@ 
                 $this->redirect(
                     'edit',
                     'DocumentFormBackoffice',
-                    null,
+                    NULL,
                     [
                         'document' => $document,
                         'activeGroup' => $activeGroup,
@@ -822,10 +822,10 @@ 
                 $this->redirect(
                     'edit',
                     'DocumentFormBackoffice',
-                    null,
+                    NULL,
                     [
                         'document' => $document,
-                        'suggestMod' => true,
+                        'suggestMod' => TRUE,
                         'activeGroup' => $activeGroup,
                         'activeGroupIndex' => $activeGroupIndex
                     ]
@@ -859,7 +859,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/AbstractController.php

Braces +10 added lines, -20 removed lines

@@ -19,8 +19,7 @@ 
 use TYPO3\CMS\Core\Log\LogManager;
 
 
-abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
-{
+abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
     /**
      * authorizationChecker
      *
@@ -69,14 +68,12 @@ 
     protected $logger = null;
 
 
-    public function __construct()
-    {
+    public function __construct() {
         /** @var $logger \TYPO3\CMS\Core\Log\Logger */
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
     }
 
-    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();
@@ -102,8 +99,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;
@@ -126,8 +122,7 @@ 
      *
      * @return
      */
-    public function getSessionData($key)
-    {
+    public function getSessionData($key) {
         if (!empty($GLOBALS['TSFE']) && is_object($GLOBALS['TSFE'])) {
 
             $userGlobals = $GLOBALS['TSFE']->fe_user;
@@ -148,8 +143,7 @@ 
      *
      * @return null|string
      */
-    protected function getParametersSafely($parameterName)
-    {
+    protected function getParametersSafely($parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->filterSafelyParameters($this->request->getArgument($parameterName));
         }
@@ -163,8 +157,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);
@@ -175,8 +168,7 @@ 
         }
     }
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         parent::initializeAction();
 
         $signalSlotDispatcher = GeneralUtility::makeInstance(Dispatcher::class);
@@ -184,13 +176,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 +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
      * @var \EWW\Dpf\Security\AuthorizationChecker
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $authorizationChecker = null;
+    protected $authorizationChecker = NULL;
 
     /**
      * security
@@ -35,7 +35,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
     /**
      * clientRepository
@@ -43,7 +43,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\ClientRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $clientRepository = null;
+    protected $clientRepository = NULL;
 
     /**
      * signalSlotDispatcher
@@ -51,7 +51,7 @@ 
      * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $signalSlotDispatcher = null;
+    protected $signalSlotDispatcher = NULL;
 
     /**
      * session
@@ -59,14 +59,14 @@ 
      * @var \EWW\Dpf\Session\Session
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $session = null;
+    protected $session = NULL;
 
     /**
      * logger
      *
      * @var \TYPO3\CMS\Core\Log\Logger
      */
-    protected $logger = null;
+    protected $logger = NULL;
 
 
     public function __construct()
@@ -89,7 +89,7 @@ 
                 $message,
                 $messageTitle = '',
                 $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::WARNING,
-                $storeInSession = true
+                $storeInSession = TRUE
             );
         } else {
             $view->assign('client', $client);
@@ -153,7 +153,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->filterSafelyParameters($this->request->getArgument($parameterName));
         }
-        return null;
+        return NULL;
     }
 
     /**

Classes/Controller/ApiController.php

Spacing +7 added lines, -7 removed lines

@@ -259,7 +259,7 @@ 
             }
 
             if ($this->documentManager->update($doc, null, [], [], true)) {
-                return '{"success": "Document '.$document.' added '.$id.'"}';
+                return '{"success": "Document ' . $document . ' added ' . $id . '"}';
             } else {
                 return '{"failed": Could not update the Document"}';
             }
@@ -298,7 +298,7 @@ 
                     return '{"error": "Invalid data in parameter json."}';
                 }
             } else {
-                if (empty($json) || json_decode($json,true) === []) {
+                if (empty($json) || json_decode($json, true) === []) {
                     return '{"error": "Parameter json can not be empty."}';
                 }
                 if (is_null(json_decode($json))) {
@@ -310,7 +310,7 @@ 
             $doc = $this->documentManager->read($document);
 
             if (!$doc) {
-                return '{"failed": "Document does not exist: '.$document.'"}';
+                return '{"failed": "Document does not exist: ' . $document . '"}';
             }
 
             if ($doc->getState() === DocumentWorkflow::STATE_NEW_NONE) {
@@ -323,7 +323,7 @@ 
             }
 
             if ($linkedDocument) {
-                return '{"failed": "There is already a suggestion for the document: '.$linkedDocument->getUid().'"}';
+                return '{"failed": "There is already a suggestion for the document: ' . $linkedDocument->getUid() . '"}';
             }
 
             $mapper = $this->objectManager->get(\EWW\Dpf\Services\Api\JsonToDocumentMapper::class);
@@ -681,7 +681,7 @@ 
         $missingArguments = [];
         foreach ($parameterNames as $parameterName) {
             if (!$this->request->hasArgument($parameterName)) {
-                $missingArguments[] =  $parameterName;
+                $missingArguments[] = $parameterName;
             }
         }
 
@@ -689,7 +689,7 @@ 
             $this->throwStatus(
                 400,
                 null,
-                '{"error": "Missing parameters: '.implode(", ", $missingArguments).'"}'
+                '{"error": "Missing parameters: ' . implode(", ", $missingArguments) . '"}'
             );
         }
 
@@ -719,7 +719,7 @@ 
             $this->throwStatus(
                 400,
                 null,
-            '{"error": "An invalid action hes been called: '.$actionName.'"}'
+            '{"error": "An invalid action hes been called: ' . $actionName . '"}'
             );
         }
 

Braces +13 added lines, -26 removed lines

@@ -32,8 +32,7 @@ 
 /**
  * DocumentController
  */
-class ApiController extends ActionController
-{
+class ApiController extends ActionController {
     /**
      * @var \TYPO3\CMS\Extbase\Mvc\View\JsonView
      */
@@ -116,8 +115,7 @@ 
         'importBibtexWithoutSaving', 'importRisWithoutSaving', 'addFisId'
     ];
 
-    public function __construct()
-    {
+    public function __construct() {
         /** @var $logger \TYPO3\CMS\Core\Log\Logger */
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
     }
@@ -139,8 +137,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeShowAction()
-    {
+    public function initializeShowAction() {
         $this->checkMandatoryParameters(['document', 'token']);
     }
 
@@ -175,8 +172,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeCreateAction()
-    {
+    public function initializeCreateAction() {
         $this->checkMandatoryParameters(['json', 'token']);
     }
 
@@ -231,8 +227,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeAddFisIdAction()
-    {
+    public function initializeAddFisIdAction() {
         $this->checkMandatoryParameters(['document', 'id', 'token']);
     }
 
@@ -272,8 +267,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeSuggestionAction()
-    {
+    public function initializeSuggestionAction() {
         $this->checkMandatoryParameters(['document', 'json', 'comment', 'token']);
         if ($this->request->hasArgument('restore')) {
             $restore = $this->request->getArgument('restore');
@@ -351,8 +345,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeImportDoiWithoutSavingAction()
-    {
+    public function initializeImportDoiWithoutSavingAction() {
         $this->checkMandatoryParameters(['doi', 'token']);
     }
 
@@ -406,8 +399,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeImportPubmedWithoutSavingAction()
-    {
+    public function initializeImportPubmedWithoutSavingAction() {
         $this->checkMandatoryParameters(['pmid', 'token']);
     }
 
@@ -458,8 +450,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeImportIsbnWithoutSavingAction()
-    {
+    public function initializeImportIsbnWithoutSavingAction() {
         $this->checkMandatoryParameters(['isbn', 'token']);
     }
 
@@ -510,8 +501,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeImportBibtexWithoutSavingAction()
-    {
+    public function initializeImportBibtexWithoutSavingAction() {
         $this->checkMandatoryParameters(['bibtex', 'token']);
         if ($this->request->hasArgument('force')) {
             $force = $this->request->getArgument('force');
@@ -590,8 +580,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function initializeImportRisWithoutSavingAction()
-    {
+    public function initializeImportRisWithoutSavingAction() {
         $this->checkMandatoryParameters(['ris', 'token']);
         if ($this->request->hasArgument('force')) {
             $force = $this->request->getArgument('force');
@@ -676,8 +665,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    protected function checkMandatoryParameters($parameterNames)
-    {
+    protected function checkMandatoryParameters($parameterNames) {
         $missingArguments = [];
         foreach ($parameterNames as $parameterName) {
             if (!$this->request->hasArgument($parameterName)) {
@@ -700,8 +688,7 @@ 
      *
      * @return string Method name of the current action
      */
-    protected function resolveActionMethodName()
-    {
+    protected function resolveActionMethodName() {
         if ($this->request->hasArgument('action')) {
             $actionName = $this->request->getArgument('action');
         }

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

@@ -51,7 +51,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
     /**
      * documentRepository
@@ -59,7 +59,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * frontendUserRepository
@@ -67,7 +67,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     /**
      * documentManager
@@ -75,7 +75,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * clientRepository
@@ -99,16 +99,16 @@ 
      * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $signalSlotDispatcher = null;
+    protected $signalSlotDispatcher = NULL;
 
     /**
      * logger
      *
      * @var \TYPO3\CMS\Core\Log\Logger
      */
-    protected $logger = null;
+    protected $logger = NULL;
 
-    protected $frontendUser = null;
+    protected $frontendUser = NULL;
 
     protected $validActions = [
         'show', 'create', 'suggestion', 'importDoiWithoutSaving',
@@ -129,9 +129,9 @@ 
 
         if ($frontendUser) {
             $this->frontendUser = $frontendUser;
-            return true;
+            return TRUE;
         } else {
-            return false;
+            return FALSE;
         }
     }
 
@@ -258,7 +258,7 @@ 
                 $doc->setProcessNumber($processNumber);
             }
 
-            if ($this->documentManager->update($doc, null, [], [], true)) {
+            if ($this->documentManager->update($doc, NULL, [], [], TRUE)) {
                 return '{"success": "Document '.$document.' added '.$id.'"}';
             } else {
                 return '{"failed": Could not update the Document"}';
@@ -289,7 +289,7 @@ 
      * @param bool $restore
      * @return string
      */
-    public function suggestionAction($document, $json, $comment, $token, $restore = false) {
+    public function suggestionAction($document, $json, $comment, $token, $restore = FALSE) {
 
         if ($this->checkToken($token)) {
 
@@ -298,7 +298,7 @@ 
                     return '{"error": "Invalid data in parameter json."}';
                 }
             } else {
-                if (empty($json) || json_decode($json,true) === []) {
+                if (empty($json) || json_decode($json,TRUE) === []) {
                     return '{"error": "Parameter json can not be empty."}';
                 }
                 if (is_null(json_decode($json))) {
@@ -525,14 +525,14 @@ 
      * @param bool $force
      * @return string
      */
-    public function importBibtexWithoutSavingAction($bibtex, $token, $force = false) {
+    public function importBibtexWithoutSavingAction($bibtex, $token, $force = FALSE) {
 
         if ($this->checkToken($token)) {
             $importer = $this->objectManager->get(BibTexFileImporter::class);
             $importer->deactivateProcessNumberGeneration();
 
             try {
-                $externalMetadata = $importer->loadFile($bibtex, $this->settings['bibTexMandatoryFields'], true);
+                $externalMetadata = $importer->loadFile($bibtex, $this->settings['bibTexMandatoryFields'], TRUE);
                 $mandatoryErrors = $importer->getMandatoryErrors();
             } catch (\Throwable $throwable) {
                 return '{"failed": "' . $throwable->getMessage() . '"}';
@@ -605,7 +605,7 @@ 
      * @param bool $force
      * @return string
      */
-    public function importRisWithoutSavingAction($ris, $token, $force = false) {
+    public function importRisWithoutSavingAction($ris, $token, $force = FALSE) {
 
         if ($this->checkToken($token)) {
             /** @var FileImporter $fileImporter */
@@ -613,7 +613,7 @@ 
             $importer->deactivateProcessNumberGeneration();
 
             try {
-                $externalMetadata = $importer->loadFile($ris, $this->settings['riswosMandatoryFields'], true);
+                $externalMetadata = $importer->loadFile($ris, $this->settings['riswosMandatoryFields'], TRUE);
                 $mandatoryErrors = $importer->getMandatoryErrors();
             } catch (\Throwable $throwable) {
                 return '{"failed": "' . $throwable->getMessage() . '"}';
@@ -688,7 +688,7 @@ 
         if ($missingArguments) {
             $this->throwStatus(
                 400,
-                null,
+                NULL,
                 '{"error": "Missing parameters: '.implode(", ", $missingArguments).'"}'
             );
         }
@@ -709,7 +709,7 @@ 
         if (empty($actionName)) {
             $this->throwStatus(
                 400,
-                null,
+                NULL,
                 '{"error": "No action has been specified"}'
             );
 
@@ -718,7 +718,7 @@ 
         if (!in_array($actionName, $this->validActions)) {
             $this->throwStatus(
                 400,
-                null,
+                NULL,
             '{"error": "An invalid action hes been called: '.$actionName.'"}'
             );
         }

Classes/Controller/AbstractDocumentFormController.php

Spacing +2 added lines, -2 removed lines

@@ -183,7 +183,7 @@ 
                 $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");
@@ -338,7 +338,7 @@ 
                 $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");

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

@@ -36,7 +36,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -44,7 +44,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -52,7 +52,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -60,7 +60,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -68,7 +68,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * depositLicenseLogRepository
@@ -76,7 +76,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DepositLicenseLogRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $depositLicenseLogRepository = null;
+    protected $depositLicenseLogRepository = NULL;
 
     /**
      * persistence manager
@@ -92,7 +92,7 @@ 
      * @var \EWW\Dpf\Services\FeUser\FisDataService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fisDataService = null;
+    protected $fisDataService = NULL;
 
     /**
      * action list
@@ -151,7 +151,7 @@ 
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("newDocumentForm")
      * @return void
      */
-    public function newAction(DocumentForm $newDocumentForm = null, $returnDocumentId = 0)
+    public function newAction(DocumentForm $newDocumentForm = NULL, $returnDocumentId = 0)
     {
         $this->view->assign('returnDocumentId', $returnDocumentId);
         $this->view->assign('documentForm', $newDocumentForm);
@@ -179,11 +179,11 @@ 
             $documentType = $this->documentTypeRepository->findByUid($docTypeUid);
             $virtualType = $documentType->getVirtualType();
 
-            if (!$formDataReader->uploadError() || $virtualType === true) {
+            if (!$formDataReader->uploadError() || $virtualType === 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");
@@ -334,11 +334,11 @@ 
             $documentType = $this->documentTypeRepository->findByUid($docTypeUid);
             $virtualType = $documentType->getVirtualType();
 
-            if (!$formDataReader->uploadError() || $virtualType === true) {
+            if (!$formDataReader->uploadError() || $virtualType === 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");
@@ -371,7 +371,7 @@ 
         // send document to index
         $elasticsearchRepository->add($updateDocument, $json);
 
-        $updateDocument->setChanged(true);
+        $updateDocument->setChanged(TRUE);
         $this->documentRepository->update($updateDocument);
 
 
@@ -411,7 +411,7 @@ 
         $this->redirect('list');
     }
 
-    protected function redirectToList($message = null)
+    protected function redirectToList($message = NULL)
     {
         $this->redirect('list');
     }

Braces +13 added lines, -26 removed lines

@@ -27,8 +27,7 @@ 
 /**
  * DocumentFormController
  */
-abstract class AbstractDocumentFormController extends AbstractController
-{
+abstract class AbstractDocumentFormController extends AbstractController {
 
     /**
      * documentRepository
@@ -99,8 +98,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $documents = $this->documentRepository->findAll();
         $docTypes = $this->documentTypeRepository->getDocumentTypesAlphabetically();
 
@@ -121,8 +119,7 @@ 
      *
      * @return void
      */
-    public function initializeNewAction()
-    {
+    public function initializeNewAction() {
 
         $requestArguments = $this->request->getArguments();
 
@@ -151,8 +148,7 @@ 
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("newDocumentForm")
      * @return void
      */
-    public function newAction(DocumentForm $newDocumentForm = null, $returnDocumentId = 0)
-    {
+    public function newAction(DocumentForm $newDocumentForm = null, $returnDocumentId = 0) {
         $this->view->assign('returnDocumentId', $returnDocumentId);
         $this->view->assign('documentForm', $newDocumentForm);
 
@@ -165,8 +161,7 @@ 
         }
     }
 
-    public function initializeCreateAction()
-    {
+    public function initializeCreateAction() {
 
         $requestArguments = $this->request->getArguments();
 
@@ -200,8 +195,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 */
@@ -281,8 +275,7 @@ 
 
     }
 
-    public function initializeEditAction()
-    {
+    public function initializeEditAction() {
         $requestArguments = $this->request->getArguments();
 
         if (array_key_exists('document', $requestArguments)) {
@@ -312,8 +305,7 @@ 
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("documentForm")
      * @return void
      */
-    public function editAction(DocumentForm $documentForm)
-    {
+    public function editAction(DocumentForm $documentForm) {
         $this->view->assign('documentForm', $documentForm);
 
         if (!empty($this->security->getUserAccessToGroups())) {
@@ -325,8 +317,7 @@ 
         }
     }
 
-    public function initializeUpdateAction()
-    {
+    public function initializeUpdateAction() {
         $requestArguments = $this->request->getArguments();
 
         if ($this->request->hasArgument('documentData')) {
@@ -359,8 +350,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 */
@@ -409,18 +399,15 @@ 
      *
      * @return void
      */
-    public function cancelAction()
-    {
+    public function cancelAction() {
         $this->redirectToList();
     }
 
-    protected function redirectAfterUpdate()
-    {
+    protected function redirectAfterUpdate() {
         $this->redirect('list');
     }
 
-    protected function redirectToList($message = null)
-    {
+    protected function redirectToList($message = null) {
         $this->redirect('list');
     }
 

Classes/Controller/ExternalMetadataImportController.php

Indentation +2 added lines, -2 removed lines

@@ -574,8 +574,8 @@
                 'manager.importMetadata.publicationNotImported', 'dpf'
             );
 
-           $this->addFlashMessage($message, '', AbstractMessage::ERROR);
-           $this->redirect('find');
+            $this->addFlashMessage($message, '', AbstractMessage::ERROR);
+            $this->redirect('find');
         }
     }
 

Braces +20 added lines, -40 removed lines

@@ -37,8 +37,7 @@ 
 /**
  * ExternalDataImportController
  */
-class ExternalMetadataImportController extends AbstractController
-{
+class ExternalMetadataImportController extends AbstractController {
     /**
      * ExternalMetadataRepository
      *
@@ -114,8 +113,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
     }
 
@@ -123,8 +121,7 @@ 
      * @param string $crossRefQuery
      * @param string $pubMedQuery
      */
-    public function bulkStartAction($crossRefQuery = '', $pubMedQuery = '')
-    {
+    public function bulkStartAction($crossRefQuery = '', $pubMedQuery = '') {
         /** @var BulkImportSessionData $bulkImportSessionData */
         $bulkImportSessionData = $this->session->getBulkImportData();
 
@@ -141,8 +138,7 @@ 
     /**
      * @param string $query
      */
-    public function bulkSearchCrossRefAction($query = '')
-    {
+    public function bulkSearchCrossRefAction($query = '') {
         /** @var BulkImportSessionData $bulkImportSessionData */
         $bulkImportSessionData = $this->session->getBulkImportData();
 
@@ -208,8 +204,7 @@ 
     /**
      * @param string $query
      */
-    public function bulkSearchPubMedAction($query = '')
-    {
+    public function bulkSearchPubMedAction($query = '') {
         /** @var BulkImportSessionData $bulkImportSessionData */
         $bulkImportSessionData = $this->session->getBulkImportData();
 
@@ -278,8 +273,7 @@ 
      * @param array $results
      * @param int $currentPage
      */
-    public function bulkResultsAction($importSourceName, $query, $results = null, $currentPage = 1)
-    {
+    public function bulkResultsAction($importSourceName, $query, $results = null, $currentPage = 1) {
         $externalMetadata = $this->externalMetadataRepository->findByFeUser($this->security->getUser()->getUid());
         $checkedPublicationIdentifiers = [];
 
@@ -300,8 +294,7 @@ 
     /**
      *
      */
-    function bulkImportAction()
-    {
+    function bulkImportAction() {
         $importCounter = ['imported' => 0, 'bookmarked' => 0, 'total' => 0];
 
         try {
@@ -385,8 +378,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    function cancelBulkImportAction()
-    {
+    function cancelBulkImportAction() {
         $this->redirect('bulkStart');
     }
 
@@ -396,8 +388,7 @@ 
      * @param string $identifier
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function findAction($identifier = '')
-    {
+    public function findAction($identifier = '') {
         $this->externalMetadataRepository->clearExternalMetadataByFeUserUid($this->security->getUser()->getUid());
         $this->view->assign('identifier', $identifier);
     }
@@ -407,8 +398,7 @@ 
      *
      * @param string $identifier
      */
-    public function retrieveAction($identifier)
-    {
+    public function retrieveAction($identifier) {
         $identifier = trim($identifier);
 
         if (empty($identifier)) {
@@ -512,8 +502,7 @@ 
      *
      * @param ExternalMetadata $externalMetadata
      */
-    public function importAction(ExternalMetadata $externalMetadata)
-    {
+    public function importAction(ExternalMetadata $externalMetadata) {
         $this->view->assign('identifierType',
             PublicationIdentifier::determineIdentifierType($externalMetadata->getPublicationIdentifier())
         );
@@ -523,8 +512,7 @@ 
     /**
      * @param ExternalMetadata $externalMetadata
      */
-    public function createDocumentAction(ExternalMetadata $externalMetadata)
-    {
+    public function createDocumentAction(ExternalMetadata $externalMetadata) {
         /** @var  Importer $importer */
         $importer = $this->objectManager->get($externalMetadata->getSource());
 
@@ -589,8 +577,7 @@ 
      * @param $identifier
      * @return array
      */
-    protected function findDocumentInWorkspace($identifier)
-    {
+    protected function findDocumentInWorkspace($identifier) {
         $bookmarkIdentifiers = [];
         foreach ($this->bookmarkRepository->findByFeUserUid($this->security->getUser()->getUid()) as $bookmark) {
             $bookmarkIdentifiers[] = $bookmark->getDocumentIdentifier();
@@ -704,8 +691,7 @@ 
     /**
      * @param array $importCounter
      */
-    public function bulkImportedDocumentsAction($importCounter = ['imported' => 0, 'bookmarked' => 0, 'total' => 0])
-    {
+    public function bulkImportedDocumentsAction($importCounter = ['imported' => 0, 'bookmarked' => 0, 'total' => 0]) {
 
         $publicationSingular = LocalizationUtility::translate('manager.importMetadata.publication.singular', 'dpf');
         $publicationPlural = LocalizationUtility::translate('manager.importMetadata.publication.plural', 'dpf');
@@ -752,8 +738,7 @@ 
     /**
      *
      */
-    protected function showImportedDocuments()
-    {
+    protected function showImportedDocuments() {
         $this->session->setStoredAction($this->getCurrentAction(), $this->getCurrentController(),
             $this->uriBuilder->getRequest()->getRequestUri()
         );
@@ -818,8 +803,7 @@ 
      *
      * @return int
      */
-    protected function itemsPerPage()
-    {
+    protected function itemsPerPage() {
         /** @var BulkImportSessionData $bulkImportSessionData */
         $bulkImportSessionData = $this->session->getBulkImportData();
 
@@ -837,8 +821,7 @@ 
     /**
      * @param string $error
      */
-    public function uploadStartAction($error = '')
-    {
+    public function uploadStartAction($error = '') {
         switch ($error) {
             case 'INVALID_FORMAT':
                 $message = LocalizationUtility::translate(
@@ -861,8 +844,7 @@ 
      * @param string $fileType (bibtex or riswos)
      * @param array $uploadFile
      */
-    public function uploadImportFileAction($fileType, $uploadFile = [])
-    {
+    public function uploadImportFileAction($fileType, $uploadFile = []) {
         $this->externalMetadataRepository->clearExternalMetadataByFeUserUid($this->security->getUser()->getUid());
 
         $uploadFileUrl = new \EWW\Dpf\Helper\UploadFileUrl;
@@ -929,8 +911,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function importUploadedDataAction()
-    {
+    public function importUploadedDataAction() {
         try {
             $externalMetadata = $this->externalMetadataRepository->findByFeUser($this->security->getUser()->getUid());
 
@@ -994,8 +975,7 @@ 
     /**
      * @param int $importCounter
      */
-    public function uploadedDocumentsAction($importCounter = 0)
-    {
+    public function uploadedDocumentsAction($importCounter = 0) {
         $publicationSingular = LocalizationUtility::translate('manager.importMetadata.publication.singular', 'dpf');
         $publicationPlural = LocalizationUtility::translate('manager.importMetadata.publication.plural', 'dpf');
 

Spacing +15 added lines, -15 removed lines

@@ -161,7 +161,7 @@ 
             $currentPage = 1;
         }
 
-        $offset = empty($currentPage)? 0 : ($currentPage-1) * $this->itemsPerPage();
+        $offset = empty($currentPage) ? 0 : ($currentPage - 1) * $this->itemsPerPage();
 
         /** @var Importer $importer */
         $importer = $this->objectManager->get(CrossRefImporter::class);
@@ -172,7 +172,7 @@ 
             $bulkImportSessionData->getCrossRefSearchField()
         );
 
-        $bulkImportSessionData->setCurrentMetadataItems(($results? $results['items'] : []));
+        $bulkImportSessionData->setCurrentMetadataItems(($results ? $results['items'] : []));
         $this->session->setBulkImportData($bulkImportSessionData);
 
         if ($results) {
@@ -228,7 +228,7 @@ 
             $currentPage = 1;
         }
 
-        $offset = empty($currentPage)? 0 : ($currentPage-1) * $this->itemsPerPage();
+        $offset = empty($currentPage) ? 0 : ($currentPage - 1) * $this->itemsPerPage();
 
         /** @var Importer $importer */
         $importer = $this->objectManager->get(PubMedImporter::class);
@@ -239,7 +239,7 @@ 
             $bulkImportSessionData->getPubMedSearchField()
         );
 
-        $bulkImportSessionData->setCurrentMetadataItems(($results? $results['items'] : []));
+        $bulkImportSessionData->setCurrentMetadataItems(($results ? $results['items'] : []));
         $this->session->setBulkImportData($bulkImportSessionData);
 
         if ($results) {
@@ -363,7 +363,7 @@ 
             $bulkImportSessionData->setLatestImportIdentifiers($importedDocumentIdentifiers);
             $this->session->setBulkImportData($bulkImportSessionData);
 
-        } catch(\Throwable $throwable) {
+        } catch (\Throwable $throwable) {
             $this->logger->log(\TYPO3\CMS\Core\Log\LogLevel::ERROR, $throwable->getMessage());
 
             $message = LocalizationUtility::translate(
@@ -571,7 +571,7 @@ 
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
             // A redirect always throws this exception, but in this case, however,
             // redirection is desired and should not lead to an exception handling
-        } catch(\Throwable $throwable) {
+        } catch (\Throwable $throwable) {
 
             $this->logger->log(\TYPO3\CMS\Core\Log\LogLevel::ERROR, $throwable->getMessage());
 
@@ -645,12 +645,12 @@ 
         $query = $this->queryBuilder->buildQuery(
             1, $workspaceFilter, 0,
             $bookmarkIdentifiers, [], [], null, null,
-            'identifier:"'.$identifier.'"'
+            'identifier:"' . $identifier . '"'
         );
 
         try {
 
-            $results =  $this->elasticSearch->search($query, 'object');
+            $results = $this->elasticSearch->search($query, 'object');
             if (is_array($results) && $results['hits']['total']['value'] > 0) {
                 return $results['hits']['hits'][0];
             }
@@ -691,7 +691,7 @@ 
 
         // Search if the document already exists in kitodo.
         $query = $this->queryBuilder->buildQuery(
-            1, $workspaceFilter , 0, [], [], [], null, null, 'identifier:"'.$identifier.'"'
+            1, $workspaceFilter, 0, [], [], [], null, null, 'identifier:"' . $identifier . '"'
         );
         $results = $this->elasticSearch->search($query, 'object');
 
@@ -722,9 +722,9 @@ 
             'dpf',
             [
                 0 => $importCounter['imported'],
-                1 => ($importCounter['imported'] == 1? $publicationSingular : $publicationPlural),
+                1 => ($importCounter['imported'] == 1 ? $publicationSingular : $publicationPlural),
                 2 => $importCounter['bookmarked'],
-                3 => ($importCounter['bookmarked'] == 1? $publicationSingular : $publicationPlural)
+                3 => ($importCounter['bookmarked'] == 1 ? $publicationSingular : $publicationPlural)
             ]
         );
 
@@ -788,7 +788,7 @@ 
         $query = $this->queryBuilder->buildQuery(
             $this->itemsPerPage(),
             $workspaceFilter,
-            (empty($currentPage)? 0 : ($currentPage-1) * $this->itemsPerPage())
+            (empty($currentPage) ? 0 : ($currentPage - 1) * $this->itemsPerPage())
         );
 
         try {
@@ -868,7 +868,7 @@ 
 
         $uploadFileUrl = new \EWW\Dpf\Helper\UploadFileUrl;
         $uploadFilePath = Environment::getPublicPath() . "/" . $uploadFileUrl->getDirectory() .
-            "/importFile.".md5($this->security->getUser()->getUid());
+            "/importFile." . md5($this->security->getUser()->getUid());
 
         if ($uploadFile['error'] === UPLOAD_ERR_OK) {
             \TYPO3\CMS\Core\Utility\GeneralUtility::upload_copy_move($uploadFile['tmp_name'], $uploadFilePath);
@@ -977,7 +977,7 @@ 
             $bulkImportSessionData->setLatestImportIdentifiers($importedDocumentIdentifiers);
             $this->session->setBulkImportData($bulkImportSessionData);
 
-        } catch(\Throwable $throwable) {
+        } catch (\Throwable $throwable) {
             $this->logger->log(\TYPO3\CMS\Core\Log\LogLevel::ERROR, $throwable->getMessage());
 
             $message = LocalizationUtility::translate(
@@ -1014,7 +1014,7 @@ 
             'dpf',
             [
                 0 => $importCounter,
-                1 => ($importCounter == 1? $publicationSingular : $publicationPlural)
+                1 => ($importCounter == 1 ? $publicationSingular : $publicationPlural)
             ]
         );
 

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

@@ -46,7 +46,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\ExternalMetadataRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $externalMetadataRepository = null;
+    protected $externalMetadataRepository = NULL;
 
     /**
      * documentRepository
@@ -54,7 +54,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -62,7 +62,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * persistence manager
@@ -78,7 +78,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\ElasticSearch
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $elasticSearch = null;
+    protected $elasticSearch = NULL;
 
     /**
      * queryBuilder
@@ -86,7 +86,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\QueryBuilder
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $queryBuilder = null;
+    protected $queryBuilder = NULL;
 
     /**
      * bookmarkRepository
@@ -94,7 +94,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * workflow
@@ -147,7 +147,7 @@ 
         /** @var BulkImportSessionData $bulkImportSessionData */
         $bulkImportSessionData = $this->session->getBulkImportData();
 
-        $currentPage = null;
+        $currentPage = NULL;
         $pagination = $this->getParametersSafely('@widget_0');
         if ($pagination) {
             $currentPage = $pagination['currentPage'];
@@ -178,8 +178,8 @@ 
         if ($results) {
             $this->forward(
                 'bulkResults',
-                null,
-                null,
+                NULL,
+                NULL,
                 [
                     'results' => $results,
                     'query' => $query,
@@ -197,8 +197,8 @@ 
 
             $this->forward(
                 'bulkStart',
-                null,
-                null,
+                NULL,
+                NULL,
                 [
                     'crossRefQuery' => $bulkImportSessionData->getCrossRefQuery()
                 ]
@@ -214,7 +214,7 @@ 
         /** @var BulkImportSessionData $bulkImportSessionData */
         $bulkImportSessionData = $this->session->getBulkImportData();
 
-        $currentPage = null;
+        $currentPage = NULL;
         $pagination = $this->getParametersSafely('@widget_0');
         if ($pagination) {
             $currentPage = $pagination['currentPage'];
@@ -245,8 +245,8 @@ 
         if ($results) {
             $this->forward(
                 'bulkResults',
-                null,
-                null,
+                NULL,
+                NULL,
                 [
                     'results' => $results,
                     'query' => $query,
@@ -264,8 +264,8 @@ 
 
             $this->forward(
                 'bulkStart',
-                null,
-                null,
+                NULL,
+                NULL,
                 [
                     'pubMedQuery' => $bulkImportSessionData->getPubMedQuery()
                 ]
@@ -279,7 +279,7 @@ 
      * @param array $results
      * @param int $currentPage
      */
-    public function bulkResultsAction($importSourceName, $query, $results = null, $currentPage = 1)
+    public function bulkResultsAction($importSourceName, $query, $results = NULL, $currentPage = 1)
     {
         $externalMetadata = $this->externalMetadataRepository->findByFeUser($this->security->getUser()->getUid());
         $checkedPublicationIdentifiers = [];
@@ -375,8 +375,8 @@ 
 
         $this->redirect(
             'bulkImportedDocuments',
-            null,
-            null,
+            NULL,
+            NULL,
             ['from' => 0, 'importCounter' => $importCounter]);
     }
 
@@ -431,7 +431,7 @@ 
             }
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
 
-            $this->redirect('find', null, null, ['identifier' => $identifier]);
+            $this->redirect('find', NULL, NULL, ['identifier' => $identifier]);
         }
 
         // Check if the document already exists in kitodo.
@@ -454,11 +454,11 @@ 
             }
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
 
-            $this->redirect('find', null, null, ['identifier' => $identifier]);
+            $this->redirect('find', NULL, NULL, ['identifier' => $identifier]);
         }
 
         /** @var \EWW\Dpf\Services\ImportExternalMetadata\Importer $importer */
-        $importer = null;
+        $importer = NULL;
 
         // Choose the right data provider depending on the identifier type and retrieve the metadata.
         $identifierType = PublicationIdentifier::determineIdentifierType($identifier);
@@ -477,7 +477,7 @@ 
             $importer = $this->objectManager->get(K10plusImporter::class);
             $externalMetadata = $importer->findByIdentifier(str_replace('- ', '', $identifier));
         } else {
-            $externalMetadata = null;
+            $externalMetadata = NULL;
         }
 
         if ($externalMetadata) {
@@ -489,8 +489,8 @@ 
         if ($externalMetadata) {
             $this->redirect(
                 'import',
-                null,
-                null,
+                NULL,
+                NULL,
                 ['externalMetadata'=>$externalMetadata]
             );
         } else {
@@ -503,7 +503,7 @@ 
                 '',
                 AbstractMessage::ERROR
             );
-            $this->redirect('find', null, null, ['identifier' => $identifier]);
+            $this->redirect('find', NULL, NULL, ['identifier' => $identifier]);
         }
 
     }
@@ -557,7 +557,7 @@ 
                 }
                 $this->addFlashMessage($message, '', AbstractMessage::OK);
 
-                $this->redirect('showDetails', 'Document', null, ['document' => $newDocument]);
+                $this->redirect('showDetails', 'Document', NULL, ['document' => $newDocument]);
 
             } else {
                 $message = LocalizationUtility::translate(
@@ -644,7 +644,7 @@ 
 
         $query = $this->queryBuilder->buildQuery(
             1, $workspaceFilter, 0,
-            $bookmarkIdentifiers, [], [], null, null,
+            $bookmarkIdentifiers, [], [], NULL, NULL,
             'identifier:"'.$identifier.'"'
         );
 
@@ -691,7 +691,7 @@ 
 
         // Search if the document already exists in kitodo.
         $query = $this->queryBuilder->buildQuery(
-            1, $workspaceFilter , 0, [], [], [], null, null, 'identifier:"'.$identifier.'"'
+            1, $workspaceFilter , 0, [], [], [], NULL, NULL, 'identifier:"'.$identifier.'"'
         );
         $results = $this->elasticSearch->search($query, 'object');
 
@@ -759,7 +759,7 @@ 
             $this->uriBuilder->getRequest()->getRequestUri()
         );
 
-        $currentPage = null;
+        $currentPage = NULL;
         $pagination = $this->getParametersSafely('@widget_0');
         if ($pagination) {
             $currentPage = $pagination['currentPage'];
@@ -878,7 +878,7 @@ 
         } elseif ($uploadFile['error'] == UPLOAD_ERR_NO_FILE) {
             $this->redirect('uploadStart');
         } else {
-            $this->redirect('uploadStart', null, null, ['error' => 'UPLOAD_ERROR']);
+            $this->redirect('uploadStart', NULL, NULL, ['error' => 'UPLOAD_ERROR']);
         }
 
         try {
@@ -916,18 +916,18 @@ 
             } elseif ($results) {
                     $this->redirect(
                         'importUploadedData',
-                        null,
-                        null,
+                        NULL,
+                        NULL,
                         ['uploadFilePath' => $uploadFilePath]
                     );
             } else {
-                $this->redirect('uploadStart', null, null, ['error' => 'INVALID_FORMAT']);
+                $this->redirect('uploadStart', NULL, NULL, ['error' => 'INVALID_FORMAT']);
             }
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $exception) {
             // A redirect always throws this exception, but in this case, however,
             // redirection is desired and should not lead to an exception handling
         } catch (\RenanBr\BibTexParser\Exception\ParserException $exception) {
-            $this->redirect('uploadStart', null, null, ['error' => 'INVALID_FORMAT']);
+            $this->redirect('uploadStart', NULL, NULL, ['error' => 'INVALID_FORMAT']);
         }
 
     }
@@ -989,8 +989,8 @@ 
 
         $this->redirect(
             'uploadedDocuments',
-            null,
-            null,
+            NULL,
+            NULL,
             ['from' => 0, 'importCounter' => sizeof($importedDocumentIdentifiers)]);
     }
 

Classes/Controller/AjaxBackofficeController.php

Spacing +10 added lines, -10 removed lines

@@ -250,7 +250,7 @@ 
      */
     public function searchFisAction($searchTerm, $type = 'person') {
         $fisUserDataService = new FisDataService();
-        $methodName = 'search'.ucfirst($type).'Request';
+        $methodName = 'search' . ucfirst($type) . 'Request';
         $result = $fisUserDataService->{$methodName}($searchTerm);
 
         return json_encode($result);
@@ -267,10 +267,10 @@ 
      */
     public function getFisDataAction($dataId, $groupId, $groupIndex, $fieldIndex, $pageId, $type = 'person') {
         $fisDataService = new FisDataService();
-        $methodName = 'get'.ucfirst($type).'Data';
+        $methodName = 'get' . ucfirst($type) . 'Data';
         $fisData = $fisDataService->{$methodName}($dataId);
 
-        $result = $this->getApiMappingArray($groupId, $fisData, $groupIndex, $fieldIndex, $pageId, 'getFis'.ucfirst($type).'Mapping');
+        $result = $this->getApiMappingArray($groupId, $fisData, $groupIndex, $fieldIndex, $pageId, 'getFis' . ucfirst($type) . 'Mapping');
 
         return json_encode($result);
     }
@@ -282,7 +282,7 @@ 
      */
     public function searchGndAction($searchTerm, $type = 'person') {
         $gndUserDataService = new GndDataService();
-        $methodName = 'search'.ucfirst($type).'Request';
+        $methodName = 'search' . ucfirst($type) . 'Request';
         $result = $gndUserDataService->{$methodName}($searchTerm);
 
         return json_encode($result);
@@ -298,10 +298,10 @@ 
      */
     public function getGndDataAction($dataId, $groupId, $groupIndex, $fieldIndex, $pageId, $type = 'person') {
         $gndUserDataService = new GndDataService();
-        $methodName = 'get'.ucfirst($type).'Data';
+        $methodName = 'get' . ucfirst($type) . 'Data';
         $gndData = $gndUserDataService->{$methodName}($dataId);
 
-        $result = $this->getApiMappingArray($groupId, $gndData, $groupIndex, $fieldIndex, $pageId, 'getGnd'.ucfirst($type).'Mapping');
+        $result = $this->getApiMappingArray($groupId, $gndData, $groupIndex, $fieldIndex, $pageId, 'getGnd' . ucfirst($type) . 'Mapping');
 
         return json_encode($result);
     }
@@ -396,7 +396,7 @@ 
      */
     public function searchOrcidAction($searchTerm, $type = 'person') {
         $orcidUserDataService = new OrcidDataService();
-        $methodName = 'search'.ucfirst($type).'Request';
+        $methodName = 'search' . ucfirst($type) . 'Request';
         $result = $orcidUserDataService->{$methodName}($searchTerm);
 
         return json_encode($result);
@@ -413,10 +413,10 @@ 
      */
     public function getOrcidDataAction($dataId, $groupId, $groupIndex, $fieldIndex, $pageId, $type = 'person') {
         $orcidDataService = new OrcidDataService();
-        $methodName = 'get'.ucfirst($type).'Data';
+        $methodName = 'get' . ucfirst($type) . 'Data';
         $orcidData = $orcidDataService->{$methodName}($dataId);
 
-        $result = $this->getApiMappingArray($groupId, $orcidData, $groupIndex, $fieldIndex, $pageId, 'getOrcid'.ucfirst($type).'Mapping');
+        $result = $this->getApiMappingArray($groupId, $orcidData, $groupIndex, $fieldIndex, $pageId, 'getOrcid' . ucfirst($type) . 'Mapping');
 
         return json_encode($result);
     }
@@ -552,7 +552,7 @@ 
     public function generateApiTokenAction($feUser) {
         $currentUser = $this->security->getUser();
         if ($currentUser->getUid() === $feUser) {
-            $string = md5(substr(md5(time()), 0, 14)).date("Y-m-dH:i:s");
+            $string = md5(substr(md5(time()), 0, 14)) . date("Y-m-dH:i:s");
             $hash = hash('sha256', $string);
 
             $currentUser->setApiToken($hash);

Braces +14 added lines, -28 removed lines

@@ -29,8 +29,7 @@ 
 /**
  * AjaxBackofficeController
  */
-class AjaxBackofficeController extends \EWW\Dpf\Controller\AbstractController
-{
+class AjaxBackofficeController extends \EWW\Dpf\Controller\AbstractController {
     /**
      * bookmarkRepository
      *
@@ -69,8 +68,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) {
@@ -90,8 +88,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) {
@@ -109,8 +106,7 @@ 
      * @param array $values
      * @return bool
      */
-    public function addWorkspaceFilterAction($name, $values = [])
-    {
+    public function addWorkspaceFilterAction($name, $values = []) {
         /** @var SearchSessionData $workspaceSessionData */
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->setFilter($name, $values);
@@ -125,8 +121,7 @@ 
      * @param string $order
      * @return bool
      */
-    public function addWorkspaceSortAction($field, $order)
-    {
+    public function addWorkspaceSortAction($field, $order) {
         /** @var SearchSessionData $workspaceSessionData */
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->setSortField($field);
@@ -140,8 +135,7 @@ 
      *
      * @return bool
      */
-    public function toggleWorkspaceExcludeDiscardedAction()
-    {
+    public function toggleWorkspaceExcludeDiscardedAction() {
         /** @var SearchSessionData $workspaceSessionData */
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->toggleExcludeDiscardedFilter();
@@ -154,8 +148,7 @@ 
      *
      * @return bool
      */
-    public function toggleWorkspaceBookmarksOnlyAction()
-    {
+    public function toggleWorkspaceBookmarksOnlyAction() {
         /** @var SearchSessionData $workspaceSessionData */
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->toggleBookmarksOnlyFilter();
@@ -169,8 +162,7 @@ 
      * @param int $itemsPerPage
      * @return bool
      */
-    public function setWorkspaceItemsPerPageAction($itemsPerPage)
-    {
+    public function setWorkspaceItemsPerPageAction($itemsPerPage) {
         /** @var SearchSessionData $workspaceSessionData */
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->setItemsPerPage($itemsPerPage);
@@ -186,8 +178,7 @@ 
      * @param string $query
      * @return bool
      */
-    public function saveExtendedSearchAction($name, $query)
-    {
+    public function saveExtendedSearchAction($name, $query) {
         $search = new \EWW\Dpf\Domain\Model\StoredSearch();
         $search->setName($name);
         $search->setQuery($query);
@@ -206,8 +197,7 @@ 
      * @param int $id
      * @return bool
      */
-    public function loadExtendedSearchAction($id)
-    {
+    public function loadExtendedSearchAction($id) {
         /** @var FrontendUser $feUser */
         $feUser = $this->security->getUser();
         $searches = $feUser->getStoredSearches();
@@ -226,8 +216,7 @@ 
      *
      * @return string
      */
-    public function loadExtendedSearchListAction()
-    {
+    public function loadExtendedSearchListAction() {
         /** @var FrontendUser $feUser */
         $feUser = $this->security->getUser();
 
@@ -481,8 +470,7 @@ 
      * @return bool
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function toggleBulkImportRecordAction($identifier)
-    {
+    public function toggleBulkImportRecordAction($identifier) {
         $externalMetaData = $this->externalMetadataRepository->findOneByPublicationIdentifier($identifier);
 
         if ($externalMetaData) {
@@ -505,8 +493,7 @@ 
      * @param string $apiName
      * @return bool
      */
-    public function toggleBulkImportAuthorSearchAction($apiName)
-    {
+    public function toggleBulkImportAuthorSearchAction($apiName) {
         /** @var BulkImportSessionData $bulkImportData */
         $bulkImportSessionData = $this->session->getBulkImportData();
 
@@ -538,8 +525,7 @@ 
         return true;
     }
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();

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

@@ -37,7 +37,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * frontendUserRepository
@@ -45,7 +45,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -53,7 +53,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * externalMetadataRepository
@@ -61,7 +61,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\ExternalMetadataRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $externalMetadataRepository = null;
+    protected $externalMetadataRepository = NULL;
 
     /**
      * Adds a the given document identifier to the bookmark list of the current fe user.
@@ -78,10 +78,10 @@ 
             $bookmark->setDocumentIdentifier($identifier);
             $bookmark->setFeUserUid($this->security->getUser()->getUid());
             $this->bookmarkRepository->add($bookmark);
-            return true;
+            return TRUE;
         }
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -96,10 +96,10 @@ 
         $bookmark = $this->bookmarkRepository->findBookmark($this->security->getUser()->getUid(), $identifier);
         if ($bookmark) {
             $this->bookmarkRepository->remove($bookmark);
-            return true;
+            return TRUE;
         }
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -115,7 +115,7 @@ 
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->setFilter($name, $values);
         $this->session->setWorkspaceData($workspaceSessionData);
-        return true;
+        return TRUE;
     }
 
     /**
@@ -132,7 +132,7 @@ 
         $workspaceSessionData->setSortField($field);
         $workspaceSessionData->setSortOrder($order);
         $this->session->setWorkspaceData($workspaceSessionData);
-        return true;
+        return TRUE;
     }
 
     /**
@@ -146,7 +146,7 @@ 
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->toggleExcludeDiscardedFilter();
         $this->session->setWorkspaceData($workspaceSessionData);
-        return true;
+        return TRUE;
     }
 
     /**
@@ -160,7 +160,7 @@ 
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->toggleBookmarksOnlyFilter();
         $this->session->setWorkspaceData($workspaceSessionData);
-        return true;
+        return TRUE;
     }
 
     /**
@@ -175,7 +175,7 @@ 
         $workspaceSessionData = $this->session->getWorkspaceData();
         $workspaceSessionData->setItemsPerPage($itemsPerPage);
         $this->session->setWorkspaceData($workspaceSessionData);
-        return true;
+        return TRUE;
     }
 
 
@@ -197,7 +197,7 @@ 
         $feUser->addStoredSearch($search);
         $this->frontendUserRepository->update($feUser);
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -218,7 +218,7 @@ 
             }
         }
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -496,7 +496,7 @@ 
             }
         }
 
-        return true;
+        return TRUE;
     }
 
     /**
@@ -530,12 +530,12 @@ 
                 $bulkImportSessionData->setPubMedSearchField($searchField);
                 break;
             default:
-                return false;
+                return FALSE;
         }
 
         $this->session->setBulkImportData($bulkImportSessionData);
 
-        return true;
+        return TRUE;
     }
 
     public function initializeAction()