kitodo / kitodo-publication

Classes/Controller/DocumentController.php

Spacing +8 added lines, -8 removed lines

@@ -352,7 +352,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];
 
                                 }
@@ -364,7 +364,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];
                         }
                     }
@@ -539,7 +539,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);
 
@@ -675,7 +675,7 @@ 
         }
 
         $this->editingLockService->lock(
-            ($document->getObjectIdentifier()? $document->getObjectIdentifier() : $document->getUid()),
+            ($document->getObjectIdentifier() ? $document->getObjectIdentifier() : $document->getUid()),
             $this->security->getUser()->getUid()
         );
 
@@ -735,7 +735,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]);
     }
 
 
@@ -867,7 +867,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->getUser()->getUserRole() === Security::ROLE_LIBRARIAN) {
@@ -896,7 +896,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]);
             }
@@ -907,7 +907,7 @@ 
             if ($exception instanceof DPFExceptionInterface) {
                 $key = $exception->messageLanguageKey();
             } else {
-                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:'.$messageKeyPart.'.failure';
+                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:' . $messageKeyPart . '.failure';
             }
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
             $this->redirectToDocumentList();

Braces +17 added lines, -34 removed lines

@@ -34,8 +34,7 @@ 
 /**
  * DocumentController
  */
-class DocumentController extends AbstractController
-{
+class DocumentController extends AbstractController {
 
     /**
      * documentRepository
@@ -134,8 +133,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -150,8 +148,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'],
@@ -389,8 +386,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(
@@ -418,8 +414,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(
@@ -448,8 +443,7 @@ 
      * @param integer $tstamp
      * @return void
      */
-    public function deleteLocallyAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp)
-    {
+    public function deleteLocallyAction(\EWW\Dpf\Domain\Model\Document $document, $tstamp) {
         if ($document->getObjectIdentifier()) {
             $voterAttribute = DocumentVoter::DELETE_WORKING_COPY;
         } else {
@@ -525,8 +519,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);
@@ -587,8 +580,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);
@@ -608,8 +600,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);
@@ -627,8 +618,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);
@@ -666,8 +656,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);
@@ -698,8 +687,7 @@ 
     }
 
 
-    public function cancelListTaskAction()
-    {
+    public function cancelListTaskAction() {
         $this->redirectToDocumentList();
     }
     
@@ -742,8 +730,7 @@ 
     /**
      * initializeAction
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -769,8 +756,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) {
@@ -785,8 +771,7 @@ 
      *
      * @return mixed
      */
-    protected function getStoragePID()
-    {
+    protected function getStoragePID() {
         return $this->settings['persistence']['classes']['EWW\Dpf\Domain\Model\Document']['newRecordStoragePid'];
     }
 
@@ -797,8 +782,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();
@@ -825,8 +809,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 +33 added lines, -33 removed lines

@@ -43,7 +43,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * inputOptionListRepository
@@ -51,7 +51,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\InputOptionListRepository
      * @inject
      */
-    protected $inputOptionListRepository = null;
+    protected $inputOptionListRepository = NULL;
 
     /**
      * persistence manager
@@ -67,7 +67,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * documentValidator
@@ -104,7 +104,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
 
     /**
@@ -113,7 +113,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     /**
      * documentManager
@@ -121,7 +121,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * bookmarkRepository
@@ -129,7 +129,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * DocumentController constructor.
@@ -195,7 +195,7 @@ 
      * @param Document $document
      * @param bool $acceptAll
      */
-    public function acceptSuggestionAction(\EWW\Dpf\Domain\Model\Document $document, bool $acceptAll = true) {
+    public function acceptSuggestionAction(\EWW\Dpf\Domain\Model\Document $document, bool $acceptAll = TRUE) {
 
         $args = $this->request->getArguments();
 
@@ -218,7 +218,7 @@ 
         if ($acceptAll) {
             // all changes are confirmed
             // copy suggest to origin document
-            $originDocument->copy($document, true);
+            $originDocument->copy($document, TRUE);
 
             if ($originDocument->getTransferStatus() == 'RESTORE') {
                 if ($originDocument->getObjectIdentifier()) {
@@ -242,7 +242,7 @@ 
             $this->documentRepository->remove($document);
 
             // redirect to document
-            $this->redirect('showDetails', 'Document', null, ['document' => $originDocument]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $originDocument]);
         }
 
         $this->redirectToDocumentList();
@@ -293,11 +293,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) {
@@ -310,7 +310,7 @@ 
                                 $valueFieldCounter = count($valueField);
 
                                 // check if group or field is not existing
-                                $notExisting = false;
+                                $notExisting = FALSE;
                                 try {
                                     $flag = 'page';
                                     $value2 = $docForm2->getItems()[$keyPage];
@@ -320,7 +320,7 @@ 
                                     $value2 = $value2[$keyRepeatGroup]->getItems()[$keyField];
                                     $flag = 'field';
                                 } catch (\Throwable $t) {
-                                    $notExisting = true;
+                                    $notExisting = TRUE;
                                 }
 
                                 $item = NULL;
@@ -403,7 +403,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;
         }
 
@@ -432,7 +432,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;
         }
 
@@ -468,7 +468,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;
         }
 
@@ -516,7 +516,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]);
         }
     }
 
