kitodo / kitodo-publication

Classes/Domain/Model/MetadataGroup.php

Spacing +1 added lines, -1 removed lines

@@ -377,7 +377,7 @@
         if ($this->accessRestrictionRoles) {
             return array_map('trim', explode(',', $this->accessRestrictionRoles));
         } else {
-            return array();
+            return array ();
         }
     }
 

Braces +37 added lines, -74 removed lines

@@ -17,8 +17,7 @@ 
 /**
  * MetadataGroup
  */
-class MetadataGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements MetadataMandatoryInterface
-{
+class MetadataGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements MetadataMandatoryInterface {
 
     /**
      * name
@@ -114,8 +113,7 @@ 
     /**
      * __construct
      */
-    public function __construct()
-    {
+    public function __construct() {
         //Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
@@ -125,8 +123,7 @@ 
      *
      * @return void
      */
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->metadataObject = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
     }
 
@@ -135,8 +132,7 @@ 
      *
      * @return string $name
      */
-    public function getName()
-    {
+    public function getName() {
         return $this->name;
     }
 
@@ -146,8 +142,7 @@ 
      * @param string $name
      * @return void
      */
-    public function setName($name)
-    {
+    public function setName($name) {
         $this->name = $name;
     }
 
@@ -156,8 +151,7 @@ 
      *
      * @return string $displayName
      */
-    public function getDisplayName()
-    {
+    public function getDisplayName() {
         return $this->displayName;
     }
 
@@ -167,8 +161,7 @@ 
      * @param string $displayName
      * @return void
      */
-    public function setDisplayName($displayName)
-    {
+    public function setDisplayName($displayName) {
         $this->displayName = $displayName;
     }
 
@@ -177,8 +170,7 @@ 
      *
      * @return string $mandatory
      */
-    public function getMandatory()
-    {
+    public function getMandatory() {
         return $this->mandatory;
     }
 
@@ -188,8 +180,7 @@ 
      * @param string $mandatory
      * @return void
      */
-    public function setMandatory($mandatory)
-    {
+    public function setMandatory($mandatory) {
         $this->mandatory = $mandatory;
     }
 
@@ -198,8 +189,7 @@ 
      *
      * @return string $mapping
      */
-    public function getMapping()
-    {
+    public function getMapping() {
         return $this->mapping;
     }
 
@@ -209,8 +199,7 @@ 
      * @param string $mapping
      * @return void
      */
-    public function setMapping($mapping)
-    {
+    public function setMapping($mapping) {
         $this->mapping = $mapping;
     }
 
@@ -219,8 +208,7 @@ 
      *
      * @return string $mappingForReading
      */
-    public function getMappingForReading()
-    {
+    public function getMappingForReading() {
         return $this->mappingForReading;
     }
 
@@ -230,8 +218,7 @@ 
      * @param string $mappingForReading
      * @return void
      */
-    public function setMappingForReading($mappingForReading)
-    {
+    public function setMappingForReading($mappingForReading) {
         $this->mappingForReading = $mappingForReading;
     }
 
@@ -240,8 +227,7 @@ 
      *
      * @return bool
      */
-    public function hasMappingForReading()
-    {
+    public function hasMappingForReading() {
         $mapping = trim($this->mappingForReading);
         return !empty($mapping);
     }
@@ -252,8 +238,7 @@ 
      * @param $mapping
      * @return string $relativeMapping
      */
-    protected function relativeMapping($mapping)
-    {
+    protected function relativeMapping($mapping) {
         return trim($mapping, " /");
     }
 
@@ -262,8 +247,7 @@ 
      *
      * @return string $relativeMappingForWriting
      */
-    public function getRelativeMapping()
-    {
+    public function getRelativeMapping() {
         return $this->relativeMapping($this->mapping);
     }
 
@@ -272,8 +256,7 @@ 
      *
      * @return string $relativeMappingForReading
      */
-    public function getRelativeMappingForReading()
-    {
+    public function getRelativeMappingForReading() {
         return $this->relativeMapping($this->mappingForReading);
     }
 
@@ -282,8 +265,7 @@ 
      *
      * @return string $absoluteMappingForWriting
      */
-    public function getAbsoluteMapping()
-    {
+    public function getAbsoluteMapping() {
         return "/data/" . $this->getRelativeMapping();
     }
 
@@ -292,8 +274,7 @@ 
      *
      * @return string $absoluteMappingForReading
      */
-    public function getAbsoluteMappingForReading()
-    {
+    public function getAbsoluteMappingForReading() {
         return "/data/" . $this->getRelativeMappingForReading();
     }
 
@@ -302,8 +283,7 @@ 
      *
      * @return string $modsExtensionMapping
      */
-    public function getModsExtensionMapping()
-    {
+    public function getModsExtensionMapping() {
         return $this->modsExtensionMapping;
     }
 
@@ -313,8 +293,7 @@ 
      * @param string $modsExtensionMapping
      * @return void
      */
-    public function setModsExtensionMapping($modsExtensionMapping)
-    {
+    public function setModsExtensionMapping($modsExtensionMapping) {
         $this->modsExtensionMapping = $modsExtensionMapping;
     }
 
@@ -323,8 +302,7 @@ 
      *
      * @return string $relativeModsExtensionMapping
      */
-    public function getRelativeModsExtensionMapping()
-    {
+    public function getRelativeModsExtensionMapping() {
 //        $modsRegExp = "/^.*?mods:mods/i";
 //        $mapping    = preg_replace($modsRegExp, "", $this->modsExtensionMapping);
         return trim($this->modsExtensionMapping, " /");
@@ -335,8 +313,7 @@ 
      *
      * @return string $absoluteModsExtensionMapping
      */
-    public function getAbsoluteModsExtensionMapping()
-    {
+    public function getAbsoluteModsExtensionMapping() {
         return "/data/" . $this->getRelativeModsExtensionMapping();
     }
 
@@ -346,8 +323,7 @@ 
      * @param string $modsExtensionReference
      * @return void
      */
-    public function setModsExtensionReference($modsExtensionReference)
-    {
+    public function setModsExtensionReference($modsExtensionReference) {
         $this->modsExtensionReference = $modsExtensionReference;
     }
 
@@ -356,8 +332,7 @@ 
      *
      * @return string $modsExtensionReference
      */
-    public function getModsExtensionReference()
-    {
+    public function getModsExtensionReference() {
         return $this->modsExtensionReference;
     }
 
@@ -366,8 +341,7 @@ 
      *
      * @return integer $maxIteration
      */
-    public function getMaxIteration()
-    {
+    public function getMaxIteration() {
         return $this->maxIteration;
     }
 
@@ -377,8 +351,7 @@ 
      * @param integer $maxIteration
      * @return void
      */
-    public function setMaxIteration($maxIteration)
-    {
+    public function setMaxIteration($maxIteration) {
         $this->maxIteration = $maxIteration;
     }
 
@@ -388,8 +361,7 @@ 
      * @param \EWW\Dpf\Domain\Model\MetadataObject $metadataObject
      * @return void
      */
-    public function addMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObject)
-    {
+    public function addMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObject) {
         $this->metadataObject->attach($metadataObject);
     }
 
@@ -399,8 +371,7 @@ 
      * @param \EWW\Dpf\Domain\Model\MetadataObject $metadataObjectToRemove The MetadataObject to be removed
      * @return void
      */
-    public function removeMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObjectToRemove)
-    {
+    public function removeMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObjectToRemove) {
         $this->metadataObject->detach($metadataObjectToRemove);
     }
 
@@ -409,8 +380,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
      */
-    public function getMetadataObject()
-    {
+    public function getMetadataObject() {
         return $this->metadataObject;
     }
 
@@ -420,8 +390,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
      * @return void
      */
-    public function setMetadataObject(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $metadataObject)
-    {
+    public function setMetadataObject(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $metadataObject) {
         $this->metadataObject = $metadataObject;
     }
 
@@ -430,8 +399,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
      */
-    public function getChildren()
-    {
+    public function getChildren() {
         return $this->getMetadataObject();
     }
 
@@ -440,8 +408,7 @@ 
      *
      * @return array $accessRestrictionRoles
      */
-    public function getAccessRestrictionRoles()
-    {
+    public function getAccessRestrictionRoles() {
         if ($this->accessRestrictionRoles) {
             return array_map('trim', explode(',', $this->accessRestrictionRoles));
         } else {
@@ -455,8 +422,7 @@ 
      * @param array $accessRestrictionRoles
      * @return void
      */
-    public function setAccessRestrictionRoles($accessRestrictionRoles)
-    {
+    public function setAccessRestrictionRoles($accessRestrictionRoles) {
         $this->accessRestrictionRoles = implode(',', $accessRestrictionRoles);
     }
 
@@ -465,8 +431,7 @@ 
      *
      * @return string $infoText
      */
-    public function getInfoText()
-    {
+    public function getInfoText() {
         return $this->infoText;
     }
 
@@ -476,8 +441,7 @@ 
      * @param string $infoText
      * @return void
      */
-    public function setInfoText($infoText)
-    {
+    public function setInfoText($infoText) {
         $this->infoText = $infoText;
     }
 
@@ -492,8 +456,7 @@ 
     /**
      * @param string $groupType
      */
-    public function setGroupType(string $groupType)
-    {
+    public function setGroupType(string $groupType) {
         $this->groupType = $groupType;
     }
 

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

@@ -82,7 +82,7 @@
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject>
      * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade("remove")
      */
-    protected $metadataObject = null;
+    protected $metadataObject = NULL;
 
     /**
      * accessRestrictionRoles

Classes/Domain/Model/MetadataMandatoryInterface.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-interface MetadataMandatoryInterface
-{
+interface MetadataMandatoryInterface {
     const MANDATORY = "1";
     const MANDATORY_FILE_ONLY = "FILE_ONLY";
 

Classes/Helper/FormDataReader.php

Spacing +4 added lines, -4 removed lines

@@ -134,7 +134,7 @@ 
     protected function getFields()
     {
 
-        $fields = array();
+        $fields = array ();
 
         if (is_array($this->formData['metadata'])) {
             foreach ($this->formData['metadata'] as $key => $value) {
@@ -148,7 +148,7 @@ 
 
     protected function getDeletedFiles()
     {
-        $deletedFiles = array();
+        $deletedFiles = array ();
 
         if (is_array($this->formData['deleteFile'])) {
             foreach ($this->formData['deleteFile'] as $key => $value) {
@@ -173,7 +173,7 @@ 
         $frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
         $fullTextLabel          = $frameworkConfiguration['settings']['defaultValue']['fullTextLabel'];
 
-        $newFiles = array();
+        $newFiles = array ();
 
         // Primary file
         if ($this->formData['primaryFile'] && $this->formData['primaryFile']['error'] != UPLOAD_ERR_NO_FILE) {
@@ -333,7 +333,7 @@ 
             $documentForm->setComment($this->formData['comment']);
         }
 
-        $documentData = array();
+        $documentData = array ();
 
         foreach ($fields as $field) {
             $pageUid    = $field->getPageUid();

Braces +9 added lines, -18 removed lines

@@ -17,8 +17,7 @@ 
 use EWW\Dpf\Domain\Model\File;
 use TYPO3\CMS\Core\Core\Environment;
 
-class FormDataReader
-{
+class FormDataReader {
 
     /**
      * documentTypeRepository
@@ -111,8 +110,7 @@ 
      */
     protected $uploadBaseUrl;
 
-    public function __construct()
-    {
+    public function __construct() {
 
         $uploadFileUrl = new \EWW\Dpf\Helper\UploadFileUrl;
 
@@ -126,14 +124,12 @@ 
      *
      * @param array $formData
      */
-    public function setFormData($formData)
-    {
+    public function setFormData($formData) {
         $this->formData     = $formData;
         $this->documentType = $this->documentTypeRepository->findByUid($formData['type']);
     }
 
-    protected function getFields()
-    {
+    protected function getFields() {
 
         $fields = array();
 
@@ -147,8 +143,7 @@ 
         return $fields;
     }
 
-    protected function getDeletedFiles()
-    {
+    protected function getDeletedFiles() {
         $deletedFiles = array();
 
         if (is_array($this->formData['deleteFile'])) {
@@ -168,8 +163,7 @@ 
         return $deletedFiles;
     }
 
-    protected function getNewAndUpdatedFiles()
-    {
+    protected function getNewAndUpdatedFiles() {
 
         $frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
         $fullTextLabel          = $frameworkConfiguration['settings']['defaultValue']['fullTextLabel'];
@@ -260,8 +254,7 @@ 
 
     }
 
-    public function uploadError()
-    {
+    public function uploadError() {
         if (
             $this->formData['primaryFile'] &&
             $this->formData['primaryFile']['error'] != UPLOAD_ERR_OK &&
@@ -281,8 +274,7 @@ 
         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);
@@ -318,8 +310,7 @@ 
         return $file;
     }
 
-    public function getDocumentForm()
-    {
+    public function getDocumentForm() {
 
         $fields = $this->getFields();
 

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

@@ -26,7 +26,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * metadataPageRepository
@@ -34,7 +34,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataPageRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataPageRepository = null;
+    protected $metadataPageRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -42,7 +42,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -50,7 +50,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * fileRepository
@@ -58,7 +58,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * documentRepository
@@ -66,7 +66,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * objectManager
@@ -180,13 +180,13 @@ 
         if ($this->formData['primaryFile'] && $this->formData['primaryFile']['error'] != UPLOAD_ERR_NO_FILE) {
 
             // Use the existing file entry
-            $file     = null;
+            $file     = NULL;
             $document = $this->documentRepository->findByUid($this->formData['documentUid']);
             if ($document) {
                 $file = $this->fileRepository->getPrimaryFileByDocument($document);
             }
 
-            $newPrimaryFile = $this->getUploadedFile($this->formData['primaryFile'], true, $file);
+            $newPrimaryFile = $this->getUploadedFile($this->formData['primaryFile'], TRUE, $file);
             $newPrimaryFile->setLabel($fullTextLabel);
 
             $newFiles[] = $newPrimaryFile;
@@ -267,28 +267,28 @@ 
             $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);
 

Classes/Security/DocumentVoter.php

Indentation +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
 
     public function __construct()
     {
-       $this->workflow = DocumentWorkflow::getWorkflow();
+        $this->workflow = DocumentWorkflow::getWorkflow();
     }
 
 
@@ -309,7 +309,7 @@ 
             $this->workflow->can($document, \EWW\Dpf\Domain\Workflow\DocumentWorkflow::TRANSITION_REGISTER) &&
             $document->getCreator() === $this->security->getUser()->getUid()
         ) {
-           return TRUE;
+            return TRUE;
         }
 
         return FALSE;

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
      */
     protected static function getAttributes()
     {
-        return array(
+        return array (
             self::CREATE,
             self::CREATE_REGISTER,
             self::UPDATE,
@@ -461,7 +461,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());
@@ -561,7 +561,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 +23 added lines, -46 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_REGISTER = "DOCUMENT_CREATE_REGISTER";
     const UPDATE = "DOCUMENT_UPDATE";
@@ -64,8 +63,7 @@ 
      */
     protected $workflow;
 
-    public function __construct()
-    {
+    public function __construct() {
        $this->workflow = DocumentWorkflow::getWorkflow();
     }
 
@@ -75,8 +73,7 @@ 
      *
      * @return array
      */
-    protected static function getAttributes()
-    {
+    protected static function getAttributes() {
         return array(
             self::CREATE,
             self::CREATE_REGISTER,
@@ -111,8 +108,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;
         }
@@ -131,8 +127,7 @@ 
      * @param mixed $subject
      * @return mixed
      */
-    public function voteOnAttribute($attribute, $subject = NULL)
-    {
+    public function voteOnAttribute($attribute, $subject = NULL) {
         if (!$subject instanceof Document) {
             return FALSE;
         }
@@ -242,8 +237,7 @@ 
     /**
      * @return bool
      */
-    protected function defaultAccess()
-    {
+    protected function defaultAccess() {
         return (
             $this->security->getUserRole() === Security::ROLE_LIBRARIAN ||
             $this->security->getUserRole() === Security::ROLE_RESEARCHER
@@ -253,8 +247,7 @@ 
     /**
      * @return bool
      */
-    protected function librarianOnly()
-    {
+    protected function librarianOnly() {
         return $this->security->getUserRole() === Security::ROLE_LIBRARIAN;
     }
 
@@ -262,8 +255,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canDiscard($document)
-    {
+    protected function canDiscard($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -286,8 +278,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 ||
@@ -313,8 +304,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()
@@ -330,8 +320,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canReleasePublish($document)
-    {
+    protected function canReleasePublish($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -349,8 +338,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canReleaseActivate($document)
-    {
+    protected function canReleaseActivate($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -367,8 +355,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canDeleteLocally($document)
-    {
+    protected function canDeleteLocally($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -393,8 +380,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;
         }
@@ -411,8 +397,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canEdit($document)
-    {
+    protected function canEdit($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -439,8 +424,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canUpdate($document)
-    {
+    protected function canUpdate($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -467,8 +451,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);
@@ -493,8 +476,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);
 
@@ -523,8 +505,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();
@@ -534,8 +515,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canPostpone($document)
-    {
+    protected function canPostpone($document) {
         if ($this->isDocumentLocked($document)) {
             return FALSE;
         }
@@ -552,8 +532,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @return bool
      */
-    protected function canCreateRegister($document)
-    {
+    protected function canCreateRegister($document) {
         if ($this->security->getUserRole()) {
             return FALSE;
         }
@@ -569,8 +548,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 ||
@@ -592,8 +570,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());
     }

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

@@ -27,7 +27,7 @@ 
     const CREATE = "DOCUMENT_CREATE";
     const CREATE_REGISTER = "DOCUMENT_CREATE_REGISTER";
     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";
 
@@ -55,7 +55,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * workflow
@@ -81,7 +81,7 @@ 
             self::CREATE,
             self::CREATE_REGISTER,
             self::UPDATE,
-            self::LIST,
+            self::list,
             self::LIST_REGISTERED,
             self::LIST_IN_PROGRESS,
             self::DISCARD,
@@ -151,7 +151,7 @@ 
                 return $this->canUpdate($subject);
                 break;
 
-            case self::LIST:
+            case self::list:
                 return $this->defaultAccess();
                 break;
 
@@ -236,7 +236,7 @@ 
             ]
         );
 
-        return false;
+        return FALSE;
     }
 
     /**
@@ -460,7 +460,7 @@ 
             );
         }
 
-        return false;
+        return FALSE;
     }
 
     /**

Classes/Domain/Repository/EditingLockRepository.php

Spacing +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
     {
         $query = $this->createQuery();
 
-        $dateTimeObj= new \DateTime();
-        $dateTimeObj->sub(new \DateInterval("PT".$timeout."S"));
+        $dateTimeObj = new \DateTime();
+        $dateTimeObj->sub(new \DateInterval("PT" . $timeout . "S"));
 
         $query->matching(
             $query->lessThan('tstamp', $dateTimeObj->getTimestamp())

Braces +2 added lines, -4 removed lines

@@ -17,16 +17,14 @@
 /**
  * The repository for editing lock objects
  */
-class EditingLockRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository
-{
+class EditingLockRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository {
     /**
      * Finds all outdated locks,
      *
      * @param integer $timeout : Time interval (in seconds) in which locks are not outdated.
      * @return array The found Document Objects
      */
-    public function findOutdatedLocks($timeout)
-    {
+    public function findOutdatedLocks($timeout) {
         $query = $this->createQuery();
 
         $dateTimeObj= new \DateTime();

Classes/Services/Document/EditingLockService.php

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 
     public function getLockedDocumentIdentifiersByUserUid($userUid)
     {
-        $identifiers = array();
+        $identifiers = array ();
 
         $locks = $this->editingLockRepository->findByEditorUid($userUid);
         /** @var  \EWW\Dpf\Domain\Model\EditingLock $lock */

Braces +7 added lines, -14 removed lines

@@ -16,8 +16,7 @@ 
 
 use EWW\Dpf\Domain\Model\EditingLock;
 
-class EditingLockService
-{
+class EditingLockService {
     /**
      * editingLockRepository
      *
@@ -41,8 +40,7 @@ 
      * @param int $userUid
      * @return bool
      */
-    public function lock($documentIdentifier, $userUid)
-    {
+    public function lock($documentIdentifier, $userUid) {
         if ($this->editingLockRepository->findOneByDocumentIdentifier($documentIdentifier)) {
             return FALSE;
         }
@@ -63,8 +61,7 @@ 
      * @param string $documentIdentifier
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function unlock($documentIdentifier)
-    {
+    public function unlock($documentIdentifier) {
         /** @var \EWW\Dpf\Domain\Model\EditingLock $editingLock */
         $editingLock = $this->editingLockRepository->findOneByDocumentIdentifyer($documentIdentifier);
         $this->editingLockRepository->remove($editingLock);
@@ -78,8 +75,7 @@ 
      * @param int $userUid
      * @return bool
      */
-    public function isLocked($documentIdentifier, $userUid)
-    {
+    public function isLocked($documentIdentifier, $userUid) {
         $locks = $this->editingLockRepository->findByDocumentIdentifier($documentIdentifier);
 
         /** @var  \EWW\Dpf\Domain\Model\EditingLock $lock */
@@ -96,8 +92,7 @@ 
      *
      * @param int $timeout : Time interval (in seconds) in which locks are not outdated, default is 1 hour.
      */
-    public function unlockOutdatedLocks($timeout = 3600)
-    {
+    public function unlockOutdatedLocks($timeout = 3600) {
         // Unlock outdated editing locks.
         $outdatedLocks = $this->editingLockRepository->findOutdatedLocks($timeout);
         foreach ($outdatedLocks as $outdatedLock) {
@@ -111,8 +106,7 @@ 
      *
      * @param int $editorUid
      */
-    public function unlockAllByEditor($editorUid)
-    {
+    public function unlockAllByEditor($editorUid) {
         $locks = $this->editingLockRepository->findByEditorUid($editorUid);
         foreach ($locks as $lock) {
             $this->editingLockRepository->remove($lock);
@@ -121,8 +115,7 @@ 
         $this->persistenceManager->persistAll();
     }
 
-    public function getLockedDocumentIdentifiersByUserUid($userUid)
-    {
+    public function getLockedDocumentIdentifiersByUserUid($userUid) {
         $identifiers = array();
 
         $locks = $this->editingLockRepository->findByEditorUid($userUid);

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

@@ -24,7 +24,7 @@
      * @var \EWW\Dpf\Domain\Repository\EditingLockRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $editingLockRepository = null;
+    protected $editingLockRepository = NULL;
 
     /**
      * persistence manager

Classes/Domain/Model/FrontendUser.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
     public function getUserRole()
     {
         // Get frontend user groups of the client.
-        $clientFrontendGroups = array();
+        $clientFrontendGroups = array ();
         foreach ($this->frontendUserGroupRepository->findAll() as $clientGroup) {
             if ($clientGroup->getKitodoRole()) {
                 $clientFrontendGroups[$clientGroup->getUid()] = $clientGroup;
@@ -46,7 +46,7 @@ 
         }
 
         // Get frontend user groups of the user.
-        $frontendUserGroups = array();
+        $frontendUserGroups = array ();
         foreach ($this->getUsergroup() as $userGroup) {
             // Because getUsergroup() does not return objects of the class
             // \EWW\Dpf\Domain\Model\FrontendUserRepository
@@ -55,7 +55,7 @@ 
         }
 
         // Get the roles the user has in the current client.
-        $roles = array();
+        $roles = array ();
         foreach ($frontendUserGroups as $uid => $group) {
             if (array_key_exists($uid, $clientFrontendGroups)) {
                 $roles[$uid] = $group->getKitodoRole();

Braces +12 added lines, -24 removed lines

@@ -19,8 +19,7 @@ 
 /**
 * Frontend user
 */
-class FrontendUser extends \TYPO3\CMS\Extbase\Domain\Model\FrontendUser
-{
+class FrontendUser extends \TYPO3\CMS\Extbase\Domain\Model\FrontendUser {
     /**
      * storedSearches
      *
@@ -80,8 +79,7 @@ 
     /**
      * __construct
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         //Do not remove the next line: It would break the functionality
@@ -93,8 +91,7 @@ 
      *
      * @return void
      */
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->storedSearches = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
     }
 
@@ -104,8 +101,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\StoredSearch>
      */
-    public function getStoredSearches()
-    {
+    public function getStoredSearches() {
         return $this->storedSearches;
     }
 
@@ -115,16 +111,14 @@ 
      * @param  \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\StoredSearch> $storedSearches
      * @return void
      */
-    public function setStoredSearches(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $storedSearches)
-    {
+    public function setStoredSearches(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $storedSearches) {
         $this->storedSearches = $storedSearches;
     }
 
     /**
      * @param \EWW\Dpf\Domain\Model\StoredSearch $storedSearch
      */
-    public function addStoredSearch(\EWW\Dpf\Domain\Model\StoredSearch $storedSearch)
-    {
+    public function addStoredSearch(\EWW\Dpf\Domain\Model\StoredSearch $storedSearch) {
         $this->storedSearches->attach($storedSearch);
     }
 
@@ -133,8 +127,7 @@ 
      *
      * @return string
      */
-    public function getUserRole()
-    {
+    public function getUserRole() {
         // Get frontend user groups of the client.
         $clientFrontendGroups = array();
         foreach ($this->frontendUserGroupRepository->findAll() as $clientGroup) {
@@ -182,8 +175,7 @@ 
     /**
      * @param bool $notifyPersonalLink
      */
-    public function setNotifyPersonalLink(bool $notifyPersonalLink)
-    {
+    public function setNotifyPersonalLink(bool $notifyPersonalLink) {
         $this->notifyPersonalLink = boolval($notifyPersonalLink);
     }
 
@@ -198,8 +190,7 @@ 
     /**
      * @param bool $notifyStatusChange
      */
-    public function setNotifyStatusChange(bool $notifyStatusChange)
-    {
+    public function setNotifyStatusChange(bool $notifyStatusChange) {
         $this->notifyStatusChange = boolval($notifyStatusChange);
     }
 
@@ -230,8 +221,7 @@ 
     /**
      * @param bool $notifyFulltextPublished
      */
-    public function setNotifyFulltextPublished(bool $notifyFulltextPublished)
-    {
+    public function setNotifyFulltextPublished(bool $notifyFulltextPublished) {
         $this->notifyFulltextPublished = boolval($notifyFulltextPublished);
     }
 
@@ -246,8 +236,7 @@ 
     /**
      * @param bool $notifyNewPublicationMypublication
      */
-    public function setNotifyNewPublicationMypublication(bool $notifyNewPublicationMypublication)
-    {
+    public function setNotifyNewPublicationMypublication(bool $notifyNewPublicationMypublication) {
         $this->notifyNewPublicationMypublication = boolval($notifyNewPublicationMypublication);
     }
 
@@ -262,8 +251,7 @@ 
     /**
      * @param string $fisPersId
      */
-    public function setFisPersId(string $fisPersId)
-    {
+    public function setFisPersId(string $fisPersId) {
         $this->fisPersId = $fisPersId;
     }
 

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

@@ -27,7 +27,7 @@ 
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\StoredSearch>
      * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade("remove")
      */
-    protected $storedSearches = null;
+    protected $storedSearches = NULL;
 
     /**
      * frontendUserGroupRepository
@@ -35,7 +35,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $frontendUserGroupRepository = null;
+    protected $frontendUserGroupRepository = NULL;
     
     /**
      * @var boolean

Classes/Controller/AbstractSearchController.php

Spacing +19 added lines, -19 removed lines

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

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

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

Braces +8 added lines, -16 removed lines

@@ -22,8 +22,7 @@ 
  * @package EWW\Dpf\Controller
  * @deprecated since version 4.0
  */
-abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController
-{
+abstract class AbstractSearchController extends \EWW\Dpf\Controller\AbstractController {
     // search terms
     private static $terms   = ['_id', 'OWNER_ID', 'submitter', 'project'];
 
@@ -36,8 +35,7 @@ 
      * @param  array $query elasticsearch search query
      * @return array        results
      */
-    public function getResultList($query, $type)
-    {
+    public function getResultList($query, $type) {
 
         $elasticSearch = $this->objectManager->get(ElasticSearch::class);
         $results = $elasticSearch->search($query, $type);
@@ -50,8 +48,7 @@ 
      * @param  string $searchString
      * @return array query
      */
-    public function searchFulltext($searchString)
-    {
+    public function searchFulltext($searchString) {
         // don't return query if searchString is empty
         if (empty($searchString)) {
             return null;
@@ -76,8 +73,7 @@ 
      * build array for elasticsearch
      * @return array Elasticsearch query array
      */
-    public function extendedSearch($searchArray = array())
-    {
+    public function extendedSearch($searchArray = array()) {
 
         $query  = array();
         $filter = array();
@@ -124,8 +120,7 @@ 
      * @param array Elasticsearch query array
      * @return array Elasticsearch queryFilter array
      */
-    public function resultsFilter($query, $showDeleted = false)
-    {
+    public function resultsFilter($query, $showDeleted = false) {
 
         $queryFilter = array();
 
@@ -214,8 +209,7 @@ 
      * @param  bool      $intervalEnd Fills missing values with the maximum possible date if true
      * @return DateTime               Determined date
      */
-    public function convertFormDate($dateString, $intervalEnd = false)
-    {
+    public function convertFormDate($dateString, $intervalEnd = false) {
         try {
             if (strlen($dateString) == 4) {
                 // assuming year
@@ -236,8 +230,7 @@ 
      * @param $string
      * @return mixed
      */
-    private function escapeQuery($string)
-    {
+    private function escapeQuery($string) {
         $luceneReservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\');
         $string                   = preg_replace_callback(
             '/([' . $luceneReservedCharacters . '])/',
@@ -257,8 +250,7 @@ 
      * @param $date
      * @return string
      */
-    public function formatDate($date)
-    {
+    public function formatDate($date) {
         // convert date from dd.mm.yyy to yyyy-dd-mm
         $date = explode(".", $date);
         return $date[2] . '-' . $date[1] . '-' . $date[0];

Classes/Session/SearchSessionData.php

Braces +16 added lines, -32 removed lines

@@ -16,8 +16,7 @@ 
 
 use EWW\Dpf\Domain\Workflow\DocumentWorkflow;
 
-class SearchSessionData
-{
+class SearchSessionData {
     /**
      * @var array
      */
@@ -54,8 +53,7 @@ 
      *
      * @return array
      */
-    public function getExcludeFilters()
-    {
+    public function getExcludeFilters() {
         return $this->excludeFilters;
     }
 
@@ -64,8 +62,7 @@ 
      * Toggles the discarded documents filter.
      *
      */
-    public function toggleExcludeDiscardedFilter()
-    {
+    public function toggleExcludeDiscardedFilter() {
         if (array_key_exists('aliasState', $this->excludeFilters)) {
             unset($this->excludeFilters['aliasState']);
         } else {
@@ -78,8 +75,7 @@ 
      * Toggles the hide bookmarks filter.
      *
      */
-    public function toggleBookmarksOnlyFilter()
-    {
+    public function toggleBookmarksOnlyFilter() {
         if (array_key_exists('bookmarks', $this->excludeFilters)) {
             unset($this->excludeFilters['bookmarks']);
         } else {
@@ -93,8 +89,7 @@ 
      * @param $name
      * @param array $values
      */
-    public function setFilter($name, $values = [])
-    {
+    public function setFilter($name, $values = []) {
         if ($name && $values && is_array($values)) {
             $this->filters[$name] = $values;
         } elseif ($name) {
@@ -108,8 +103,7 @@ 
      *
      * @return array
      */
-    public function clearFilters()
-    {
+    public function clearFilters() {
         $this->filters = [];
     }
 
@@ -119,8 +113,7 @@ 
      *
      * @return array
      */
-    public function getFilters()
-    {
+    public function getFilters() {
         return $this->filters;
     }
 
@@ -129,8 +122,7 @@ 
      * Removes the sort information
      *
      */
-    public function clearSort()
-    {
+    public function clearSort() {
         $this->sortField = '';
         $this->sortOrder = '';
     }
@@ -140,8 +132,7 @@ 
      *
      * @return string
      */
-    public function getSortField()
-    {
+    public function getSortField() {
         return $this->sortField;
     }
 
@@ -150,8 +141,7 @@ 
      *
      * @param string $fieldName
      */
-    public function setSortField($fieldName)
-    {
+    public function setSortField($fieldName) {
         $this->sortField = $fieldName;
     }
 
@@ -160,8 +150,7 @@ 
      *
      * @return string
      */
-    public function getSortOrder()
-    {
+    public function getSortOrder() {
         return $this->sortOrder;
     }
 
@@ -170,8 +159,7 @@ 
      *
      * @param string $order
      */
-    public function setSortOrder($order)
-    {
+    public function setSortOrder($order) {
         $this->sortOrder = $order;
     }
 
@@ -180,8 +168,7 @@ 
      *
      * @return string
      */
-    public function getSimpleQuery()
-    {
+    public function getSimpleQuery() {
         return $this->simpleQuery;
     }
 
@@ -190,8 +177,7 @@ 
      *
      * @param string $query
      */
-    public function setSimpleQuery($query)
-    {
+    public function setSimpleQuery($query) {
         $this->simpleQuery = $query;
     }
 
@@ -200,8 +186,7 @@ 
      *
      * @return int
      */
-    public function getItemsPerPage()
-    {
+    public function getItemsPerPage() {
         return $this->itemsPerPage;
     }
 
@@ -210,8 +195,7 @@ 
      *
      * @param int $itemsPerPage
      */
-    public function setItemsPerPage($itemsPerPage)
-    {
+    public function setItemsPerPage($itemsPerPage) {
         $this->itemsPerPage = $itemsPerPage;
     }
 

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

@@ -41,7 +41,7 @@ 
     /**
      * @var string
      */
-    protected $simpleQuery = null;
+    protected $simpleQuery = NULL;
 
     /**
      * @var int
@@ -83,7 +83,7 @@ 
         if (array_key_exists('bookmarks', $this->excludeFilters)) {
             unset($this->excludeFilters['bookmarks']);
         } else {
-            $this->excludeFilters['bookmarks'] = true;
+            $this->excludeFilters['bookmarks'] = TRUE;
         }
     }