Erikmitk / kitodo-presentation

Classes/Api/Orcid/Profile.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');
             $givenNames = $this->raw->xpath('./personal-details:name/personal-details:given-names');
             $familyName = $this->raw->xpath('./personal-details:name/personal-details:family-name');
-            return (string) $givenNames[0] . ' ' . (string) $familyName[0];
+            return (string) $givenNames[0].' '.(string) $familyName[0];
         } else {
             $this->logger->warning('No name found for given ORCID');
             return false;

Braces +6 added lines, -12 removed lines

@@ -26,8 +26,7 @@ 
  *
  * @access public
  **/
-class Profile
-{
+class Profile {
     /**
      * @access protected
      * @var Logger This holds the logger
@@ -55,8 +54,7 @@ 
      *
      * @return void
      **/
-    public function __construct(string $orcid)
-    {
+    public function __construct(string $orcid) {
         $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(static::class);
         $this->client = new Client($orcid, GeneralUtility::makeInstance(RequestFactory::class));
     }
@@ -68,8 +66,7 @@ 
      *
      * @return array|false
      **/
-    public function getData()
-    {
+    public function getData() {
         $this->getRaw('person');
         if ($this->raw !== false && !empty($this->raw)) {
             $data = [];
@@ -90,8 +87,7 @@ 
      *
      * @return string|false
      **/
-    public function getAddress()
-    {
+    public function getAddress() {
         $this->getRaw('address');
         if ($this->raw !== false && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('address', 'http://www.orcid.org/ns/address');
@@ -109,8 +105,7 @@ 
      *
      * @return string|false
      **/
-    public function getEmail()
-    {
+    public function getEmail() {
         $this->getRaw('email');
         if ($this->raw !== false && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('email', 'http://www.orcid.org/ns/email');
@@ -128,8 +123,7 @@ 
      *
      * @return string|false
      **/
-    public function getFullName()
-    {
+    public function getFullName() {
         $this->getRaw('personal-details');
         if ($this->raw !== false && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');

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

@@ -44,7 +44,7 @@ 
      * @access private
      * @var \SimpleXmlElement|false The raw ORCID profile
      **/
-    private $raw = false;
+    private $raw = FALSE;
 
     /**
      * Constructs client instance
@@ -71,7 +71,7 @@ 
     public function getData()
     {
         $this->getRaw('person');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $data = [];
             $data['address'] = $this->getAddress();
             $data['email'] = $this->getEmail();
@@ -79,7 +79,7 @@ 
             return $data;
         } else {
             $this->logger->warning('No data found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -93,12 +93,12 @@ 
     public function getAddress()
     {
         $this->getRaw('address');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('address', 'http://www.orcid.org/ns/address');
             return (string) $this->raw->xpath('./address:address/address:country')[0];
         } else {
             $this->logger->warning('No address found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -112,12 +112,12 @@ 
     public function getEmail()
     {
         $this->getRaw('email');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('email', 'http://www.orcid.org/ns/email');
             return (string) $this->raw->xpath('./email:email/email:email')[0];
         } else {
             $this->logger->warning('No email found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -131,14 +131,14 @@ 
     public function getFullName()
     {
         $this->getRaw('personal-details');
-        if ($this->raw !== false && !empty($this->raw)) {
+        if ($this->raw !== FALSE && !empty($this->raw)) {
             $this->raw->registerXPathNamespace('personal-details', 'http://www.orcid.org/ns/personal-details');
             $givenNames = $this->raw->xpath('./personal-details:name/personal-details:given-names');
             $familyName = $this->raw->xpath('./personal-details:name/personal-details:family-name');
             return (string) $givenNames[0] . ' ' . (string) $familyName[0];
         } else {
             $this->logger->warning('No name found for given ORCID');
-            return false;
+            return FALSE;
         }
     }
 
@@ -155,7 +155,7 @@ 
     {
         $this->client->setEndpoint($endpoint);
         $data = $this->client->getData();
-        if ($data != false) {
+        if ($data != FALSE) {
             $this->raw = Helper::getXmlFileAsString($data);
         }
     }

Classes/Hooks/Form/FieldInformation/EditInProductionWarning.php

Braces +1 added lines, -2 removed lines

@@ -24,8 +24,7 @@
  *
  * @access public
  */
-class EditInProductionWarning extends AbstractNode
-{
+class EditInProductionWarning extends AbstractNode {
     /**
      * Generates warning message when editing 'index_name' field
      *

Classes/Hooks/DataHandler.php

Braces +1 added lines, -2 removed lines

@@ -33,8 +33,7 @@
  *
  * @access public
  */
-class DataHandler implements LoggerAwareInterface
-{
+class DataHandler implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**

Spacing +7 added lines, -7 removed lines

@@ -149,10 +149,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.is_listed AS is_listed')
+                            ->select($table.'.is_listed AS is_listed')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', (int) $id),
+                                $queryBuilder->expr()->eq($table.'.uid', (int) $id),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -175,10 +175,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.index_autocomplete AS index_autocomplete')
+                            ->select($table.'.index_autocomplete AS index_autocomplete')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', (int) $id),
+                                $queryBuilder->expr()->eq($table.'.uid', (int) $id),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -348,7 +348,7 @@ 
         if ($solr->ready) {
             // Delete Solr document.
             $updateQuery = $solr->service->createUpdate();
-            $updateQuery->addDeleteQuery('uid:' . (int) $id);
+            $updateQuery->addDeleteQuery('uid:'.(int) $id);
             $updateQuery->addCommit(false);
             $solr->service->update($updateQuery);
         }
@@ -371,7 +371,7 @@ 
             $document->setCurrentDocument($doc);
             Indexer::add($document, $this->getDocumentRepository());
         } else {
-            $this->logger->error('Failed to re-index document with UID ' . (string) $id);
+            $this->logger->error('Failed to re-index document with UID '.(string) $id);
         }
     }
 
@@ -422,7 +422,7 @@ 
                     try {
                         $response = $solr->service->coreAdmin($query);
                         if ($response->getWasSuccessful() == false) {
-                            $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr');
+                            $this->logger->warning('Core '.$resArray['core'].' could not be deleted from Apache Solr');
                         }
                     } catch (\Exception $e) {
                         $this->logger->warning($e->getMessage());

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

@@ -349,7 +349,7 @@ 
             // Delete Solr document.
             $updateQuery = $solr->service->createUpdate();
             $updateQuery->addDeleteQuery('uid:' . (int) $id);
-            $updateQuery->addCommit(false);
+            $updateQuery->addCommit(FALSE);
             $solr->service->update($updateQuery);
         }
     }
@@ -366,8 +366,8 @@ 
     private function reindexDocument($id):void
     {
         $document = $this->getDocumentRepository()->findByUid((int) $id);
-        $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $document->getPid()], true);
-        if ($document !== null && $doc !== null) {
+        $doc = AbstractDocument::getInstance($document->getLocation(), ['storagePid' => $document->getPid()], TRUE);
+        if ($document !== NULL && $doc !== NULL) {
             $document->setCurrentDocument($doc);
             Indexer::add($document, $this->getDocumentRepository());
         } else {
@@ -415,13 +415,13 @@ 
                     $query = $solr->service->createCoreAdmin();
                     $action = $query->createUnload();
                     $action->setCore($resArray['core']);
-                    $action->setDeleteDataDir(true);
-                    $action->setDeleteIndex(true);
-                    $action->setDeleteInstanceDir(true);
+                    $action->setDeleteDataDir(TRUE);
+                    $action->setDeleteIndex(TRUE);
+                    $action->setDeleteInstanceDir(TRUE);
                     $query->setAction($action);
                     try {
                         $response = $solr->service->coreAdmin($query);
-                        if ($response->getWasSuccessful() == false) {
+                        if ($response->getWasSuccessful() == FALSE) {
                             $this->logger->warning('Core ' . $resArray['core'] . ' could not be deleted from Apache Solr');
                         }
                     } catch (\Exception $e) {

Classes/Hooks/KitodoProductionHacks.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
                 }
                 $dmdIds = explode(' ', $id);
                 foreach ($dmdIds as $dmdId) {
-                    $recordIds = $xml->xpath('//mets:dmdSec[@ID="' . $dmdId . '"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
+                    $recordIds = $xml->xpath('//mets:dmdSec[@ID="'.$dmdId.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
                     if (!empty($recordIds)) {
                         $recordId = (string) $recordIds[0];
                         break;

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
  *
  * @access public
  */
-class KitodoProductionHacks
-{
+class KitodoProductionHacks {
     /**
      * Hook for \Kitodo\Dlf\Common\MetsDocument::establishRecordId()
      * When using Kitodo.Production the record identifier is saved only in MODS, but not

Classes/Hooks/ConfigurationForm.php

Braces +2 added lines, -4 removed lines

@@ -24,8 +24,7 @@ 
  *
  * @access public
  */
-class ConfigurationForm
-{
+class ConfigurationForm {
 
     /**
      * Check if a connection to a Solr server could be established with the given credentials.
@@ -60,8 +59,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Load backend localization file.
         Helper::getLanguageService()->includeLLFile('EXT:dlf/Resources/Private/Language/locallang_be.xlf');
     }

Classes/Hooks/ItemsProcFunc.php

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
  *
  * @access public
  */
-class ItemsProcFunc implements LoggerAwareInterface
-{
+class ItemsProcFunc implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -155,8 +155,8 @@
             ->select(...explode(',', $fields))
             ->from($table)
             ->where(
-                $queryBuilder->expr()->eq($table . '.pid', $this->storagePid),
-                $queryBuilder->expr()->in($table . '.sys_language_uid', [-1, 0]),
+                $queryBuilder->expr()->eq($table.'.pid', $this->storagePid),
+                $queryBuilder->expr()->in($table.'.sys_language_uid', [-1, 0]),
                 $andWhere
             )
             ->orderBy($sorting)

Classes/Updates/FileLocationUpdater.php

Spacing +4 added lines, -4 removed lines

@@ -190,9 +190,9 @@ 
                             $queryBuilder->createNamedParameter('', \PDO::PARAM_STR)
                         ),
                         $queryBuilder->expr()->comparison(
-                            'CAST(CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS DECIMAL) AS CHAR)',
+                            'CAST(CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS DECIMAL) AS CHAR)',
                             ExpressionBuilder::NEQ,
-                            'CAST(' . $queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]) . ' AS CHAR)'
+                            'CAST('.$queryBuilder->quoteIdentifier($this->fieldsToMigrate[$table]).' AS CHAR)'
                         )
                     )
                     ->orderBy('uid')
@@ -205,7 +205,7 @@ 
                 }
             } catch (Exception $e) {
                 throw new \RuntimeException(
-                    'Database query failed. Error was: ' . $e->getPrevious()->getMessage(),
+                    'Database query failed. Error was: '.$e->getPrevious()->getMessage(),
                     1511950673
                 );
             }
@@ -271,7 +271,7 @@ 
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
 
         $fileUid = null;
-        $sourcePath = Environment::getPublicPath() . '/' . $fieldItem;
+        $sourcePath = Environment::getPublicPath().'/'.$fieldItem;
 
         // maybe the file was already moved, so check if the original file still exists
         if (file_exists($sourcePath)) {

Braces +1 added lines, -2 removed lines

@@ -171,8 +171,7 @@
      *
      * @throws \RuntimeException
      */
-    protected function getRecordsFromTable(bool $countOnly = false)
-    {
+    protected function getRecordsFromTable(bool $countOnly = false) {
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $allResults = [];
         $numResults = 0;

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

@@ -105,11 +105,11 @@ 
     public function updateNecessary(): bool
     {
         /** @var int */
-        $numRecords = $this->getRecordsFromTable(true);
+        $numRecords = $this->getRecordsFromTable(TRUE);
         if ($numRecords > 0) {
-            return true;
+            return TRUE;
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -145,16 +145,16 @@ 
      */
     public function executeUpdate(): bool
     {
-        $result = true;
+        $result = TRUE;
         try {
             /** @var int */
-            $numRecords = $this->getRecordsFromTable(true);
+            $numRecords = $this->getRecordsFromTable(TRUE);
             if ($numRecords > 0) {
                 $this->performUpdate();
             }
         } catch (\Exception $e) {
             // If something goes wrong, migrateField() logs an error
-            $result = false;
+            $result = FALSE;
         }
         return $result;
     }
@@ -171,7 +171,7 @@ 
      *
      * @throws \RuntimeException
      */
-    protected function getRecordsFromTable(bool $countOnly = false)
+    protected function getRecordsFromTable(bool $countOnly = FALSE)
     {
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
         $allResults = [];
@@ -198,7 +198,7 @@ 
                     ->orderBy('uid')
                     ->execute()
                     ->fetchAllAssociative();
-                if ($countOnly === true) {
+                if ($countOnly === TRUE) {
                     $numResults += count($result);
                 } else {
                     $allResults[$table] = $result;
@@ -211,7 +211,7 @@ 
             }
         }
 
-        if ($countOnly === true) {
+        if ($countOnly === TRUE) {
             return $numResults;
         } else {
             return $allResults;
@@ -228,7 +228,7 @@ 
      */
     protected function performUpdate(): bool
     {
-        $result = true;
+        $result = TRUE;
 
         try {
             $storages = GeneralUtility::makeInstance(StorageRepository::class)->findAll();
@@ -241,7 +241,7 @@ 
                 }
             }
         } catch (\Exception $e) {
-            $result = false;
+            $result = FALSE;
         }
 
         return $result;
@@ -270,7 +270,7 @@ 
         $storageUid = (int) $this->storage->getUid();
         $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
 
-        $fileUid = null;
+        $fileUid = NULL;
         $sourcePath = Environment::getPublicPath() . '/' . $fieldItem;
 
         // maybe the file was already moved, so check if the original file still exists

Classes/ExpressionLanguage/DocumentTypeProvider.php

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
  *
  * @access public
  */
-class DocumentTypeProvider extends AbstractProvider
-{
+class DocumentTypeProvider extends AbstractProvider {
     /**
      * Construct the instance
      *
@@ -31,8 +30,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $this->expressionLanguageProviders = [
             DocumentTypeFunctionProvider::class
         ];

Classes/ExpressionLanguage/DocumentTypeFunctionProvider.php

Braces +2 added lines, -4 removed lines

@@ -116,12 +116,10 @@
     {
         return new ExpressionFunction(
             'getDocumentType',
-            function()
-            {
+            function() {
                 // Not implemented, we only use the evaluator
             },
-            function($arguments, $cPid)
-            {
+            function($arguments, $cPid) {
                 /** @var RequestWrapper $requestWrapper */
                 $requestWrapper = $arguments['request'];
                 $queryParams = $requestWrapper->getQueryParams();

Spacing +4 added lines, -4 removed lines

@@ -179,7 +179,7 @@ 
                 if ($this->document) {
                     $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
                 } else {
-                    $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
+                    $this->logger->error('Invalid UID "'.$requestData['id'].'" or PID "'.$pid.'" for document loading');
                 }
             } elseif (GeneralUtility::isValidUrl($requestData['id'])) {
                 $doc = AbstractDocument::getInstance($requestData['id'], ['storagePid' => $pid], true);
@@ -193,7 +193,7 @@ 
                     }
                     $this->document->setLocation($requestData['id']);
                 } else {
-                    $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading');
+                    $this->logger->error('Invalid location given "'.$requestData['id'].'" for document loading');
                 }
             }
             if ($this->document !== null && $doc !== null) {
@@ -206,11 +206,11 @@ 
                 if ($doc !== null) {
                     $this->document->setCurrentDocument($doc);
                 } else {
-                    $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');
+                    $this->logger->error('Failed to load document with record ID "'.$requestData['recordId'].'"');
                 }
             }
         } else {
-            $this->logger->error('Empty UID or invalid PID "' . $pid . '" for document loading');
+            $this->logger->error('Empty UID or invalid PID "'.$pid.'" for document loading');
         }
     }
 

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

@@ -139,7 +139,7 @@ 
 
                 // Load document with current plugin parameters.
                 $this->loadDocument($queryParams['tx_dlf'], $cPid);
-                if (!isset($this->document) || $this->document->getCurrentDocument() === null) {
+                if (!isset($this->document) || $this->document->getCurrentDocument() === NULL) {
                     return $type;
                 }
 
@@ -172,18 +172,18 @@ 
         // Try to get document format from database
         if (!empty($requestData['id'])) {
             $this->initializeRepositories($pid);
-            $doc = null;
+            $doc = NULL;
             if (MathUtility::canBeInterpretedAsInteger($requestData['id'])) {
                 // find document from repository by uid
                 $this->document = $this->documentRepository->findOneByIdAndSettings((int) $requestData['id'], ['storagePid' => $pid]);
                 if ($this->document) {
-                    $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
+                    $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], TRUE);
                 } else {
                     $this->logger->error('Invalid UID "' . $requestData['id'] . '" or PID "' . $pid . '" for document loading');
                 }
             } elseif (GeneralUtility::isValidUrl($requestData['id'])) {
-                $doc = AbstractDocument::getInstance($requestData['id'], ['storagePid' => $pid], true);
-                if ($doc !== null) {
+                $doc = AbstractDocument::getInstance($requestData['id'], ['storagePid' => $pid], TRUE);
+                if ($doc !== NULL) {
                     if ($doc->recordId) {
                         $this->document = $this->documentRepository->findOneByRecordId($doc->recordId);
                     }
@@ -196,14 +196,14 @@ 
                     $this->logger->error('Invalid location given "' . $requestData['id'] . '" for document loading');
                 }
             }
-            if ($this->document !== null && $doc !== null) {
+            if ($this->document !== NULL && $doc !== NULL) {
                 $this->document->setCurrentDocument($doc);
             }
         } elseif (!empty($requestData['recordId'])) {
             $this->document = $this->documentRepository->findOneByRecordId($requestData['recordId']);
-            if ($this->document !== null) {
-                $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], true);
-                if ($doc !== null) {
+            if ($this->document !== NULL) {
+                $doc = AbstractDocument::getInstance($this->document->getLocation(), ['storagePid' => $pid], TRUE);
+                if ($doc !== NULL) {
                     $this->document->setCurrentDocument($doc);
                 } else {
                     $this->logger->error('Failed to load document with record ID "' . $requestData['recordId'] . '"');