kitodo / kitodo-publication

src/Classes/Services/ElasticSearch/ElasticsearchMapper.php

Braces +2 added lines, -4 removed lines

@@ -16,8 +16,7 @@ 
 
 use EWW\Dpf\Helper\XSLTransformator;
 
-class ElasticsearchMapper
-{
+class ElasticsearchMapper {
 
     /**
      * [$documentRepository description]
@@ -40,8 +39,7 @@ 
      * @param  Document $document [description]
      * @return json Elasticsearch json format
      */
-    public function getElasticsearchJson($document)
-    {
+    public function getElasticsearchJson($document) {
         $xsltDoc = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName('EXT:dpf/Resources/Private/Xslt/mets-mods-xml2json.xsl');
 
         // xslt

src/Classes/Services/ElasticSearch/QueryBuilder.php

Spacing +37 added lines, -37 removed lines

@@ -138,7 +138,7 @@ 
             $query = [
                 'bool' => [
                     'must' => [
-                        'match_all' => (object)[]
+                        'match_all' => (object) []
                     ],
                     'filter' => $queryFilter
                 ]
@@ -180,11 +180,11 @@ 
                             'script' => [
                                 'lang' => 'painless',
                                 'source' =>
-                                    "for (int i = 0; i < doc['collections'].length; ++i) {".
-                                    "    if(doc['collections'][i] =='".$this->getSettings()['universityCollection']."') {".
-                                    "        return 'true';".
-                                    "    }".
-                                    "}".
+                                    "for (int i = 0; i < doc['collections'].length; ++i) {" .
+                                    "    if(doc['collections'][i] =='" . $this->getSettings()['universityCollection'] . "') {" .
+                                    "        return 'true';" .
+                                    "    }" .
+                                    "}" .
                                     "return 'false';"
                             ]
                         ]
@@ -200,23 +200,23 @@ 
                             'script' => [
                                 'lang' => 'painless',
                                 'source' =>
-                                    "if (".
-                                    "    doc['creator'].size() > 0 &&".
-                                    "    doc['creator'].value == '".$this->security->getUser()->getUid()."') {".
-                                    "    return 'self';".
-                                    "}".
-                                    "if (".
-                                    "    doc['creatorRole'].size() > 0 &&".
-                                    "    doc['creatorRole'].value == '".Security::ROLE_LIBRARIAN."'".
-                                    ") {".
-                                    "    return 'librarian';".
-                                    "}".
-                                    "if (".
-                                    "    doc['creatorRole'].size() > 0 &&".
-                                    "    doc['creatorRole'].value == '".Security::ROLE_RESEARCHER."'".
-                                    ") {".
-                                    "    return 'user';".
-                                    "}".
+                                    "if (" .
+                                    "    doc['creator'].size() > 0 &&" .
+                                    "    doc['creator'].value == '" . $this->security->getUser()->getUid() . "') {" .
+                                    "    return 'self';" .
+                                    "}" .
+                                    "if (" .
+                                    "    doc['creatorRole'].size() > 0 &&" .
+                                    "    doc['creatorRole'].value == '" . Security::ROLE_LIBRARIAN . "'" .
+                                    ") {" .
+                                    "    return 'librarian';" .
+                                    "}" .
+                                    "if (" .
+                                    "    doc['creatorRole'].size() > 0 &&" .
+                                    "    doc['creatorRole'].value == '" . Security::ROLE_RESEARCHER . "'" .
+                                    ") {" .
+                                    "    return 'user';" .
+                                    "}" .
                                     "return 'unknown';"
                             ]
                         ]
@@ -429,8 +429,8 @@ 
      */
     protected function buildSortQueryPart($sortField, $sortOrder) {
 
-        $sortField = ($sortField)? $sortField : 'title';
-        $sortOrder = ($sortOrder)? $sortOrder : 'asc';
+        $sortField = ($sortField) ? $sortField : 'title';
+        $sortOrder = ($sortOrder) ? $sortOrder : 'asc';
 
         // Build the sorting part.
         $script = "";
@@ -460,11 +460,11 @@ 
             ];
         } else {
             if ($sortField == 'title') {
-                $sortField.= ".keyword";
+                $sortField .= ".keyword";
             }
 
             if ($sortField == 'personsSort') {
-                $sortField.= ".keyword";
+                $sortField .= ".keyword";
             }
 
             $sort = [
@@ -481,7 +481,7 @@ 
     protected function getSortScriptUniversityCollection($collection)
     {
         $script  = "for (int i = 0; i < doc['collections'].length; ++i) {";
-        $script .= "    if (doc['collections'][i] == '".$collection."') {";
+        $script .= "    if (doc['collections'][i] == '" . $collection . "') {";
         $script .= "        return '1';";
         $script .= "    }";
         $script .= "}";
@@ -502,13 +502,13 @@ 
 
     protected function getSortScriptCreatorRole($feUserUid)
     {
-        $script = "if (doc['creator'].value == '".$feUserUid."') {";
+        $script = "if (doc['creator'].value == '" . $feUserUid . "') {";
         $script .= "    return '1';";
         $script .= "}";
-        $script .= "if (doc['creatorRole'].value == '".Security::ROLE_LIBRARIAN."') {";
+        $script .= "if (doc['creatorRole'].value == '" . Security::ROLE_LIBRARIAN . "') {";
         $script .= "return '2';";
         $script .= "}";
-        $script .= "if (doc['creatorRole'].value == '".Security::ROLE_RESEARCHER."') {";
+        $script .= "if (doc['creatorRole'].value == '" . Security::ROLE_RESEARCHER . "') {";
         $script .= "    return '3';";
         $script .= "}";
         $script .= "return '4';";
@@ -523,15 +523,15 @@ 
         foreach (DocumentWorkflow::PLACES as $state) {
             if (array_key_exists($state, DocumentWorkflow::STATE_TO_ALIASSTATE_MAPPING)) {
                 $aliasState = DocumentWorkflow::STATE_TO_ALIASSTATE_MAPPING[$state];
-                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:manager.documentList.state.'.$aliasState;
+                $key = 'LLL:EXT:dpf/Resources/Private/Language/locallang.xlf:manager.documentList.state.' . $aliasState;
                 $stateName = LocalizationUtility::translate($key, 'dpf');
-                $sortStates[] = "if (doc['state'].value == '".$state."') return '".$stateName."';";
+                $sortStates[] = "if (doc['state'].value == '" . $state . "') return '" . $stateName . "';";
             }
         }
 
         $sortStates = implode(" ", $sortStates);
 
-        return $sortStates." return '';";
+        return $sortStates . " return '';";
     }
 
 
@@ -540,14 +540,14 @@ 
         $sortDoctypes = [];
         foreach ($this->documentTypeRepository->findAll() as $documentType) {
             if ($documentType->getName() && $documentType->getDisplayname()) {
-                $sortDoctypes[] = "if (doc['doctype'].value == '".$documentType->getName()."')"
-                    ." return '".$documentType->getDisplayname()."';";
+                $sortDoctypes[] = "if (doc['doctype'].value == '" . $documentType->getName() . "')"
+                    ." return '" . $documentType->getDisplayname() . "';";
             }
         }
 
         $sortDoctypes = implode(" ", $sortDoctypes);
 
-        return $sortDoctypes." return '';";
+        return $sortDoctypes . " return '';";
     }
 
 }

Braces +8 added lines, -16 removed lines

@@ -19,8 +19,7 @@ 
 use EWW\Dpf\Security\Security;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
-class QueryBuilder
-{
+class QueryBuilder {
     /**
      *
      * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
@@ -51,8 +50,7 @@ 
      *
      * @return mixed
      */
-    public function getSettings()
-    {
+    public function getSettings() {
         $frameworkConfiguration = $this->configurationManager->getConfiguration(
             \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK
         );
@@ -78,8 +76,7 @@ 
     public function buildQuery(
         $itemsPerPage, $workspaceFilter, $from = 0, $bookmarkIdentifiers = [], $filters = [],
         $excludeFilters = [], $sortField = null, $sortOrder = null, $queryString = null
-    )
-    {
+    ) {
 
         if ($workspaceFilter) {
             $workspaceFilter = [0 => $workspaceFilter];
@@ -478,8 +475,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';";
@@ -490,8 +486,7 @@ 
         return $script;
     }
 
-    protected function getSortScriptHasFiles()
-    {
+    protected function getSortScriptHasFiles() {
         $script = "if (doc['hasFiles'].value == 'true') {";
         $script .= "    return '1';";
         $script .= "}";
@@ -500,8 +495,7 @@ 
         return $script;
     }
 
-    protected function getSortScriptCreatorRole($feUserUid)
-    {
+    protected function getSortScriptCreatorRole($feUserUid) {
         $script = "if (doc['creator'].value == '".$feUserUid."') {";
         $script .= "    return '1';";
         $script .= "}";
@@ -517,8 +511,7 @@ 
     }
 
 
-    protected function getSortScriptState()
-    {
+    protected function getSortScriptState() {
         $sortStates = [];
         foreach (DocumentWorkflow::PLACES as $state) {
             if (array_key_exists($state, DocumentWorkflow::STATE_TO_ALIASSTATE_MAPPING)) {
@@ -535,8 +528,7 @@ 
     }
 
 
-    protected function getSortScriptDoctype()
-    {
+    protected function getSortScriptDoctype() {
         $sortDoctypes = [];
         foreach ($this->documentTypeRepository->findAll() as $documentType) {
             if ($documentType->getName() && $documentType->getDisplayname()) {

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

@@ -35,7 +35,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      * @inject
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * security
@@ -43,7 +43,7 @@ 
      * @var \EWW\Dpf\Security\Security
      * @inject
      */
-    protected $security = null;
+    protected $security = NULL;
 
 
     /**
@@ -77,7 +77,7 @@ 
      */
     public function buildQuery(
         $itemsPerPage, $workspaceFilter, $from = 0, $bookmarkIdentifiers = [], $filters = [],
-        $excludeFilters = [], $sortField = null, $sortOrder = null, $queryString = null
+        $excludeFilters = [], $sortField = NULL, $sortOrder = NULL, $queryString = NULL
     )
     {
 
@@ -253,7 +253,7 @@ 
 
             foreach ($filters as $key => $filterValues) {
                 $queryFilterPart = [];
-                if (in_array($key, $validKeys, true)) {
+                if (in_array($key, $validKeys, TRUE)) {
                     if ($key == 'universityCollection') {
                         if ($filterValues && is_array($filterValues)) {
                             if (in_array("true", $filterValues)) {

src/Classes/Services/ElasticSearch/ElasticSearch.php

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

@@ -37,7 +37,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\FrontendUserRepository
      * @inject
      */
-    protected $frontendUserRepository = null;
+    protected $frontendUserRepository = NULL;
 
     protected $client;
 
@@ -140,7 +140,7 @@ 
                 ],
                 'mappings' => [
                     '_source' => [
-                        'enabled' => true
+                        'enabled' => TRUE
                     ],
                     //'dynamic' => 'strict',
                     'properties' => [
@@ -203,11 +203,11 @@ 
                                 ],
                                 'fobId' => [
                                     //'type' => 'keyword'
-                                    'enabled' => false
+                                    'enabled' => FALSE
                                 ],
                                 'index' => [
                                     //'type' => 'integer'
-                                    'enabled' => false
+                                    'enabled' => FALSE
                                 ]
                             ]
                         ],
@@ -261,7 +261,7 @@ 
             if ($document->getCreator()) {
                 $data->creator = $document->getCreator();
             } else {
-                $data->creator = null;
+                $data->creator = NULL;
             }
 
 
@@ -289,9 +289,9 @@ 
 
             $files = $document->getFile();
             if ($files->count() > 0) {
-                $data->hasFiles = true;
+                $data->hasFiles = TRUE;
             } else {
-                $data->hasFiles = false;
+                $data->hasFiles = FALSE;
             }
 
 
@@ -328,11 +328,11 @@ 
 
             $data->source = $document->getSourceDetails();
 
-            $data->universityCollection = false;
+            $data->universityCollection = FALSE;
             if ($data->collections && is_array($data->collections)) {
                 foreach ($data->collections as $collection) {
                     if ($collection == $this->getSettings()['universityCollection']) {
-                        $data->universityCollection = true;
+                        $data->universityCollection = TRUE;
                         break;
                     }
                 }
@@ -342,7 +342,7 @@ 
             if ($embargoDate instanceof \DateTime) {
                 $data->embargoDate = $embargoDate->format("Y-m-d");
             } else {
-                $data->embargoDate = null;
+                $data->embargoDate = NULL;
             }
 
             $data->originalSourceTitle = $internalFormat->getOriginalSourceTitle();
@@ -409,7 +409,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

Braces +9 added lines, -18 removed lines

@@ -23,8 +23,7 @@ 
 use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
 
-class ElasticSearch
-{
+class ElasticSearch {
     /**
      *
      * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
@@ -60,8 +59,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);
@@ -94,8 +92,7 @@ 
      *
      * @return mixed
      */
-    public function getSettings()
-    {
+    public function getSettings() {
         $frameworkConfiguration = $this->configurationManager->getConfiguration(
             \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK
         );
@@ -108,8 +105,7 @@ 
      *
      * @param $indexName
      */
-    protected function initializeIndex($indexName)
-    {
+    protected function initializeIndex($indexName) {
         $paramsIndex = [
             'index' => $indexName,
             'body' => [
@@ -247,8 +243,7 @@ 
      *
      * @param Document $document
      */
-    public function index($document)
-    {
+    public function index($document) {
         $data = json_decode($this->elasticsearchMapper->getElasticsearchJson($document));
 
         if (!$data) {
@@ -377,8 +372,7 @@ 
      *
      * @param string $identifier
      */
-    public function delete($identifier)
-    {
+    public function delete($identifier) {
         try {
 
             $params = [
@@ -404,8 +398,7 @@ 
     /**
      * @param $identifier
      */
-    public function getDocument($identifier)
-    {
+    public function getDocument($identifier) {
         $params = [
             'index' => $this->indexName,
             'id'    => $identifier
@@ -420,8 +413,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'])) {
@@ -453,8 +445,7 @@ 
      * Get the results
      * @return mixed
      */
-    public function getResults()
-    {
+    public function getResults() {
         // return results from the last search request
         return $this->results;
     }

src/Classes/Services/FeUser/UnpaywallDataService.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
     public function searchRequest($searchTerm) {
         $mail = $this->clientConfigurationManager->getSetting("adminEmail");
-        $response = Request::get($this->apiUrl . '' . $searchTerm .'?email=' . $mail)
+        $response = Request::get($this->apiUrl . '' . $searchTerm . '?email=' . $mail)
             ->send();
         if ($response->body->HTTP_status_code == 404) {
             return ['entries' => ''];
@@ -37,7 +37,7 @@ 
 
     public function getDataRequest($id) {
         $mail = $this->clientConfigurationManager->getSetting("adminEmail");
-        $response = Request::get($this->apiUrl . '' . $id .'?email=' . $mail)
+        $response = Request::get($this->apiUrl . '' . $id . '?email=' . $mail)
             ->send();
 
         if ($response->body->HTTP_status_code == 404) {

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use \Httpful\Request;
 
-class UnpaywallDataService
-{
+class UnpaywallDataService {
     /**
      * clientConfigurationManager
      *

src/Classes/Services/FeUser/FisDataService.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
 
     protected function getPersonRequestBody($id) {
         $graphQl = '{
-            person (id:"'.$id.'") 
+            person (id:"'.$id . '") 
             {
                 _createDate
                 _createUser
@@ -72,7 +72,7 @@ 
 
     protected function getSearchPersonBody($searchTerm) {
         $graphQl = '{   
-            staff(filter: {fullName: "'.$searchTerm.'"}, pageSize: 100) 
+            staff(filter: {fullName: "'.$searchTerm . '"}, pageSize: 100) 
             {     
                 entries 
                 {
@@ -97,7 +97,7 @@ 
 
     protected function getOrgaRequestBody($id) {
         $graphQl = '{   
-            organisationalUnit(id:'.$id.') {
+            organisationalUnit(id:'.$id . ') {
                 titleDe
                 id
             }
@@ -108,7 +108,7 @@ 
 
     protected function getSearchOrgaBody($searchTerm) {
         $graphQl = '{   
-            organisationalUnits(filter: {text: "'.$searchTerm.'"}) 
+            organisationalUnits(filter: {text: "'.$searchTerm . '"}) 
             {     
                 entries 
                 {

Braces +1 added lines, -2 removed lines

@@ -5,8 +5,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 
-class FisDataService
-{
+class FisDataService {
     /**
      * @var string
      */

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

@@ -35,7 +35,7 @@ 
 
             return $response->body->data->person;
         } catch (\Throwable $e) {
-            return null;
+            return NULL;
         }
     }
 
@@ -47,7 +47,7 @@ 
 
             return $response->body->data->staff;
         } catch (\Throwable $e) {
-            return null;
+            return NULL;
         }
     }
 
@@ -59,7 +59,7 @@ 
 
             return $response->body->data->organisationalUnit;
         } catch (\Throwable $e) {
-            return null;
+            return NULL;
         }
     }
 
@@ -71,7 +71,7 @@ 
 
             return $response->body->data->organisationalUnits;
         } catch (\Throwable $e) {
-            return null;
+            return NULL;
         }
     }
 

src/Classes/Services/FeUser/ZdbDataService.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
     }
 
     public function getDataRequest($zdbId) {
-        $response = Request::get($this->apiUrl . 'resource/' . $zdbId .'/')
+        $response = Request::get($this->apiUrl . 'resource/' . $zdbId . '/')
             ->send();
         
         return $response->body;

Braces +1 added lines, -2 removed lines

@@ -3,8 +3,7 @@
 
 use \Httpful\Request;
 
-class ZdbDataService
-{
+class ZdbDataService {
 
     protected $apiUrl = 'https://www.zeitschriftendatenbank.de/api/hydra/';
 

src/Classes/Services/FeUser/OrcidDataService.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
     public function searchPersonRequest($searchTerm) {
         $response = Request::get($this->apiUrl . '/expanded-search/?q=' . $this->searchTermReplacement($searchTerm))
             ->expectsJson()
-            ->addHeader('Accept','*/*')
+            ->addHeader('Accept', '*/*')
             ->addHeader('Content-Type', 'application/vnd.orcid+json')
             ->send();
 
@@ -30,7 +30,7 @@ 
     public function getPersonData($orcidId) {
         $response = Request::get($this->apiUrl . '/expanded-search/?q=orcid:' . $orcidId)
             ->expectsJson()
-            ->addHeader('Accept','*/*')
+            ->addHeader('Accept', '*/*')
             ->addHeader('Content-Type', 'application/vnd.orcid+json')
             ->send();
 

Braces +1 added lines, -2 removed lines

@@ -3,8 +3,7 @@
 
 use \Httpful\Request;
 
-class OrcidDataService
-{
+class OrcidDataService {
     protected $apiUrl = 'https://pub.orcid.org/v3.0';
 
     protected $params = '&start=0&rows=20';

src/Classes/Services/FeUser/RorDataService.php

Braces +1 added lines, -2 removed lines

@@ -3,8 +3,7 @@
 
 use \Httpful\Request;
 
-class RorDataService
-{
+class RorDataService {
 
     protected $apiUrl = 'https://api.ror.org/organizations';
 

src/Classes/Services/FeUser/GndDataService.php

Braces +1 added lines, -2 removed lines

@@ -3,8 +3,7 @@
 
 use \Httpful\Request;
 
-class GndDataService
-{
+class GndDataService {
 
     protected $apiUrl = 'http://lobid.org/gnd/';