@@ -530,7 +530,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;
         }
 
@@ -592,11 +592,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);
 
     }
 
@@ -613,11 +613,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);
 
     }
 
@@ -632,13 +632,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);
@@ -657,7 +657,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]);
     }
 
     /**
@@ -690,7 +690,7 @@ 
         }
 
         $mapper = $this->objectManager->get(DocumentMapper::class);
-        $documentForm = $mapper->getDocumentForm($document, false);
+        $documentForm = $mapper->getDocumentForm($document, FALSE);
 
         $this->view->assign('documentForm', $documentForm);
 
@@ -714,7 +714,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;
         }
 
@@ -734,8 +734,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]);
     }
 
 
@@ -769,7 +769,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();
 
@@ -812,7 +812,7 @@ 
             $message,
             '',
             $severity,
-            true
+            TRUE
         );
     }
 

Classes/Controller/DocumentFormBackofficeController.php

Braces +11 added lines, -22 removed lines

@@ -28,8 +28,7 @@ 
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-class DocumentFormBackofficeController extends AbstractDocumentFormController
-{
+class DocumentFormBackofficeController extends AbstractDocumentFormController {
     /**
      * documentTransferManager
      *
@@ -71,8 +70,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -113,8 +111,7 @@ 
      */
     public function editAction(
         \EWW\Dpf\Domain\Model\DocumentForm $documentForm, bool $suggestMod = false, $activeFileTab = false
-    )
-    {
+    ) {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
         $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
 
@@ -161,8 +158,7 @@ 
      * @param \EWW\Dpf\Domain\Model\DocumentForm $documentForm
      * @param bool $restore
      */
-    public function createSuggestionDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $restore = FALSE)
-    {
+    public function createSuggestionDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $restore = FALSE) {
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
         $hasFilesFlag = true;
@@ -233,8 +229,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]);
@@ -267,8 +262,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null)
-    {
+    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null) {
         try {
             /** @var \EWW\Dpf\Domain\Model\Document $document */
             $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
@@ -415,8 +409,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);
 
@@ -481,8 +474,7 @@ 
      *
      * @return void
      */
-    public function cancelEditAction($documentUid = 0)
-    {
+    public function cancelEditAction($documentUid = 0) {
         if ($documentUid) {
             /** @var $document \EWW\Dpf\Domain\Model\Document */
             $document = $this->documentRepository->findByUid($documentUid);
@@ -501,14 +493,12 @@ 
      *
      * @return void
      */
-    public function cancelNewAction()
-    {
+    public function cancelNewAction() {
         $this->redirect('list');
     }
 
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -522,8 +512,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 +28 added lines, -28 removed lines

@@ -50,7 +50,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * documentManager
@@ -58,7 +58,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * bookmarkRepository
@@ -66,7 +66,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * DocumentController constructor.
@@ -112,7 +112,7 @@ 
      * @return void
      */
     public function editAction(
-        \EWW\Dpf\Domain\Model\DocumentForm $documentForm, bool $suggestMod = false, $activeFileTab = false
+        \EWW\Dpf\Domain\Model\DocumentForm $documentForm, bool $suggestMod = FALSE, $activeFileTab = FALSE
     )
     {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
@@ -141,7 +141,7 @@ 
             }
 
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -165,17 +165,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);
@@ -195,7 +195,7 @@ 
             $newDocument->setLinkedUid($document->getUid());
         }
 
-        $newDocument->setSuggestion(true);
+        $newDocument->setSuggestion(TRUE);
         $newDocument->setComment($document->getComment());
 
         if ($restore) {
@@ -223,10 +223,10 @@ 
             $newDocument->setCreator($this->security->getUser()->getUid());
             $this->documentRepository->add($newDocument);
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::SUCCESS;
-            $this->addFlashMessage("Success", '', $severity,false);
+            $this->addFlashMessage("Success", '', $severity,FALSE);
         } catch (\Throwable $t) {
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR;
-            $this->addFlashMessage("Failed", '', $severity,false);
+            $this->addFlashMessage("Failed", '', $severity,FALSE);
         }
 
         $this->redirectToDocumentList();
@@ -237,7 +237,7 @@ 
     {
         if ($this->request->getArgument('documentData')['suggestMod']) {
             $restore = $this->request->getArgument('documentData')['suggestRestore'];
-            $this->forward('createSuggestionDocument', null, null, ['documentForm' => $documentForm, 'restore' => $restore]);
+            $this->forward('createSuggestionDocument', NULL, NULL, ['documentForm' => $documentForm, 'restore' => $restore]);
         }
 
         if ($this->request->hasArgument('saveAndUpdate')) {
@@ -245,7 +245,7 @@ 
         } elseif ($this->request->hasArgument('saveWorkingCopy')) {
             $saveMode = 'saveWorkingCopy';
         } else {
-            $saveMode = null;
+            $saveMode = NULL;
         }
 
         $this->forward(
@@ -267,7 +267,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null)
+    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = NULL)
     {
         try {
             /** @var \EWW\Dpf\Domain\Model\Document $document */
@@ -288,7 +288,7 @@ 
                 $this->addFlashMessage($message, '', AbstractMessage::ERROR);
                 $this->redirect(
                     'showDetails', 'Document',
-                    null, ['document' => $document]
+                    NULL, ['document' => $document]
                 );
             }
 
@@ -298,13 +298,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;
@@ -387,7 +387,7 @@ 
             if ($workflowTransition && $workflowTransition === DocumentWorkflow::TRANSITION_REMOTE_UPDATE) {
                 $this->redirectToDocumentList();
             } else {
-                $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
+                $this->redirect('showDetails', 'Document', NULL, ['document' => $updateDocument]);
             }
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
             // A redirect always throws this exception, but in this case, however,
@@ -410,8 +410,8 @@ 
 
             $exceptionMsg[] = LocalizationUtility::translate($key, 'dpf');
 
-            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity, true);
-            $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
+            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity, TRUE);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $updateDocument]);
         }
     }
 
