kitodo / kitodo-publication

Configuration/TCA/tx_dpf_domain_model_metadatagroup.php

Indentation +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mapping',
-           // 'displayCond' => 'FIELD:group_type:!IN:file',
+            // 'displayCond' => 'FIELD:group_type:!IN:file',
             'config'    => array(
                 'type' => 'input',
                 'size' => 30,

Spacing +64 added lines, -64 removed lines

@@ -16,8 +16,8 @@ 
     die('Access denied.');
 }
 
-return array(
-    'ctrl' => array(
+return array (
+    'ctrl' => array (
         'title'                    => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup',
         'label'                    => 'name',
         'tstamp'                   => 'tstamp',
@@ -28,7 +28,7 @@ 
         'transOrigPointerField'    => 'l10n_parent',
         'transOrigDiffSourceField' => 'l10n_diffsource',
         'delete'                   => 'deleted',
-        'enablecolumns'            => array(
+        'enablecolumns'            => array (
             'disabled'  => 'hidden',
             'starttime' => 'starttime',
             'endtime'   => 'endtime',
@@ -36,75 +36,75 @@ 
         'searchFields'             => 'name, display_name, mandatory, mapping_for_reading, mapping, mods_extension_mapping, mods_extension_reference, json_mapping, max_iteration, metadata_object, access_restriction_roles, info_text, group_type, optional_groups, required_groups',
         'iconfile'                 => 'EXT:dpf/Resources/Public/Icons/default.gif',
     ),
-    'interface' => array(
+    'interface' => array (
         'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, display_name, mandatory, mapping_for_reading, mapping, mods_extension_mapping, mods_extension_reference, json_mapping, max_iteration, metadata_object, access_restriction_roles, info_text, group_type, optional_groups, required_groups',
     ),
-    'types'     => array(
-        '1' => array('showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, --palette--;;1, name, display_name, mandatory, mapping_for_reading, mapping, mods_extension_mapping, mods_extension_reference, json_mapping, max_iteration, metadata_object, access_restriction_roles, info_text, group_type, optional_groups, required_groups, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'),
+    'types'     => array (
+        '1' => array ('showitem' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, --palette--;;1, name, display_name, mandatory, mapping_for_reading, mapping, mods_extension_mapping, mods_extension_reference, json_mapping, max_iteration, metadata_object, access_restriction_roles, info_text, group_type, optional_groups, required_groups, --div--;LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:tabs.access, starttime, endtime'),
     ),
-    'palettes'  => array(
-        '1' => array('showitem' => ''),
+    'palettes'  => array (
+        '1' => array ('showitem' => ''),
     ),
-    'columns'   => array(
+    'columns'   => array (
 
-        'sys_language_uid'         => array(
+        'sys_language_uid'         => array (
             'exclude' => 1,
             'label'   => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
-            'config'  => array(
+            'config'  => array (
                 'type'                => 'select',
                 'renderType'          => 'selectSingle',
                 'foreign_table'       => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
-                'items'               => array(
-                    array('LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1),
-                    array('LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0),
+                'items'               => array (
+                    array ('LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1),
+                    array ('LLL:EXT:lang/locallang_general.xlf:LGL.default_value', 0),
                 ),
                 'default' => 0,
             ),
         ),
-        'l10n_parent'              => array(
+        'l10n_parent'              => array (
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude'     => 1,
             'label'       => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
-            'config'      => array(
+            'config'      => array (
                 'type'                => 'select',
                 'renderType'          => 'selectSingle',
-                'items'               => array(
-                    array('', 0),
+                'items'               => array (
+                    array ('', 0),
                 ),
                 'foreign_table'       => 'tx_dpf_domain_model_metadatagroup',
                 'foreign_table_where' => 'AND tx_dpf_domain_model_metadatagroup.pid=###CURRENT_PID### AND tx_dpf_domain_model_metadatagroup.sys_language_uid IN (-1,0)',
                 'default' => 0,
             ),
         ),
-        'l10n_diffsource'          => array(
-            'config' => array(
+        'l10n_diffsource'          => array (
+            'config' => array (
                 'type' => 'passthrough',
             ),
         ),
 
-        't3ver_label'              => array(
+        't3ver_label'              => array (
             'label'  => 'LLL:EXT:lang/locallang_general.xlf:LGL.versionLabel',
-            'config' => array(
+            'config' => array (
                 'type' => 'input',
                 'size' => 30,
                 'max'  => 255,
             ),
         ),
 
-        'hidden'                   => array(
+        'hidden'                   => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:lang/locallang_general.xlf:LGL.hidden',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'check',
             ),
         ),
-        'starttime'                => array(
+        'starttime'                => array (
             'exclude'   => 1,
             'label'     => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime',
-            'config'    => array(
-                'behaviour' => array(
+            'config'    => array (
+                'behaviour' => array (
                     'allowLanguageSynchronization' => true
                 ),
                 'type'     => 'input',
@@ -113,144 +113,144 @@ 
                 'eval'     => 'datetime',
                 'checkbox' => 0,
                 'default'  => 0,
-                'range'    => array(
+                'range'    => array (
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')),
                 ),
             ),
         ),
-        'endtime'                  => array(
+        'endtime'                  => array (
             'exclude'   => 1,
             'label'     => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime',
-            'config'    => array(
+            'config'    => array (
                 'type'     => 'input',
                 'renderType' => 'inputDateTime',
                 'size'     => 13,
                 'eval'     => 'datetime',
                 'checkbox' => 0,
                 'default'  => 0,
-                'range'    => array(
+                'range'    => array (
                     'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')),
                 ),
             ),
         ),
 
-        'name'                     => array(
+        'name'                     => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.name',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim,uniqueInPid',
             ),
         ),
-        'display_name'             => array(
+        'display_name'             => array (
             'exclude' => 1,
             'label'   => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.display_name',
-            'config'  => array(
+            'config'  => array (
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim',
             ),
         ),
-        'mandatory'                => array(
+        'mandatory'                => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mandatory',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'size' => 1,
                 'maxitems' => 1,
-                'items' => array(
-                    array('',''),
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mandatory_yes', \EWW\Dpf\Domain\Model\MetadataMandatoryInterface::MANDATORY),
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mandatory_file_only', \EWW\Dpf\Domain\Model\MetadataMandatoryInterface::MANDATORY_FILE_ONLY),
+                'items' => array (
+                    array ('', ''),
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mandatory_yes', \EWW\Dpf\Domain\Model\MetadataMandatoryInterface::MANDATORY),
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mandatory_file_only', \EWW\Dpf\Domain\Model\MetadataMandatoryInterface::MANDATORY_FILE_ONLY),
                 ),
             ),
         ),
-        'mapping_for_reading'      => array(
+        'mapping_for_reading'      => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mapping_for_reading',
             'displayCond' => 'FIELD:group_type:!IN:file',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim',
             ),
         ),
-        'mapping'                  => array(
+        'mapping'                  => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mapping',
            // 'displayCond' => 'FIELD:group_type:!IN:file',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim',
             ),
         ),
-        'mods_extension_mapping'   => array(
+        'mods_extension_mapping'   => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mods_extension_mapping',
             'displayCond' => 'FIELD:group_type:!IN:file',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim',
             ),
         ),
-        'mods_extension_reference' => array(
+        'mods_extension_reference' => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.mods_extension_reference',
             'displayCond' => 'FIELD:group_type:!IN:file',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim',
             ),
         ),
-        'json_mapping'                  => array(
+        'json_mapping'                  => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.json_mapping',
             'displayCond' => 'FIELD:group_type:!IN:file',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'input',
                 'size' => 30,
                 'eval' => 'trim',
             ),
         ),
-        'max_iteration'            => array(
+        'max_iteration'            => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.max_iteration',
-            'config'    => array(
+            'config'    => array (
                 'type' => 'input',
                 'size' => 4,
                 'eval' => 'int',
             ),
         ),
-        'access_restriction_roles' => array(
+        'access_restriction_roles' => array (
             'label' => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.access_restriction_roles',
-            'config' => array(
+            'config' => array (
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
                 'size' => 2,
                 'maxitems' => 2,
-                'items' => array(
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_feusergroup.kitodo_role_researcher', EWW\Dpf\Security\Security::ROLE_RESEARCHER),
-                    array('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_feusergroup.kitodo_role_librarian', EWW\Dpf\Security\Security::ROLE_LIBRARIAN),
+                'items' => array (
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_feusergroup.kitodo_role_researcher', EWW\Dpf\Security\Security::ROLE_RESEARCHER),
+                    array ('LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_feusergroup.kitodo_role_librarian', EWW\Dpf\Security\Security::ROLE_LIBRARIAN),
                 ),
             ),
         ),
-        'info_text'                => array(
+        'info_text'                => array (
             'exclude' => 1,
             'label'   => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.info_text',
-            'config'  => array(
+            'config'  => array (
                 'type' => 'text',
                 'cols' => 40,
                 'rows' => 15,
@@ -258,24 +258,24 @@ 
                 'enableRichtext' => true,
             ),
         ),
-        'metadata_object'          => array(
+        'metadata_object'          => array (
             'exclude'   => 1,
             'l10n_mode' => 'exclude',
             'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_metadatagroup.metadata_object',
-            'config'    => array(
+            'config'    => array (
                 'type'           => 'inline',
                 'foreign_table'  => 'tx_dpf_domain_model_metadataobject',
                 'foreign_field'  => 'metadatagroup',
                 'foreign_label'  => 'display_name',
                 'foreign_sortby' => 'sorting',
-                'behaviour'      => array(
+                'behaviour'      => array (
                     'disableMovingChildrenWithParent' => 1,
                 ),
                 'size'           => 10,
                 'autoSizeMax'    => 30,
                 'maxitems'       => 9999,
                 'multiple'       => 0,
-                'appearance'     => array(
+                'appearance'     => array (
                     'collapseAll'                     => 1,
                     'levelLinksPosition'              => 'top',
                     'showSynchronizationLink'         => 1,

Classes/Domain/Repository/FileRepository.php

Braces +1 added lines, -2 removed lines

@@ -17,6 +17,5 @@
 /**
  * The repository for Files
  */
-class FileRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
-{
+class FileRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 }

Classes/Domain/Model/MetadataObject.php

Spacing +2 added lines, -2 removed lines

@@ -460,7 +460,7 @@ 
         if ($this->accessRestrictionRoles) {
             return array_map('trim', explode(',', $this->accessRestrictionRoles));
         } else {
-            return array();
+            return array ();
         }
     }
 
@@ -827,7 +827,7 @@ 
     }
 
     protected function isRepeatable() {
-        return !in_array($this->getObjectType(), ['fileDownload','fileArchive','fileLabel'])
+        return !in_array($this->getObjectType(), ['fileDownload', 'fileArchive', 'fileLabel'])
             && $this->getInputField() != self::FILE_UPLOAD;
     }
 }

Braces +42 added lines, -84 removed lines

@@ -17,8 +17,7 @@ 
 /**
  * MetadataObject
  */
-class MetadataObject extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements MetadataMandatoryInterface
-{
+class MetadataObject extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements MetadataMandatoryInterface {
 
     /**
      * name
@@ -229,8 +228,7 @@ 
      *
      * @return string $name
      */
-    public function getName()
-    {
+    public function getName() {
         return $this->name;
     }
 
@@ -240,8 +238,7 @@ 
      * @param string $name
      * @return void
      */
-    public function setName($name)
-    {
+    public function setName($name) {
         $this->name = $name;
     }
 
@@ -250,8 +247,7 @@ 
      *
      * @return string $displayName
      */
-    public function getDisplayName()
-    {
+    public function getDisplayName() {
         return $this->displayName;
     }
 
@@ -261,8 +257,7 @@ 
      * @param string $displayName
      * @return void
      */
-    public function setDisplayName($displayName)
-    {
+    public function setDisplayName($displayName) {
         $this->displayName = $displayName;
     }
 
@@ -271,8 +266,7 @@ 
      *
      * @return integer $maxIteration
      */
-    public function getMaxIteration()
-    {
+    public function getMaxIteration() {
         if ($this->isRepeatable()) {
             return $this->maxIteration;
         }
@@ -285,8 +279,7 @@ 
      * @param integer $maxIteration
      * @return void
      */
-    public function setMaxIteration($maxIteration)
-    {
+    public function setMaxIteration($maxIteration) {
         if ($this->isRepeatable()) {
             $this->maxIteration = $maxIteration;
         } else {
@@ -299,8 +292,7 @@ 
      *
      * @return string $mandatory
      */
-    public function getMandatory()
-    {
+    public function getMandatory() {
         return $this->mandatory;
     }
 
@@ -310,8 +302,7 @@ 
      * @param string $mandatory
      * @return void
      */
-    public function setMandatory($mandatory)
-    {
+    public function setMandatory($mandatory) {
         $this->mandatory = $mandatory;
     }
 
@@ -320,8 +311,7 @@ 
      *
      * @return boolean $modsExtension
      */
-    public function getModsExtension()
-    {
+    public function getModsExtension() {
         return $this->modsExtension;
     }
 
@@ -331,8 +321,7 @@ 
      * @param boolean $modsExtension
      * @return void
      */
-    public function setModsExtension($modsExtension)
-    {
+    public function setModsExtension($modsExtension) {
         $this->modsExtension = boolval($modsExtension);
     }
 
@@ -341,8 +330,7 @@ 
      *
      * @return boolean
      */
-    public function isModsExtension()
-    {
+    public function isModsExtension() {
         return $this->modsExtension;
     }
 
@@ -351,8 +339,7 @@ 
      *
      * @return string $mapping
      */
-    public function getMapping()
-    {
+    public function getMapping() {
         return $this->mapping;
     }
 
@@ -362,8 +349,7 @@ 
      * @param string $mapping
      * @return void
      */
-    public function setMapping($mapping)
-    {
+    public function setMapping($mapping) {
         $this->mapping = $mapping;
     }
 
@@ -372,8 +358,7 @@ 
      *
      * @return string $relativeMapping
      */
-    public function getRelativeMapping()
-    {
+    public function getRelativeMapping() {
         return trim($this->mapping, " /");
     }
 
@@ -382,8 +367,7 @@ 
      *
      * @return integer $inputField
      */
-    public function getInputField()
-    {
+    public function getInputField() {
         return $this->inputField;
     }
 
@@ -393,8 +377,7 @@ 
      * @param integer $inputField
      * @return void
      */
-    public function setInputField($inputField)
-    {
+    public function setInputField($inputField) {
         $this->inputField = $inputField;
     }
 
@@ -403,8 +386,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
      */
-    public function getChildren()
-    {
+    public function getChildren() {
         return null;
     }
 
@@ -413,8 +395,7 @@ 
      *
      * @return \EWW\Dpf\Domain\Model\InputOptionList $inputOptionList
      */
-    public function getInputOptionList()
-    {
+    public function getInputOptionList() {
         return $this->inputOptionList;
     }
 
@@ -424,8 +405,7 @@ 
      * @param \EWW\Dpf\Domain\Model\InputOptionList $inputOptionList
      * @return void
      */
-    public function setInputOptionList(\EWW\Dpf\Domain\Model\InputOptionList $inputOptionList)
-    {
+    public function setInputOptionList(\EWW\Dpf\Domain\Model\InputOptionList $inputOptionList) {
         $this->inputOptionList = $inputOptionList;
     }
 
@@ -434,8 +414,7 @@ 
      *
      * @return string $fillOutService
      */
-    public function getFillOutService()
-    {
+    public function getFillOutService() {
         return $this->fillOutService;
     }
 
@@ -445,8 +424,7 @@ 
      * @param string $fillOutService
      * @return void
      */
-    public function setFillOutService($fillOutService)
-    {
+    public function setFillOutService($fillOutService) {
         $this->fillOutService = $fillOutService;
     }
 
@@ -455,8 +433,7 @@ 
      *
      * @return array $accessRestrictionRoles
      */
-    public function getAccessRestrictionRoles()
-    {
+    public function getAccessRestrictionRoles() {
         if ($this->accessRestrictionRoles) {
             return array_map('trim', explode(',', $this->accessRestrictionRoles));
         } else {
@@ -470,8 +447,7 @@ 
      * @param array $accessRestrictionRoles
      * @return void
      */
-    public function setAccessRestrictionRoles($accessRestrictionRoles)
-    {
+    public function setAccessRestrictionRoles($accessRestrictionRoles) {
         $this->accessRestrictionRoles = implode(',', $accessRestrictionRoles);
     }
 
@@ -480,8 +456,7 @@ 
      *
      * @return boolean $consent
      */
-    public function getConsent()
-    {
+    public function getConsent() {
         return $this->consent;
     }
 
@@ -491,8 +466,7 @@ 
      * @param boolean $consent
      * @return void
      */
-    public function setConsent($consent)
-    {
+    public function setConsent($consent) {
         $this->consent = boolval($consent);
     }
 
@@ -501,8 +475,7 @@ 
      *
      * @return string $defaultValue
      */
-    public function getDefaultValue()
-    {
+    public function getDefaultValue() {
         return $this->defaultValue;
     }
 
@@ -512,8 +485,7 @@ 
      * @param string $defaultValue
      * @return void
      */
-    public function setDefaultValue($defaultValue)
-    {
+    public function setDefaultValue($defaultValue) {
         $this->defaultValue = $defaultValue;
     }
 
@@ -522,8 +494,7 @@ 
      *
      * @return string $validation
      */
-    public function getValidation()
-    {
+    public function getValidation() {
         return $this->validation;
     }
 
@@ -533,8 +504,7 @@ 
      * @param string $validation
      * @return void
      */
-    public function setValidation($validation)
-    {
+    public function setValidation($validation) {
         $this->validation = $validation;
     }
 
@@ -543,8 +513,7 @@ 
      *
      * @return string $dataType
      */
-    public function getDataType()
-    {
+    public function getDataType() {
         return $this->dataType;
     }
 
@@ -554,32 +523,28 @@ 
      * @param string $dataType
      * @return void
      */
-    public function setDataType($dataType)
-    {
+    public function setDataType($dataType) {
         $this->dataType = $dataType;
     }
 
     /**
      * @return string
      */
-    public function getGndFieldUid()
-    {
+    public function getGndFieldUid() {
         return $this->gndFieldUid;
     }
 
     /**
      * @param string $gndFieldUid
      */
-    public function setGndFieldUid($gndFieldUid)
-    {
+    public function setGndFieldUid($gndFieldUid) {
         $this->gndFieldUid = $gndFieldUid;
     }
 
     /**
      * @return integer
      */
-    public function getMaxInputLength()
-    {
+    public function getMaxInputLength() {
         if ($this->maxInputLength == 0) {
             if ($this->inputField == self::input) {
                 return 255;
@@ -594,8 +559,7 @@ 
     /**
      * @return integer
      */
-    public function setMaxInputLength($maxInputLength)
-    {
+    public function setMaxInputLength($maxInputLength) {
         $this->maxInputLength = $maxInputLength;
     }
 
@@ -610,8 +574,7 @@ 
     /**
      * @param bool $embargo
      */
-    public function setEmbargo(bool $embargo)
-    {
+    public function setEmbargo(bool $embargo) {
         $this->embargo = boolval($embargo);
     }
 
@@ -658,8 +621,7 @@ 
     /**
      * @param string $rorMapping
      */
-    public function setRorMapping(string $rorMapping)
-    {
+    public function setRorMapping(string $rorMapping) {
         $this->rorMapping = $rorMapping;
     }
 
@@ -797,32 +759,28 @@ 
     /**
      * @return bool
      */
-    public function isUploadField()
-    {
+    public function isUploadField() {
         return $this->getInputField() == self::FILE_UPLOAD;
     }
 
     /**
      * @return bool
      */
-    public function isFileLabelField()
-    {
+    public function isFileLabelField() {
         return $this->getObjectType() == 'fileLabel';
     }
 
     /**
      * @return bool
      */
-    public function isFileDownloadField()
-    {
+    public function isFileDownloadField() {
         return $this->getObjectType() == 'fileDownload';
     }
 
     /**
      * @return bool
      */
-    public function isFileArchiveField()
-    {
+    public function isFileArchiveField() {
         return $this->getObjectType() == 'fileArchive';
     }
 

Classes/Domain/Model/Document.php

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

@@ -60,7 +60,7 @@ 
      *
      * @var \EWW\Dpf\Domain\Model\DocumentType
      */
-    protected $documentType = null;
+    protected $documentType = NULL;
 
     /**
      * objectIdentifier
@@ -95,14 +95,14 @@ 
      *
      * @var boolean
      */
-    protected $changed = false;
+    protected $changed = FALSE;
 
     /**
      * valid
      *
      * @var boolean
      */
-    protected $valid = false;
+    protected $valid = FALSE;
 
     /**
      *
@@ -119,7 +119,7 @@ 
     /**
      * @var bool $suggestion
      */
-    protected $suggestion = false;
+    protected $suggestion = FALSE;
 
     /**
      * creator
@@ -185,7 +185,7 @@ 
      *
      * @var \DateTime
      */
-    protected $embargoDate = null;
+    protected $embargoDate = NULL;
 
     /**
      * newlyAssignedFobIdentifiers
@@ -197,7 +197,7 @@ 
     /**
      * @var bool
      */
-    protected $stateChange = false;
+    protected $stateChange = FALSE;
 
     /**
      * file
@@ -205,7 +205,7 @@ 
      * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\File>
      * @TYPO3\CMS\Extbase\Annotation\ORM\Cascade("remove")
      */
-    protected $file = null;
+    protected $file = NULL;
 
     const TRANSFER_ERROR = "ERROR";
     const TRANSFER_QUEUED = "QUEUED";
@@ -378,7 +378,7 @@ 
     public function setObjectIdentifier($objectIdentifier)
     {
         // Due to uniqe key uc_object_identifier, which should ignore empty object identifiers.
-        $this->objectIdentifier = empty($objectIdentifier)? null : $objectIdentifier;
+        $this->objectIdentifier = empty($objectIdentifier)? NULL : $objectIdentifier;
     }
 
     /**
@@ -561,7 +561,7 @@ 
                 return $file;
             }
         }
-        return null;
+        return NULL;
     }
 
     /**
@@ -575,7 +575,7 @@ 
                 return $file;
             }
         }
-        return null;
+        return NULL;
     }
 
     /**
@@ -587,12 +587,12 @@ 
             foreach ($this->getFile() as $file) {
                 /** @var File $file */
                 if (!$file->isFileGroupDeleted()) {
-                    return true;
+                    return TRUE;
                 }
             }
         }
 
-        return false;
+        return FALSE;
     }
 
     /**

Spacing +6 added lines, -6 removed lines

@@ -377,7 +377,7 @@ 
     public function setObjectIdentifier($objectIdentifier)
     {
         // Due to uniqe key uc_object_identifier, which should ignore empty object identifiers.
-        $this->objectIdentifier = empty($objectIdentifier)? null : $objectIdentifier;
+        $this->objectIdentifier = empty($objectIdentifier) ? null : $objectIdentifier;
     }
 
     /**
@@ -712,7 +712,7 @@ 
      */
     public function getCreator()
     {
-        return $this->creator? $this->creator : 0;
+        return $this->creator ? $this->creator : 0;
     }
 
     /**
@@ -867,7 +867,7 @@ 
 
         foreach ($availableProperties as $propertyName) {
             if (\TYPO3\CMS\Extbase\Reflection\ObjectAccess::isPropertySettable($newDocument, $propertyName)
-                && !in_array($propertyName, array('uid','pid', 'file', 'comment', 'linkedUid', 'suggestion', 'creator'))) {
+                && !in_array($propertyName, array ('uid', 'pid', 'file', 'comment', 'linkedUid', 'suggestion', 'creator'))) {
 
                 $propertyValue = \TYPO3\CMS\Extbase\Reflection\ObjectAccess::getProperty($documentToCopy, $propertyName);
                 \TYPO3\CMS\Extbase\Reflection\ObjectAccess::setProperty($newDocument, $propertyName, $propertyValue);
@@ -889,7 +889,7 @@ 
      */
     public function getDocumentIdentifier()
     {
-        return $this->getObjectIdentifier()? $this->getObjectIdentifier() : $this->getUid();
+        return $this->getObjectIdentifier() ? $this->getObjectIdentifier() : $this->getUid();
     }
 
     /**
@@ -922,8 +922,8 @@ 
     public function getPublicationYear()
     {
         $internalFormat = new InternalFormat($this->getXmlData(), $this->getPid());
-        $year =  $internalFormat->getPublishingYear();
-        return $year? $year : "";
+        $year = $internalFormat->getPublishingYear();
+        return $year ? $year : "";
     }
 
     /**

Braces +63 added lines, -126 removed lines

@@ -21,8 +21,7 @@ 
 /**
  * Document
  */
-class Document extends AbstractEntity
-{
+class Document extends AbstractEntity {
     // xml data size ist limited to 64 KB
     const XML_DATA_SIZE_LIMIT = 64 * 1024;
 
@@ -213,8 +212,7 @@ 
     /**
      * __construct
      */
-    public function __construct()
-    {
+    public function __construct() {
         //Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
@@ -224,8 +222,7 @@ 
      *
      * @return void
      */
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->file = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
         $this->initCreationDate();
     }
@@ -235,8 +232,7 @@ 
      *
      * @return string $title
      */
-    public function getTitle()
-    {
+    public function getTitle() {
         return $this->title;
     }
 
@@ -246,8 +242,7 @@ 
      * @param string $title
      * @return void
      */
-    public function setTitle($title)
-    {
+    public function setTitle($title) {
         $this->title = $title ?? '';
         //htmlspecialchars_decode($title,ENT_QUOTES);
     }
@@ -257,8 +252,7 @@ 
      *
      * @return array $authors
      */
-    public function getAuthors()
-    {
+    public function getAuthors() {
         $authors = @unserialize($this->authors);
         if (is_array($authors)) {
             return $authors;
@@ -273,8 +267,7 @@ 
      * @param array $authors
      * @return void
      */
-    public function setAuthors($authors)
-    {
+    public function setAuthors($authors) {
         $this->authors = serialize($authors);
     }
 
@@ -283,8 +276,7 @@ 
      *
      * @return string $xmlData
      */
-    public function getXmlData()
-    {
+    public function getXmlData() {
         return $this->xmlData;
     }
 
@@ -294,8 +286,7 @@ 
      * @param string $xmlData
      * @return void
      */
-    public function setXmlData($xmlData)
-    {
+    public function setXmlData($xmlData) {
         $this->xmlData = $xmlData;
     }
 
@@ -322,8 +313,7 @@ 
      *
      * @return string $slubInfoData
      */
-    public function getSlubInfoData()
-    {
+    public function getSlubInfoData() {
         return $this->slubInfoData;
     }
 
@@ -332,8 +322,7 @@ 
      *
      * @return string $slubInfoData
      */
-    public function setSlubInfoData($slubInfoData)
-    {
+    public function setSlubInfoData($slubInfoData) {
         $this->slubInfoData = $slubInfoData;
     }
 
@@ -342,8 +331,7 @@ 
      *
      * @return \EWW\Dpf\Domain\Model\DocumentType $documentType
      */
-    public function getDocumentType()
-    {
+    public function getDocumentType() {
         return $this->documentType;
     }
 
@@ -353,8 +341,7 @@ 
      * @param \EWW\Dpf\Domain\Model\DocumentType $documentType
      * @return void
      */
-    public function setDocumentType(\EWW\Dpf\Domain\Model\DocumentType $documentType)
-    {
+    public function setDocumentType(\EWW\Dpf\Domain\Model\DocumentType $documentType) {
         $this->documentType = $documentType;
     }
 
@@ -363,8 +350,7 @@ 
      *
      * @return string
      */
-    public function getObjectIdentifier()
-    {
+    public function getObjectIdentifier() {
         return $this->objectIdentifier;
     }
 
@@ -374,8 +360,7 @@ 
      * @param string $objectIdentifier
      * @return void
      */
-    public function setObjectIdentifier($objectIdentifier)
-    {
+    public function setObjectIdentifier($objectIdentifier) {
         // Due to uniqe key uc_object_identifier, which should ignore empty object identifiers.
         $this->objectIdentifier = empty($objectIdentifier)? null : $objectIdentifier;
     }
@@ -385,8 +370,7 @@ 
      *
      * @return string
      */
-    public function getReservedObjectIdentifier()
-    {
+    public function getReservedObjectIdentifier() {
         return $this->reservedObjectIdentifier;
     }
 
@@ -396,8 +380,7 @@ 
      * @param string $reservedObjectIdentifier
      * @return void
      */
-    public function setReservedObjectIdentifier($reservedObjectIdentifier)
-    {
+    public function setReservedObjectIdentifier($reservedObjectIdentifier) {
         $this->reservedObjectIdentifier = $reservedObjectIdentifier;
     }
 
@@ -406,8 +389,7 @@ 
      *
      * @return string
      */
-    public function getTransferStatus()
-    {
+    public function getTransferStatus() {
         return $this->transferStatus;
     }
 
@@ -417,8 +399,7 @@ 
      * @param string
      * @return void
      */
-    public function setTransferStatus($transferStatus)
-    {
+    public function setTransferStatus($transferStatus) {
         $this->transferStatus = $transferStatus;
     }
 
@@ -427,8 +408,7 @@ 
      *
      * @return integer
      */
-    public function getTransferDate()
-    {
+    public function getTransferDate() {
         return $this->transferDate;
     }
 
@@ -438,8 +418,7 @@ 
      * @param integer $transferDate
      * @return void
      */
-    public function setTransferDate($transferDate)
-    {
+    public function setTransferDate($transferDate) {
         $this->transferDate = $transferDate;
     }
 
@@ -448,8 +427,7 @@ 
      *
      * @var integer
      */
-    public function getTransferErrorCode()
-    {
+    public function getTransferErrorCode() {
         return $this->transferErrorCode;
     }
 
@@ -459,8 +437,7 @@ 
      * @param integer $transferErrorCode
      * @return void
      */
-    public function setTransferErrorCode($transferErrorCode)
-    {
+    public function setTransferErrorCode($transferErrorCode) {
         $this->transferErrorCode = $transferErrorCode;
     }
 
@@ -469,8 +446,7 @@ 
      *
      * @var string
      */
-    public function getTransferResponse()
-    {
+    public function getTransferResponse() {
         return $this->transferResponse;
     }
 
@@ -480,8 +456,7 @@ 
      * @param string $transferResponse
      * @return void
      */
-    public function setTransferResponse($transferResponse)
-    {
+    public function setTransferResponse($transferResponse) {
         $this->transferResponse = $transferResponse;
     }
 
@@ -490,8 +465,7 @@ 
      *
      * @var integer
      */
-    public function getTransferHttpStatus()
-    {
+    public function getTransferHttpStatus() {
         return $this->transferHttpStatus;
     }
 
@@ -501,8 +475,7 @@ 
      * @param integer $transferHttpStatus
      * @return void
      */
-    public function setTransferHttpStatus($transferHttpStatus)
-    {
+    public function setTransferHttpStatus($transferHttpStatus) {
         $this->transferHttpStatus = $transferHttpStatus;
     }
 
@@ -512,8 +485,7 @@ 
      * @param \EWW\Dpf\Domain\Model\File $file
      * @return void
      */
-    public function addFile(\EWW\Dpf\Domain\Model\File $file)
-    {
+    public function addFile(\EWW\Dpf\Domain\Model\File $file) {
         $this->file->attach($file);
     }
 
@@ -523,8 +495,7 @@ 
      * @param \EWW\Dpf\Domain\Model\File $fileToRemove The File to be removed
      * @return void
      */
-    public function removeFile(\EWW\Dpf\Domain\Model\File $fileToRemove)
-    {
+    public function removeFile(\EWW\Dpf\Domain\Model\File $fileToRemove) {
         $this->file->detach($fileToRemove);
     }
 
@@ -533,8 +504,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\File> $file
      */
-    public function getFile()
-    {
+    public function getFile() {
         return $this->file;
     }
 
@@ -544,8 +514,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\File> $file
      * @return void
      */
-    public function setFile(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $file)
-    {
+    public function setFile(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $file) {
         $this->file = $file;
     }
 
@@ -580,8 +549,7 @@ 
     /**
      * Has files
      */
-    public function hasFiles()
-    {
+    public function hasFiles() {
         if (is_a($this->getFile(), '\TYPO3\CMS\Extbase\Persistence\ObjectStorage')) {
             foreach ($this->getFile() as $file) {
                 /** @var File $file */
@@ -599,8 +567,7 @@ 
      *
      * @return boolean $changed
      */
-    public function getChanged()
-    {
+    public function getChanged() {
         return $this->changed;
     }
 
@@ -610,8 +577,7 @@ 
      * @param boolean $changed
      * @return void
      */
-    public function setChanged($changed)
-    {
+    public function setChanged($changed) {
         $this->changed = boolval($changed);
     }
 
@@ -620,8 +586,7 @@ 
      *
      * @return boolean $valid
      */
-    public function getValid()
-    {
+    public function getValid() {
         return $this->valid;
     }
 
@@ -631,8 +596,7 @@ 
      * @param boolean $valid
      * @return void
      */
-    public function setValid($valid)
-    {
+    public function setValid($valid) {
         $this->valid = boolval($valid);
     }
 
@@ -641,8 +605,7 @@ 
      *
      * @return string
      */
-    public function getDateIssued()
-    {
+    public function getDateIssued() {
         return empty($this->dateIssued) ? '' : $this->dateIssued;
     }
 
@@ -652,8 +615,7 @@ 
      * @param string $dateIssued
      * @return void
      */
-    public function setDateIssued($dateIssued)
-    {
+    public function setDateIssued($dateIssued) {
         $this->dateIssued = empty($dateIssued) ? '' : $dateIssued;
     }
 
@@ -663,8 +625,7 @@ 
      *
      * @return string
      */
-    public function getProcessNumber()
-    {
+    public function getProcessNumber() {
         return $this->processNumber;
     }
 
@@ -674,8 +635,7 @@ 
      * @param string $processNumber
      * @return void
      */
-    public function setProcessNumber($processNumber)
-    {
+    public function setProcessNumber($processNumber) {
         $this->processNumber = trim($processNumber);
     }
 
@@ -684,8 +644,7 @@ 
      *
      * @return string
      */
-    public function getSubmitterName()
-    {
+    public function getSubmitterName() {
         try {
             $internalFormat = new InternalFormat($this->getXmlData(), $this->getPid());
             return $internalFormat->getSubmitterName();
@@ -699,8 +658,7 @@ 
      *
      * @return string
      */
-    public function getPrimaryUrn()
-    {
+    public function getPrimaryUrn() {
         $internalFormat = new InternalFormat($this->getXmlData(), $this->getPid());
         return $internalFormat->getPrimaryUrn();
     }
@@ -710,8 +668,7 @@ 
      *
      * @return int
      */
-    public function getCreator()
-    {
+    public function getCreator() {
         return $this->creator? $this->creator : 0;
     }
 
@@ -721,24 +678,20 @@ 
      * @param int $creator
      * @return void
      */
-    public function setCreator($creator)
-    {
+    public function setCreator($creator) {
         $this->creator = $creator;
     }
 
-    public function getState()
-    {
+    public function getState() {
         return $this->state;
     }
 
-    public function setState($state)
-    {
+    public function setState($state) {
         $this->stateChange = $this->state != $state;
         $this->state = $state;
     }
 
-    public function getRemoteState()
-    {
+    public function getRemoteState() {
         $state = explode(':', $this->state);
         if (is_array($state) && array_key_exists(1, $state)) {
             return $state[1];
@@ -776,8 +729,7 @@ 
     /**
      * @return string
      */
-    public function getRemoteLastModDate()
-    {
+    public function getRemoteLastModDate() {
         return $this->remoteLastModDate;
     }
 
@@ -785,24 +737,21 @@ 
      * @param string $remoteLastModDate
      * @return void
      */
-    public function setRemoteLastModDate($remoteLastModDate)
-    {
+    public function setRemoteLastModDate($remoteLastModDate) {
         $this->remoteLastModDate = $remoteLastModDate;
     }
 
     /**
      * @return integer
      */
-    public function getTstamp()
-    {
+    public function getTstamp() {
         return $this->tstamp;
     }
 
     /**
      * @return integer
      */
-    public function getPid()
-    {
+    public function getPid() {
         return $this->pid;
     }
 
@@ -817,8 +766,7 @@ 
     /**
      * @param bool $suggestion
      */
-    public function setSuggestion(bool $suggestion)
-    {
+    public function setSuggestion(bool $suggestion) {
         $this->suggestion = boolval($suggestion);
     }
 
@@ -833,8 +781,7 @@ 
     /**
      * @param string $linkedUid
      */
-    public function setLinkedUid(string $linkedUid)
-    {
+    public function setLinkedUid(string $linkedUid) {
         $this->linkedUid = $linkedUid;
     }
 
@@ -849,8 +796,7 @@ 
     /**
      * @param string $comment
      */
-    public function setComment(string $comment)
-    {
+    public function setComment(string $comment) {
         $this->comment = $comment;
     }
 
@@ -887,8 +833,7 @@ 
      *
      * @return string|int
      */
-    public function getDocumentIdentifier()
-    {
+    public function getDocumentIdentifier() {
         return $this->getObjectIdentifier()? $this->getObjectIdentifier() : $this->getUid();
     }
 
@@ -897,8 +842,7 @@ 
      *
      * @return bool
      */
-    public function isWorkingCopy()
-    {
+    public function isWorkingCopy() {
         return $this->getObjectIdentifier() && !$this->isTemporary() && !$this->isSuggestion();
     }
 
@@ -908,8 +852,7 @@ 
      *
      * @return bool
      */
-    public function isTemporaryCopy()
-    {
+    public function isTemporaryCopy() {
         return $this->getObjectIdentifier() && $this->isTemporary() && !$this->isSuggestion();
     }
 
@@ -919,8 +862,7 @@ 
      *
      * @return string|null
      */
-    public function getPublicationYear()
-    {
+    public function getPublicationYear() {
         $internalFormat = new InternalFormat($this->getXmlData(), $this->getPid());
         $year =  $internalFormat->getPublishingYear();
         return $year? $year : "";
@@ -931,8 +873,7 @@ 
      *
      * @return string|null
      */
-    public function getSourceDetails()
-    {
+    public function getSourceDetails() {
         $internalFormat = new InternalFormat($this->getXmlData(), $this->getPid());
         $data = $internalFormat->getSourceDetails();
         return $data;
@@ -949,8 +890,7 @@ 
     /**
      * @param \DateTime|null $embargoDate
      */
-    public function setEmbargoDate(?\DateTime $embargoDate)
-    {
+    public function setEmbargoDate(?\DateTime $embargoDate) {
         $this->embargoDate = $embargoDate;
     }
 
@@ -973,8 +913,7 @@ 
     /**
      * @return array
      */
-    public function getPreviouslyAssignedFobIdentifiers()
-    {
+    public function getPreviouslyAssignedFobIdentifiers() {
         return array_diff(
             $this->getAssignedFobIdentifiers(), $this->getNewlyAssignedFobIdentifiers()
         );
@@ -1000,8 +939,7 @@ 
     /**
      * @return mixed
      */
-    public function getDepositLicense()
-    {
+    public function getDepositLicense() {
         $internalFormat = new InternalFormat($this->getXmlData(), $this->getPid());
         $data = $internalFormat->getDepositLicense();
         return $data;
@@ -1044,8 +982,7 @@ 
     /**
      * @return bool
      */
-    public function isClientChangeable()
-    {
+    public function isClientChangeable() {
         return (
             in_array(
                 $this->getState(),

Classes/Domain/Model/DocumentForm.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
 
     public function getFileNames()
     {
-        $fileNames = array();
+        $fileNames = array ();
         foreach ($this->getFiles() as $file) {
             $fileNames[] = $file->getTitle();
         }

Braces +25 added lines, -50 removed lines

@@ -19,8 +19,7 @@ 
  * The TYPO3 project - inspiring people to share!
  */
 
-class DocumentForm extends AbstractFormElement
-{
+class DocumentForm extends AbstractFormElement {
 
     /**
      * @var string CSRF token for this form
@@ -84,8 +83,7 @@ 
      *
      * @param string $csrfToken
      */
-    public function generateCsrfToken()
-    {
+    public function generateCsrfToken() {
         $formProtection = FormProtectionFactory::get();
         $this->csrfToken = $formProtection->generateToken('DocumentForm', 'construct', 'DocumentForm');
         $formProtection->persistSessionToken();
@@ -100,10 +98,8 @@ 
      * @throws Exception if the given string is empty.
      * @throws TypeError if the given string is null
      */
-    public function setCsrfToken(string $csrfToken)
-    {
-        if ($csrfToken === "")
-        {
+    public function setCsrfToken(string $csrfToken) {
+        if ($csrfToken === "") {
             throw new Exception("A forms CSRF token cannot be empty");
         }
         $this->csrfToken = $csrfToken;
@@ -115,8 +111,7 @@ 
      *
      * @return string CSRF token for this form
      */
-    public function getCsrfToken()
-    {
+    public function getCsrfToken() {
         return $this->csrfToken;
     }
 
@@ -126,8 +121,7 @@ 
      *
      * @return bool True, is CSRF token is considered valid. False if the token is invalid or missing.
      */
-    public function hasValidCsrfToken()
-    {
+    public function hasValidCsrfToken() {
         $formProtection = FormProtectionFactory::get();
         return $formProtection->validateToken($this->csrfToken, 'DocumentForm', 'construct', 'DocumentForm');
     }
@@ -136,8 +130,7 @@ 
      *
      * @return integer
      */
-    public function getDocumentUid()
-    {
+    public function getDocumentUid() {
         return $this->documentUid;
     }
 
@@ -145,8 +138,7 @@ 
      *
      * @param integer $documentUid
      */
-    public function setDocumentUid($documentUid)
-    {
+    public function setDocumentUid($documentUid) {
         $this->documentUid = $documentUid;
     }
 
@@ -154,8 +146,7 @@ 
      *
      * @return boolean
      */
-    public function getPrimaryFileMandatory()
-    {
+    public function getPrimaryFileMandatory() {
         return $this->primaryFileMandatory;
     }
 
@@ -163,8 +154,7 @@ 
      *
      * @param boolean $primaryFileMandatory
      */
-    public function setPrimaryFileMandatory($primaryFileMandatory)
-    {
+    public function setPrimaryFileMandatory($primaryFileMandatory) {
         $this->primaryFileMandatory = boolval($primaryFileMandatory);
     }
 
@@ -172,8 +162,7 @@ 
      *
      * @return string
      */
-    public function getFedoraPid()
-    {
+    public function getFedoraPid() {
         return $this->fedoraPid;
     }
 
@@ -181,52 +170,44 @@ 
      *
      * @param string $fedoraPid
      */
-    public function setFedoraPid($fedoraPid)
-    {
+    public function setFedoraPid($fedoraPid) {
         $this->fedoraPid = $fedoraPid;
     }
 
-    public function getFiles()
-    {
+    public function getFiles() {
         return $this->files;
     }
 
     /**
      * @return bool
      */
-    public function hasFiles()
-    {
+    public function hasFiles() {
         return is_array($this->files) && !empty($this->files);
     }
 
-    public function setFiles($files)
-    {
+    public function setFiles($files) {
         $this->files = $files;
     }
 
-    public function addFile($file)
-    {
+    public function addFile($file) {
         $this->files[] = $file;
     }
 
     /**
      * @return bool
      */
-    public function getValid()
-    {
+    public function getValid() {
         return $this->valid;
     }
 
     /**
      * @param bool $valid
      */
-    public function setValid($valid)
-    {
+    public function setValid($valid) {
         $this->valid = boolval($valid);
     }
 
-    public function getFileNames()
-    {
+    public function getFileNames() {
         $fileNames = array();
         foreach ($this->getFiles() as $file) {
             $fileNames[] = $file->getTitle();
@@ -239,8 +220,7 @@ 
      *
      * @return string
      */
-    public function getProcessNumber()
-    {
+    public function getProcessNumber() {
         return $this->processNumber;
     }
 
@@ -249,8 +229,7 @@ 
      *
      * @param string $processNumber
      */
-    public function setProcessNumber($processNumber)
-    {
+    public function setProcessNumber($processNumber) {
         $this->processNumber = $processNumber;
     }
 
@@ -259,8 +238,7 @@ 
      *
      * @return bool
      */
-    public function isTemporary()
-    {
+    public function isTemporary() {
         return $this->temporary;
     }
 
@@ -268,24 +246,21 @@ 
      * Sets if a document is a temporary document or not.
      * @param bool $temporary
      */
-    public function setTemporary($temporary)
-    {
+    public function setTemporary($temporary) {
         $this->temporary = boolval($temporary);
     }
 
     /**
      * @return string
      */
-    public function getComment()
-    {
+    public function getComment() {
         return $this->comment;
     }
 
     /**
      * @param string $comment
      */
-    public function setComment($comment)
-    {
+    public function setComment($comment) {
         $this->comment = $comment;
     }
 }

Classes/Domain/Model/DocumentFormGroup.php

Braces +6 added lines, -12 removed lines

@@ -14,8 +14,7 @@ 
  * The TYPO3 project - inspiring people to share!
  */
 
-class DocumentFormGroup extends AbstractFormElement
-{
+class DocumentFormGroup extends AbstractFormElement {
 
     /**
      * infoText
@@ -49,8 +48,7 @@ 
      *
      * @return string $infoText
      */
-    public function getInfoText()
-    {
+    public function getInfoText() {
         return $this->infoText;
     }
 
@@ -60,24 +58,21 @@ 
      * @param string $infoText
      * @return void
      */
-    public function setInfoText($infoText)
-    {
+    public function setInfoText($infoText) {
         $this->infoText = $infoText;
     }
 
     /**
      * @return mixed
      */
-    public function getGroupType()
-    {
+    public function getGroupType() {
         return $this->groupType;
     }
 
     /**
      * @param mixed $groupType
      */
-    public function setGroupType($groupType)
-    {
+    public function setGroupType($groupType) {
         $this->groupType = $groupType;
     }
 
@@ -132,8 +127,7 @@ 
     /**
      * @param mixed $groupType
      */
-    public function isPrimaryFileGroup()
-    {
+    public function isPrimaryFileGroup() {
         return $this->groupType == 'primary_file';
     }
 

Classes/Domain/Model/MetadataGroup.php

Braces +40 added lines, -80 removed lines

@@ -17,8 +17,7 @@ 
 /**
  * MetadataGroup
  */
-class MetadataGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements MetadataMandatoryInterface
-{
+class MetadataGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity implements MetadataMandatoryInterface {
 
     /**
      * name
@@ -124,8 +123,7 @@ 
     /**
      * __construct
      */
-    public function __construct()
-    {
+    public function __construct() {
         //Do not remove the next line: It would break the functionality
         $this->initStorageObjects();
     }
@@ -135,8 +133,7 @@ 
      *
      * @return void
      */
-    protected function initStorageObjects()
-    {
+    protected function initStorageObjects() {
         $this->metadataObject = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
     }
 
@@ -145,8 +142,7 @@ 
      *
      * @return string $name
      */
-    public function getName()
-    {
+    public function getName() {
         return $this->name;
     }
 
@@ -156,8 +152,7 @@ 
      * @param string $name
      * @return void
      */
-    public function setName($name)
-    {
+    public function setName($name) {
         $this->name = $name;
     }
 
@@ -166,8 +161,7 @@ 
      *
      * @return string $displayName
      */
-    public function getDisplayName()
-    {
+    public function getDisplayName() {
         return $this->displayName;
     }
 
@@ -177,8 +171,7 @@ 
      * @param string $displayName
      * @return void
      */
-    public function setDisplayName($displayName)
-    {
+    public function setDisplayName($displayName) {
         $this->displayName = $displayName;
     }
 
@@ -187,8 +180,7 @@ 
      *
      * @return string $mandatory
      */
-    public function getMandatory()
-    {
+    public function getMandatory() {
         return $this->mandatory;
     }
 
@@ -198,8 +190,7 @@ 
      * @param string $mandatory
      * @return void
      */
-    public function setMandatory($mandatory)
-    {
+    public function setMandatory($mandatory) {
         $this->mandatory = $mandatory;
     }
 
@@ -208,8 +199,7 @@ 
      *
      * @return string $mapping
      */
-    public function getMapping()
-    {
+    public function getMapping() {
         return $this->mapping;
     }
 
@@ -219,8 +209,7 @@ 
      * @param string $mapping
      * @return void
      */
-    public function setMapping($mapping)
-    {
+    public function setMapping($mapping) {
         $this->mapping = $mapping;
     }
 
@@ -229,8 +218,7 @@ 
      *
      * @return string $mappingForReading
      */
-    public function getMappingForReading()
-    {
+    public function getMappingForReading() {
         return $this->mappingForReading;
     }
 
@@ -240,8 +228,7 @@ 
      * @param string $mappingForReading
      * @return void
      */
-    public function setMappingForReading($mappingForReading)
-    {
+    public function setMappingForReading($mappingForReading) {
         $this->mappingForReading = $mappingForReading;
     }
 
@@ -250,8 +237,7 @@ 
      *
      * @return bool
      */
-    public function hasMappingForReading()
-    {
+    public function hasMappingForReading() {
         $mapping = trim($this->mappingForReading);
         return !empty($mapping);
     }
@@ -262,8 +248,7 @@ 
      * @param $mapping
      * @return string $relativeMapping
      */
-    protected function relativeMapping($mapping)
-    {
+    protected function relativeMapping($mapping) {
         return trim($mapping, " /");
     }
 
@@ -272,8 +257,7 @@ 
      *
      * @return string $relativeMappingForWriting
      */
-    public function getRelativeMapping()
-    {
+    public function getRelativeMapping() {
         return $this->relativeMapping($this->mapping);
     }
 
@@ -282,8 +266,7 @@ 
      *
      * @return string $relativeMappingForReading
      */
-    public function getRelativeMappingForReading()
-    {
+    public function getRelativeMappingForReading() {
         return $this->relativeMapping($this->mappingForReading);
     }
 
@@ -292,8 +275,7 @@ 
      *
      * @return string $absoluteMappingForWriting
      */
-    public function getAbsoluteMapping()
-    {
+    public function getAbsoluteMapping() {
         return "/data/" . $this->getRelativeMapping();
     }
 
@@ -302,8 +284,7 @@ 
      *
      * @return string $absoluteMappingForReading
      */
-    public function getAbsoluteMappingForReading()
-    {
+    public function getAbsoluteMappingForReading() {
         return "/data/" . $this->getRelativeMappingForReading();
     }
 
@@ -312,8 +293,7 @@ 
      *
      * @return string $modsExtensionMapping
      */
-    public function getModsExtensionMapping()
-    {
+    public function getModsExtensionMapping() {
         return $this->modsExtensionMapping;
     }
 
@@ -323,8 +303,7 @@ 
      * @param string $modsExtensionMapping
      * @return void
      */
-    public function setModsExtensionMapping($modsExtensionMapping)
-    {
+    public function setModsExtensionMapping($modsExtensionMapping) {
         $this->modsExtensionMapping = $modsExtensionMapping;
     }
 
@@ -333,8 +312,7 @@ 
      *
      * @return string $relativeModsExtensionMapping
      */
-    public function getRelativeModsExtensionMapping()
-    {
+    public function getRelativeModsExtensionMapping() {
 //        $modsRegExp = "/^.*?mods:mods/i";
 //        $mapping    = preg_replace($modsRegExp, "", $this->modsExtensionMapping);
         return trim($this->modsExtensionMapping, " /");
@@ -345,8 +323,7 @@ 
      *
      * @return string $absoluteModsExtensionMapping
      */
-    public function getAbsoluteModsExtensionMapping()
-    {
+    public function getAbsoluteModsExtensionMapping() {
         return "/data/" . $this->getRelativeModsExtensionMapping();
     }
 
@@ -356,8 +333,7 @@ 
      * @param string $modsExtensionReference
      * @return void
      */
-    public function setModsExtensionReference($modsExtensionReference)
-    {
+    public function setModsExtensionReference($modsExtensionReference) {
         $this->modsExtensionReference = $modsExtensionReference;
     }
 
@@ -366,8 +342,7 @@ 
      *
      * @return string $modsExtensionReference
      */
-    public function getModsExtensionReference()
-    {
+    public function getModsExtensionReference() {
         return $this->modsExtensionReference;
     }
 
@@ -376,8 +351,7 @@ 
      *
      * @return integer $maxIteration
      */
-    public function getMaxIteration()
-    {
+    public function getMaxIteration() {
         if ($this->isPrimaryFileGroup()) {
             return 1;
         }
@@ -390,8 +364,7 @@ 
      * @param integer $maxIteration
      * @return void
      */
-    public function setMaxIteration($maxIteration)
-    {
+    public function setMaxIteration($maxIteration) {
         if ($this->isPrimaryFileGroup()) {
             $maxIteration = 1;
         }
@@ -404,8 +377,7 @@ 
      * @param \EWW\Dpf\Domain\Model\MetadataObject $metadataObject
      * @return void
      */
-    public function addMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObject)
-    {
+    public function addMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObject) {
         $this->metadataObject->attach($metadataObject);
     }
 
@@ -415,8 +387,7 @@ 
      * @param \EWW\Dpf\Domain\Model\MetadataObject $metadataObjectToRemove The MetadataObject to be removed
      * @return void
      */
-    public function removeMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObjectToRemove)
-    {
+    public function removeMetadataObject(\EWW\Dpf\Domain\Model\MetadataObject $metadataObjectToRemove) {
         $this->metadataObject->detach($metadataObjectToRemove);
     }
 
@@ -425,8 +396,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
      */
-    public function getMetadataObject()
-    {
+    public function getMetadataObject() {
         return $this->metadataObject;
     }
 
@@ -436,8 +406,7 @@ 
      * @param \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
      * @return void
      */
-    public function setMetadataObject(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $metadataObject)
-    {
+    public function setMetadataObject(\TYPO3\CMS\Extbase\Persistence\ObjectStorage $metadataObject) {
         $this->metadataObject = $metadataObject;
     }
 
@@ -446,8 +415,7 @@ 
      *
      * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\EWW\Dpf\Domain\Model\MetadataObject> $metadataObject
      */
-    public function getChildren()
-    {
+    public function getChildren() {
         return $this->getMetadataObject();
     }
 
@@ -456,8 +424,7 @@ 
      *
      * @return array $accessRestrictionRoles
      */
-    public function getAccessRestrictionRoles()
-    {
+    public function getAccessRestrictionRoles() {
         if ($this->accessRestrictionRoles) {
             return array_map('trim', explode(',', $this->accessRestrictionRoles));
         } else {
@@ -471,8 +438,7 @@ 
      * @param array $accessRestrictionRoles
      * @return void
      */
-    public function setAccessRestrictionRoles($accessRestrictionRoles)
-    {
+    public function setAccessRestrictionRoles($accessRestrictionRoles) {
         $this->accessRestrictionRoles = implode(',', $accessRestrictionRoles);
     }
 
@@ -481,8 +447,7 @@ 
      *
      * @return string $infoText
      */
-    public function getInfoText()
-    {
+    public function getInfoText() {
         return $this->infoText;
     }
 
@@ -492,8 +457,7 @@ 
      * @param string $infoText
      * @return void
      */
-    public function setInfoText($infoText)
-    {
+    public function setInfoText($infoText) {
         $this->infoText = $infoText;
     }
 
@@ -508,23 +472,19 @@ 
     /**
      * @param string $groupType
      */
-    public function setGroupType(string $groupType)
-    {
+    public function setGroupType(string $groupType) {
         $this->groupType = $groupType;
     }
 
-    public function isFileGroup()
-    {
+    public function isFileGroup() {
         return $this->isPrimaryFileGroup() || $this->isSecondaryFileGroup();
     }
 
-    public function isPrimaryFileGroup()
-    {
+    public function isPrimaryFileGroup() {
         return $this->getGroupType() == 'primary_file';
     }
 
-    public function isSecondaryFileGroup()
-    {
+    public function isSecondaryFileGroup() {
         return $this->getGroupType() == 'secondary_file';
     }
 

Classes/Controller/DocumentFormBackofficeController.php

Braces +11 added lines, -22 removed lines

@@ -30,8 +30,7 @@ 
 
 use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
 
-class DocumentFormBackofficeController extends AbstractDocumentFormController
-{
+class DocumentFormBackofficeController extends AbstractDocumentFormController {
     /**
      * documentTransferManager
      *
@@ -81,8 +80,7 @@ 
     /**
      * DocumentController constructor.
      */
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
 
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
@@ -129,8 +127,7 @@ 
         $activeGroup = '',
         $activeGroupIndex = 0,
         $addCurrentFeUser = true
-    )
-    {
+    ) {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
         $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
 
@@ -179,8 +176,7 @@ 
      * @param \EWW\Dpf\Domain\Model\DocumentForm $documentForm
      * @param bool $restore
      */
-    public function createSuggestionDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $restore = FALSE)
-    {
+    public function createSuggestionDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $restore = FALSE) {
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
         $workingCopy = $this->documentRepository->findByUid($documentForm->getDocumentUid());
@@ -288,8 +284,7 @@ 
     }
 
 
-    public function updateAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm)
-    {
+    public function updateAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm) {
         if ($this->request->getArgument('documentData')['suggestMod']) {
             $restore = $this->request->getArgument('documentData')['suggestRestore'];
             $this->forward('createSuggestionDocument', null, null, ['documentForm' => $documentForm, 'restore' => $restore]);
@@ -326,8 +321,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null, $backToList = false)
-    {
+    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null, $backToList = false) {
         try {
             /** @var \EWW\Dpf\Domain\Model\Document $document */
             $document = $this->documentRepository->findByUid($documentForm->getDocumentUid());
@@ -517,8 +511,7 @@ 
         }
     }
 
-    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm)
-    {
+    public function createAction(\EWW\Dpf\Domain\Model\DocumentForm $newDocumentForm) {
         /** @var \EWW\Dpf\Helper\DocumentMapper $documentMapper */
         $documentMapper = $this->objectManager->get(DocumentMapper::class);
 
@@ -584,8 +577,7 @@ 
      *
      * @return void
      */
-    public function cancelEditAction($documentUid = 0, $backToList = false)
-    {
+    public function cancelEditAction($documentUid = 0, $backToList = false) {
         if (empty($documentUid) || $backToList) {
             $this->redirectToDocumentList();
         }
@@ -603,14 +595,12 @@ 
      *
      * @return void
      */
-    public function cancelNewAction()
-    {
+    public function cancelNewAction() {
         $this->redirect('list');
     }
 
 
-    public function initializeAction()
-    {
+    public function initializeAction() {
         $this->authorizationChecker->denyAccessUnlessLoggedIn();
 
         parent::initializeAction();
@@ -624,8 +614,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    protected function redirectToDocumentList($message = null)
-    {
+    protected function redirectToDocumentList($message = null) {
         list($action, $controller, $redirectUri) = $this->session->getStoredAction();
 
         if ($redirectUri) {

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

@@ -52,7 +52,7 @@ 
      * @var \EWW\Dpf\Services\Document\EditingLockService
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $editingLockService = null;
+    protected $editingLockService = NULL;
 
     /**
      * documentManager
@@ -60,7 +60,7 @@ 
      * @var \EWW\Dpf\Services\Document\DocumentManager
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $documentManager = null;
+    protected $documentManager = NULL;
 
     /**
      * bookmarkRepository
@@ -68,7 +68,7 @@ 
      * @var \EWW\Dpf\Domain\Repository\BookmarkRepository
      * @TYPO3\CMS\Extbase\Annotation\Inject
      */
-    protected $bookmarkRepository = null;
+    protected $bookmarkRepository = NULL;
 
     /**
      * clientConfigurationManager
@@ -125,10 +125,10 @@ 
      */
     public function editAction(
         \EWW\Dpf\Domain\Model\DocumentForm $documentForm,
-        bool $suggestMod = false,
+        bool $suggestMod = FALSE,
         $activeGroup = '',
         $activeGroupIndex = 0,
-        $addCurrentFeUser = true
+        $addCurrentFeUser = TRUE
     )
     {
         /** @var \EWW\Dpf\Domain\Model\Document $document */
@@ -157,7 +157,7 @@ 
             }
 
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -186,7 +186,7 @@ 
         $workingCopy = $this->documentRepository->findByUid($documentForm->getDocumentUid());
 
         if ($workingCopy->isTemporary()) {
-            $workingCopy->setTemporary(false);
+            $workingCopy->setTemporary(FALSE);
         }
 
         $newDocument = $this->objectManager->get(Document::class);
@@ -206,7 +206,7 @@ 
             $newDocument->setLinkedUid($document->getUid());
         }
 
-        $newDocument->setSuggestion(true);
+        $newDocument->setSuggestion(TRUE);
         $newDocument->setComment($document->getComment());
 
         if ($restore) {
@@ -245,7 +245,7 @@ 
                     ''
                 );
             }
-            $this->addFlashMessage($flashMessage, '', AbstractMessage::OK, true);
+            $this->addFlashMessage($flashMessage, '', AbstractMessage::OK, TRUE);
 
             $notifier = $this->objectManager->get(Notifier::class);
             $notifier->sendAdminNewSuggestionNotification($newDocument);
@@ -281,7 +281,7 @@ 
 
         } catch (\Throwable $t) {
             $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR;
-            $this->addFlashMessage("Failed", '', $severity,false);
+            $this->addFlashMessage("Failed", '', $severity,FALSE);
         }
 
         $this->redirectToDocumentList();
@@ -292,7 +292,7 @@ 
     {
         if ($this->request->getArgument('documentData')['suggestMod']) {
             $restore = $this->request->getArgument('documentData')['suggestRestore'];
-            $this->forward('createSuggestionDocument', null, null, ['documentForm' => $documentForm, 'restore' => $restore]);
+            $this->forward('createSuggestionDocument', NULL, NULL, ['documentForm' => $documentForm, 'restore' => $restore]);
         }
 
         $backToList = $this->request->getArgument('documentData')['backToList'];
@@ -302,7 +302,7 @@ 
         } elseif ($this->request->hasArgument('saveWorkingCopy')) {
             $saveMode = 'saveWorkingCopy';
         } else {
-            $saveMode = null;
+            $saveMode = NULL;
         }
 
         $this->forward(
@@ -326,7 +326,7 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = null, $backToList = false)
+    public function updateDocumentAction(\EWW\Dpf\Domain\Model\DocumentForm $documentForm, $saveMode = NULL, $backToList = FALSE)
     {
         try {
             /** @var \EWW\Dpf\Domain\Model\Document $document */
@@ -348,8 +348,8 @@ 
                 $this->addFlashMessage($message, '', AbstractMessage::ERROR);
 
                 $this->redirect('cancelEdit',
-                    null,
-                    null,
+                    NULL,
+                    NULL,
                     ['documentUid' => $document->getUid(), 'backToList' => $backToList]
                 );
                 /*
@@ -367,13 +367,13 @@ 
             /** @var \EWW\Dpf\Domain\Model\Document $updateDocument */
             $updateDocument = $documentMapper->getDocument($documentForm);
 
-            $saveWorkingCopy = false;
-            $workflowTransition = null;
+            $saveWorkingCopy = FALSE;
+            $workflowTransition = NULL;
 
             // Convert the temporary copy into a local working copy if needed.
             if ( $updateDocument->isTemporaryCopy() && $saveMode == 'saveWorkingCopy') {
-                $saveWorkingCopy = true;
-                $updateDocument->setTemporary(false);
+                $saveWorkingCopy = TRUE;
+                $updateDocument->setTemporary(FALSE);
                 $workflowTransition = DocumentWorkflow::TRANSITION_IN_PROGRESS;
             } elseif ($updateDocument->isTemporaryCopy() && $saveMode == 'saveAndUpdate') {
                 $workflowTransition = DocumentWorkflow::TRANSITION_REMOTE_UPDATE;
@@ -481,8 +481,8 @@ 
                 $this->redirectToDocumentList();
             } else {
                 $this->redirect('cancelEdit',
-                    null,
-                    null,
+                    NULL,
+                    NULL,
                     ['documentUid' => $updateDocument->getUid(), 'backToList' => $backToList]
                 );
                 // $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
@@ -507,13 +507,13 @@ 
 
             $exceptionMsg[] = LocalizationUtility::translate($key, 'dpf');
 
-            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity, true);
+            $this->addFlashMessage(implode(" ", $exceptionMsg), '', $severity, TRUE);
             $this->redirect('cancelEdit',
-                null,
-                null,
+                NULL,
+                NULL,
                 ['documentUid' => $updateDocument->getUid(), 'backToList' => $backToList]
             );
-            $this->redirect('showDetails', 'Document', null, ['document' => $updateDocument]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $updateDocument]);
         }
     }
 
@@ -530,7 +530,7 @@ 
             $args[] = $document->getTitle();
             $message = LocalizationUtility::translate($key, 'dpf', $args);
             $this->addFlashMessage($message, '', AbstractMessage::ERROR);
-            $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+            $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
             return FALSE;
         }
 
@@ -544,7 +544,7 @@ 
                 $message,
                 '',
                 $severity,
-                true
+                TRUE
             );
 
         } catch (\TYPO3\CMS\Extbase\Mvc\Exception\StopActionException $e) {
@@ -566,7 +566,7 @@ 
                 implode(" ", $message),
                 '',
                 $severity,
-                true
+                TRUE
             );
         }
 
@@ -584,7 +584,7 @@ 
      *
      * @return void
      */
-    public function cancelEditAction($documentUid = 0, $backToList = false)
+    public function cancelEditAction($documentUid = 0, $backToList = FALSE)
     {
         if (empty($documentUid) || $backToList) {
             $this->redirectToDocumentList();
@@ -592,7 +592,7 @@ 
 
         /** @var $document \EWW\Dpf\Domain\Model\Document */
         $document = $this->documentRepository->findByUid($documentUid);
-        $this->redirect('showDetails', 'Document', null, ['document' => $document]);
+        $this->redirect('showDetails', 'Document', NULL, ['document' => $document]);
     }
 
     /**
@@ -624,14 +624,14 @@ 
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
      * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
      */
-    protected function redirectToDocumentList($message = null)
+    protected function redirectToDocumentList($message = NULL)
     {
         list($action, $controller, $redirectUri) = $this->session->getStoredAction();
 
         if ($redirectUri) {
             $this->redirectToUri($redirectUri);
         } else {
-            $this->redirect($action, $controller, null, array('message' => $message));
+            $this->redirect($action, $controller, NULL, array('message' => $message));
         }
     }
 }

Classes/Controller/GetFileController.php

Braces +5 added lines, -10 removed lines

@@ -50,8 +50,7 @@ 
 /**
  * GetFileController
  */
-class GetFileController extends \EWW\Dpf\Controller\AbstractController
-{
+class GetFileController extends \EWW\Dpf\Controller\AbstractController {
 
     /**
      * documentRepository
@@ -69,8 +68,7 @@ 
      */
     protected $clientConfigurationManager;
 
-    public function attachmentAction()
-    {
+    public function attachmentAction() {
 
         $piVars = GeneralUtility::_GP('tx_dpf'); // get GET params from powermail
 
@@ -293,8 +291,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
@@ -306,8 +303,7 @@ 
         return $filename;
     }
 
-    private function buildMetsXml($document)
-    {
+    private function buildMetsXml($document) {
         $parserGenerator = new ParserGenerator();
         $parserGenerator->setXML($document->getXmlData());
 
@@ -323,8 +319,7 @@ 
         return $XSLTransformator->getTransformedOutputXML($document);
     }
 
-    private function isForbidden($action)
-    {
+    private function isForbidden($action) {
         $allowed =
             array_key_exists('allowedActions', $this->settings)
             && is_array($this->settings['allowedActions'])

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

@@ -199,22 +199,22 @@ 
         // allow dissemination if a request parameter 'deliverInactive' has the secret
         // TYPOScript configuration value 'deliverInactiveSecretKey'
 
-        $restrictToActiveDocuments = true;
+        $restrictToActiveDocuments = TRUE;
         $deliverInactiveSecretKey = $this->settings['deliverInactiveSecretKey'];
 
         if ($deliverInactiveSecretKey == $piVars['deliverInactive']) {
-            $restrictToActiveDocuments = false;
+            $restrictToActiveDocuments = FALSE;
         }
 
-        if (true === $isRepositoryObject) {
-            if (true === $restrictToActiveDocuments) {
+        if (TRUE === $isRepositoryObject) {
+            if (TRUE === $restrictToActiveDocuments) {
                 // if restriction applies, check object state before dissemination
                 $objectProfileURI = rtrim('http://' . $fedoraHost,
                         "/") . '/fedora/objects/' . $piVars['qid'] . '?format=XML';
                 $objectProfileXML = file_get_contents($objectProfileURI);
-                if (false !== $objectProfileXML) {
+                if (FALSE !== $objectProfileXML) {
                     $objectProfileDOM = new \DOMDocument('1.0', 'UTF-8');
-                    if (true === $objectProfileDOM->loadXML($objectProfileXML)) {
+                    if (TRUE === $objectProfileDOM->loadXML($objectProfileXML)) {
                         $objectState = $objectProfileDOM->getElementsByTagName('objState')[0];
                         if ('I' === $objectState->nodeValue) {
                             $this->response->setStatus(403);
@@ -235,29 +235,29 @@ 
         // get remote header and set it before passtrough
         $headers = get_headers($path);
 
-        if (false === $headers) {
+        if (FALSE === $headers) {
             $this->response->setStatus(500);
             return 'Error while fetching headers';
         }
 
-        $contentDispFlag = false;
-        $contentTypeFlag = false;
+        $contentDispFlag = FALSE;
+        $contentTypeFlag = FALSE;
 
         foreach ($headers as $value) {
 
-            if (false !== stripos($value, 'Content-Disposition')) {
+            if (FALSE !== stripos($value, 'Content-Disposition')) {
                 header($value);
-                $contentDispFlag = true;
+                $contentDispFlag = TRUE;
                 continue;
             }
 
-            if (false !== stripos($value, 'Content-Type')) {
+            if (FALSE !== stripos($value, 'Content-Type')) {
                 header($value);
-                $contentTypeFlag = true;
+                $contentTypeFlag = TRUE;
                 continue;
             }
 
-            if (false !== stripos($value, 'Content-Length')) {
+            if (FALSE !== stripos($value, 'Content-Length')) {
                 header($value);
                 continue;
             }