kitodo / kitodo-publication

ext_localconf.php

Spacing +10 added lines, -10 removed lines

@@ -22,13 +22,13 @@ 
     require_once $composerAutoloadFile;
 }
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['EWW\Dpf\Tasks\TransferTask'] = array(
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['EWW\Dpf\Tasks\TransferTask'] = array (
     'extension'   => $_EXTKEY,
     'title'       => 'Kitodo.Publication-Dokumente ans Repository übertragen.',
     'description' => '',
 );
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['EWW\Dpf\Tasks\EmbargoTask'] = array(
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['EWW\Dpf\Tasks\EmbargoTask'] = array (
     'extension' => $_EXTKEY,
     'title' => 'Kitodo.Publication Embargo Task',
     'description' => 'Embargo task for sending information to admins or publish files automatically if the embargo date is expired',
@@ -37,13 +37,13 @@ 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
     'EWW.' . $_EXTKEY,
     'KitodoPublicationForm',
-    array(
+    array (
         'DocumentForm'     => 'list,new,create,edit,update,delete,cancel,summary,register,delete',
         'AjaxDocumentForm' => 'group,fileGroup,field,deleteFile,primaryUpload,secondaryUpload,fillOut',
         'Gnd'              => 'search',
     ),
     // non-cacheable actions
-    array(
+    array (
         'DocumentForm'     => 'list,new,create,edit,update,delete,cancel,summary,register,delete,'
             . 'ajaxGroup,ajaxFileGroup,ajaxField',
         'AjaxDocumentForm' => 'group,fileGroup,field,deleteFile,primaryUpload,secondaryUpload,fillOut',
@@ -56,11 +56,11 @@ 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
     'EWW.' . $_EXTKEY,
     'Frontendsearch',
-    array(
+    array (
         'SearchFE' => 'search,extendedSearch,showSearchForm',
     ),
     // non-cacheable actions
-    array(
+    array (
         'SearchFE' => 'search,extendedSearch'
     )
 );
@@ -68,11 +68,11 @@ 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
     'EWW.' . $_EXTKEY,
     'Getfile',
-    array(
+    array (
         'GetFile'     => 'attachment',
     ),
     // non-cacheable actions
-    array(
+    array (
         'GetFile'     => 'attachment',
     )
 );
@@ -91,7 +91,7 @@ 
 \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
     'EWW.' . $_EXTKEY,
     'Backoffice',
-    array(
+    array (
         'Workspace'        => 'listWorkspace, initIndex, '
             .'batch, batchRegister, batchRemove, batchReleaseValidated, batchReleaseUnvalidated, editDocument, batchSetInProgress',
         'Document'         => 'logout, showDetails, discard, postpone, deleteLocally, deleteLocallySuggestion, register, releasePublish, '
@@ -116,7 +116,7 @@ 
         'User'             => 'settings, saveSettings',
     ),
     // non-cacheable actions
-    array(
+    array (
         'Workspace'        => 'listWorkspace, initIndex, '
             .'batch, batchRegister, batchRemove, batchReleaseValidated, batchReleaseUnvalidated, editDocument, batchSetInProgress',
         'Document'         => 'logout, showDetails, discard, postpone, deleteLocally, deleteLocallySuggestion, register, releasePublish, '

Classes/Helper/FormDataReader.php

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

@@ -29,7 +29,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * metadataPageRepository
@@ -37,7 +37,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataPageRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataPageRepository = null;
+    protected $metadataPageRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -45,7 +45,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -53,7 +53,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * fileRepository
@@ -61,7 +61,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * documentRepository
@@ -69,7 +69,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * objectManager
@@ -92,7 +92,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DepositLicenseRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $depositLicenseRepository = null;
+    protected $depositLicenseRepository = NULL;
 
     /**
      * formData
@@ -182,35 +182,35 @@ 
     public function uploadError()
     {
         // todo: To be updated or implemented elsewhere
-        return false;
+        return FALSE;
 
         if (
             $this->formData['primaryFile'] &&
             $this->formData['primaryFile']['error'] != UPLOAD_ERR_OK &&
             $this->formData['primaryFile']['error'] != UPLOAD_ERR_NO_FILE
         ) {
-            return true;
+            return TRUE;
         }
 
         if (is_array($this->formData['secondaryFiles'])) {
             foreach ($this->formData['secondaryFiles'] as $tmpFile) {
                 if ($tmpFile['error'] != UPLOAD_ERR_OK && $tmpFile['error'] != UPLOAD_ERR_NO_FILE) {
-                    return true;
+                    return TRUE;
                 }
             }
         }
 
-        return false;
+        return FALSE;
     }
 
-    protected function getUploadedFile($tmpFile, $primary = false, \EWW\Dpf\Domain\Model\File $file = null)
+    protected function getUploadedFile($tmpFile, $primary = FALSE, \EWW\Dpf\Domain\Model\File $file = NULL)
     {
 
         if (empty($file)) {
             $file = $this->objectManager->get(File::class);
         }
 
-        $fileName = uniqid(time(), true);
+        $fileName = uniqid(time(), TRUE);
 
         \TYPO3\CMS\Core\Utility\GeneralUtility::upload_copy_move($tmpFile['tmp_name'], $this->uploadPath . $fileName);
 
@@ -223,7 +223,7 @@ 
         $file->setTitle($tmpFile['name']);
         $file->setLink($fileName);
         $file->setPrimaryFile($primary);
-        $file->setFileIdentifier(uniqid(time(), true));
+        $file->setFileIdentifier(uniqid(time(), TRUE));
 
         if ($primary) {
             if ($file->getDatastreamIdentifier()) {
@@ -334,7 +334,7 @@ 
                             if ($metadataGroup->isFileGroup()) {
 
                                 // Use the existing file entry
-                                $file = null;
+                                $file = NULL;
                                 $document = $this->documentRepository->findByUid($this->formData['documentUid']);
                                 if ($document) {
                                     if ($metadataGroup->isPrimaryFileGroup()) {

Classes/Security/DocumentVoter.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
      */
     protected static function getAttributes()
     {
-        return array(
+        return array (
             self::CREATE,
             self::CREATE_ANONYMOUSLY,
             self::UPDATE,
@@ -488,7 +488,7 @@ 
     {
         if ($this->security->getUserRole() === Security::ROLE_RESEARCHER) {
 
-            $objectManager =GeneralUtility::makeInstance(ObjectManager::class);
+            $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
             $documentRepository = $objectManager->get(DocumentRepository::class);
 
             $linkedDocument = $documentRepository->findOneByLinkedUid($document->getUid());
@@ -607,7 +607,7 @@ 
      */
     protected function isDocumentLocked($document)
     {
-        $identifier = $document->getObjectIdentifier()? $document->getObjectIdentifier() : $document->getUid();
+        $identifier = $document->getObjectIdentifier() ? $document->getObjectIdentifier() : $document->getUid();
         return $this->editingLockService->isLocked($identifier, $this->security->getUser()->getUid());
     }
 

Braces +25 added lines, -50 removed lines

@@ -22,8 +22,7 @@ 
 use TYPO3\CMS\Core\Log\LogManager;
 
 
-class DocumentVoter extends Voter
-{
+class DocumentVoter extends Voter {
     const CREATE = "DOCUMENT_CREATE";
     const CREATE_ANONYMOUSLY = "DOCUMENT_CREATE_ANONYMOUSLY";
     const UPDATE = "DOCUMENT_UPDATE";
@@ -67,8 +66,7 @@ 
      */
     protected $workflow;
 
-    public function __construct()
-    {
+    public function __construct() {
        $this->workflow = DocumentWorkflow::getWorkflow();
     }
 
@@ -78,8 +76,7 @@ 
      *
      * @return array
      */
-    protected static function getAttributes()
-    {
+    protected static function getAttributes() {
         return array(
             self::CREATE,
             self::CREATE_ANONYMOUSLY,
@@ -117,8 +114,7 @@ 
      * @param mixed $subject
      * @return mixed
      */
-    public static function supports($attribute, $subject = NULL)
-    {
+    public static function supports($attribute, $subject = NULL) {
         if (!in_array($attribute, self::getAttributes())) {
             return FALSE;
         }
@@ -137,8 +133,7 @@ 
      * @param mixed $subject
      * @return mixed
      */
-    public function voteOnAttribute($attribute, $subject = NULL)
-    {
+    public function voteOnAttribute($attribute, $subject = NULL) {
         if (!$subject instanceof Document) {
             return FALSE;
         }
@@ -259,8 +254,7 @@ 
     /**
      * @return bool
      */
-    protected function defaultAccess()
-    {
+    protected function defaultAccess() {
         return (
             $this->security->getUserRole() === Security::ROLE_LIBRARIAN ||
             $this->security->getUserRole() === Security::ROLE_RESEARCHER
@@ -270,8 +264,7 @@ 
     /**
      * @return bool
      */
-    protected function librarianOnly()
-    {
+    protected function librarianOnly() {
         return $this->security->getUserRole() === Security::ROLE_LIBRARIAN;
     }
 
@@ -279,8 +272,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canDiscard($document)
-    {
+    protected function canDiscard($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -303,8 +295,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canShowDetails($document)
-    {
+    protected function canShowDetails($document) {
         if ($this->security->getUserRole() === Security::ROLE_LIBRARIAN) {
             return (
                 $document->getState() !== DocumentWorkflow::STATE_NEW_NONE ||
@@ -330,8 +321,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canRegister($document)
-    {
+    protected function canRegister($document) {
         if (
             $this->workflow->can($document, \EWW\Dpf\Domain\Workflow\DocumentWorkflow::TRANSITION_REGISTER) &&
             $document->getCreator() === $this->security->getUser()->getUid()
@@ -347,8 +337,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canReleasePublish($document)
-    {
+    protected function canReleasePublish($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -366,8 +355,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canReleaseActivate($document)
-    {
+    protected function canReleaseActivate($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -384,8 +372,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canDeleteLocally($document)
-    {
+    protected function canDeleteLocally($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -410,8 +397,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canDeleteWorkingCopy($document)
-    {
+    protected function canDeleteWorkingCopy($document) {
         if ($document->isTemporary() || $this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -428,8 +414,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canEdit($document)
-    {
+    protected function canEdit($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -456,8 +441,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canUpdate($document)
-    {
+    protected function canUpdate($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -484,8 +468,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canSuggestRestore($document)
-    {
+    protected function canSuggestRestore($document) {
         if ($this->security->getUserRole() === Security::ROLE_RESEARCHER) {
 
             $objectManager =GeneralUtility::makeInstance(ObjectManager::class);
@@ -510,8 +493,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canSuggestModification($document)
-    {
+    protected function canSuggestModification($document) {
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $documentRepository = $objectManager->get(DocumentRepository::class);
 
@@ -540,8 +522,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canSuggestionAccept($document)
-    {
+    protected function canSuggestionAccept($document) {
         // TODO: What if a document should be restored?
 
         return $this->librarianOnly();
@@ -551,8 +532,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canPostpone($document)
-    {
+    protected function canPostpone($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -569,8 +549,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canCreateAnonymously($document)
-    {
+    protected function canCreateAnonymously($document) {
         if ($this->security->getUserRole()) {
             return FALSE;
         }
@@ -582,8 +561,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canDuplicate($document)
-    {
+    protected function canDuplicate($document) {
         if ($this->security->getUserRole() === Security::ROLE_LIBRARIAN) {
             return (
                 $document->getState() !== DocumentWorkflow::STATE_NEW_NONE ||
@@ -605,8 +583,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function isDocumentLocked($document)
-    {
+    protected function isDocumentLocked($document) {
         $identifier = $document->getObjectIdentifier()? $document->getObjectIdentifier() : $document->getUid();
         return $this->editingLockService->isLocked($identifier, $this->security->getUser()->getUid());
     }
@@ -615,8 +592,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canEditAnonymously($document)
-    {
+    protected function canEditAnonymously($document) {
         if ($this->security->getUserRole()) {
             return FALSE;
         }
@@ -634,8 +610,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canRegisterAnonymously($document)
-    {
+    protected function canRegisterAnonymously($document) {
         if ($this->security->getUserRole()) {
             return FALSE;
         }

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

@@ -27,7 +27,7 @@ 
     const CREATE = "DOCUMENT_CREATE";
     const CREATE_ANONYMOUSLY = "DOCUMENT_CREATE_ANONYMOUSLY";
     const UPDATE = "DOCUMENT_UPDATE";
-    const LIST = "DOCUMENT_LIST";
+    const list = "DOCUMENT_LIST";
     const LIST_REGISTERED = "DOCUMENT_LIST_REGISTERED";
     const LIST_IN_PROGRESS = "DOCUMENT_LIST_IN_PROGRESS";
 
@@ -58,7 +58,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * workflow
@@ -84,7 +84,7 @@ 
             self::CREATE,
             self::CREATE_ANONYMOUSLY,
             self::UPDATE,
-            self::LIST,
+            self::list,
             self::LIST_REGISTERED,
             self::LIST_IN_PROGRESS,
             self::DISCARD,
@@ -157,7 +157,7 @@ 
                 return $this->canUpdate($subject);
                 break;
 
-            case self::LIST:
+            case self::list:
                 return $this->defaultAccess();
                 break;
 
@@ -253,7 +253,7 @@ 
             ]
         );
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -477,7 +477,7 @@ 
             );
         }
 
-        return false;
+        return FALSE;
     }
 
     /**

Classes/Controller/AbstractDocumentFormController.php

Spacing +2 added lines, -2 removed lines

@@ -352,7 +352,7 @@ 
                 $this->request->setArguments($requestArguments);
             } else {
                 $t = $docForm->getFileNames();
-                $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");
@@ -410,7 +410,7 @@ 
                 $this->request->setArguments($requestArguments);
             } else {
                 $t = $docForm->getFileNames();
-                $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");

Braces +13 added lines, -26 removed lines

@@ -27,8 +27,7 @@ 
 /**
  * DocumentFormController
  */
-abstract class AbstractDocumentFormController extends AbstractController
-{
+abstract class AbstractDocumentFormController extends AbstractController {
     /**
      * documentManager
      *
@@ -111,8 +110,7 @@ 
      *
      * @return void
      */
-    public function listAction()
-    {
+    public function listAction() {
         $documents = $this->documentRepository->findAll();
         $docTypes = $this->documentTypeRepository->getDocumentTypesAlphabetically();
 
@@ -133,8 +131,7 @@ 
      *
      * @return void
      */
-    public function initializeNewAction()
-    {
+    public function initializeNewAction() {
 
         $requestArguments = $this->request->getArguments();
 
@@ -170,8 +167,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);
 
@@ -184,8 +180,7 @@ 
         }
     }
 
-    public function initializeCreateAction()
-    {
+    public function initializeCreateAction() {
         $this->documentFormMapping();
     }
 
@@ -195,8 +190,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 */
@@ -283,8 +277,7 @@ 
         }
     }
 
-    public function initializeEditAction()
-    {
+    public function initializeEditAction() {
         $requestArguments = $this->request->getArguments();
 
         if (array_key_exists('document', $requestArguments)) {
@@ -313,8 +306,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())) {
@@ -326,8 +318,7 @@ 
         }
     }
 
-    public function initializeUpdateAction()
-    {
+    public function initializeUpdateAction() {
         $requestArguments = $this->request->getArguments();
 
         if ($this->request->hasArgument('documentData')) {
@@ -364,23 +355,19 @@ 
      *
      * @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');
     }
 
-    protected function documentFormMapping()
-    {
+    protected function documentFormMapping() {
         $requestArguments = $this->request->getArguments();
 
         \TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump($requestArguments, null, 20);

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

@@ -35,7 +35,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * documentRepository
@@ -43,7 +43,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -51,7 +51,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -59,7 +59,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -67,7 +67,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -75,7 +75,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * depositLicenseLogRepository
@@ -83,7 +83,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DepositLicenseLogRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $depositLicenseLogRepository = null;
+    protected $depositLicenseLogRepository = NULL;
 
     /**
      * persistence manager
@@ -99,12 +99,12 @@ 
      * @var \EWW\Dpf\Services\FeUser\FisDataService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fisDataService = null;
+    protected $fisDataService = NULL;
 
     /**
      * @var Document
      */
-    protected $newDocument = null;
+    protected $newDocument = NULL;
 
     /**
      * action list
@@ -151,7 +151,7 @@ 
             $docForm = $this->request->getArgument('newDocumentForm');
             if (is_numeric($docForm)) {
                 $sessionData = $this->session->getData();
-                $docForm = null;
+                $docForm = NULL;
                 if (array_key_exists('newDocumentForm', $sessionData)) {
                     $docForm = unserialize($sessionData['newDocumentForm']);
                 }
@@ -170,7 +170,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);
@@ -212,7 +212,7 @@ 
             //$workflow->apply($newDocument, DocumentWorkflow::TRANSITION_CREATE);
         } else {
             $newDocument->setCreator(0);
-            $newDocument->setTemporary(true);
+            $newDocument->setTemporary(TRUE);
             //$workflow->apply($newDocument, DocumentWorkflow::TRANSITION_CREATE_REGISTER);
         }
 
@@ -348,11 +348,11 @@ 
             $virtualType = $documentType->getVirtualType();
 
 
-            if (!$formDataReader->uploadError() || $virtualType === true) {
+            if (!$formDataReader->uploadError() || $virtualType === TRUE) {
                 $this->request->setArguments($requestArguments);
             } else {
                 $t = $docForm->getFileNames();
-                $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");
@@ -374,7 +374,7 @@ 
         $this->redirect('list');
     }
 
-    protected function redirectToList($message = null)
+    protected function redirectToList($message = NULL)
     {
         $this->redirect('list');
     }
@@ -383,7 +383,7 @@ 
     {
         $requestArguments = $this->request->getArguments();
 
-        \TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump($requestArguments, null, 20);
+        \TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump($requestArguments, NULL, 20);
 
 
         if ($this->request->hasArgument('documentData')) {
@@ -397,7 +397,7 @@ 
             if (!$docForm->hasValidCsrfToken()) {
                 throw new Exception("Invalid CSRF Token");
             }
-            \TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump($docForm, null, 20);
+            \TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump($docForm, NULL, 20);
 
 
             $requestArguments['newDocumentForm'] = $docForm;
@@ -406,11 +406,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->getFileNames();
-                $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");

Classes/Controller/DocumentController.php

Braces +18 added lines, -36 removed lines

@@ -36,8 +36,7 @@ 
 /**
  * DocumentController
  */
-class DocumentController extends AbstractController
-{
+class DocumentController extends AbstractController {
 
     /**
      * documentRepository
@@ -152,8 +151,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -168,8 +166,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'],
@@ -440,8 +437,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(
@@ -469,8 +465,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(
@@ -499,8 +494,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(
@@ -551,8 +545,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',
@@ -574,8 +567,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 {
@@ -656,8 +648,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);
@@ -713,8 +704,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);
@@ -736,8 +726,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);
@@ -755,8 +744,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);
@@ -802,8 +790,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);
@@ -843,8 +830,7 @@ 
     }
 
 
-    public function cancelListTaskAction()
-    {
+    public function cancelListTaskAction() {
         $this->redirectToDocumentList();
     }
 
@@ -887,8 +873,7 @@ 
     /**
      * initializeAction
      */
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -919,8 +904,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) {
@@ -935,8 +919,7 @@ 
      *
      * @return mixed
      */
-    protected function getStoragePID()
-    {
+    protected function getStoragePID() {
         return $this->settings['persistence']['classes']['EWW\Dpf\Domain\Model\Document']['newRecordStoragePid'];
     }
 
@@ -949,8 +932,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 +39 added lines, -39 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;
         }
 
@@ -533,12 +533,12 @@ 
             $documentForm = $documentMapper->getDocumentForm($document);
             $document = $documentMapper->getDocument($documentForm);
 
-            $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;
         }
     }
@@ -556,7 +556,7 @@ 
         $this->redirect(
             'deleteLocally',
             'Document',
-            null,
+            NULL,
             [
                 'document' => $document,
                 'tstamp' => $tstamp,
@@ -594,7 +594,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;
         }
 
@@ -647,7 +647,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]);
         }
     }
 
@@ -661,7 +661,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;
         }
 
@@ -718,11 +718,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);
@@ -741,11 +741,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);
 
     }
 
@@ -760,13 +760,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);
@@ -793,7 +793,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]);
     }
 
     /**
@@ -826,7 +826,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) {
@@ -859,7 +859,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;
         }
 
@@ -879,8 +879,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]);
     }
 
 
@@ -919,7 +919,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();
 

Classes/Controller/DocumentFormController.php

Indentation +1 added lines, -1 removed lines

@@ -255,7 +255,7 @@
     public function deleteAction(Document $document)
     {
         if ($this->authorizationChecker->isGranted(DocumentVoter::DELETE_ANONYMOUSLY, $document)) {
-           $this->documentRepository->remove($document);
+            $this->documentRepository->remove($document);
         } else {
             $message = LocalizationUtility::translate(
                 'manager.workspace.accessDenied', 'dpf'

Spacing +5 added lines, -5 removed lines

@@ -33,11 +33,11 @@ 
      * @var \EWW\Dpf\Helper\DocumentMapper
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentMapper= null;
+    protected $documentMapper = null;
 
     protected function redirectToList($message = null)
     {
-        $this->redirect('list', 'DocumentForm', null, array('message' => $message));
+        $this->redirect('list', 'DocumentForm', null, array ('message' => $message));
     }
 
     /**
@@ -95,8 +95,8 @@ 
 
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
 
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
-            $this->forward('new', 'DocumentForm', null, array('newDocumentForm' => $newDocumentForm));
+            $this->addFlashMessage(implode(" ", $message), '', $severity, true);
+            $this->forward('new', 'DocumentForm', null, array ('newDocumentForm' => $newDocumentForm));
         }
     }
 
@@ -116,7 +116,7 @@ 
             $message = LocalizationUtility::translate(
                 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_edit.accessDenied',
                 'dpf',
-                array($document->getTitle())
+                array ($document->getTitle())
             );
 
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);

Braces +9 added lines, -18 removed lines

@@ -25,8 +25,7 @@ 
 use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
-class DocumentFormController extends AbstractDocumentFormController
-{
+class DocumentFormController extends AbstractDocumentFormController {
     /**
      * documentRepository
      *
@@ -35,8 +34,7 @@ 
      */
     protected $documentMapper= null;
 
-    protected function redirectToList($message = null)
-    {
+    protected function redirectToList($message = null) {
         $this->redirect('list', 'DocumentForm', null, array('message' => $message));
     }
 
@@ -48,8 +46,7 @@ 
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("newDocumentForm")
      * @return void
      */
-    public function newAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm = null, $returnDocumentId = 0)
-    {
+    public function newAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm = null, $returnDocumentId = 0) {
         $this->view->assign('documentForm', $newDocumentForm);
     }
 
@@ -59,8 +56,7 @@ 
      * @param \EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm
      * @return void
      */
-    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm)
-    {
+    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm) {
         // Replaced by the form configuration (download/archive)
         /*
            foreach ($newDocumentForm->getFiles() as $file) {
@@ -107,8 +103,7 @@ 
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("documentForm")
      * @return void
      */
-    public function editAction(DocumentForm $documentForm)
-    {
+    public function editAction(DocumentForm $documentForm) {
         $document = $this->documentMapper->getDocument($documentForm);
 
         if (!$this->authorizationChecker->isGranted(DocumentVoter::EDIT_ANONYMOUSLY, $document)) {
@@ -133,8 +128,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 */
@@ -162,8 +156,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return void
      */
-    public function registerAction(Document $document)
-    {
+    public function registerAction(Document $document) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::REGISTER_ANONYMOUSLY, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_register.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
@@ -230,8 +223,7 @@ 
      * @param Document $document
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
-    public function summaryAction(Document $document)
-    {
+    public function summaryAction(Document $document) {
         if (!$this->authorizationChecker->isGranted(DocumentVoter::EDIT_ANONYMOUSLY, $document)) {
             $message = LocalizationUtility::translate(
                 'manager.workspace.accessDenied', 'dpf'
@@ -252,8 +244,7 @@ 
      * @param Document $document
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
-    public function deleteAction(Document $document)
-    {
+    public function deleteAction(Document $document) {
         if ($this->authorizationChecker->isGranted(DocumentVoter::DELETE_ANONYMOUSLY, $document)) {
            $this->documentRepository->remove($document);
         } else {

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

@@ -33,11 +33,11 @@ 
      * @var \EWW\Dpf\Helper\DocumentMapper
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentMapper= null;
+    protected $documentMapper= NULL;
 
-    protected function redirectToList($message = null)
+    protected function redirectToList($message = NULL)
     {
-        $this->redirect('list', 'DocumentForm', null, array('message' => $message));
+        $this->redirect('list', 'DocumentForm', NULL, array('message' => $message));
     }
 
     /**
@@ -48,7 +48,7 @@ 
      * @TYPO3\CMS\Extbase\Annotation\IgnoreValidation("newDocumentForm")
      * @return void
      */
-    public function newAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm = null, $returnDocumentId = 0)
+    public function newAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm = NULL, $returnDocumentId = 0)
     {
         $this->view->assign('documentForm', $newDocumentForm);
     }
@@ -77,8 +77,8 @@ 
             parent::createAction($newDocumentForm);
             $this->redirect(
                 'summary',
-                null,
-                null,
+                NULL,
+                NULL,
                 ['document' => $this->newDocument]
             );
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
@@ -95,8 +95,8 @@ 
 
             $message[] = \TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate($key, 'dpf');
 
-            $this->addFlashMessage(implode(" ", $message), '', $severity,true);
-            $this->forward('new', 'DocumentForm', null, array('newDocumentForm' => $newDocumentForm));
+            $this->addFlashMessage(implode(" ", $message), '', $severity,TRUE);
+            $this->forward('new', 'DocumentForm', NULL, array('newDocumentForm' => $newDocumentForm));
         }
     }
 
@@ -145,13 +145,13 @@ 
             throw new \EWW\Dpf\Exceptions\DocumentMaxSizeErrorException("Maximum document size exceeded.");
         }
 
-        $updateDocument->setChanged(true);
+        $updateDocument->setChanged(TRUE);
         $this->documentRepository->update($updateDocument);
 
         $this->redirect(
             'summary',
-            null,
-            null,
+            NULL,
+            NULL,
             ['document' => $updateDocument]
         );
     }
@@ -167,14 +167,14 @@ 
         if (!$this->authorizationChecker->isGranted(DocumentVoter::REGISTER_ANONYMOUSLY, $document)) {
             $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_register.accessDenied';
             $this->flashMessage($document, $key, AbstractMessage::ERROR);
-            $this->redirect('summary', 'DocumentForm', null, ['document' => $document]);
-            return false;
+            $this->redirect('summary', 'DocumentForm', NULL, ['document' => $document]);
+            return FALSE;
         }
 
         $workflow = $this->objectManager->get(DocumentWorkflow::class)->getWorkflow();
         $workflow->apply($document, DocumentWorkflow::TRANSITION_REGISTER);
 
-        $document->setTemporary(false);
+        $document->setTemporary(FALSE);
         $this->documentRepository->update($document);
 
         $depositLicenseLog = $this->depositLicenseLogRepository->findOneByProcessNumber($document->getProcessNumber());
@@ -242,7 +242,7 @@ 
         }
 
         $mapper = $this->objectManager->get(DocumentMapper::class);
-        $documentForm = $mapper->getDocumentForm($document, false);
+        $documentForm = $mapper->getDocumentForm($document, FALSE);
 
         $this->view->assign('documentForm', $documentForm);
         $this->view->assign('document', $document);

Classes/Controller/AbstractController.php

Braces +11 added lines, -22 removed lines

@@ -21,8 +21,7 @@ 
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
 
-abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
-{
+abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
     /**
      * authorizationChecker
      *
@@ -71,14 +70,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();
@@ -104,8 +101,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;
@@ -128,8 +124,7 @@ 
      *
      * @return
      */
-    public function getSessionData($key)
-    {
+    public function getSessionData($key) {
         if (!empty($GLOBALS['TSFE']) && is_object($GLOBALS['TSFE'])) {
 
             $userGlobals = $GLOBALS['TSFE']->fe_user;
@@ -150,8 +145,7 @@ 
      *
      * @return null|string
      */
-    protected function getParametersSafely($parameterName)
-    {
+    protected function getParametersSafely($parameterName) {
         if ($this->request->hasArgument($parameterName)) {
             return $this->filterSafelyParameters($this->request->getArgument($parameterName));
         }
@@ -165,8 +159,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);
@@ -179,8 +172,7 @@ 
         }
     }
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         parent::initializeAction();
 
         $signalSlotDispatcher = GeneralUtility::makeInstance(Dispatcher::class);
@@ -188,13 +180,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);
     }
@@ -207,8 +197,7 @@ 
      * @param int $severity
      * @param string $defaultMessage
      */
-    protected function flashMessage(Document $document, string $key, int $severity, $defaultMessage = "")
-    {
+    protected function flashMessage(Document $document, string $key, int $severity, $defaultMessage = "") {
         // Show success or failure of the action in a flash message
         $args = [];
         if ($document) {

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

@@ -29,7 +29,7 @@ 
      * @var \EWW\Dpf\Security\AuthorizationChecker
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $authorizationChecker = null;
+    protected $authorizationChecker = NULL;
 
     /**
      * security
@@ -37,7 +37,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
     /**
      * clientRepository
@@ -45,7 +45,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\ClientRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $clientRepository = null;
+    protected $clientRepository = NULL;
 
     /**
      * signalSlotDispatcher
@@ -53,7 +53,7 @@ 
      * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $signalSlotDispatcher = null;
+    protected $signalSlotDispatcher = NULL;
 
     /**
      * session
@@ -61,14 +61,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()
@@ -91,7 +91,7 @@ 
                 $message,
                 $messageTitle = '',
                 $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::WARNING,
-                $storeInSession = true
+                $storeInSession = TRUE
             );
         } else {
             $view->assign('client', $client);
@@ -155,7 +155,7 @@ 
         if ($this->request->hasArgument($parameterName)) {
             return $this->filterSafelyParameters($this->request->getArgument($parameterName));
         }
-        return null;
+        return NULL;
     }
 
     /**
@@ -223,7 +223,7 @@ 
             $message,
             '',
             $severity,
-            true
+            TRUE
         );
     }