kitodo / kitodo-publication

Classes/Domain/Model/ProcessNumber.php

Spacing +1 added lines, -1 removed lines

@@ -106,6 +106,6 @@
     }
 
     public function getProcessNumberString() {
-        return strtoupper($this->getOwnerId()).'-'. $this->getYear().'-'.$this->getCounter();
+        return strtoupper($this->getOwnerId()) . '-' . $this->getYear() . '-' . $this->getCounter();
     }
 }
\ No newline at end of file

Braces +6 added lines, -12 removed lines

@@ -47,8 +47,7 @@ 
      *
      * @return string $ownerId
      */
-    public function getOwnerId()
-    {
+    public function getOwnerId() {
         return $this->ownerId;
     }
 
@@ -58,8 +57,7 @@ 
      * @param string $ownerId
      * @return void
      */
-    public function setOwnerId($ownerId)
-    {
+    public function setOwnerId($ownerId) {
         $this->ownerId = $ownerId;
     }
 
@@ -68,8 +66,7 @@ 
      *
      * @return int $year
      */
-    public function getYear()
-    {
+    public function getYear() {
         return $this->year;
     }
 
@@ -79,8 +76,7 @@ 
      * @param int $year
      * @return void
      */
-    public function setYear($year)
-    {
+    public function setYear($year) {
         $this->year = $year;
     }
 
@@ -89,8 +85,7 @@ 
      *
      * @return int $counter
      */
-    public function getCounter()
-    {
+    public function getCounter() {
         return $this->counter;
     }
 
@@ -100,8 +95,7 @@ 
      * @param int $counter
      * @return void
      */
-    public function setCounter($counter)
-    {
+    public function setCounter($counter) {
         $this->counter = $counter;
     }
 

Classes/Plugins/DownloadTool/DownloadTool.php

Indentation -1 removed lines

@@ -107,7 +107,6 @@
 
     /**
      * Get PDF document list
-
      * @return array of attachments
      */
     protected function getAttachments()

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
         $content = '';
         if (is_array($attachments)) {
             foreach ($attachments as $id => $file) {
-                $conf = array(
+                $conf = array (
                     'useCacheHash'     => 0,
                     'parameter'        => $this->conf['apiPid'] . ' - piwik_download',
                     'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment' . '&tx_dpf[attachment]=' . $file['ID'],
@@ -81,7 +81,7 @@ 
                 $title = $file['LABEL'] ? $file['LABEL'] : $file['ID'];
                 $markerArray['###FILE###'] = $this->cObj->typoLink($title, $conf);
 
-                if(!empty($vgwort)) {
+                if (!empty($vgwort)) {
                     $markerArray['###VGWORT###'] = "<div class='div_vgwpixel' data-url='" . $vgwort . "'></div>";
                 } else {
                     $markerArray['###VGWORT###'] = "";
@@ -103,10 +103,10 @@ 
         $xPath = 'mets:fileSec/mets:fileGrp[@USE="' . $this->conf['fileGrpDownload'] . '"]/mets:file';
         $files = $this->doc->mets->xpath($xPath);
         if (!is_array($files)) {
-            return array();
+            return array ();
         }
         foreach ($files as $key => $file) {
-            $singleFile = array();
+            $singleFile = array ();
             foreach ($file->attributes('mext', 1) as $attribute => $value) {
                 $singleFile[$attribute] = $value;
             }
@@ -128,7 +128,7 @@ 
         $xPath = '//slub:info/slub:vgwortOpenKey';
         $vgwortOpenKey = $this->doc->mets->xpath($xPath)[0];
 
-        if (!empty($vgwortOpenKey) or $vgwortOpenKey != FALSE ) {
+        if (!empty($vgwortOpenKey) or $vgwortOpenKey != FALSE) {
             if (GeneralUtility::getIndpEnv('TYPO3_SSL')) {
                 $vgwortserver = 'https://ssl-vg03.met.vgwort.de/na/';
             } else {

Braces +4 added lines, -8 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage    tx_dpf
  * @access    public
  */
-class DownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class DownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugins/DownloadTool.php';
 
     /**
@@ -38,8 +37,7 @@ 
      *
      * @return    string        The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
 
         // get the tx_dpf.settings too
@@ -97,8 +95,7 @@ 
 
      * @return array of attachments
      */
-    protected function getAttachments()
-    {
+    protected function getAttachments() {
         // Get pdf documents
         $xPath = 'mets:fileSec/mets:fileGrp[@USE="' . $this->conf['fileGrpDownload'] . '"]/mets:file';
         $files = $this->doc->mets->xpath($xPath);
@@ -121,8 +118,7 @@ 
         return $attachments;
     }
 
-    protected function getVGWortUrl()
-    {
+    protected function getVGWortUrl() {
         // Get VG-Wort-OpenKey for document
         $this->doc->mets->registerXPathNamespace("slub", 'http://slub-dresden.de/');
         $xPath = '//slub:info/slub:vgwortOpenKey';

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

@@ -46,13 +46,13 @@ 
         // Flexform wins over TS
         $dpfTSconfig = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dpf.'];
         if (is_array($dpfTSconfig['settings.'])) {
-            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, true, false);
+            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, TRUE, FALSE);
             $this->conf = $dpfTSconfig['settings.'];
         }
 
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null || empty($this->conf['fileGrpDownload'])) {
+        if ($this->doc === NULL || empty($this->conf['fileGrpDownload'])) {
             // Quit without doing anything if required variables are not set.
             return $content;
         }
@@ -76,7 +76,7 @@ 
                     'useCacheHash'     => 0,
                     'parameter'        => $this->conf['apiPid'] . ' - piwik_download',
                     'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment' . '&tx_dpf[attachment]=' . $file['ID'],
-                    'forceAbsoluteUrl' => true,
+                    'forceAbsoluteUrl' => TRUE,
                 );
                 $title = $file['LABEL'] ? $file['LABEL'] : $file['ID'];
                 $markerArray['###FILE###'] = $this->cObj->typoLink($title, $conf);
@@ -89,7 +89,7 @@ 
                 $content .= $this->cObj->substituteMarkerArray($subpartArray['downloads'], $markerArray);
             }
         }
-        return $this->cObj->substituteSubpart($this->template, '###DOWNLOADS###', $content, true);
+        return $this->cObj->substituteSubpart($this->template, '###DOWNLOADS###', $content, TRUE);
     }
 
     /**

Classes/Services/ProcessNumber/ProcessNumberGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             $datetime = new \DateTime();
             $currentYear = $datetime->format('y');
 
-            $processNumber = $processNumberRepository->getHighestProcessNumberByOwnerIdAndYear(strtolower($ownerId),$currentYear);
+            $processNumber = $processNumberRepository->getHighestProcessNumberByOwnerIdAndYear(strtolower($ownerId), $currentYear);
 
             if ($processNumber) {
                 $counter = $processNumber->getCounter() + 1;

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
 use EWW\Dpf\Domain\Model\ProcessNumber;
 use EWW\Dpf\Domain\Repository\ClientRepository;
 
-class ProcessNumberGenerator
-{
+class ProcessNumberGenerator {
     public function getProcessNumber($ownerId = NULL) {
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
         $processNumberRepository = $objectManager->get(ProcessNumberRepository::class);

Classes/Services/MetsExporter.php

Indentation +1 added lines, -1 removed lines

@@ -439,7 +439,7 @@
 
                 $domXPath2 = \EWW\Dpf\Helper\XPath::create($doc2);
 
-                  // second part nested xpath
+                    // second part nested xpath
                 if ($match[2] && $secondMatch[2]) {
                     // import node from nested
                     $docXMLNested = new \DOMDocument();

Spacing +7 added lines, -7 removed lines

@@ -44,13 +44,13 @@ 
      *
      * @var array
      */
-    protected $formData = array();
+    protected $formData = array ();
 
     /**
      * files from form
      * @var array
      */
-    protected $files = array();
+    protected $files = array ();
 
     /**
      * metsData
@@ -105,7 +105,7 @@ 
 
         $this->documentTypeRepository = $objectManager->get(DocumentTypeRepository::class);
 
-        $namespaceConfiguration = explode(";",$this->clientConfigurationManager->getNamespaces());
+        $namespaceConfiguration = explode(";", $this->clientConfigurationManager->getNamespaces());
 
 
         foreach ($namespaceConfiguration as $key => $value) {
@@ -115,7 +115,7 @@ 
 
         $this->xmlHeader = '<data' . $this->namespaceString . '></data>';
 
-        $this->xmlData =  new \DOMDocument();
+        $this->xmlData = new \DOMDocument();
         $this->xmlData->loadXML($this->xmlHeader);
 
         // Parser
@@ -206,7 +206,7 @@ 
             $values     = $group['values'];
             $attributes = $group['attributes'];
 
-            $attributeXPath     = '';
+            $attributeXPath = '';
             foreach ($attributes as $attribute) {
                 $attributeXPath .= '[' . $attribute['mapping'] . '="' . $attribute['value'] . '"]';
             }
@@ -314,7 +314,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]);
 
@@ -373,7 +373,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 +10 added lines, -20 removed lines

@@ -22,8 +22,7 @@ 
 /**
  * MetsExporter
  */
-class MetsExporter
-{
+class MetsExporter {
     /**
      * clientConfigurationManager
      *
@@ -98,8 +97,7 @@ 
     /**
      * Constructor
      */
-    public function __construct()
-    {
+    public function __construct() {
         $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);
 
@@ -172,8 +169,7 @@ 
      * @param $document
      * @return string The transformed xml
      */
-    public function getTransformedOutputXML($document)
-    {
+    public function getTransformedOutputXML($document) {
         $documentType = $document->getDocumentType();
         $transformationFile = $documentType->getTransformationFileOutput()->current();
         if ($transformationFile != NULL) {
@@ -194,8 +190,7 @@ 
      * build mods from form array
      * @param array $array structured form data array
      */
-    public function buildXmlFromForm($array)
-    {
+    public function buildXmlFromForm($array) {
         $this->xmlData = $this->xmlData;
         // Build xml mods from form fields
         // loop each group
@@ -243,8 +238,7 @@ 
      * @param  xpath $xPath xPath expression
      * @return xml
      */
-    public function parseXPath($xPath)
-    {
+    public function parseXPath($xPath) {
 
         $this->parser->generateXmlFromXPath($xPath);
         $xml = $this->parser->getXML();
@@ -252,8 +246,7 @@ 
         return $xml;
     }
 
-    public function parseXPathWrapped($xPath)
-    {
+    public function parseXPathWrapped($xPath) {
         $this->parser->generateXmlFromXPath($xPath);
         $xml = $this->parser->getXML();
 
@@ -268,8 +261,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);
@@ -448,8 +440,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();
     }
@@ -576,8 +567,7 @@ 
      * @param string $objId
      * @return void
      */
-    public function setObjId($objId)
-    {
+    public function setObjId($objId) {
         $this->objId = $objId;
     }
 }

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

@@ -37,7 +37,7 @@ 
      *
      * @var \EWW\Dpf\Domain\Repository\DocumentTypeRepository
      */
-    protected $documentTypeRepository = null;
+    protected $documentTypeRepository = NULL;
 
     /**
      * formData
@@ -75,7 +75,7 @@ 
      * xPathXMLGenerator
      * @var object
      */
-    protected $parser = null;
+    protected $parser = NULL;
 
     /**
      * ref id counter
@@ -218,9 +218,9 @@ 
                     $path = $mapping . $attributeXPath . '%/' . $value['mapping'];
 
                     if ($i == 0) {
-                        $newGroupFlag = true;
+                        $newGroupFlag = TRUE;
                     } else {
-                        $newGroupFlag = false;
+                        $newGroupFlag = FALSE;
                     }
 
                     $xml = $this->customXPath($path, $newGroupFlag, $value['value']);
@@ -230,7 +230,7 @@ 
             } else {
                 if (!empty($attributeXPath)) {
                     $path = $mapping . $attributeXPath;
-                    $xml  = $this->customXPath($path, true, '', true);
+                    $xml  = $this->customXPath($path, TRUE, '', TRUE);
                 }
             }
         }
@@ -268,13 +268,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
@@ -286,7 +286,7 @@ 
                     $path = $explodedXPath[0];
                 }
 
-                $praedicateFlag = true;
+                $praedicateFlag = TRUE;
             } else {
                 $path = $newPath[0];
             }
@@ -336,7 +336,7 @@ 
                     $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);
                 }
@@ -344,7 +344,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
@@ -393,7 +393,7 @@ 
                     $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);
                 }
@@ -401,7 +401,7 @@ 
                 $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);
 
@@ -410,7 +410,7 @@ 
                 $firstChild = $this->xmlData->firstChild;
                 $firstItem = $doc1->documentElement->firstChild;
 
-                $nodeAppendModsData = $this->xmlData->importNode($firstItem, true);
+                $nodeAppendModsData = $this->xmlData->importNode($firstItem, TRUE);
                 $firstChild->appendChild($nodeAppendModsData);
 
                 return $doc1->saveXML();
@@ -427,7 +427,7 @@ 
 
             $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();
@@ -464,14 +464,14 @@ 
         foreach ($this->files as $key => $fileGrp) {
             foreach ($fileGrp as $file) {
 
-                $this->customXPath($fileXpathConfiguration . '/href', true, $file["path"]);
-                $this->customXPath($fileXpathConfiguration . '%mimetype', false, $file["type"]);
-                $this->customXPath($fileXpathConfiguration . '%title', false, $file["title"]);
-                $this->customXPath($fileXpathConfiguration . '%download', false, $file["download"]);
-                $this->customXPath($fileXpathConfiguration . '%archive', false, $file["archive"]);
-                $this->customXPath($fileXpathConfiguration . '%use', false, $file["use"]);
-                $this->customXPath($fileXpathConfiguration . '%id', false, $file["id"]);
-                $this->customXPath($fileXpathConfiguration . '%hasFLocat', false, $file["hasFLocat"]);
+                $this->customXPath($fileXpathConfiguration . '/href', TRUE, $file["path"]);
+                $this->customXPath($fileXpathConfiguration . '%mimetype', FALSE, $file["type"]);
+                $this->customXPath($fileXpathConfiguration . '%title', FALSE, $file["title"]);
+                $this->customXPath($fileXpathConfiguration . '%download', FALSE, $file["download"]);
+                $this->customXPath($fileXpathConfiguration . '%archive', FALSE, $file["archive"]);
+                $this->customXPath($fileXpathConfiguration . '%use', FALSE, $file["use"]);
+                $this->customXPath($fileXpathConfiguration . '%id', FALSE, $file["id"]);
+                $this->customXPath($fileXpathConfiguration . '%hasFLocat', FALSE, $file["hasFLocat"]);
 
             }
         }

Classes/Controller/SearchFEController.php

Spacing +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
             $this->currentPage = 1;
         } else {
             // restore query
-            $this->query = (!empty($session[$this->action]['query'])) ? $session[$this->action]['query'] : array();
+            $this->query = (!empty($session[$this->action]['query'])) ? $session[$this->action]['query'] : array ();
             // set current page
             if ((!empty($currentPage))) {
                 $this->currentPage = MathUtility::forceIntegerInRange($currentPage, 1);
@@ -197,8 +197,8 @@ 
      */
     private function viewAssign()
     {
-        $this->view->assign('query',       $this->query);
-        $this->view->assign('resultList',  $this->resultList);
+        $this->view->assign('query', $this->query);
+        $this->view->assign('resultList', $this->resultList);
         $this->view->assign('currentPage', $this->currentPage);
     }
 }

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

@@ -124,7 +124,7 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
     }
@@ -155,7 +155,7 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
     }

Braces +11 added lines, -22 removed lines

@@ -21,8 +21,7 @@ 
  * @package EWW\Dpf\Controller
  * @deprecated since version 4.0
  */
-class SearchFEController extends \EWW\Dpf\Controller\AbstractSearchController
-{
+class SearchFEController extends \EWW\Dpf\Controller\AbstractSearchController {
     /**
      * action
      * @var string
@@ -64,8 +63,7 @@ 
     /**
      * __construct
      */
-    public function __construct()
-    {
+    public function __construct() {
         // get session data
         $session = $this->getSessionData('tx_dpf_frontendsearch');
         // get action
@@ -106,8 +104,7 @@ 
      * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
-    public function initializeSearchAction()
-    {
+    public function initializeSearchAction() {
         if ($this->action == 'extendedSearch') {
             $this->forward('extendedSearch');
         }
@@ -117,8 +114,7 @@ 
      * action search
      * @return void
      */
-    public function searchAction()
-    {
+    public function searchAction() {
         try {
             if (!empty($this->query['fulltext'])) {
                 $query = $this->searchFulltext($this->query['fulltext']);
@@ -146,8 +142,7 @@ 
      * @return void
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      */
-    public function initializeExtendedSearchAction()
-    {
+    public function initializeExtendedSearchAction() {
         if ($this->action == 'search') {
             $this->forward('search');
         }
@@ -157,8 +152,7 @@ 
      * action extendedSearch
      * @return void
      */
-    public function extendedSearchAction()
-    {
+    public function extendedSearchAction() {
         try {
             $this->docTypes();
             if (!empty(implode('', $this->query))) {
@@ -186,8 +180,7 @@ 
      * @param  array $query
      * @return array $results
      */
-    private function getResults($query)
-    {
+    private function getResults($query) {
         $size = $this->settings['list']['paginate']['itemsPerPage'];
 
         $query['body']['from'] = ($this->currentPage - 1) * $size;
@@ -203,8 +196,7 @@ 
      * dummy action for showSearchForm Action used in sidebar
      * @return void
      */
-    public static function showSearchFormAction()
-    {
+    public static function showSearchFormAction() {
 
     }
 
@@ -212,8 +204,7 @@ 
      * set session data
      * @return void
      */
-    private function setSession()
-    {
+    private function setSession() {
         $session[$this->action] = array (
                 'query'       => $this->query,
                 'currentPage' => $this->currentPage
@@ -225,8 +216,7 @@ 
      * create docTypes
      * @return void
      */
-    private function docTypes()
-    {
+    private function docTypes() {
         // get document types
         $allTypes = $this->documentTypeRepository->findAll();
         // add empty field
@@ -242,8 +232,7 @@ 
      * create view
      * @return void
      */
-    private function viewAssign()
-    {
+    private function viewAssign() {
         $this->view->assign('query',       $this->query);
         $this->view->assign('resultList',  $this->resultList);
         $this->view->assign('currentPage', $this->currentPage);

Classes/Controller/GetFileController.php

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

@@ -179,20 +179,20 @@
             return 'Error while fetching headers';
         }
 
-        $contentDispFlag = false;
-        $contentTypeFlag = false;
+        $contentDispFlag = FALSE;
+        $contentTypeFlag = FALSE;
 
         foreach ($headers as $value) {
 
             if (FALSE !== stripos($value, 'Content-Disposition')) {
                 header($value);
-                $contentDispFlag = true;
+                $contentDispFlag = TRUE;
                 continue;
             }
 
             if (FALSE !== stripos($value, 'Content-Type')) {
                 header($value);
-                $contentTypeFlag = true;
+                $contentTypeFlag = TRUE;
                 continue;
             }
 

Braces +5 added lines, -10 removed lines

@@ -46,8 +46,7 @@ 
 /**
  * GetFileController
  */
-class GetFileController extends \EWW\Dpf\Controller\AbstractController
-{
+class GetFileController extends \EWW\Dpf\Controller\AbstractController {
 
     /**
      * documentRepository
@@ -65,8 +64,7 @@ 
      */
     protected $clientConfigurationManager;
 
-    public function attachmentAction()
-    {
+    public function attachmentAction() {
 
         $piVars = GeneralUtility::_GP('tx_dpf'); // get GET params from powermail
 
@@ -282,8 +280,7 @@ 
 
     }
 
-    private static function sanitizeFilename($filename)
-    {
+    private static function sanitizeFilename($filename) {
         // remove anything which isn't a word, whitespace, number or any of the following caracters -_~,;[]().
         $filename = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $filename);
         // turn diacritical characters to ASCII
@@ -295,8 +292,7 @@ 
         return $filename;
     }
 
-    private function buildMetsXml($document)
-    {
+    private function buildMetsXml($document) {
         $exporter = new \EWW\Dpf\Services\ParserGenerator();
         $fileData = $document->getCurrentFileData();
         $exporter->setFileData($fileData);
@@ -314,8 +310,7 @@ 
         return $transformedXml;
     }
 
-    private function isForbidden($action)
-    {
+    private function isForbidden($action) {
         $allowed =
             array_key_exists('allowedActions', $this->settings)
             && is_array($this->settings['allowedActions'])

Spacing +3 added lines, -3 removed lines

@@ -83,7 +83,7 @@ 
 
         switch ($piVars['action']) {
             case 'mets':
-                $path = rtrim('http://' . $fedoraHost,"/").'/fedora/objects/'.$piVars['qid'].'/methods/'.$fedoraNamespace.':SDef/getMETSDissemination?supplement=yes';
+                $path = rtrim('http://' . $fedoraHost, "/") . '/fedora/objects/' . $piVars['qid'] . '/methods/' . $fedoraNamespace . ':SDef/getMETSDissemination?supplement=yes';
                 break;
 
             case 'preview':
@@ -148,7 +148,7 @@ 
                 $source = explode(':', $qid);
                 if ($source[0] == $fedoraNamespace) {
 
-                    $path = rtrim('http://' . $fedoraHost, "/").'/fedora/objects/'.$piVars['qid'].'/methods/'.$fedoraNamespace.':SDef/getMETSDissemination?supplement=yes';
+                    $path = rtrim('http://' . $fedoraHost, "/") . '/fedora/objects/' . $piVars['qid'] . '/methods/' . $fedoraNamespace . ':SDef/getMETSDissemination?supplement=yes';
                     $metsXml = str_replace('&', '&', file_get_contents($path));
                     $dataCiteXml = \EWW\Dpf\Helper\DataCiteXml::convertFromMetsXml($metsXml);
 
@@ -201,7 +201,7 @@ 
         if (TRUE === $isRepositoryObject) {
             if (TRUE === $restrictToActiveDocuments) {
                 // if restriction applies, check object state before dissemination
-                $objectProfileURI = rtrim('http://' . $fedoraHost,"/").'/fedora/objects/'.$piVars['qid'].'?format=XML';
+                $objectProfileURI = rtrim('http://' . $fedoraHost, "/") . '/fedora/objects/' . $piVars['qid'] . '?format=XML';
                 $objectProfileXML = file_get_contents($objectProfileURI);
                 if (FALSE !== $objectProfileXML) {
                     $objectProfileDOM = new \DOMDocument('1.0', 'UTF-8');

Classes/Services/Transfer/Repository.php

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * The TYPO3 project - inspiring people to share!
  */
 
-interface Repository
-{
+interface Repository {
 
     public function ingest($document, $metsXml);
 

Classes/Services/Transfer/FileId.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     public function __construct($document)
     {
 
-        $idList   = array();
+        $idList   = array ();
         $this->id = 0;
 
         if (is_a($document->getFile(), '\TYPO3\CMS\Extbase\Persistence\ObjectStorage')) {

Braces +3 added lines, -6 removed lines

@@ -14,13 +14,11 @@ 
  * The TYPO3 project - inspiring people to share!
  */
 
-class FileId
-{
+class FileId {
 
     protected $id = 0;
 
-    public function __construct($document)
-    {
+    public function __construct($document) {
 
         $idList   = array();
         $this->id = 0;
@@ -42,8 +40,7 @@ 
 
     }
 
-    public function getId($file)
-    {
+    public function getId($file) {
 
         $fileId = $file->getDatastreamIdentifier();
         if (empty($fileId)) {

Classes/Services/Transfer/ElasticsearchRepository.php

Spacing +2 added lines, -2 removed lines

@@ -66,9 +66,9 @@
         $client = $this->clientRepository->findAll()->current();
 
         // build es json
-        $esJson                               = array();
+        $esJson                               = array ();
         $esJson['OWNER_ID']                   = $client->getOwnerId();
-        $esJson['_dissemination']             = array();
+        $esJson['_dissemination']             = array ();
         $esJson['_dissemination']['_content'] = json_decode($json);
 
         $esJson = json_encode($esJson);

Braces +8 added lines, -16 removed lines

@@ -27,8 +27,7 @@ 
  * @package EWW\Dpf\Services\Transfer
  * @deprecated since version 4.0
  */
-class ElasticsearchRepository implements Repository
-{
+class ElasticsearchRepository implements Repository {
     /**
      * clientRepository
      *
@@ -45,8 +44,7 @@ 
 
     protected $url;
 
-    public function __construct()
-    {
+    public function __construct() {
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
         $clientConfigurationManager = $objectManager->get(ClientConfigurationManager::class);
@@ -65,8 +63,7 @@ 
      * saves new document into elasticsearch local
      * @param \EWW\Dpf\Domain\Model\Document $document
      */
-    public function add($document, $json)
-    {
+    public function add($document, $json) {
 
         $client = $this->clientRepository->findAll()->current();
 
@@ -103,8 +100,7 @@ 
      * @param \EWW\Dpf\Domain\Model\Document $document
      * @param string $state
      */
-    public function delete($document, $state)
-    {
+    public function delete($document, $state) {
 
         try {
             $response = Request::delete($this->url . $document->getUid())
@@ -122,23 +118,19 @@ 
 
     }
 
-    public function retrieve($id)
-    {
+    public function retrieve($id) {
         # not implemented yet
     }
 
-    public function ingest($document, $metsXML)
-    {
+    public function ingest($document, $metsXML) {
         # not implemented yet
     }
 
-    public function update($document, $metsXml)
-    {
+    public function update($document, $metsXml) {
         # not implemented yet
     }
 
-    public function getNextDocumentId()
-    {
+    public function getNextDocumentId() {
         # not implemented yet
     }
 

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

@@ -35,7 +35,7 @@
      * @var \EWW\Dpf\Domain\Repository\ClientRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $clientRepository = null;
+    protected $clientRepository = NULL;
 
     protected $host;