@@ -428,7 +428,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;
         }
 
@@ -442,7 +442,7 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
 
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
@@ -464,7 +464,7 @@ 
                 implode(" ", $message),
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
 
@@ -487,7 +487,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]);
         } else {
             $this->redirectToDocumentList();
         }
@@ -522,14 +522,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/AbstractDocumentFormController.php

Braces +13 added lines, -26 removed lines

@@ -25,8 +25,7 @@ 
 /**
  * DocumentFormController
  */
-abstract class AbstractDocumentFormController extends AbstractController
-{
+abstract class AbstractDocumentFormController extends AbstractController {
 
     /**
      * documentRepository
@@ -81,8 +80,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $documents = $this->documentRepository->findAll();
 
         $documentTypes = $this->documentTypeRepository->findAll();
@@ -127,8 +125,7 @@ 
      *
      * @return void
      */
-    public function initializeNewAction()
-    {
+    public function initializeNewAction() {
 
         $requestArguments = $this->request->getArguments();
 
@@ -157,14 +154,12 @@ 
      * @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);
     }
 
-    public function initializeCreateAction()
-    {
+    public function initializeCreateAction() {
 
         $requestArguments = $this->request->getArguments();
 
@@ -198,8 +193,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 */
@@ -248,8 +242,7 @@ 
 
     }
 
-    public function initializeEditAction()
-    {
+    public function initializeEditAction() {
         $requestArguments = $this->request->getArguments();
 
         if (array_key_exists('document', $requestArguments)) {
@@ -279,13 +272,11 @@ 
      * @ignorevalidation $documentForm
      * @return void
      */
-    public function editAction(DocumentForm $documentForm)
-    {
+    public function editAction(DocumentForm $documentForm) {
         $this->view->assign('documentForm', $documentForm);
     }
 
-    public function initializeUpdateAction()
-    {
+    public function initializeUpdateAction() {
         $requestArguments = $this->request->getArguments();
 
         if ($this->request->hasArgument('documentData')) {
@@ -318,8 +309,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 */
@@ -360,18 +350,15 @@ 
      *
      * @return void
      */
-    public function cancelAction()
-    {
+    public function cancelAction() {
         $this->redirectToList();
     }
 
-    protected function redirectAfterUpdate()
-    {
+    protected function redirectAfterUpdate() {
         $this->redirect('list');
     }
 
-    protected function redirectToList($message = null)
-    {
+    protected function redirectToList($message = null) {
         $this->redirect('list');
     }
 

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

@@ -34,7 +34,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -42,7 +42,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -50,7 +50,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -58,7 +58,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -66,7 +66,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * persistence manager
@@ -157,7 +157,7 @@ 
      * @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);
@@ -181,11 +181,11 @@ 
             $documentType = $this->documentTypeRepository->findByUid($docTypeUid);
             $virtual = $documentType->getVirtual();
 
-            if (!$formDataReader->uploadError() || $virtual === true) {
+            if (!$formDataReader->uploadError() || $virtual === TRUE) {
                 $this->request->setArguments($requestArguments);
             } else {
                 $t = $docForm->getNewFileNames();
-                $this->redirect('list', 'DocumentForm', null, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
+                $this->redirect('list', 'DocumentForm', NULL, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
             }
         } else {
             $this->redirectToList("UPLOAD_POST_SIZE_ERROR");
@@ -301,11 +301,11 @@ 
             $documentType = $this->documentTypeRepository->findByUid($docTypeUid);
             $virtual = $documentType->getVirtual();
 
-            if (!$formDataReader->uploadError() || $virtual === true) {
+            if (!$formDataReader->uploadError() || $virtual === TRUE) {
                 $this->request->setArguments($requestArguments);
             } else {
                 $t = $docForm->getNewFileNames();
-                $this->redirect('list', 'Document', null, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
+                $this->redirect('list', 'Document', NULL, array('message' => 'UPLOAD_MAX_FILESIZE_ERROR', 'errorFiles' => $t));
             }
         } else {
             $this->redirectToList("UPLOAD_POST_SIZE_ERROR");
@@ -330,7 +330,7 @@ 
             throw new \EWW\Dpf\Exceptions\DocumentMaxSizeErrorException("Maximum document size exceeded.");
         }
 
-        $updateDocument->setChanged(true);
+        $updateDocument->setChanged(TRUE);
         $this->documentRepository->update($updateDocument);
 
 
@@ -370,7 +370,7 @@ 
         $this->redirect('list');
     }
 
-    protected function redirectToList($message = null)
+    protected function redirectToList($message = NULL)
     {
         $this->redirect('list');
     }

Classes/ViewHelpers/FileUrlViewHelper.php

Braces +3 added lines, -6 removed lines

@@ -17,8 +17,7 @@ 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 
-class FileUrlViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
-{
+class FileUrlViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
     /**
      * Secret API key for delivering inactive documents.
      * @var string
@@ -44,8 +43,7 @@ 
      * @param string $uri
      *
      */
-    public function render($uri)
-    {
+    public function render($uri) {
         $fileUri = $this->buildFileUri($uri);
 
         // pass configured API secret key parameter to enable dissemination for inactive documents
@@ -59,8 +57,7 @@ 
     /**
      * Construct file URI
      */
-    protected function buildFileUri($uri)
-    {
+    protected function buildFileUri($uri) {
         $uploadFileUrl = new \EWW\Dpf\Helper\UploadFileUrl;
 
         if (strpos(strtolower($uri), "datastreams")) {

Classes/Services/Document/DocumentCleaner.php

Braces +4 added lines, -8 removed lines

@@ -14,8 +14,7 @@ 
  * The TYPO3 project - inspiring people to share!
  */
 
-class DocumentCleaner
-{
+class DocumentCleaner {
 
     /**
      * clientRepository
@@ -55,8 +54,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $openedDocument
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function cleanUpDocuments($actionMethodName, $controllerClass)
-    {
+    public function cleanUpDocuments($actionMethodName, $controllerClass) {
         $excludeActions = [
             \EWW\Dpf\Controller\DocumentController::class => [
                 'showDetailsAction',
@@ -105,8 +103,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    protected function cleanUpOutdatedTemporaryDocuments()
-    {
+    protected function cleanUpOutdatedTemporaryDocuments() {
         // Remove outdated temporary documents from the document table.
         $outdatedTemporaryDocuments = $this->documentRepository->findOutdatedTemporaryDocuments(3600);
         foreach ($outdatedTemporaryDocuments as $outdatedTemporaryDocument) {
@@ -119,8 +116,7 @@ 
     /**
      * Unlocks all editing locks of the current user.
      */
-    protected function cleanUpEditingLocks($actionMethodName, $controllerClass)
-    {
+    protected function cleanUpEditingLocks($actionMethodName, $controllerClass) {
         $excludeActions = [
             \EWW\Dpf\Controller\DocumentController::class => [
                 'duplicateAction'

Classes/Domain/Model/Document.php

Spacing +11 added lines, -11 removed lines

@@ -324,7 +324,7 @@ 
     public function setObjectIdentifier($objectIdentifier)
     {
         // Due to uniqe key uc_object_identifier, which should ignore empty object identifiers.
-        $this->objectIdentifier = empty($objectIdentifier)? null : $objectIdentifier;
+        $this->objectIdentifier = empty($objectIdentifier) ? null : $objectIdentifier;
     }
 
     /**
@@ -506,14 +506,14 @@ 
 
         $fileId = new \EWW\Dpf\Services\Transfer\FileId($this);
 
-        $files = array();
+        $files = array ();
 
         if (is_a($this->getFile(), '\TYPO3\CMS\Extbase\Persistence\ObjectStorage')) {
             foreach ($this->getFile() as $file) {
 
                 if (!$file->isFileGroupDeleted()) {
 
-                    $tmpFile = array(
+                    $tmpFile = array (
                         'path' => $file->getUrl(),
                         'type' => $file->getContentType(),
                         'title' => (($file->getLabel()) ? $file->getLabel() : $file->getTitle()),
@@ -557,12 +557,12 @@ 
 
         $fileId = new \EWW\Dpf\Services\Transfer\FileId($this);
 
-        $files = array();
+        $files = array ();
 
         if (is_a($this->getFile(), '\TYPO3\CMS\Extbase\Persistence\ObjectStorage')) {
             foreach ($this->getFile() as $file) {
 
-                $tmpFile = array(
+                $tmpFile = array (
                     'path' => $file->getUrl(),
                     'type' => $file->getContentType(),
                     'title' => (($file->getLabel()) ? $file->getLabel() : $file->getTitle()),
@@ -715,7 +715,7 @@ 
      */
     public function getCreator()
     {
-        return $this->creator? $this->creator : 0;
+        return $this->creator ? $this->creator : 0;
     }
 
     /**
@@ -861,7 +861,7 @@ 
 
         foreach ($availableProperties as $propertyName) {
             if (\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($newDocument, $propertyName)
-                && !in_array($propertyName, array('uid','pid', 'file', 'comment', 'linkedUid', 'suggestion', 'creator'))) {
+                && !in_array($propertyName, array ('uid', 'pid', 'file', 'comment', 'linkedUid', 'suggestion', 'creator'))) {
 
                 $propertyValue = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($documentToCopy, $propertyName);
                 \TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($newDocument, $propertyName, $propertyValue);
@@ -883,7 +883,7 @@ 
      */
     public function getDocumentIdentifier()
     {
-        return $this->getObjectIdentifier()? $this->getObjectIdentifier() : $this->getUid();
+        return $this->getObjectIdentifier() ? $this->getObjectIdentifier() : $this->getUid();
     }
 
     /**
@@ -916,8 +916,8 @@ 
     public function getPublicationYear()
     {
         $mods = new Mods($this->getXmlData());
-        $year =  $mods->getPublishingYear();
-        return $year? $year : "";
+        $year = $mods->getPublishingYear();
+        return $year ? $year : "";
     }
 
     /**
@@ -929,7 +929,7 @@ 
     {
         $mods = new Mods($this->getXmlData());
         $title = $mods->getTitle();
-        return $title? $title : "";
+        return $title ? $title : "";
     }
 
 

Classes/Helper/DocumentMapper.php

Braces +4 added lines, -8 removed lines

@@ -19,8 +19,7 @@ 
 use EWW\Dpf\Domain\Workflow\DocumentWorkflow;
 use EWW\Dpf\Services\ProcessNumber\ProcessNumberGenerator;
 
-class DocumentMapper
-{
+class DocumentMapper {
 
     /**
      * objectManager
@@ -77,8 +76,7 @@ 
      * @param bool $generateEmptyFields
      * @return \EWW\Dpf\Domain\Model\DocumentForm
      */
-    public function getDocumentForm(Document $document, $generateEmptyFields = true)
-    {
+    public function getDocumentForm(Document $document, $generateEmptyFields = true) {
         $documentForm = new \EWW\Dpf\Domain\Model\DocumentForm();
         $documentForm->setUid($document->getDocumentType()->getUid());
         $documentForm->setDisplayName($document->getDocumentType()->getDisplayName());
@@ -298,8 +296,7 @@ 
         return $documentForm;
     }
 
-    public function getDocument($documentForm)
-    {
+    public function getDocument($documentForm) {
 
         if ($documentForm->getDocumentUid()) {
             $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
@@ -357,8 +354,7 @@ 
         return $document;
     }
 
-    public function getMetadata($documentForm)
-    {
+    public function getMetadata($documentForm) {
 
         foreach ($documentForm->getItems() as $page) {
 

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

@@ -36,7 +36,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -44,7 +44,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -52,7 +52,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * documentRepository
@@ -60,7 +60,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -68,7 +68,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * Gets the document form representation of the document data
@@ -77,7 +77,7 @@ 
      * @param bool $generateEmptyFields
      * @return \EWW\Dpf\Domain\Model\DocumentForm
      */
-    public function getDocumentForm(Document $document, $generateEmptyFields = true)
+    public function getDocumentForm(Document $document, $generateEmptyFields = TRUE)
     {
         $documentForm = new \EWW\Dpf\Domain\Model\DocumentForm();
         $documentForm->setUid($document->getDocumentType()->getUid());
@@ -146,7 +146,7 @@ 
                 // build mapping path, previous fixed attributes which are differ from
                 // the own fixed attributes are excluded
                 $queryGroupMapping = $metadataGroup->getAbsoluteMapping();
-                if (strpos($queryGroupMapping, "@displayLabel") === false && is_array($excludeGroupAttributes[$groupMappingName])) {
+                if (strpos($queryGroupMapping, "@displayLabel") === FALSE && is_array($excludeGroupAttributes[$groupMappingName])) {
                     foreach ($excludeGroupAttributes[$groupMappingName] as $excludeAttr => $excludeAttrValue) {
                         if (!in_array($excludeAttr, $fixedGroupAttributes)) {
                             $queryGroupMapping .= $excludeAttrValue;
@@ -200,7 +200,7 @@ 
 
                                 // ensure that e.g. <mods:detail> and <mods:detail type="volume">
                                 // are not recognized as the same node
-                                if ((strpos($value, "@") === false) && ($value != '.')) {
+                                if ((strpos($value, "@") === FALSE) && ($value != '.')) {
                                     $objectMappingPath[$key] .= "[not(@*)]";
                                 }
                             }

Classes/Helper/Mods.php

Braces +20 added lines, -40 removed lines

@@ -15,8 +15,7 @@ 
  */
 
 
-class Mods
-{
+class Mods {
     /**
      * metadataObjectRepository
      *
@@ -36,13 +35,11 @@ 
 
     protected $modsDom;
 
-    public function __construct($modsXml)
-    {
+    public function __construct($modsXml) {
         $this->setModsXml($modsXml);
     }
 
-    public function setModsXml($modsXml)
-    {
+    public function setModsXml($modsXml) {
         $modsDom = new \DOMDocument();
         if (!empty($modsXml)) {
             if (is_null(@$modsDom->loadXML($modsXml))) {
@@ -52,19 +49,16 @@ 
         $this->modsDom = $modsDom;
     }
 
-    public function getModsXml()
-    {
+    public function getModsXml() {
         return $this->modsDom->saveXML();
     }
 
-    public function getModsXpath()
-    {
+    public function getModsXpath() {
         $xpath = \EWW\Dpf\Helper\XPath::create($this->modsDom);
         return $xpath;
     }
 
-    public function getTitle()
-    {
+    public function getTitle() {
         $titleNode = $this->getModsXpath()->query('/mods:mods/mods:titleInfo[@usage="primary"]/mods:title');
 
         if ($titleNode->length == 0) {
@@ -74,8 +68,7 @@ 
     }
 
 
-    public function setTitle($title)
-    {
+    public function setTitle($title) {
         $titleNode = $this->getModsXpath()->query('/mods:mods/mods:titleInfo[@usage="primary"]/mods:title');
 
         if ($titleNode->length == 0) {
@@ -88,13 +81,11 @@ 
     }
 
 
-    public function getAuthors()
-    {
+    public function getAuthors() {
         return $this->getPersons("aut");
     }
 
-    public function getPublishers()
-    {
+    public function getPublishers() {
         return $this->getPersons("edt");
     }
 
@@ -104,8 +95,7 @@ 
      * @param $role
      * @return array
      */
-    protected function getPersons($role)
-    {
+    protected function getPersons($role) {
         $xpath = $this->getModsXpath();
 
         $authorNode = $xpath->query('/mods:mods/mods:name[mods:role/mods:roleTerm[@type="code"]="'.$role.'"]');
@@ -134,8 +124,7 @@ 
         return $authors;
     }
 
-    public function setDateIssued($date)
-    {
+    public function setDateIssued($date) {
 
         $originInfo = $this->getModsXpath()->query('/mods:mods/mods:originInfo[@eventType="distribution"]');
 
@@ -175,8 +164,7 @@ 
     }
 
 
-    public function getPublishingYear()
-    {
+    public function getPublishingYear() {
         $year = $this->getModsXpath()->query('/mods:mods/mods:originInfo[@eventType="publication"]/mods:dateIssued[@encoding="iso8601"]');
         if ($year->length > 0) {
             return $year->item(0)->nodeValue;
@@ -185,8 +173,7 @@ 
         return null;
     }
 
-    public function getOriginalSourceTitle()
-    {
+    public function getOriginalSourceTitle() {
         $node= $this->getModsXpath()->query('/mods:mods/mods:relatedItem[@type="original"]/mods:titleInfo/mods:title');
         if ($node->length > 0) {
             return $node->item(0)->nodeValue;
@@ -195,8 +182,7 @@ 
         return null;
     }
 
-    public function getDateIssued()
-    {
+    public function getDateIssued() {
 
         $dateIssued = $this->getModsXpath()->query('/mods:mods/mods:originInfo[@eventType="distribution"]/mods:dateIssued[@encoding="iso8601"][@keyDate="yes"]');
         if ($dateIssued->length > 0) {
@@ -206,8 +192,7 @@ 
         return null;
     }
 
-    public function removeDateIssued()
-    {
+    public function removeDateIssued() {
 
         $dateIssued = $this->getModsXpath()->query('/mods:mods/mods:originInfo[@eventType="distribution"]/mods:dateIssued[@encoding="iso8601"][@keyDate="yes"]');
         if ($dateIssued->length > 0) {
@@ -216,8 +201,7 @@ 
 
     }
 
-    public function hasQucosaUrn()
-    {
+    public function hasQucosaUrn() {
         $urnNodeList = $this->getModsXpath()->query('/mods:mods/mods:identifier[@type="qucosa:urn"]');
 
         $hasUrn = false;
@@ -230,8 +214,7 @@ 
         return $hasUrn;
     }
 
-    public function getQucosaUrn()
-    {
+    public function getQucosaUrn() {
         $urnNodeList = $this->getModsXpath()->query('/mods:mods/mods:identifier[@type="qucosa:urn"]');
         $urnList     = '';
 
@@ -243,8 +226,7 @@ 
         return $urnList;
     }
 
-    public function addQucosaUrn($urn)
-    {
+    public function addQucosaUrn($urn) {
         $rootNode = $this->getModsXpath()->query('/mods:mods');
 
         if ($rootNode->length == 1) {
@@ -258,8 +240,7 @@ 
 
     }
 
-    public function clearAllUrn()
-    {
+    public function clearAllUrn() {
         $urnNodeList = $this->getModsXpath()->query('/mods:mods/mods:identifier[@type="urn"]');
 
         foreach ($urnNodeList as $urnNode) {
@@ -275,8 +256,7 @@ 
     /**
      * @return string
      */
-    public function getSourceDetails()
-    {
+    public function getSourceDetails() {
         $data = [];
 
         $dataNodes[] = $this->getModsXpath()->query('/mods:mods/mods:relatedItem[@type="original"]');

Classes/Domain/Model/File.php

Braces +25 added lines, -50 removed lines

@@ -17,8 +17,7 @@ 
 /**
  * File
  */
-class File extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
-{
+class File extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
     /**
      * title
@@ -110,8 +109,7 @@ 
      *
      * @return string $title
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->title;
     }
 
@@ -121,8 +119,7 @@ 
      * @param string $title
      * @return void
      */
-    public function setTitle($title)
-    {
+    public function setTitle($title) {
         $this->title = $title;
     }
 
@@ -131,8 +128,7 @@ 
      *
      * @return string $label
      */
-    public function getLabel()
-    {
+    public function getLabel() {
         return $this->label;
     }
 
@@ -142,8 +138,7 @@ 
      * @param string $label
      * @return void
      */
-    public function setLabel($label)
-    {
+    public function setLabel($label) {
         $this->label = $label;
     }
 
@@ -152,8 +147,7 @@ 
      *
      * @return boolean $download
      */
-    public function getDownload()
-    {
+    public function getDownload() {
         return $this->download;
     }
 
@@ -163,8 +157,7 @@ 
      * @param string $download
      * @return void
      */
-    public function setDownload($download)
-    {
+    public function setDownload($download) {
         $this->download = $download;
     }
 
@@ -173,8 +166,7 @@ 
      *
      * @return boolean $archive
      */
-    public function getArchive()
-    {
+    public function getArchive() {
         return $this->archive;
     }
 
@@ -184,8 +176,7 @@ 
      * @param boolean $archive
      * @return void
      */
-    public function setArchive($archive)
-    {
+    public function setArchive($archive) {
         $this->archive = $archive;
     }
 
@@ -194,8 +185,7 @@ 
      *
      * @return boolean $fileGroupDeleted
      */
-    public function isFileGroupDeleted()
-    {
+    public function isFileGroupDeleted() {
         return $this->fileGroupDeleted;
     }
 
@@ -204,8 +194,7 @@ 
      *
      * @return boolean $fileGroupDeleted
      */
-    public function setFileGroupDeleted($fileGroupDeleted)
-    {
+    public function setFileGroupDeleted($fileGroupDeleted) {
         $this->fileGroupDeleted = $fileGroupDeleted;
     }
 
@@ -214,8 +203,7 @@ 
      *
      * @return string $contentType
      */
-    public function getContentType()
-    {
+    public function getContentType() {
         return $this->contentType;
     }
 
@@ -225,8 +213,7 @@ 
      * @param string $contentType
      * @return void
      */
-    public function setContentType($contentType)
-    {
+    public function setContentType($contentType) {
         $this->contentType = $contentType;
     }
 
@@ -235,8 +222,7 @@ 
      *
      * @return string $link
      */
-    public function getLink()
-    {
+    public function getLink() {
         return $this->link;
     }
 
@@ -246,8 +232,7 @@ 
      * @param string $link
      * @return void
      */
-    public function setLink($link)
-    {
+    public function setLink($link) {
         $this->link = $link;
     }
 
@@ -256,8 +241,7 @@ 
      *
      * @return string $status
      */
-    public function getStatus()
-    {
+    public function getStatus() {
         return $this->status;
     }
 
@@ -267,8 +251,7 @@ 
      * @param string $status
      * @return void
      */
-    public function setStatus($status)
-    {
+    public function setStatus($status) {
         $this->status = $status;
     }
 
@@ -277,8 +260,7 @@ 
      *
      * @return \EWW\Dpf\Domain\Model\Document $document
      */
-    public function getDocument()
-    {
+    public function getDocument() {
         return $this->document;
     }
 
@@ -288,8 +270,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return void
      */
-    public function setDocument(\EWW\Dpf\Domain\Model\Document $document)
-    {
+    public function setDocument(\EWW\Dpf\Domain\Model\Document $document) {
         $this->document = $document;
     }
 
@@ -298,8 +279,7 @@ 
      *
      * @return boolean $primaryFile
      */
-    public function getPrimaryFile()
-    {
+    public function getPrimaryFile() {
         return $this->primaryFile;
     }
 
@@ -309,8 +289,7 @@ 
      * @param boolean $primaryFile
      * @return void
      */
-    public function setPrimaryFile($primaryFile)
-    {
+    public function setPrimaryFile($primaryFile) {
         $this->primaryFile = $primaryFile;
     }
 
@@ -319,8 +298,7 @@ 
      *
      * @return boolean
      */
-    public function isPrimaryFile()
-    {
+    public function isPrimaryFile() {
         return $this->primaryFile;
     }
 
@@ -329,8 +307,7 @@ 
      *
      * @return string $datastreamIdentifier
      */
-    public function getDatastreamIdentifier()
-    {
+    public function getDatastreamIdentifier() {
         return $this->datastreamIdentifier;
     }
 
@@ -340,8 +317,7 @@ 
      * @param string $datastreamIdentifier
      * @return void
      */
-    public function setDatastreamIdentifier($datastreamIdentifier)
-    {
+    public function setDatastreamIdentifier($datastreamIdentifier) {
         $this->datastreamIdentifier = $datastreamIdentifier;
     }
 
@@ -373,8 +349,7 @@ 
      *
      * @return string
      */
-    public function getUrl()
-    {
+    public function getUrl() {
         $url = $this->getLink();
 
         // FIXME: Checking for "datastreams" in the URL is Fedora 3 specific, for Fedora 4 we need a better solution.

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

@@ -95,7 +95,7 @@ 
      *
      * @var \EWW\Dpf\Domain\Model\Document
      */
-    protected $document = null;
+    protected $document = NULL;
 
     const STATUS_REMOTE  = "remote";
     const STATUS_DELETED = "deleted";
@@ -378,7 +378,7 @@ 
         $url = $this->getLink();
 
         // FIXME: Checking for "datastreams" in the URL is Fedora 3 specific, for Fedora 4 we need a better solution.
-        if (strpos(strtolower($url), "datastreams") === false) {
+        if (strpos(strtolower($url), "datastreams") === FALSE) {
             // File is a locally uploaded file, therefor we need to
             // determine the path
             $uploadFileUrl = new \EWW\Dpf\Helper\UploadFileUrl;