kitodo / kitodo-publication

Classes/Configuration/ClientConfigurationManager.php

Braces +58 added lines, -116 removed lines

@@ -22,8 +22,7 @@ 
 use EWW\Dpf\Domain\Repository\ClientRepository;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 
-class ClientConfigurationManager
-{
+class ClientConfigurationManager {
     /**
      * settings
      *
@@ -46,8 +45,7 @@ 
      */
     protected $extensionConfiguration = array();
 
-    public function __construct()
-    {
+    public function __construct() {
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $clientRepository = $objectManager->get(ClientRepository::class);
 
@@ -77,8 +75,7 @@ 
 
     }
 
-    public function setConfigurationPid($pid)
-    {
+    public function setConfigurationPid($pid) {
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $clientRepository = $objectManager->get(ClientRepository::class);
 
@@ -88,8 +85,7 @@ 
     /**
      * @return int|null
      */
-    public function getClientPid()
-    {
+    public function getClientPid() {
         return $this->client->getPid();
     }
 
@@ -98,8 +94,7 @@ 
      *
      * @var array
      */
-    public function getSetting($settingName, $extConfig = null)
-    {
+    public function getSetting($settingName, $extConfig = null) {
         $setting = null;
         if ($this->client) {
             $setting = trim($this->client->{"get" . ucfirst($settingName)}());
@@ -114,270 +109,217 @@ 
     }
 
 
-    public function getOwnerId()
-    {
+    public function getOwnerId() {
         return $this->getSetting("ownerId");
     }
 
-    public function getSwordHost()
-    {
+    public function getSwordHost() {
         return $this->getSetting("swordHost", "swordHost");
     }
 
-    public function getSwordUser()
-    {
+    public function getSwordUser() {
         return $this->getSetting("swordUser", "swordUser");
     }
 
-    public function getSwordPassword()
-    {
+    public function getSwordPassword() {
         return $this->getSetting("swordPassword", "swordPassword");
     }
 
-    public function getSwordCollectionNamespace()
-    {
+    public function getSwordCollectionNamespace() {
         return $this->getSetting("swordCollectionNamespace", "swordCollectionNamespace");
     }
 
-    public function getFedoraHost()
-    {
+    public function getFedoraHost() {
         return $this->getSetting("fedoraHost", "fedoraHost");
     }
 
-    public function getFedoraUser()
-    {
+    public function getFedoraUser() {
         return $this->getSetting("fedoraUser", "fedoraUser");
     }
 
-    public function getFedoraPassword()
-    {
+    public function getFedoraPassword() {
         return $this->getSetting("fedoraPassword", "fedoraPassword");
     }
 
-    public function getElasticSearchHost()
-    {
+    public function getElasticSearchHost() {
         return $this->getSetting("elasticSearchHost", "elasticSearchHost");
     }
 
-    public function getElasticSearchPort()
-    {
+    public function getElasticSearchPort() {
         return $this->getSetting("elasticSearchPort", "elasticSearchPort");
     }
 
-    public function getElasticSearchIndexName()
-    {
+    public function getElasticSearchIndexName() {
         return $this->getSetting("elasticSearchIndexName", "elasticSearchIndexName");
     }
 
-    public function getUploadDirectory()
-    {
+    public function getUploadDirectory() {
         return $this->getSetting("uploadDirectory", "uploadDirectory");
     }
 
-    public function getUploadDomain()
-    {
+    public function getUploadDomain() {
         return $this->getSetting("uploadDomain", "uploadDomain");
     }
 
-    public function getSuggestionFlashMessage()
-    {
+    public function getSuggestionFlashMessage() {
         return $this->getSetting("suggestionFlashmessage", "suggestionFlashmessage");
     }
 
-    public function getFileXpath()
-    {
+    public function getFileXpath() {
         return $this->getSetting("fileXpath", "fileXpath");
     }
 
-    public function getStateXpath()
-    {
+    public function getStateXpath() {
         return $this->getSetting("stateXpath", "stateXpath");
     }
 
-    public function getTypeXpath()
-    {
+    public function getTypeXpath() {
         return $this->getSetting("typeXpath", "typeXpath");
     }
 
-    public function getTypeXpathInput()
-    {
+    public function getTypeXpathInput() {
         return $this->getSetting("typeXpathInput", "typeXpathInput");
     }
 
-    public function getUrnXpath()
-    {
+    public function getUrnXpath() {
         return $this->getSetting("urnXpath", "urnXpath");
     }
 
-    public function getPrimaryUrnXpath()
-    {
+    public function getPrimaryUrnXpath() {
         return $this->getSetting("primaryUrnXpath", "primaryUrnXpath");
     }
 
-    public function getDateXpath()
-    {
+    public function getDateXpath() {
         return $this->getSetting("dateXpath", "dateXpath");
     }
 
-    public function getPublishingYearXpath()
-    {
+    public function getPublishingYearXpath() {
         return $this->getSetting("publishingYearXpath", "publishingYearXpath");
     }
 
-    public function getNamespaces()
-    {
+    public function getNamespaces() {
         return $this->getSetting("namespaces", "namespaces");
     }
 
-    public function getTitleXpath()
-    {
+    public function getTitleXpath() {
         return $this->getSetting("titleXpath", "titleXpath");
     }
 
-    public function getOriginalSourceTitleXpath()
-    {
+    public function getOriginalSourceTitleXpath() {
         return $this->getSetting("originalSourceTitleXpath", "originalSourceTitleXpath");
     }
 
-    public function getProcessNumberXpath()
-    {
+    public function getProcessNumberXpath() {
         return $this->getSetting("processnumberXpath", "processnumberXpath");
     }
 
-    public function getSubmitterNameXpath()
-    {
+    public function getSubmitterNameXpath() {
         return $this->getSetting("submitterNameXpath", "submitterNameXpath");
     }
 
-    public function getSubmitterEmailXpath()
-    {
+    public function getSubmitterEmailXpath() {
         return $this->getSetting("submitterEmailXpath", "submitterEmailXpath");
     }
 
-    public function getSubmitterNoticeXpath()
-    {
+    public function getSubmitterNoticeXpath() {
         return $this->getSetting("submitterNoticeXpath", "submitterNoticeXpath");
     }
 
-    public function getCreatorXpath()
-    {
+    public function getCreatorXpath() {
         return $this->getSetting("creatorXpath", "creatorXpath");
     }
 
-    public function getCreationDateXpath()
-    {
+    public function getCreationDateXpath() {
         return $this->getSetting("creationDateXpath", "creationDateXpath");
     }
 
-    public function getRepositoryCreationDateXpath()
-    {
+    public function getRepositoryCreationDateXpath() {
         return $this->getSetting("repositoryCreationDateXpath", "repositoryCreationDateXpath");
     }
 
-    public function getRepositoryLastModDateXpath()
-    {
+    public function getRepositoryLastModDateXpath() {
         return $this->getSetting("repositoryLastModDateXpath", "repositoryLastModDateXpath");
     }
 
-    public function getDepositLicenseXpath()
-    {
+    public function getDepositLicenseXpath() {
         return $this->getSetting("depositLicenseXpath", "depositLicenseXpath");
     }
 
-    public function getAllNotesXpath()
-    {
+    public function getAllNotesXpath() {
         return $this->getSetting("allNotesXpath", "allNotesXpath");
     }
 
-    public function getPrivateNotesXpath()
-    {
+    public function getPrivateNotesXpath() {
         return $this->getSetting("privateNotesXpath", "privateNotesXpath");
     }
 
-    public function getInputTransformation()
-    {
+    public function getInputTransformation() {
         return $this->client->getInputTransformation()->current();
     }
 
-    public function getOutputTransformation()
-    {
+    public function getOutputTransformation() {
         return $this->client->getOutputTransformation()->current();
     }
 
-    public function getPersonXpath()
-    {
+    public function getPersonXpath() {
         return $this->getSetting("personXpath", "personXpath");
     }
 
-    public function getPersonFamilyXpath()
-    {
+    public function getPersonFamilyXpath() {
         return $this->getSetting("personFamilyXpath", "personFamilyXpath");
     }
 
-    public function getPersonGivenXpath()
-    {
+    public function getPersonGivenXpath() {
         return $this->getSetting("personGivenXpath", "personGivenXpath");
     }
 
-    public function getPersonRoleXpath()
-    {
+    public function getPersonRoleXpath() {
         return $this->getSetting("personRoleXpath", "personRoleXpath");
     }
 
-    public function getPersonFisIdentifierXpath()
-    {
+    public function getPersonFisIdentifierXpath() {
         return $this->getSetting("personFisIdentifierXpath", "personFisIdentifierXpath");
     }
 
-    public function getPersonAffiliationXpath()
-    {
+    public function getPersonAffiliationXpath() {
         return $this->getSetting("personAffiliationXpath", "personAffiliationXpath");
     }
 
-    public function getPersonAffiliationIdentifierXpath()
-    {
+    public function getPersonAffiliationIdentifierXpath() {
         return $this->getSetting("personAffiliationIdentifierXpath", "personAffiliationIdentifierXpath");
     }
 
-    public function getPersonAuthorRole()
-    {
+    public function getPersonAuthorRole() {
         return $this->getSetting("personAuthorRole", "personAuthorRole");
     }
 
-    public function getPersonPublisherRole()
-    {
+    public function getPersonPublisherRole() {
         return $this->getSetting("personPublisherRole", "personPublisherRole");
     }
 
-    public function getValidationXpath()
-    {
+    public function getValidationXpath() {
         return $this->getSetting("validationXpath", "validationXpath");
     }
 
-    public function fisIdXpath()
-    {
+    public function fisIdXpath() {
         return $this->getSetting("fisIdXpath", "fisIdXpath");
     }
 
-    public function getSourceDetailsXpaths()
-    {
+    public function getSourceDetailsXpaths() {
         return $this->getSetting("sourceDetailsXpaths", "sourceDetailsXpaths");
     }
 
-    public function getFedoraNamespace()
-    {
+    public function getFedoraNamespace() {
         $settings = $this->getTypoScriptSettings();
         return $settings['fedoraNamespace'];
     }
 
-    public function getUniversityCollection()
-    {
+    public function getUniversityCollection() {
         $settings = $this->getTypoScriptSettings();
         return $settings['universityCollection'];
     }
 
-    public function getTypoScriptSettings()
-    {
+    public function getTypoScriptSettings() {
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
         $configurationManager = $objectManager->get(ConfigurationManager::class);
         $settings = $configurationManager->getConfiguration(

Classes/Domain/Repository/BookmarkRepository.php

Braces +5 added lines, -10 removed lines

@@ -22,15 +22,13 @@ 
 /**
  * The repository for Bookmarks
  */
-class BookmarkRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository
-{
+class BookmarkRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository {
     /**
      * @param int $feUserUid
      * @param string $identifier
      * @return object
      */
-    public function findBookmark($feUserUid, $identifier)
-    {
+    public function findBookmark($feUserUid, $identifier) {
         $query = $this->createQuery();
 
         $query->matching(
@@ -49,8 +47,7 @@ 
      * @return bool
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function removeBookmark($document, $feUserUid)
-    {
+    public function removeBookmark($document, $feUserUid) {
         $query = $this->createQuery();
 
         if ($document instanceof Document) {
@@ -88,8 +85,7 @@ 
      * @return bool
      * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
      */
-    public function addBookmark($document, $feUserUid)
-    {
+    public function addBookmark($document, $feUserUid) {
         if ($document instanceof Document) {
             // The returned documentIdentifier is either a PID or the document UID (TYPO3 db), see also
             // the above method removeBookmark().
@@ -115,8 +111,7 @@ 
      * @param Document $document
      * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
      */
-    public function findDocumentBookmarks(Document $document)
-    {
+    public function findDocumentBookmarks(Document $document) {
         $query = $this->createQuery();
 
         $constraintsAnd[] = $query->logicalOr(

Classes/Domain/Repository/AbstractRepository.php

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
 /**
  * The abstract repository
  */
-class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
     /**
      * Finds all records of all clients.
      *
@@ -34,8 +33,7 @@ 
         return $query->execute($returnRawQueryResult);
     }
 
-    public function crossClient($active = false)
-    {
+    public function crossClient($active = false) {
         /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
         $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
         $querySettings->setRespectStoragePage(!$active);

Classes/Domain/Repository/ClientRepository.php

Braces +2 added lines, -4 removed lines

@@ -17,16 +17,14 @@
 /**
  * The repository for Clients
  */
-class ClientRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository
-{
+class ClientRepository extends \EWW\Dpf\Domain\Repository\AbstractRepository {
 
     /**
      * findAllByPid
      *
      * @return
      */
-    public function findAllByPid($pid)
-    {
+    public function findAllByPid($pid) {
         $query = $this->createQuery();
         $query->getQuerySettings()->setRespectStoragePage(false);
         $query->matching($query->equals('pid', $pid));

Classes/Domain/Repository/FrontendUserRepository.php

Braces +2 added lines, -4 removed lines

@@ -4,15 +4,13 @@
 use EWW\Dpf\Domain\Model\Document;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 
-class FrontendUserRepository extends \TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository
-{
+class FrontendUserRepository extends \TYPO3\CMS\Extbase\Domain\Repository\FrontendUserRepository {
     /**
      * @param $feUserUid
      * @param $clientPid
      * @return bool
      */
-    public function isUserInClient($feUserUid, $clientPid)
-    {
+    public function isUserInClient($feUserUid, $clientPid) {
         /** @var $querySettings \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings */
         $querySettings = $this->objectManager->get('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Typo3QuerySettings');
         $querySettings->setRespectStoragePage(false);

Classes/Exceptions/ElasticSearchMissingIndexNameException.php

Braces +2 added lines, -4 removed lines

@@ -14,10 +14,8 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-class ElasticSearchMissingIndexNameException extends \Exception implements DPFExceptionInterface
-{
-    public function messageLanguageKey()
-    {
+class ElasticSearchMissingIndexNameException extends \Exception implements DPFExceptionInterface {
+    public function messageLanguageKey() {
         return 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:document_transfer.elasticsearch_indexname_error';
     }
 }

Classes/Services/ElasticSearch/ElasticSearch.php

Braces +9 added lines, -18 removed lines

@@ -28,8 +28,7 @@ 
 use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
-class ElasticSearch
-{
+class ElasticSearch {
     /**
      * @var \EWW\Dpf\Configuration\ClientConfigurationManager
      */
@@ -61,8 +60,7 @@ 
      * @param int|null $clientPid
      * @throws ElasticSearchMissingIndexNameException
      */
-    public function __construct($clientPid = null)
-    {
+    public function __construct($clientPid = null) {
         $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
 
         $this->elasticsearchMapper = $objectManager->get(ElasticsearchMapper::class);
@@ -103,8 +101,7 @@ 
     /**
      * @return string|null
      */
-    protected function getIndexName()
-    {
+    protected function getIndexName() {
         return $this->indexName;
     }
 
@@ -113,8 +110,7 @@ 
      *
      * @param $indexName
      */
-    protected function initializeIndex($indexName)
-    {
+    protected function initializeIndex($indexName) {
         $paramsIndex = [
             'index' => $indexName,
             'body' => [
@@ -252,8 +248,7 @@ 
      *
      * @param Document $document
      */
-    public function index($document)
-    {
+    public function index($document) {
         try {
             $data = json_decode($this->elasticsearchMapper->getElasticsearchJson($document));
         } catch (\Throwable $throwable) {
@@ -391,8 +386,7 @@ 
      *
      * @param string $identifier
      */
-    public function delete($identifier)
-    {
+    public function delete($identifier) {
         try {
 
             $params = [
@@ -418,8 +412,7 @@ 
     /**
      * @param $identifier
      */
-    public function getDocument($identifier)
-    {
+    public function getDocument($identifier) {
         $params = [
             'index' => $this->getIndexName(),
             'id'    => $identifier
@@ -434,8 +427,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'])) {
@@ -467,8 +459,7 @@ 
      * Get the results
      * @return mixed
      */
-    public function getResults()
-    {
+    public function getResults() {
         // return results from the last search request
         return $this->results;
     }

Classes/Services/ElasticSearch/QueryBuilder.php

Braces +7 added lines, -14 removed lines

@@ -19,8 +19,7 @@ 
 use EWW\Dpf\Security\Security;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
-class QueryBuilder
-{
+class QueryBuilder {
     /**
      *
      * @var \EWW\Dpf\Configuration\ClientConfigurationManager
@@ -62,8 +61,7 @@ 
     public function buildQuery(
         $itemsPerPage, $workspaceFilter, $from = 0, $bookmarkIdentifiers = [], $filters = [],
         $excludeFilters = [], $sortField = null, $sortOrder = null, $queryString = null
-    )
-    {
+    ) {
 
         if ($workspaceFilter) {
             $workspaceFilter = [0 => $workspaceFilter];
@@ -464,8 +462,7 @@ 
     }
 
 
-    protected function getSortScriptUniversityCollection($collection)
-    {
+    protected function getSortScriptUniversityCollection($collection) {
         $script  = "for (int i = 0; i < doc['collections'].length; ++i) {";
         $script .= "    if (doc['collections'][i] == '".$collection."') {";
         $script .= "        return '1';";
@@ -476,8 +473,7 @@ 
         return $script;
     }
 
-    protected function getSortScriptHasFiles()
-    {
+    protected function getSortScriptHasFiles() {
         $script = "if (doc['hasFiles'].value == 'true') {";
         $script .= "    return '1';";
         $script .= "}";
@@ -486,8 +482,7 @@ 
         return $script;
     }
 
-    protected function getSortScriptCreatorRole($feUserUid)
-    {
+    protected function getSortScriptCreatorRole($feUserUid) {
         $script = "if (doc['creator'].value == '".$feUserUid."') {";
         $script .= "    return '1';";
         $script .= "}";
@@ -503,8 +498,7 @@ 
     }
 
 
-    protected function getSortScriptState()
-    {
+    protected function getSortScriptState() {
         $sortStates = [];
         foreach (DocumentWorkflow::PLACES as $state) {
             if (array_key_exists($state, DocumentWorkflow::STATE_TO_ALIASSTATE_MAPPING)) {
@@ -521,8 +515,7 @@ 
     }
 
 
-    protected function getSortScriptDoctype()
-    {
+    protected function getSortScriptDoctype() {
         $sortDoctypes = [];
         foreach ($this->documentTypeRepository->findAll() as $documentType) {
             if ($documentType->getName() && $documentType->getDisplayname()) {

Classes/Services/ParserGenerator.php

Braces +10 added lines, -20 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,16 +126,14 @@ 
      * 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);
 
         return $xml;
     }
 
-    public function transformInputXML($xml)
-    {
+    public function transformInputXML($xml) {
         $XSLTransformator = new XSLTransformator();
         return $XSLTransformator->transformInputXML($xml);
     }
@@ -146,8 +142,7 @@ 
      * @param $document
      * @return string The transformed xml
      */
-    public function getTransformedOutputXML($document)
-    {
+    public function getTransformedOutputXML($document) {
         $XSLTransformator = new XSLTransformator();
         return $XSLTransformator->getTransformedOutputXML($document);
     }
@@ -157,8 +152,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;
@@ -241,8 +235,7 @@ 
      * @param  xpath $xPath xPath expression
      * @return xml
      */
-    public function parseXPath($xPath)
-    {
+    public function parseXPath($xPath) {
 
         $this->parser->generateXmlFromXPath($xPath);
         $xml = $this->parser->getXML();
@@ -250,8 +243,7 @@ 
         return $xml;
     }
 
-    public function parseXPathWrapped($xPath)
-    {
+    public function parseXPathWrapped($xPath) {
         $this->parser->generateXmlFromXPath($xPath);
         $xml = $this->parser->getXML();
 
@@ -266,8 +258,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);
@@ -466,8 +457,7 @@ 
      * sets the file data and generates file xml
      * @param string $value
      */
-    public function setFileData($value = '')
-    {
+    public function setFileData($value = '') {
         $this->files = $value;
         $this->generateFileXML();
     }