kitodo / kitodo-publication

Classes/Domain/Repository/DocumentRepository.php

Spacing +14 added lines, -14 removed lines

@@ -44,7 +44,7 @@ 
             case Security::ROLE_RESEARCHER:
                 $query->matching(
                     $query->logicalAnd(
-                        array(
+                        array (
                             $query->equals('suggestion', true),
                             $query->equals('creator', $creatorUid)
                         )
@@ -63,7 +63,7 @@ 
     {
         $query = $this->createQuery();
 
-        $constraints = array(
+        $constraints = array (
             $query->logicalNot($query->equals('object_identifier', '')),
             $query->logicalNot($query->equals('object_identifier', NULL)));
 
@@ -81,7 +81,7 @@ 
 
         $result = $query->execute();
 
-        $objectIdentifiers = array();
+        $objectIdentifiers = array ();
 
         foreach ($result as $document) {
             $objectIdentifiers[$document->getObjectIdentifier()] = $document->getObjectIdentifier();
@@ -101,9 +101,9 @@ 
         $query = $this->createQuery();
         $query->getQuerySettings()->setRespectStoragePage(FALSE);
 
-        $constraints = array();
-        $constraints[] =  $query->equals('process_number', '');
-        $constraints[] =  $query->equals('process_number', NULL);
+        $constraints = array ();
+        $constraints[] = $query->equals('process_number', '');
+        $constraints[] = $query->equals('process_number', NULL);
 
         if (count($constraints)) {
             $query->matching(
@@ -127,10 +127,10 @@ 
     {
         $query = $this->createQuery();
 
-        $dateTimeObj= new \DateTime();
-        $dateTimeObj->sub(new \DateInterval("PT".$timeout."S"));
+        $dateTimeObj = new \DateTime();
+        $dateTimeObj->sub(new \DateInterval("PT" . $timeout . "S"));
 
-        $constraints = array();
+        $constraints = array ();
         $constraints[] = $query->lessThan('tstamp', $dateTimeObj->getTimestamp());
 
         $query->matching(
@@ -153,10 +153,10 @@ 
     {
         $query = $this->createQuery();
 
-        $dateTimeObj= new \DateTime();
-        $dateTimeObj->sub(new \DateInterval("PT".$timeout."S"));
+        $dateTimeObj = new \DateTime();
+        $dateTimeObj->sub(new \DateInterval("PT" . $timeout . "S"));
 
-        $constraints = array();
+        $constraints = array ();
         $constraints[] = $query->lessThan('tstamp', $dateTimeObj->getTimestamp());
 
         $query->matching(
@@ -178,7 +178,7 @@ 
     {
         $query = $this->createQuery();
 
-        $constraints = array(
+        $constraints = array (
             $query->equals('object_identifier', $objectIdentifier),
             $query->logicalNot($query->equals('temporary', TRUE)),
             $query->logicalNot($query->equals('suggestion', TRUE))
@@ -276,7 +276,7 @@ 
     {
 
         $query = $this->createQuery();
-        $query->statement( "update tx_dpf_domain_model_document set creator = owner");
+        $query->statement("update tx_dpf_domain_model_document set creator = owner");
         $query->execute();
 
     }

Braces +10 added lines, -20 removed lines

@@ -21,8 +21,7 @@ 
 /**
  * The repository for Documents
  */
-class DocumentRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository
-{
+class DocumentRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository {
     /**
      * Finds all suggestion documents of the given user role filtered by creator feuser uid
      *
@@ -59,8 +58,7 @@ 
      * @param boolean $temporary
      * @return array
      */
-    public function getObjectIdentifiers($temporary = FALSE)
-    {
+    public function getObjectIdentifiers($temporary = FALSE) {
         $query = $this->createQuery();
 
         $constraints = array(
@@ -96,8 +94,7 @@ 
      *
      * @return array The found Document Objects
      */
-    public function findDocumentsWithoutProcessNumber()
-    {
+    public function findDocumentsWithoutProcessNumber() {
         $query = $this->createQuery();
         $query->getQuerySettings()->setRespectStoragePage(FALSE);
 
@@ -123,8 +120,7 @@ 
      * @param integer $timeout : Time interval (in seconds) in which documents are not outdated.
      * @return array The found Document Objects
      */
-    public function findOutdatedTemporaryDocuments($timeout = 3600)
-    {
+    public function findOutdatedTemporaryDocuments($timeout = 3600) {
         $query = $this->createQuery();
 
         $dateTimeObj= new \DateTime();
@@ -149,8 +145,7 @@ 
      * @param integer $timeout : Time interval (in seconds) in which documents are not outdated.
      * @return array The found Document Objects
      */
-    public function findOutdatedLockedDocuments($timeout = 3600)
-    {
+    public function findOutdatedLockedDocuments($timeout = 3600) {
         $query = $this->createQuery();
 
         $dateTimeObj= new \DateTime();
@@ -174,8 +169,7 @@ 
      * @param string $objectIdentifier
      * @return array
      */
-    public function findWorkingCopyByObjectIdentifier($objectIdentifier)
-    {
+    public function findWorkingCopyByObjectIdentifier($objectIdentifier) {
         $query = $this->createQuery();
 
         $constraints = array(
@@ -193,8 +187,7 @@ 
      * @param string $identifier
      * @return Document
      */
-    public function findByIdentifier($identifier)
-    {
+    public function findByIdentifier($identifier) {
         $query = $this->createQuery();
 
         if (is_numeric($identifier)) {
@@ -218,8 +211,7 @@ 
      * @param bool $includeSuggestion
      * @return Document
      */
-    public function findWorkingCopy($identifier, $includeTemporary = false, $includeSuggestion = false)
-    {
+    public function findWorkingCopy($identifier, $includeTemporary = false, $includeSuggestion = false) {
         $query = $this->createQuery();
 
         if (is_numeric($identifier)) {
@@ -245,8 +237,7 @@ 
      * @param object $modifiedObject The modified object
      * @throws \Exception
      */
-    public function update($modifiedObject)
-    {
+    public function update($modifiedObject) {
         /** @var Document $document */
         $document = $modifiedObject;
 
@@ -272,8 +263,7 @@ 
 
 
 
-    public function updateCreator()
-    {
+    public function updateCreator() {
 
         $query = $this->createQuery();
         $query->statement( "update tx_dpf_domain_model_document set creator = owner");

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

@@ -37,7 +37,7 @@ 
 
             case Security::ROLE_LIBRARIAN:
                 $query->matching(
-                    $query->equals('suggestion', true)
+                    $query->equals('suggestion', TRUE)
                 );
                 break;
 
@@ -45,7 +45,7 @@ 
                 $query->matching(
                     $query->logicalAnd(
                         array(
-                            $query->equals('suggestion', true),
+                            $query->equals('suggestion', TRUE),
                             $query->equals('creator', $creatorUid)
                         )
                     )
@@ -218,7 +218,7 @@ 
      * @param bool $includeSuggestion
      * @return Document
      */
-    public function findWorkingCopy($identifier, $includeTemporary = false, $includeSuggestion = false)
+    public function findWorkingCopy($identifier, $includeTemporary = FALSE, $includeSuggestion = FALSE)
     {
         $query = $this->createQuery();
 
@@ -253,8 +253,8 @@ 
         if (trim($document->getObjectIdentifier()) && !$document->isTemporary() && !$document->isSuggestion()) {
             $query = $this->createQuery();
             $constraints[] = $query->equals('object_identifier', trim($document->getObjectIdentifier()));
-            $constraints[] = $query->equals('temporary', false);
-            $constraints[] = $query->equals('suggestion', false);
+            $constraints[] = $query->equals('temporary', FALSE);
+            $constraints[] = $query->equals('suggestion', FALSE);
             $query->matching($query->logicalAnd($constraints));
 
             /** @var Document $workingCopy */

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/Domain/Model/EditingLock.php

Braces +5 added lines, -10 removed lines

@@ -21,8 +21,7 @@ 
  *
  * @package EWW\Dpf\Domain\Model
  */
-class EditingLock extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
-{
+class EditingLock extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
     /**
      * documentIdentifier : A document uid or a qucosa object identifier.
      *
@@ -42,8 +41,7 @@ 
      *
      * @return int
      */
-    public function getDocumentIdentifier()
-    {
+    public function getDocumentIdentifier() {
         return $this->documentIdentifier;
     }
 
@@ -52,8 +50,7 @@ 
      *
      * @param int $documentIdentifier
      */
-    public function setDocumentIdentifier($documentIdentifier)
-    {
+    public function setDocumentIdentifier($documentIdentifier) {
         $this->documentIdentifier = $documentIdentifier;
     }
 
@@ -62,8 +59,7 @@ 
      *
      * @return int
      */
-    public function getEditorUid()
-    {
+    public function getEditorUid() {
         return $this->editorUid;
     }
 
@@ -72,8 +68,7 @@ 
      *
      * @param int $editorUid
      */
-    public function setEditorUid($editorUid)
-    {
+    public function setEditorUid($editorUid) {
         $this->editorUid = $editorUid;
     }
 

Classes/Domain/Model/Bookmark.php

Braces +5 added lines, -10 removed lines

@@ -20,8 +20,7 @@ 
  *
  * @package EWW\Dpf\Domain\Model
  */
-class Bookmark extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
-{
+class Bookmark extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
     /**
      * documentIdentifier : A document uid or a qucosa object identifier.
      *
@@ -41,8 +40,7 @@ 
      *
      * @return int
      */
-    public function getDocumentIdentifier()
-    {
+    public function getDocumentIdentifier() {
         return $this->documentIdentifier;
     }
 
@@ -51,8 +49,7 @@ 
      *
      * @param int $documentIdentifier
      */
-    public function setDocumentIdentifier($documentIdentifier)
-    {
+    public function setDocumentIdentifier($documentIdentifier) {
         $this->documentIdentifier = $documentIdentifier;
     }
 
@@ -61,8 +58,7 @@ 
      *
      * @return int
      */
-    public function getFeUserUid()
-    {
+    public function getFeUserUid() {
         return $this->feUserUid;
     }
 
@@ -71,8 +67,7 @@ 
      *
      * @param int $feUserUid
      */
-    public function setFeUserUid($feUserUid)
-    {
+    public function setFeUserUid($feUserUid) {
         $this->feUserUid = $feUserUid;
     }
 

Classes/Domain/Workflow/DocumentWorkflow.php

Spacing +12 added lines, -12 removed lines

@@ -34,30 +34,30 @@
     const REMOTE_STATE_INACTIVE     = "INACTIVE";
     const REMOTE_STATE_DELETED      = "DELETED";
 
-    const STATE_NONE_NONE            = self::LOCAL_STATE_NONE.':'.self::REMOTE_STATE_NONE;
+    const STATE_NONE_NONE            = self::LOCAL_STATE_NONE . ':' . self::REMOTE_STATE_NONE;
 
     // New
-    const STATE_NEW_NONE             = self::LOCAL_STATE_NEW.':'.self::REMOTE_STATE_NONE;
+    const STATE_NEW_NONE             = self::LOCAL_STATE_NEW . ':' . self::REMOTE_STATE_NONE;
 
     // Registered
-    const STATE_REGISTERED_NONE      = self::LOCAL_STATE_REGISTERED.':'.self::REMOTE_STATE_NONE;
+    const STATE_REGISTERED_NONE      = self::LOCAL_STATE_REGISTERED . ':' . self::REMOTE_STATE_NONE;
 
     // In progress
-    const STATE_IN_PROGRESS_NONE     = self::LOCAL_STATE_IN_PROGRESS.':'.self::REMOTE_STATE_NONE;
-    const STATE_IN_PROGRESS_ACTIVE   = self::LOCAL_STATE_IN_PROGRESS.":".self::REMOTE_STATE_ACTIVE;
-    const STATE_IN_PROGRESS_INACTIVE = self::LOCAL_STATE_IN_PROGRESS.":".self::REMOTE_STATE_INACTIVE;
-    const STATE_IN_PROGRESS_DELETED  = self::LOCAL_STATE_IN_PROGRESS.":".self::REMOTE_STATE_DELETED;
+    const STATE_IN_PROGRESS_NONE     = self::LOCAL_STATE_IN_PROGRESS . ':' . self::REMOTE_STATE_NONE;
+    const STATE_IN_PROGRESS_ACTIVE   = self::LOCAL_STATE_IN_PROGRESS . ":" . self::REMOTE_STATE_ACTIVE;
+    const STATE_IN_PROGRESS_INACTIVE = self::LOCAL_STATE_IN_PROGRESS . ":" . self::REMOTE_STATE_INACTIVE;
+    const STATE_IN_PROGRESS_DELETED  = self::LOCAL_STATE_IN_PROGRESS . ":" . self::REMOTE_STATE_DELETED;
 
     // Active
-    const STATE_NONE_ACTIVE          = self::LOCAL_STATE_NONE.':'.self::REMOTE_STATE_ACTIVE;
+    const STATE_NONE_ACTIVE          = self::LOCAL_STATE_NONE . ':' . self::REMOTE_STATE_ACTIVE;
 
     // Postponed
-    const STATE_POSTPONED_NONE       = self::LOCAL_STATE_POSTPONED.':'.self::REMOTE_STATE_NONE;
-    const STATE_NONE_INACTIVE        = self::LOCAL_STATE_NONE.':'.self::REMOTE_STATE_INACTIVE;
+    const STATE_POSTPONED_NONE       = self::LOCAL_STATE_POSTPONED . ':' . self::REMOTE_STATE_NONE;
+    const STATE_NONE_INACTIVE        = self::LOCAL_STATE_NONE . ':' . self::REMOTE_STATE_INACTIVE;
 
     // Discarded
-    const STATE_DISCARDED_NONE       = self::LOCAL_STATE_DISCARDED.':'.self::REMOTE_STATE_NONE;
-    const STATE_NONE_DELETED         = self::LOCAL_STATE_NONE.':'.self::REMOTE_STATE_DELETED;
+    const STATE_DISCARDED_NONE       = self::LOCAL_STATE_DISCARDED . ':' . self::REMOTE_STATE_NONE;
+    const STATE_NONE_DELETED         = self::LOCAL_STATE_NONE . ':' . self::REMOTE_STATE_DELETED;
 
     const TRANSITION_CREATE              = "CREATE_TRANSITION";
     const TRANSITION_CREATE_REGISTER     = "CREATE_REGISTER_TRANSITION";

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
 use Symfony\Component\Workflow\Workflow;
 use Symfony\Component\Workflow\Registry;
 
-class DocumentWorkflow
-{
+class DocumentWorkflow {
     const LOCAL_STATE_NONE          = 'NONE';
     const LOCAL_STATE_NEW           = 'NEW';
     const LOCAL_STATE_REGISTERED    = 'REGISTERED';
@@ -264,8 +263,7 @@ 
         ]
     ];
     
-    public static function getWorkflow()
-    {
+    public static function getWorkflow() {
         $definitionBuilder = new DefinitionBuilder();
 
         $definitionBuilder->addPlaces(self::PLACES);

Classes/Services/Document/DocumentCleaner.php

Braces +4 added lines, -8 removed lines

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

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

@@ -23,7 +23,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * editingLockService
@@ -31,7 +31,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * persistence manager
@@ -47,7 +47,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
     /**
      * @param string $actionMethodName

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
      * @inject
      */
-    protected $editingLockRepository = null;
+    protected $editingLockRepository = NULL;
 
     /**
      * persistence manager

Classes/Services/Document/DocumentManager.php

Braces +7 added lines, -14 removed lines

@@ -9,8 +9,7 @@ 
 use EWW\Dpf\Domain\Workflow\DocumentWorkflow;
 use EWW\Dpf\Controller\AbstractController;
 
-class DocumentManager
-{
+class DocumentManager {
     /**
      * objectManager
      *
@@ -75,8 +74,7 @@ 
      * @return Document|null
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function read($identifier)
-    {
+    public function read($identifier) {
         if (!$identifier) {
             return null;
         }
@@ -121,8 +119,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    public function update(Document $document, $workflowTransition = null, $deletedFiles = [], $newFiles = [])
-    {
+    public function update(Document $document, $workflowTransition = null, $deletedFiles = [], $newFiles = []) {
         // xml data fields are limited to 64 KB
         if (strlen($document->getXmlData()) >= 64 * 1024 || strlen($document->getSlubInfoData() >= 64 * 1024)) {
             throw new \EWW\Dpf\Exceptions\DocumentMaxSizeErrorException("Maximum document size exceeded.");
@@ -214,8 +211,7 @@ 
     /**
      * @return DocumentTransferManager
      */
-    protected function getDocumentTransferManager()
-    {
+    protected function getDocumentTransferManager() {
         /** @var DocumentTransferManager $documentTransferManager */
         $documentTransferManager = $this->objectManager->get(DocumentTransferManager::class);
 
@@ -237,8 +233,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    protected function updateFiles(Document $document, $deletedFiles, $newFiles)
-    {
+    protected function updateFiles(Document $document, $deletedFiles, $newFiles) {
         // Delete files
         /** @var File $deleteFile */
         foreach ($deletedFiles as $deleteFile) {
@@ -265,8 +260,7 @@ 
      * @param $document
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    protected function removeDocument($document)
-    {
+    protected function removeDocument($document) {
         $files = $this->fileRepository->findByDocument($document->getUid());
         foreach ($files as $file) {
             $this->fileRepository->remove($file);
@@ -285,8 +279,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    protected function updateRemotely($document, $workflowTransition = null, $deletedFiles = [], $newFiles = [])
-    {
+    protected function updateRemotely($document, $workflowTransition = null, $deletedFiles = [], $newFiles = []) {
         $lastModDate = $this->getDocumentTransferManager()->getLastModDate($document->getObjectIdentifier());
         if ($lastModDate !== $document->getRemoteLastModDate()) {
             // There is a newer version in the fedora repository.

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

@@ -17,7 +17,7 @@ 
      * @var \TYPO3\CMS\Extbase\Object\ObjectManager
      * @inject
      */
-    protected $objectManager = null;
+    protected $objectManager = NULL;
 
     /**
      * documentRepository
@@ -25,7 +25,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -33,7 +33,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * bookmarkRepository
@@ -41,7 +41,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * persistence manager
@@ -57,7 +57,7 @@ 
      * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
      * @inject
      */
-    protected $signalSlotDispatcher = null;
+    protected $signalSlotDispatcher = NULL;
 
     /**
      * security
@@ -65,7 +65,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
     /**
      * Returns a document specified by repository object identifier or dataset uid.
@@ -78,7 +78,7 @@ 
     public function read($identifier)
     {
         if (!$identifier) {
-            return null;
+            return NULL;
         }
 
         $document = $this->documentRepository->findByIdentifier($identifier);
@@ -99,14 +99,14 @@ 
             );
 
         } catch (\EWW\Dpf\Exceptions\RetrieveDocumentErrorException $exception) {
-            return null;
+            return NULL;
         }
 
         if ($document instanceof Document) {
             return $document;
         }
 
-        return null;
+        return NULL;
     }
 
     /**
@@ -121,7 +121,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    public function update(Document $document, $workflowTransition = null, $deletedFiles = [], $newFiles = [])
+    public function update(Document $document, $workflowTransition = NULL, $deletedFiles = [], $newFiles = [])
     {
         // xml data fields are limited to 64 KB
         if (strlen($document->getXmlData()) >= 64 * 1024 || strlen($document->getSlubInfoData() >= 64 * 1024)) {
@@ -133,7 +133,7 @@ 
 
         if ($workflowTransition) {
             if (!$workflow->can($document, $workflowTransition)) {
-                return false;
+                return FALSE;
             }
             $workflow->apply($document, $workflowTransition);
         }
@@ -141,7 +141,7 @@ 
         if ($document->isSuggestion()) {
 
             // if local suggestion copy
-            $updateResult = false;
+            $updateResult = FALSE;
 
         } elseif ($document->isTemporaryCopy()) {
 
@@ -185,7 +185,7 @@ 
                 $this->removeDocument($document);
                 $updateResult = $document->getDocumentIdentifier();
             } else {
-                $updateResult = false;
+                $updateResult = FALSE;
             }
         } else {
 
@@ -285,12 +285,12 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    protected function updateRemotely($document, $workflowTransition = null, $deletedFiles = [], $newFiles = [])
+    protected function updateRemotely($document, $workflowTransition = NULL, $deletedFiles = [], $newFiles = [])
     {
         $lastModDate = $this->getDocumentTransferManager()->getLastModDate($document->getObjectIdentifier());
         if ($lastModDate !== $document->getRemoteLastModDate()) {
             // There is a newer version in the fedora repository.
-            return false;
+            return FALSE;
         }
 
         $this->updateFiles($document, $deletedFiles, $newFiles);
@@ -310,13 +310,13 @@ 
                 break;
 
             default:
-                $transferState = null;
+                $transferState = NULL;
                 break;
         }
 
         if ($transferState) {
             if (!$this->getDocumentTransferManager()->delete($document, $transferState)) {
-                return false;
+                return FALSE;
             }
         }
 
@@ -325,7 +325,7 @@ 
             return $document->getDocumentIdentifier();
         }
 
-        return false;
+        return FALSE;
     }
 
 }

Classes/Services/ElasticSearch/ElasticSearch.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
         $this->server = $clientConfigurationManager->getElasticSearchHost();
         $this->port = $clientConfigurationManager->getElasticSearchPort();
 
-        $hosts = array(
+        $hosts = array (
             $this->server . ':' . $this->port,
         );
 
@@ -189,7 +189,7 @@ 
             if ($notes && is_array($notes)) {
                 $data->notes = $notes;
             } else {
-                $data->notes = array();
+                $data->notes = array ();
             }
 
             $files = $document->getFile();
@@ -286,7 +286,7 @@ 
             $this->results = $results;
 
             return $this->results;
-        } catch ( \Elasticsearch\Common\Exceptions\Curl\CouldNotConnectToHost $exception) {
+        } catch (\Elasticsearch\Common\Exceptions\Curl\CouldNotConnectToHost $exception) {
             throw new \EWW\Dpf\Exceptions\ElasticSearchConnectionErrorException("Could not connect to repository server.");
         } catch (\Elasticsearch\Common\Exceptions\Curl\CouldNotResolveHostException $exception) {
             throw new \EWW\Dpf\Exceptions\ElasticSearchConnectionErrorException("Could not connect to repository server.");

Braces +8 added lines, -16 removed lines

@@ -24,8 +24,7 @@ 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Log\LogManager;
 
-class ElasticSearch
-{
+class ElasticSearch {
     /**
      * frontendUserRepository
      *
@@ -54,8 +53,7 @@ 
     /**
      * elasticsearch client constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
 
         $this->elasticsearchMapper = $objectManager->get(ElasticsearchMapper::class);
@@ -82,8 +80,7 @@ 
      *
      * @param $indexName
      */
-    protected function initializeIndex($indexName)
-    {
+    protected function initializeIndex($indexName) {
         $paramsIndex = [
             'index' => $indexName,
             'body' => [
@@ -169,8 +166,7 @@ 
      *
      * @param Document $document
      */
-    public function index($document)
-    {
+    public function index($document) {
         $data = json_decode($this->elasticsearchMapper->getElasticsearchJson($document));
 
         if ($data) {
@@ -234,8 +230,7 @@ 
      *
      * @param string $identifier
      */
-    public function delete($identifier)
-    {
+    public function delete($identifier) {
         try {
 
             $params = [
@@ -261,8 +256,7 @@ 
     /**
      * @param $identifier
      */
-    public function getDocument($identifier)
-    {
+    public function getDocument($identifier) {
         $params = [
             'index' => $this->indexName,
             'id'    => $identifier
@@ -277,8 +271,7 @@ 
      * @param  array $query search query
      * @return array        result list
      */
-    public function search($query, $type = null)
-    {
+    public function search($query, $type = null) {
         try {
             // define type and index
             if (empty($query['index'])) {
@@ -310,8 +303,7 @@ 
      * Get the results
      * @return mixed
      */
-    public function getResults()
-    {
+    public function getResults() {
         // return results from the last search request
         return $this->results;
     }

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

@@ -32,7 +32,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     protected $client;
 
@@ -111,7 +111,7 @@ 
                 ],
                 'mappings' => [
                     '_source' => [
-                        'enabled' => true
+                        'enabled' => TRUE
                     ],
                     //'dynamic' => 'strict',
                     'properties' => [
@@ -121,7 +121,7 @@ 
                                 'keyword' => [
                                     'type' => 'text',
                                     'analyzer' => 'keyword_lowercase',
-                                    'fielddata' => true
+                                    'fielddata' => TRUE
                                 ]
                             ]
                         ],
@@ -201,9 +201,9 @@ 
 
             $files = $document->getFile();
             if ($files->count() > 0) {
-                $data->hasFiles = true;
+                $data->hasFiles = TRUE;
             } else {
-                $data->hasFiles = false;
+                $data->hasFiles = FALSE;
             }
 
 
@@ -277,7 +277,7 @@ 
      * @param  array $query search query
      * @return array        result list
      */
-    public function search($query, $type = null)
+    public function search($query, $type = NULL)
     {
         try {
             // define type and index