kitodo / kitodo-publication

Classes/Controller/ApiController.php

Spacing +8 added lines, -8 removed lines

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

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

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

Classes/Controller/DocumentFormController.php

Braces +4 added lines, -8 removed lines

@@ -18,11 +18,9 @@ 
 use EWW\Dpf\Helper\DocumentMapper;
 use EWW\Dpf\Services\Email\Notifier;
 
-class DocumentFormController extends AbstractDocumentFormController
-{
+class DocumentFormController extends AbstractDocumentFormController {
 
-    protected function redirectToList($message = null)
-    {
+    protected function redirectToList($message = null) {
         $this->redirect('list', 'DocumentForm', null, array('message' => $message));
     }
 
@@ -34,8 +32,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);
     }
 
@@ -45,8 +42,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) {
         foreach ($newDocumentForm->getFiles() as $file) {
             $uid = $file->getUID();
             if (empty($uid)) {

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

@@ -21,9 +21,9 @@ 
 class DocumentFormController extends AbstractDocumentFormController
 {
 
-    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));
     }
 
     /**
@@ -34,7 +34,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);
     }
@@ -50,7 +50,7 @@ 
         foreach ($newDocumentForm->getFiles() as $file) {
             $uid = $file->getUID();
             if (empty($uid)) {
-                $file->setDownload(true);
+                $file->setDownload(TRUE);
             }
             $files[] = $file;
         }
@@ -90,8 +90,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));
         }
     }
 }

Classes/Controller/AbstractDocumentFormController.php

Spacing +2 added lines, -2 removed lines

@@ -192,7 +192,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");
@@ -355,7 +355,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");

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

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

Classes/Services/Transfer/FileId.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public function __construct(ObjectStorage $documentFiles)
     {
-        $idList   = array();
+        $idList   = array ();
         $this->id = 0;
 
         if (is_a($documentFiles, ObjectStorage::class)) {

Braces +3 added lines, -6 removed lines

@@ -16,8 +16,7 @@ 
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-class FileId
-{
+class FileId {
 
     protected $id = 0;
 
@@ -25,8 +24,7 @@ 
      * FileId constructor.
      * @param ObjectStorage $documentFiles
      */
-    public function __construct(ObjectStorage $documentFiles)
-    {
+    public function __construct(ObjectStorage $documentFiles) {
         $idList   = array();
         $this->id = 0;
 
@@ -47,8 +45,7 @@ 
 
     }
 
-    public function getId($file)
-    {
+    public function getId($file) {
 
         $fileId = $file->getDatastreamIdentifier();
         if (empty($fileId)) {

Classes/Services/ParserGenerator.php

Spacing +7 added lines, -7 removed lines

@@ -45,13 +45,13 @@ 
      *
      * @var array
      */
-    protected $formData = array();
+    protected $formData = array ();
 
     /**
      * files from form
      * @var array
      */
-    protected $files = array();
+    protected $files = array ();
 
     /**
      * metsData
@@ -111,7 +111,7 @@ 
 
         $this->xmlHeader = '<data' . $this->namespaceString . '></data>';
 
-        $this->xmlData =  new \DOMDocument();
+        $this->xmlData = new \DOMDocument();
         $this->xmlData->loadXML($this->xmlHeader);
 
         // Parser
@@ -164,7 +164,7 @@ 
             // mods extension
             if ($group['modsExtensionMapping']) {
                 $counter = sprintf("%'03d", $this->counter);
-                $attributeXPath .= '[@ID="'.$fedoraNamespace.'_' . $counter . '"]';
+                $attributeXPath .= '[@ID="' . $fedoraNamespace . '_' . $counter . '"]';
             }
 
             $existsExtensionFlag = false;
@@ -205,7 +205,7 @@ 
                 }
             }
             if (!$existsExtensionFlag && $group['modsExtensionMapping']) {
-                $xPath = $group['modsExtensionMapping'] . $extensionAttribute . '[@' . $group['modsExtensionReference'] . '="'.$fedoraNamespace.'_' . $counter . '"]';
+                $xPath = $group['modsExtensionMapping'] . $extensionAttribute . '[@' . $group['modsExtensionReference'] . '="' . $fedoraNamespace . '_' . $counter . '"]';
                 $xml   = $this->customXPath($xPath, true, '', true);
             }
             if ($group['modsExtensionMapping']) {
@@ -290,7 +290,7 @@ 
                     $nestedXml = $this->parseXPath($nested);
 
                     // object xpath without nested element []
-                    $newPath[1] = str_replace('['.$match[2].']', '', $newPath[1]);
+                    $newPath[1] = str_replace('[' . $match[2] . ']', '', $newPath[1]);
 
                     $xml = $this->parseXPath($newPath[1]);
 
@@ -360,7 +360,7 @@ 
                     $nestedXml = $this->parseXPathWrapped($nested);
 
                     // object xpath without nested element []
-                    $newPath[1] = str_replace('['.$match[2].']', '', $newPath[1]);
+                    $newPath[1] = str_replace('[' . $match[2] . ']', '', $newPath[1]);
 
                     $xml2 = $this->parseXPathWrapped($path . $newPath[1]);
                 }

Braces +7 added lines, -14 removed lines

@@ -23,8 +23,7 @@ 
 /**
  * ParserGenerator
  */
-class ParserGenerator
-{
+class ParserGenerator {
     /**
      * clientConfigurationManager
      *
@@ -93,8 +92,7 @@ 
      * ParserGenerator constructor.
      * @param int $clientPid
      */
-    public function __construct($clientPid = 0)
-    {
+    public function __construct($clientPid = 0) {
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
         $this->clientConfigurationManager = $objectManager->get(ClientConfigurationManager::class);
 
@@ -128,8 +126,7 @@ 
      * returns the mods xml string
      * @return string mods xml
      */
-    public function getXMLData()
-    {
+    public function getXMLData() {
         $xml = $this->xmlData->saveXML();
         $xml = preg_replace("/eww=\"\d-\d-\d\"/", '${1}${2}${3}', $xml);
 
@@ -140,8 +137,7 @@ 
      * build mods from form array
      * @param array $array structured form data array
      */
-    public function buildXmlFromForm($array)
-    {
+    public function buildXmlFromForm($array) {
         $fedoraNamespace = $this->clientConfigurationManager->getFedoraNamespace();
 
         $this->xmlData = $this->xmlData;
@@ -223,8 +219,7 @@ 
      * @param  xpath $xPath xPath expression
      * @return xml
      */
-    public function parseXPath($xPath)
-    {
+    public function parseXPath($xPath) {
 
         $this->parser->generateXmlFromXPath($xPath);
         $xml = $this->parser->getXML();
@@ -232,8 +227,7 @@ 
         return $xml;
     }
 
-    public function parseXPathWrapped($xPath)
-    {
+    public function parseXPathWrapped($xPath) {
         $this->parser->generateXmlFromXPath($xPath);
         $xml = $this->parser->getXML();
 
@@ -248,8 +242,7 @@ 
      * @param  string $value form value
      * @return xml    created xml
      */
-    public function customXPath($xPath, $newGroupFlag = false, $value = '', $attributeOnly = false)
-    {
+    public function customXPath($xPath, $newGroupFlag = false, $value = '', $attributeOnly = false) {
         if (!$attributeOnly) {
             // Explode xPath
             $newPath = explode('%', $xPath);

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

@@ -38,7 +38,7 @@ 
      *
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * formData
@@ -76,7 +76,7 @@ 
      * xPathXMLGenerator
      * @var object
      */
-    protected $parser = null;
+    protected $parser = NULL;
 
     /**
      * ref id counter
@@ -171,7 +171,7 @@ 
                 $attributeXPath .= '[@ID="'.$fedoraNamespace.'_' . $counter . '"]';
             }
 
-            $existsExtensionFlag = false;
+            $existsExtensionFlag = FALSE;
             $i                   = 0;
             // loop each object
             if (!empty($values)) {
@@ -179,21 +179,21 @@ 
                 foreach ($values as $value) {
 
                     if ($value['modsExtension']) {
-                        $existsExtensionFlag = true;
+                        $existsExtensionFlag = TRUE;
                         // mods extension
                         $counter = sprintf("%'03d", $this->counter);
                         $referenceAttribute = $extensionAttribute . '[@' . $group['modsExtensionReference'] . '="' . $fedoraNamespace . '_' . $counter . '"]';
 
                         $path = $group['modsExtensionMapping'] . $referenceAttribute . '%/' . $value['mapping'];
 
-                        $xml = $this->customXPath($path, false, $value['value']);
+                        $xml = $this->customXPath($path, FALSE, $value['value']);
                     } else {
                         $path = $mapping . $attributeXPath . '%/' . $value['mapping'];
 
                         if ($i == 0) {
-                            $newGroupFlag = true;
+                            $newGroupFlag = TRUE;
                         } else {
-                            $newGroupFlag = false;
+                            $newGroupFlag = FALSE;
                         }
 
                         $this->customXPath($path, $newGroupFlag, $value['value']);
@@ -205,12 +205,12 @@ 
             } else {
                 if (!empty($attributeXPath)) {
                     $path = $mapping . $attributeXPath;
-                    $this->customXPath($path, true, '', true);
+                    $this->customXPath($path, TRUE, '', TRUE);
                 }
             }
             if (!$existsExtensionFlag && $group['modsExtensionMapping']) {
                 $xPath = $group['modsExtensionMapping'] . $extensionAttribute . '[@' . $group['modsExtensionReference'] . '="'.$fedoraNamespace.'_' . $counter . '"]';
-                $xml   = $this->customXPath($xPath, true, '', true);
+                $xml   = $this->customXPath($xPath, TRUE, '', TRUE);
             }
             if ($group['modsExtensionMapping']) {
                 $this->counter++;
@@ -248,13 +248,13 @@ 
      * @param  string $value form value
      * @return xml    created xml
      */
-    public function customXPath($xPath, $newGroupFlag = false, $value = '', $attributeOnly = false)
+    public function customXPath($xPath, $newGroupFlag = FALSE, $value = '', $attributeOnly = FALSE)
     {
         if (!$attributeOnly) {
             // Explode xPath
             $newPath = explode('%', $xPath);
 
-            $praedicateFlag = false;
+            $praedicateFlag = FALSE;
             $explodedXPath  = explode('[', $newPath[0]);
             if (count($explodedXPath) > 1) {
                 // praedicate is given
@@ -266,12 +266,12 @@ 
                     $path = $explodedXPath[0];
                 }
 
-                $praedicateFlag = true;
+                $praedicateFlag = TRUE;
             } else {
                 $path = $newPath[0];
             }
 
-            if (isset($value) === true && $value !== '') {
+            if (isset($value) === TRUE && $value !== '') {
                 $newPath[1] = $newPath[1] . '="' . $value . '"';
             }
 
@@ -303,10 +303,10 @@ 
                 // FIXME: XPATHXmlGenerator XPATH does not generate any namespaces,
                 // which DOMDocument cannot cope with. Actually, namespaces should not be necessary here,
                 // since it is about child elements that are then added to the overall XML.
-                libxml_use_internal_errors(true);
+                libxml_use_internal_errors(TRUE);
                 $docXML = new \DOMDocument();
                 $docXML->loadXML($xml);
-                libxml_use_internal_errors(false);
+                libxml_use_internal_errors(FALSE);
 
                 $domXPath = \EWW\Dpf\Helper\XPath::create($this->xmlData);
 
@@ -317,17 +317,17 @@ 
                     // FIXME: XPATHXmlGenerator XPATH does not generate any namespaces,
                     // which DOMDocument cannot cope with. Actually, namespaces should not be necessary here,
                     // since it is about child elements that are then added to the overall XML.
-                    libxml_use_internal_errors(true);
+                    libxml_use_internal_errors(TRUE);
                     $docXMLNested = new \DOMDocument();
                     $docXMLNested->loadXML($nestedXml);
-                    libxml_use_internal_errors(false);
+                    libxml_use_internal_errors(FALSE);
 
                     $xPath = \EWW\Dpf\Helper\XPath::create($docXML);
 
                     $nodeList = $xPath->query($match[1]);
                     $node = $nodeList->item(0);
 
-                    $importNode = $docXML->importNode($docXMLNested->getElementsByTagName("mods")->item(0)->firstChild, true);
+                    $importNode = $docXML->importNode($docXMLNested->getElementsByTagName("mods")->item(0)->firstChild, TRUE);
 
                     $node->appendChild($importNode);
                 }
@@ -335,7 +335,7 @@ 
                 $domNode = $domXPath->query('/data/' . $path);
                 $node = $docXML->documentElement;
 
-                $nodeAppendModsData = $this->xmlData->importNode($node, true);
+                $nodeAppendModsData = $this->xmlData->importNode($node, TRUE);
                 $domNode->item($domNode->length - 1)->appendChild($nodeAppendModsData);
             } else {
                 // first xpath doesn't exist
@@ -384,14 +384,14 @@ 
                     $nodeList = $xPath->query('//' . $path . $match[1]);
                     $node = $nodeList->item(0);
 
-                    $importNode = $doc2->importNode($docXMLNested->documentElement, true);
+                    $importNode = $doc2->importNode($docXMLNested->documentElement, TRUE);
 
                     $node->appendChild($importNode);
                 }
                 $domNode2 = $domXPath2->query('//' . $path)->item(0)->childNodes->item(0);
 
                 // merge xml nodes
-                $nodeToBeAppended = $doc1->importNode($domNode2, true);
+                $nodeToBeAppended = $doc1->importNode($domNode2, TRUE);
                 $domNode->item(0)->appendChild($nodeToBeAppended);
 
                 // add to modsData (merge not required)
@@ -405,7 +405,7 @@ 
                 }
                 //$firstChild = $this->xmlData->childNodes->item(0);
                 $firstItem = $doc1->documentElement->firstChild;
-                $nodeAppendModsData = $this->xmlData->importNode($firstItem, true);
+                $nodeAppendModsData = $this->xmlData->importNode($firstItem, TRUE);
                 $firstChild->appendChild($nodeAppendModsData);
 
                 return $doc1->saveXML();
@@ -417,17 +417,17 @@ 
             // FIXME: XPATHXmlGenerator XPATH does not generate any namespaces,
             // which DOMDocument cannot cope with. Actually, namespaces should not be necessary here,
             // since it is about child elements that are then added to the overall XML.
-            libxml_use_internal_errors(true);
+            libxml_use_internal_errors(TRUE);
             $docXML = new \DOMDocument();
             $docXML->loadXML($xml);
-            libxml_use_internal_errors(false);
+            libxml_use_internal_errors(FALSE);
 
             $domXPath = \EWW\Dpf\Helper\XPath::create($this->xmlData);
             $domNode  = $domXPath->query('/data');
 
             $node = $docXML->documentElement;
 
-            $nodeAppendModsData = $this->xmlData->importNode($node, true);
+            $nodeAppendModsData = $this->xmlData->importNode($node, TRUE);
             $domNode->item($domNode->length - 1)->appendChild($nodeAppendModsData);
 
             return $docXML->saveXML();

Classes/Services/Document/DocumentManager.php

Braces +14 added lines, -25 removed lines

@@ -15,8 +15,7 @@ 
 use Symfony\Component\Workflow\Workflow;
 use Httpful\Request;
 
-class DocumentManager
-{
+class DocumentManager {
     /**
      * objectManager
      *
@@ -155,8 +154,7 @@ 
      * @param string $identifier
      * @return Document|null
      */
-    public function read($identifier)
-    {
+    public function read($identifier) {
         if (!$identifier) {
             return null;
         }
@@ -199,8 +197,7 @@ 
      */
     public function update(
         Document $document, $workflowTransition = null, $addedFisIdOnly = false
-    )
-    {
+    ) {
         // xml data fields are limited to 64 KB
         // FIXME: Code duplication should be removed and it should be encapsulated or made configurable.
         if (strlen($document->getXmlData()) >= Document::XML_DATA_SIZE_LIMIT) {
@@ -261,7 +258,7 @@ 
                 }
 
                 // check embargo
-                if(!$this->hasActiveEmbargo($document)){
+                if(!$this->hasActiveEmbargo($document)) {
                     $this->removeDocument($document);
                 } else {
                     $document->setState(DocumentWorkflow::constructState(DocumentWorkflow::LOCAL_STATE_IN_PROGRESS, $document->getRemoteState()));
@@ -307,8 +304,7 @@ 
     /**
      * @return DocumentTransferManager
      */
-    protected function getDocumentTransferManager()
-    {
+    protected function getDocumentTransferManager() {
         /** @var DocumentTransferManager $documentTransferManager */
         $documentTransferManager = $this->objectManager->get(DocumentTransferManager::class);
 
@@ -326,8 +322,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);
@@ -342,8 +337,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    protected function updateRemotely($document, $workflowTransition = null)
-    {
+    protected function updateRemotely($document, $workflowTransition = null) {
         $lastModDate = $this->getDocumentTransferManager()->getLastModDate($document->getObjectIdentifier());
         $docLastModDate = $document->getRemoteLastModDate();
         if ($lastModDate !== $docLastModDate && !empty($docLastModDate)) {
@@ -379,7 +373,7 @@ 
 
         if ($this->getDocumentTransferManager()->update($document)) {
 
-            if(!$this->hasActiveEmbargo($document)){
+            if(!$this->hasActiveEmbargo($document)) {
                 $this->removeDocument($document);
             } else {
                 $document->setState(DocumentWorkflow::LOCAL_STATE_IN_PROGRESS . ':' . $document->getRemoteState());
@@ -435,10 +429,9 @@ 
      * @return bool (true: if no embargo is set or embargo is expired, false: embargo is active)
      * @throws \Exception
      */
-    protected function hasActiveEmbargo($document)
-    {
+    protected function hasActiveEmbargo($document) {
         $currentDate = new \DateTime('now');
-        if($currentDate > $document->getEmbargoDate()){
+        if($currentDate > $document->getEmbargoDate()) {
             // embargo is expired
             return false;
         } else {
@@ -460,8 +453,7 @@ 
      * @param Document $document
      * @return array
      */
-    public function getAssignedUsers(Document $document)
-    {
+    public function getAssignedUsers(Document $document) {
         $assignedUsers = [];
 
         foreach ($document->getAssignedFobIdentifiers() as $fobId) {
@@ -479,8 +471,7 @@ 
      * @param Document $document
      * @return array
      */
-    public function getNewlyAssignedUsers(Document $document)
-    {
+    public function getNewlyAssignedUsers(Document $document) {
         $assignedUsers = [];
 
         foreach ($document->getNewlyAssignedFobIdentifiers() as $fobId) {
@@ -515,8 +506,7 @@ 
      * @param Document $document
      * @return array
      */
-    public function getUpdateNotificationRecipients(Document $document)
-    {
+    public function getUpdateNotificationRecipients(Document $document) {
         $users = [];
 
         if ($document->getCreator()) {
@@ -621,8 +611,7 @@ 
      * @param Document $document
      * @return array
      */
-    public function getNewPublicationNotificationRecipients(Document $document)
-    {
+    public function getNewPublicationNotificationRecipients(Document $document) {
         $users = [];
 
         /** @var FrontendUser $user */

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

@@ -23,7 +23,7 @@ 
      * @var \TYPO3\CMS\Extbase\Object\ObjectManager
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $objectManager = null;
+    protected $objectManager = NULL;
 
     /**
      * documentRepository
@@ -31,7 +31,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -39,7 +39,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * bookmarkRepository
@@ -47,7 +47,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * persistence manager
@@ -63,7 +63,7 @@ 
      * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $signalSlotDispatcher = null;
+    protected $signalSlotDispatcher = NULL;
 
     /**
      * notifier
@@ -71,7 +71,7 @@ 
      * @var \EWW\Dpf\Services\Email\Notifier
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $notifier = null;
+    protected $notifier = NULL;
 
     /**
      * security
@@ -79,7 +79,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
     /**
      * frontendUserRepository
@@ -87,7 +87,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     /**
      * elasticSearch
@@ -95,7 +95,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\ElasticSearch
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $elasticSearch = null;
+    protected $elasticSearch = NULL;
 
     /**
      * queryBuilder
@@ -103,7 +103,7 @@ 
      * @var \EWW\Dpf\Services\ElasticSearch\QueryBuilder
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $queryBuilder = null;
+    protected $queryBuilder = NULL;
 
     /**
      * Returns the localized document identifiers (uid/objectIdentifier).
@@ -130,7 +130,7 @@ 
 
             $query = $this->queryBuilder->buildQuery(
                 1, [], 0,
-                [], [], [], null, null,
+                [], [], [], NULL, NULL,
                 'identifier:"'.$identifier.'"'
             );
 
@@ -158,7 +158,7 @@ 
     public function read($identifier)
     {
         if (!$identifier) {
-            return null;
+            return NULL;
         }
 
         $localizedIdentifiers = $this->resolveIdentifier($identifier);
@@ -179,11 +179,11 @@ 
 
                 return $document;
             } catch (\Exception $exception) {
-                return null;
+                return NULL;
             }
         }
 
-        return null;
+        return NULL;
     }
 
     /**
@@ -198,7 +198,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
     public function update(
-        Document $document, $workflowTransition = null, $addedFisIdOnly = false
+        Document $document, $workflowTransition = NULL, $addedFisIdOnly = FALSE
     )
     {
         // xml data fields are limited to 64 KB
@@ -212,7 +212,7 @@ 
 
         if ($workflowTransition) {
             if (!$workflow->can($document, $workflowTransition)) {
-                return false;
+                return FALSE;
             }
             $workflow->apply($document, $workflowTransition);
         }
@@ -220,7 +220,7 @@ 
         if ($document->isSuggestion()) {
 
             // if local suggestion copy
-            $updateResult = false;
+            $updateResult = FALSE;
 
         } elseif ($document->isTemporaryCopy()) {
 
@@ -268,7 +268,7 @@ 
                 }
                 $updateResult = $document->getDocumentIdentifier();
             } else {
-                $updateResult = false;
+                $updateResult = FALSE;
             }
         } else {
             $this->documentRepository->update($document);
@@ -342,13 +342,13 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    protected function updateRemotely($document, $workflowTransition = null)
+    protected function updateRemotely($document, $workflowTransition = NULL)
     {
         $lastModDate = $this->getDocumentTransferManager()->getLastModDate($document->getObjectIdentifier());
         $docLastModDate = $document->getRemoteLastModDate();
         if ($lastModDate !== $docLastModDate && !empty($docLastModDate)) {
             // There is a newer version in the fedora repository.
-            return false;
+            return FALSE;
         }
 
         $this->documentRepository->update($document);
@@ -367,13 +367,13 @@ 
                 break;
 
             default:
-                $transferState = null;
+                $transferState = NULL;
                 break;
         }
 
         if ($transferState) {
             if (!$this->getDocumentTransferManager()->delete($document, $transferState)) {
-                return false;
+                return FALSE;
             }
         }
 
@@ -387,10 +387,10 @@ 
             return $document->getDocumentIdentifier();
         }
 
-        return false;
+        return FALSE;
     }
 
-    public function addSuggestion($editDocument, $restore = false, $comment = '') {
+    public function addSuggestion($editDocument, $restore = FALSE, $comment = '') {
         // add new document
         /** @var Document $suggestionDocument */
         $suggestionDocument = $this->objectManager->get(Document::class);
@@ -402,7 +402,7 @@ 
         $suggestionDocument->setCreator($editDocument->getCreator());
 
         if ($suggestionDocument->isTemporary()) {
-            $suggestionDocument->setTemporary(false);
+            $suggestionDocument->setTemporary(FALSE);
         }
 
         if ($editDocument->getObjectIdentifier()) {
@@ -411,7 +411,7 @@ 
             $suggestionDocument->setLinkedUid($editDocument->getUid());
         }
 
-        $suggestionDocument->setSuggestion(true);
+        $suggestionDocument->setSuggestion(TRUE);
         if ($comment) {
             $suggestionDocument->setComment($comment);
         }
@@ -423,7 +423,7 @@ 
         try {
             $this->documentRepository->add($suggestionDocument);
         } catch (\Throwable $t) {
-            return null;
+            return NULL;
         }
 
         return $suggestionDocument;
@@ -440,9 +440,9 @@ 
         $currentDate = new \DateTime('now');
         if($currentDate > $document->getEmbargoDate()){
             // embargo is expired
-            return false;
+            return FALSE;
         } else {
-            return true;
+            return TRUE;
         }
 
     }
@@ -586,13 +586,13 @@ 
                             $embargoDate = $document->getEmbargoDate();
                             $currentDate = new \DateTime('now');
 
-                            $fulltextPublished = false;
+                            $fulltextPublished = FALSE;
                             foreach ($document->getFile() as $file) {
                                 if ($file->getStatus() != 'added') {
-                                    $fulltextPublished = false;
+                                    $fulltextPublished = FALSE;
                                     break;
                                 } else {
-                                    $fulltextPublished = true;
+                                    $fulltextPublished = TRUE;
                                 }
                             }
 

Classes/Helper/XSLTransformator.php

Spacing +4 added lines, -4 removed lines

@@ -88,7 +88,7 @@ 
             $logger->log(
                 LogLevel::WARNING,
                 "Input XML: No transformation file is present. The given xml data was taken over as it is",
-                array(
+                array (
                     'documentTypeName' => $documentTypeName
                 )
             );
@@ -119,7 +119,7 @@ 
             $filePath = $transformationFile->getFile()->getOriginalResource()->getIdentifier();
             $documentTransformer = new DocumentTransformer();
 
-            if ( !$document->getRemoteState() || $document->getRemoteState() == 'NONE' ) {
+            if (!$document->getRemoteState() || $document->getRemoteState() == 'NONE') {
                 $remoteState = 'ACTIVE';
             } else {
                 $remoteState = $document->getRemoteState();
@@ -138,7 +138,7 @@ 
                 );
             } else {
                 $transformedXml = $documentTransformer->transform(
-                    Environment::getPublicPath(). '/fileadmin' . $filePath, $document->publicXml(), $transformParams
+                    Environment::getPublicPath() . '/fileadmin' . $filePath, $document->publicXml(), $transformParams
                 );
             }
 
@@ -154,7 +154,7 @@ 
             $logger->log(
                 LogLevel::WARNING,
                 "Output XML: No transformation file is present. The generated xml data was taken over as it is",
-                array(
+                array (
                     'documentTypeName' => $documentTypeName
                 )
             );

Braces +1 added lines, -2 removed lines

@@ -25,8 +25,7 @@
 use \TYPO3\CMS\Core\Log\LogLevel;
 use \TYPO3\CMS\Core\Log\LogManager;
 
-class XSLTransformator
-{
+class XSLTransformator {
 
     /**
      * clientConfigurationManager

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

@@ -102,7 +102,7 @@
      * @param string $xmlData
      * @return string The transformed xml
      */
-    public function getTransformedOutputXML(Document $document, $xmlData = null): string
+    public function getTransformedOutputXML(Document $document, $xmlData = NULL): string
     {
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
         $this->clientConfigurationManager = $objectManager->get(ClientConfigurationManager::class);

Classes/Helper/DocumentMapper.php

Braces +6 added lines, -12 removed lines

@@ -22,8 +22,7 @@ 
 use EWW\Dpf\Domain\Workflow\DocumentWorkflow;
 use EWW\Dpf\Services\ProcessNumber\ProcessNumberGenerator;
 
-class DocumentMapper
-{
+class DocumentMapper {
 
     /**
      * objectManager
@@ -101,8 +100,7 @@ 
      *
      * @return mixed
      */
-    public function getSettings()
-    {
+    public function getSettings() {
         $frameworkConfiguration = $this->configurationManager->getConfiguration(
             \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK
         );
@@ -116,8 +114,7 @@ 
      * @param bool $generateEmptyFields
      * @return \EWW\Dpf\Domain\Model\DocumentForm
      */
-    public function getDocumentForm(Document $document, $generateEmptyFields = true)
-    {
+    public function getDocumentForm(Document $document, $generateEmptyFields = true) {
         $documentForm = new \EWW\Dpf\Domain\Model\DocumentForm();
         $documentForm->generateCsrfToken();
         $documentForm->setUid($document->getDocumentType()->getUid());
@@ -365,8 +362,7 @@ 
         return $documentForm;
     }
 
-    public function getDocument($documentForm)
-    {
+    public function getDocument($documentForm) {
         /** @var Document $document */
 
         if ($documentForm->getDocumentUid()) {
@@ -431,8 +427,7 @@ 
      * @return array
      * @throws \Exception
      */
-    public function getMetadata(DocumentForm $documentForm)
-    {
+    public function getMetadata(DocumentForm $documentForm) {
         foreach ($documentForm->getItems() as $page) {
 
             foreach ($page[0]->getItems() as $group) {
@@ -543,8 +538,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
      */
-    protected function updateFiles(Document $document, $files)
-    {
+    protected function updateFiles(Document $document, $files) {
         $filesToBeDeleted = [];
         foreach ($document->getFile() as $docFile) {
             $filesToBeDeleted[$docFile->getFileIdentifier()] = $docFile;

Spacing +7 added lines, -7 removed lines

@@ -142,7 +142,7 @@ 
                 (
                     $this->getSettings()['deactivatePrimaryFileMandatoryCheck'] ||
                     $document->getDocumentType()->getVirtualType()
-                )? false : true
+                ) ? false : true
             )
         );
 
@@ -159,7 +159,7 @@ 
 
         $internalFormat = new \EWW\Dpf\Helper\InternalFormat($document->getXmlData(), $this->clientPid);
 
-        $excludeGroupAttributes = array();
+        $excludeGroupAttributes = array ();
 
         foreach ($document->getDocumentType()->getMetadataPage() as $metadataPage) {
             $documentFormPage = new \EWW\Dpf\Domain\Model\DocumentFormPage();
@@ -190,7 +190,7 @@ 
                 $xpath = $internalFormat->getXpath();
 
                 // get fixed attributes from xpath configuration
-                $fixedGroupAttributes = array();
+                $fixedGroupAttributes = array ();
 
                 preg_match_all('/[A-Za-z0-9:@\.]+(\[@.*?\])*/', $metadataGroup->getAbsoluteMapping(), $groupMappingPathParts);
                 $groupMappingPathParts = $groupMappingPathParts[0];
@@ -458,7 +458,7 @@ 
 
                 foreach ($group as $groupItem) {
 
-                    $item = array();
+                    $item = array ();
 
                     $uid           = $groupItem->getUid();
                     $metadataGroup = $this->metadataGroupRepository->findByUid($uid);
@@ -483,7 +483,7 @@ 
 
                             $fieldMapping = $metadataObject->getRelativeMapping();
 
-                            $formField = array();
+                            $formField = array ();
 
                             $value = $fieldItem->getValue();
 
@@ -533,11 +533,11 @@ 
                     }
 
                     if (!key_exists('attributes', $item)) {
-                        $item['attributes'] = array();
+                        $item['attributes'] = array ();
                     }
 
                     if (!key_exists('values', $item)) {
-                        $item['values'] = array();
+                        $item['values'] = array ();
                     }
 
                     if ($groupItem->getMandatory() || $defaultValueCount < $fieldValueCount || $defaultValueCount == $fieldCount) {

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

@@ -46,7 +46,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -54,7 +54,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * documentTypeRepository
@@ -62,7 +62,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * documentRepository
@@ -70,7 +70,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * fileRepository
@@ -78,7 +78,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * depositLicenseRepository
@@ -86,7 +86,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DepositLicenseRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $depositLicenseRepository = null;
+    protected $depositLicenseRepository = NULL;
 
     /**
      * clientPid
@@ -98,7 +98,7 @@ 
     /**
      * @var bool
      */
-    protected $customClientPid = false;
+    protected $customClientPid = FALSE;
 
     /**
      * clientConfigurationManager
@@ -128,7 +128,7 @@ 
      * @param bool $generateEmptyFields
      * @return \EWW\Dpf\Domain\Model\DocumentForm
      */
-    public function getDocumentForm(Document $document, $generateEmptyFields = true)
+    public function getDocumentForm(Document $document, $generateEmptyFields = TRUE)
     {
         $documentForm = new \EWW\Dpf\Domain\Model\DocumentForm();
         $documentForm->generateCsrfToken();
@@ -142,7 +142,7 @@ 
                 (
                     $this->getSettings()['deactivatePrimaryFileMandatoryCheck'] ||
                     $document->getDocumentType()->getVirtualType()
-                )? false : true
+                )? FALSE : TRUE
             )
         );
 
@@ -205,7 +205,7 @@ 
                 // build mapping path, previous fixed attributes which are differ from
                 // the own fixed attributes are excluded
                 $queryGroupMapping = $metadataGroup->getAbsoluteMapping();
-                if (strpos($queryGroupMapping, "@displayLabel") === false && is_array($excludeGroupAttributes[$groupMappingName])) {
+                if (strpos($queryGroupMapping, "@displayLabel") === FALSE && is_array($excludeGroupAttributes[$groupMappingName])) {
                     foreach ($excludeGroupAttributes[$groupMappingName] as $excludeAttr => $excludeAttrValue) {
                         if (!in_array($excludeAttr, $fixedGroupAttributes)) {
                             $queryGroupMapping .= $excludeAttrValue;
@@ -265,7 +265,7 @@ 
 
                                 // ensure that e.g. <mods:detail> and <mods:detail type="volume">
                                 // are not recognized as the same node
-                                if ((strpos($value, "@") === false) && ($value != '.')) {
+                                if ((strpos($value, "@") === FALSE) && ($value != '.')) {
                                     $objectMappingPath[$key] .= "[not(@*)]";
                                 }
                             }
@@ -340,7 +340,7 @@ 
                     }
                 } else {
 
-                    $documentFormGroup->setEmptyGroup(true);
+                    $documentFormGroup->setEmptyGroup(TRUE);
 
                     foreach ($metadataGroup->getMetadataObject() as $metadataObject) {
                         $documentFormField = new \EWW\Dpf\Domain\Model\DocumentFormField();
@@ -387,7 +387,7 @@ 
 
         if ($documentForm->getDocumentUid()) {
             if ($this->isCustomClientPid()) {
-                $this->documentRepository->crossClient(true);
+                $this->documentRepository->crossClient(TRUE);
             }
             $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
             $tempInternalFormat = new \EWW\Dpf\Helper\InternalFormat($document->getXmlData(), $this->clientPid);
@@ -566,7 +566,7 @@ 
      */
     public function setClientPid(int $clientPid): void
     {
-        $this->customClientPid = true;
+        $this->customClientPid = TRUE;
         $this->clientPid = $clientPid;
     }
 

Classes/Helper/FormDataReader.php

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

@@ -28,7 +28,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * metadataPageRepository
@@ -36,7 +36,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataPageRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataPageRepository = null;
+    protected $metadataPageRepository = NULL;
 
     /**
      * metadataGroupRepository
@@ -44,7 +44,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataGroupRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataGroupRepository = null;
+    protected $metadataGroupRepository = NULL;
 
     /**
      * metadataObjectRepository
@@ -52,7 +52,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\MetadataObjectRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $metadataObjectRepository = null;
+    protected $metadataObjectRepository = NULL;
 
     /**
      * fileRepository
@@ -60,7 +60,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FileRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $fileRepository = null;
+    protected $fileRepository = NULL;
 
     /**
      * documentRepository
@@ -68,7 +68,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentRepository = null;
+    protected $documentRepository = NULL;
 
     /**
      * objectManager
@@ -173,35 +173,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);
 
@@ -214,7 +214,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()) {
@@ -321,7 +321,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()) {

Spacing +4 added lines, -4 removed lines

@@ -138,7 +138,7 @@ 
     protected function getFields()
     {
 
-        $fields = array();
+        $fields = array ();
 
         if (is_array($this->formData['metadata'])) {
             foreach ($this->formData['metadata'] as $key => $value) {
@@ -152,7 +152,7 @@ 
 
     protected function getDeletedFiles()
     {
-        $deletedFiles = array();
+        $deletedFiles = array ();
 
         if (is_array($this->formData['deleteFile'])) {
             foreach ($this->formData['deleteFile'] as $key => $value) {
@@ -246,7 +246,7 @@ 
             $documentForm->setComment($this->formData['comment']);
         }
 
-        $documentData = array();
+        $documentData = array ();
 
         foreach ($fields as $field) {
             $pageUid    = $field->getPageUid();
@@ -332,7 +332,7 @@ 
                                     }
                                 }
 
-                                if ($metadataObject->isUploadField() ) {
+                                if ($metadataObject->isUploadField()) {
                                     if ($object && is_array($object) &&
                                         array_key_exists('error', $object) &&
                                         $object['error'] != UPLOAD_ERR_NO_FILE)

Braces +9 added lines, -18 removed lines

@@ -20,8 +20,7 @@ 
 use EWW\Dpf\Domain\Model\MetadataObject;
 use TYPO3\CMS\Core\Core\Environment;
 
-class FormDataReader
-{
+class FormDataReader {
 
     /**
      * documentTypeRepository
@@ -114,8 +113,7 @@ 
      */
     protected $uploadBaseUrl;
 
-    public function __construct()
-    {
+    public function __construct() {
 
         $uploadFileUrl = new \EWW\Dpf\Helper\UploadFileUrl;
 
@@ -129,14 +127,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();
 
@@ -150,8 +146,7 @@ 
         return $fields;
     }
 
-    protected function getDeletedFiles()
-    {
+    protected function getDeletedFiles() {
         $deletedFiles = array();
 
         if (is_array($this->formData['deleteFile'])) {
@@ -171,8 +166,7 @@ 
         return $deletedFiles;
     }
 
-    public function uploadError()
-    {
+    public function uploadError() {
         // todo: To be updated or implemented elsewhere
         return false;
 
@@ -195,8 +189,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);
@@ -230,8 +223,7 @@ 
         return $file;
     }
 
-    public function getDocumentForm()
-    {
+    public function getDocumentForm() {
         $fields = $this->getFields();
 
         $documentForm = new \EWW\Dpf\Domain\Model\DocumentForm();
@@ -335,8 +327,7 @@ 
                                 if ($metadataObject->isUploadField() ) {
                                     if ($object && is_array($object) &&
                                         array_key_exists('error', $object) &&
-                                        $object['error'] != UPLOAD_ERR_NO_FILE)
-                                    {
+                                        $object['error'] != UPLOAD_ERR_NO_FILE) {
                                         if (empty($file)) {
                                             $file = $this->objectManager->get(File::class);
                                             $file = $this->getUploadedFile(