fabarea / vidi

Classes/Grid/GridAnalyserService.php

Indentation +102 added lines, -102 removed lines

@@ -16,114 +16,114 @@
 class GridAnalyserService
 {
 
-    /**
-     * Check relation for table.
-     *
-     * @param $tableName
-     * @return array
-     */
-    public function checkRelationForTable($tableName)
-    {
+	/**
+	 * Check relation for table.
+	 *
+	 * @param $tableName
+	 * @return array
+	 */
+	public function checkRelationForTable($tableName)
+	{
 
-        $relations = [];
-        $table = Tca::table($tableName);
+		$relations = [];
+		$table = Tca::table($tableName);
 
-        $missingOppositionRelationMessage = <<<EOF
+		$missingOppositionRelationMessage = <<<EOF
 
   WARNING! Could not define relation precisely. This is not necessarily a problem
   if the opposite relation is not required in a Grid. But consider adding the opposite
   TCA configuration if so.
 EOF;
 
-        foreach (Tca::grid($tableName)->getFields() as $fieldName => $configuration) {
-
-            if ($table->hasField($fieldName)) {
-                if ($table->field($fieldName)->hasMany()) {
-                    if ($table->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
-                        $_relations = $this->checkRelationOf($tableName, $fieldName, 'comma separated values');
-                        $relations = array_merge($relations, $_relations);
-                    } elseif ($table->field($fieldName)->hasRelationManyToMany()) {
-                        $_relations = $this->checkRelationManyToMany($tableName, $fieldName);
-                        $relations = array_merge($relations, $_relations);
-
-                    } elseif ($table->field($fieldName)->hasRelationOneToMany()) {
-                        $_relations = $this->checkRelationOf($tableName, $fieldName, 'one-to-many');
-                        $relations = array_merge($relations, $_relations);
-                    } else {
-                        $relations[] = sprintf('* field: "%s", relation: ?-to-many%s', $fieldName, $missingOppositionRelationMessage);
-                    }
-                    $relations[] = '';
-                } elseif ($table->field($fieldName)->hasOne()) {
-
-                    if ($table->field($fieldName)->hasRelationOneToOne()) {
-                        $relations[] = sprintf('* one-to-one "%s"', $fieldName);
-                    } elseif ($table->field($fieldName)->hasRelationManyToOne()) {
-                        $_relations = $this->checkRelationOf($tableName, $fieldName, 'many-to-one');
-                        $relations = array_merge($relations, $_relations);
-                    } else {
-                        $relations[] = sprintf('* field: "%s", relation: ?-to-one%s', $fieldName, $missingOppositionRelationMessage);
-                    }
-                    $relations[] = '';
-                }
-            }
-        }
-        return $relations;
-    }
-
-    /**
-     * Convenience method for printing out relation many-to-many.
-     *
-     * @param string $tableName
-     * @param string $fieldName
-     * @return array
-     */
-    protected function checkRelationManyToMany($tableName, $fieldName)
-    {
-
-        $output = [];
-
-        $table = Tca::table($tableName);
-        $output[] = sprintf('* field: "%s", relation: many-to-many', $fieldName);
-
-        $foreignTable = $table->field($fieldName)->getForeignTable();
-        $manyToManyTable = $table->field($fieldName)->getManyToManyTable();
-        $foreignField = $table->field($fieldName)->getForeignField();
-
-        if (!$foreignField) {
-            $output[] = sprintf('  ERROR! Can not found foreign field for "%s". Perhaps missing opposite configuration?', $fieldName);
-        } elseif (!$foreignTable) {
-            $output[] = sprintf('  ERROR! Can not found foreign table for "%s". Perhaps missing opposite configuration?', $fieldName);
-        } elseif (!$manyToManyTable) {
-            $output[] = sprintf('  ERROR! Can not found relation table (MM) for "%s". Perhaps missing opposite configuration?', $fieldName);
-        } else {
-            $output[] = sprintf('  %s.%s <--> %s <--> %s.%s', $tableName, $fieldName, $manyToManyTable, $foreignTable, $foreignField);
-        }
-
-        $output[] = '';
-        return $output;
-    }
-
-    /**
-     * Convenience method for printing out relation.
-     *
-     * @param string $tableName
-     * @param string $fieldName
-     * @param string $relationType
-     * @return array
-     */
-    protected function checkRelationOf($tableName, $fieldName, $relationType)
-    {
-
-        $output = [];
-
-        $table = Tca::table($tableName);
-        $output[] = sprintf('* field: "%s", relation: %s', $fieldName, $relationType);
-
-        $foreignTable = $table->field($fieldName)->getForeignTable();
-        $foreignField = $table->field($fieldName)->getForeignField();
-        $output[] = sprintf('  %s.%s <--> %s.%s', $tableName, $fieldName, $foreignTable, $foreignField);
-        $output[] = '';
-
-        return $output;
-    }
+		foreach (Tca::grid($tableName)->getFields() as $fieldName => $configuration) {
+
+			if ($table->hasField($fieldName)) {
+				if ($table->field($fieldName)->hasMany()) {
+					if ($table->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
+						$_relations = $this->checkRelationOf($tableName, $fieldName, 'comma separated values');
+						$relations = array_merge($relations, $_relations);
+					} elseif ($table->field($fieldName)->hasRelationManyToMany()) {
+						$_relations = $this->checkRelationManyToMany($tableName, $fieldName);
+						$relations = array_merge($relations, $_relations);
+
+					} elseif ($table->field($fieldName)->hasRelationOneToMany()) {
+						$_relations = $this->checkRelationOf($tableName, $fieldName, 'one-to-many');
+						$relations = array_merge($relations, $_relations);
+					} else {
+						$relations[] = sprintf('* field: "%s", relation: ?-to-many%s', $fieldName, $missingOppositionRelationMessage);
+					}
+					$relations[] = '';
+				} elseif ($table->field($fieldName)->hasOne()) {
+
+					if ($table->field($fieldName)->hasRelationOneToOne()) {
+						$relations[] = sprintf('* one-to-one "%s"', $fieldName);
+					} elseif ($table->field($fieldName)->hasRelationManyToOne()) {
+						$_relations = $this->checkRelationOf($tableName, $fieldName, 'many-to-one');
+						$relations = array_merge($relations, $_relations);
+					} else {
+						$relations[] = sprintf('* field: "%s", relation: ?-to-one%s', $fieldName, $missingOppositionRelationMessage);
+					}
+					$relations[] = '';
+				}
+			}
+		}
+		return $relations;
+	}
+
+	/**
+	 * Convenience method for printing out relation many-to-many.
+	 *
+	 * @param string $tableName
+	 * @param string $fieldName
+	 * @return array
+	 */
+	protected function checkRelationManyToMany($tableName, $fieldName)
+	{
+
+		$output = [];
+
+		$table = Tca::table($tableName);
+		$output[] = sprintf('* field: "%s", relation: many-to-many', $fieldName);
+
+		$foreignTable = $table->field($fieldName)->getForeignTable();
+		$manyToManyTable = $table->field($fieldName)->getManyToManyTable();
+		$foreignField = $table->field($fieldName)->getForeignField();
+
+		if (!$foreignField) {
+			$output[] = sprintf('  ERROR! Can not found foreign field for "%s". Perhaps missing opposite configuration?', $fieldName);
+		} elseif (!$foreignTable) {
+			$output[] = sprintf('  ERROR! Can not found foreign table for "%s". Perhaps missing opposite configuration?', $fieldName);
+		} elseif (!$manyToManyTable) {
+			$output[] = sprintf('  ERROR! Can not found relation table (MM) for "%s". Perhaps missing opposite configuration?', $fieldName);
+		} else {
+			$output[] = sprintf('  %s.%s <--> %s <--> %s.%s', $tableName, $fieldName, $manyToManyTable, $foreignTable, $foreignField);
+		}
+
+		$output[] = '';
+		return $output;
+	}
+
+	/**
+	 * Convenience method for printing out relation.
+	 *
+	 * @param string $tableName
+	 * @param string $fieldName
+	 * @param string $relationType
+	 * @return array
+	 */
+	protected function checkRelationOf($tableName, $fieldName, $relationType)
+	{
+
+		$output = [];
+
+		$table = Tca::table($tableName);
+		$output[] = sprintf('* field: "%s", relation: %s', $fieldName, $relationType);
+
+		$foreignTable = $table->field($fieldName)->getForeignTable();
+		$foreignField = $table->field($fieldName)->getForeignField();
+		$output[] = sprintf('  %s.%s <--> %s.%s', $tableName, $fieldName, $foreignTable, $foreignField);
+		$output[] = '';
+
+		return $output;
+	}
 }

Classes/Grid/CheckBoxRenderer.php

Indentation +25 added lines, -25 removed lines

@@ -14,30 +14,30 @@
 class CheckBoxRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Configure the "Check Box" Grid Renderer.
-     */
-    public function __construct()
-    {
-        $configuration = array(
-            'width' => '5px',
-            'sortable' => false,
-            'canBeHidden' => false,
-            'html' => '<input type="checkbox" class="checkbox-row-top"/>',
-        );
-        parent::__construct($configuration);
-    }
+	/**
+	 * Configure the "Check Box" Grid Renderer.
+	 */
+	public function __construct()
+	{
+		$configuration = array(
+			'width' => '5px',
+			'sortable' => false,
+			'canBeHidden' => false,
+			'html' => '<input type="checkbox" class="checkbox-row-top"/>',
+		);
+		parent::__construct($configuration);
+	}
 
-    /**
-     * Render the "Check Box" in the Grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        return sprintf('<input type="checkbox" class="checkbox-row" data-index="%s" data-uid="%s"/>',
-            $this->getRowIndex(),
-            $this->getObject()->getUid()
-        );
-    }
+	/**
+	 * Render the "Check Box" in the Grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		return sprintf('<input type="checkbox" class="checkbox-row" data-index="%s" data-uid="%s"/>',
+			$this->getRowIndex(),
+			$this->getObject()->getUid()
+		);
+	}
 }

Classes/Grid/ButtonGroupRenderer.php

Indentation +37 added lines, -37 removed lines

@@ -16,42 +16,42 @@
 class ButtonGroupRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Configure the "Button Group" Grid Renderer.
-     */
-    public function __construct()
-    {
-        $configuration = array(
-            'sortable' => false,
-            'canBeHidden' => false,
-            'width' => '100px',
-        );
-        parent::__construct($configuration);
-    }
-
-    /**
-     * Render the "Button Group" in the Grid, e.g. edit, delete, etc..
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $components = $this->getModuleLoader()->getGridButtonsComponents();
-
-        $buttons = [];
-        foreach ($components as $component) {
-
-            /** @var  $view */
-            $view = GeneralUtility::makeInstance($component);
-            $buttons[] = $view->render($this->getObject());
-        }
-
-        $output = sprintf(
-            '<div class="btn-toolbar pull-right" role="toolbar" aria-label=""><div class="btn-group" role="group" aria-label="">%s</div></div>',
-            implode("\n", $buttons)
-        );
-
-        return $output;
-    }
+	/**
+	 * Configure the "Button Group" Grid Renderer.
+	 */
+	public function __construct()
+	{
+		$configuration = array(
+			'sortable' => false,
+			'canBeHidden' => false,
+			'width' => '100px',
+		);
+		parent::__construct($configuration);
+	}
+
+	/**
+	 * Render the "Button Group" in the Grid, e.g. edit, delete, etc..
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$components = $this->getModuleLoader()->getGridButtonsComponents();
+
+		$buttons = [];
+		foreach ($components as $component) {
+
+			/** @var  $view */
+			$view = GeneralUtility::makeInstance($component);
+			$buttons[] = $view->render($this->getObject());
+		}
+
+		$output = sprintf(
+			'<div class="btn-toolbar pull-right" role="toolbar" aria-label=""><div class="btn-group" role="group" aria-label="">%s</div></div>',
+			implode("\n", $buttons)
+		);
+
+		return $output;
+	}
 
 }

Classes/Module/ConfigurablePart.php

Indentation +18 added lines, -18 removed lines

@@ -14,25 +14,25 @@
 class ConfigurablePart
 {
 
-    const __default = '';
-    const EXCLUDED_FIELDS = 'excluded_fields';
-    const MENU_VISIBLE_ITEMS = 'menuVisibleItems';
-    const MENU_VISIBLE_ITEMS_DEFAULT = 'menuVisibleItemsDefault';
+	const __default = '';
+	const EXCLUDED_FIELDS = 'excluded_fields';
+	const MENU_VISIBLE_ITEMS = 'menuVisibleItems';
+	const MENU_VISIBLE_ITEMS_DEFAULT = 'menuVisibleItemsDefault';
 
-    /**
-     * Get the valid values for this enum.
-     *
-     * @param boolean $include_default
-     * @return array
-     */
-    static public function getParts($include_default = false)
-    {
+	/**
+	 * Get the valid values for this enum.
+	 *
+	 * @param boolean $include_default
+	 * @return array
+	 */
+	static public function getParts($include_default = false)
+	{
 
-        return array(
-            'EXCLUDED_FIELDS' => self::EXCLUDED_FIELDS,
-            'MENU_VISIBLE_ITEMS' => self::MENU_VISIBLE_ITEMS,
-            'MENU_VISIBLE_ITEMS_DEFAULT' => self::MENU_VISIBLE_ITEMS_DEFAULT,
-        );
-    }
+		return array(
+			'EXCLUDED_FIELDS' => self::EXCLUDED_FIELDS,
+			'MENU_VISIBLE_ITEMS' => self::MENU_VISIBLE_ITEMS,
+			'MENU_VISIBLE_ITEMS_DEFAULT' => self::MENU_VISIBLE_ITEMS_DEFAULT,
+		);
+	}
 
 }
\ No newline at end of file

Classes/Persistence/ConstraintContainer.php

Indentation +20 added lines, -20 removed lines

@@ -15,27 +15,27 @@
  */
 class ConstraintContainer
 {
-    /**
-     * @var ConstraintInterface
-     */
-    protected $constraint;
+	/**
+	 * @var ConstraintInterface
+	 */
+	protected $constraint;
 
-    /**
-     * @return ConstraintInterface
-     */
-    public function getConstraint()
-    {
-        return $this->constraint;
-    }
+	/**
+	 * @return ConstraintInterface
+	 */
+	public function getConstraint()
+	{
+		return $this->constraint;
+	}
 
-    /**
-     * @param ConstraintInterface $constraint
-     * @return $this
-     */
-    public function setConstraint($constraint)
-    {
-        $this->constraint = $constraint;
-        return $this;
-    }
+	/**
+	 * @param ConstraintInterface $constraint
+	 * @return $this
+	 */
+	public function setConstraint($constraint)
+	{
+		$this->constraint = $constraint;
+		return $this;
+	}
 
 }

Classes/Module/ModulePreferences.php

Spacing +2 added lines, -2 removed lines

@@ -179,8 +179,8 @@
         $generalSettings = $this->getSettings();
 
         $preferences = [];
-        if (isset($generalSettings[$dataType . '.'])) {
-            $settings = $generalSettings[$dataType . '.'];
+        if (isset($generalSettings[$dataType.'.'])) {
+            $settings = $generalSettings[$dataType.'.'];
 
             $configurableParts = ConfigurablePart::getParts();
             foreach ($settings as $key => $value) {

Indentation +216 added lines, -216 removed lines

@@ -19,221 +19,221 @@
 class ModulePreferences implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $preferences;
-
-    /**
-     * @var string
-     */
-    protected $tableName = 'tx_vidi_preference';
-
-    /**
-     * @param string $key
-     * @param string $dataType
-     * @return mixed
-     */
-    public function get($key, $dataType = '')
-    {
-
-        if (empty($dataType)) {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-
-        if (!$this->isLoaded($dataType)) {
-            $this->load($dataType);
-        }
-
-        $value = empty($this->preferences[$dataType][$key]) ? null : $this->preferences[$dataType][$key];
-        return $value;
-    }
-
-    /**
-     * Tell whether the module is loaded.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    public function isLoaded($dataType)
-    {
-        return !empty($this->preferences[$dataType]);
-    }
-
-    /**
-     * @param string $dataType
-     * @return array
-     */
-    public function getAll($dataType = '')
-    {
-
-        if (empty($dataType)) {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-        $this->load($dataType);
-        return $this->preferences[$dataType];
-    }
-
-    /**
-     * Get the md5 signature of the preferences.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    public function getSignature($dataType = '')
-    {
-        $preferences = $this->getAll($dataType);
-        return md5(serialize($preferences));
-    }
-
-    /**
-     * Load preferences.
-     *
-     * @param string $dataType
-     * @return void
-     */
-    public function load($dataType)
-    {
-
-        // Fetch preferences from different sources and overlay them
-        $databasePreferences = $this->fetchPreferencesFromDatabase($dataType);
-        $generalPreferences = $this->fetchGlobalPreferencesFromTypoScript();
-        $specificPreferences = $this->fetchExtraPreferencesFromTypoScript($dataType);
-
-        $preferences = array_merge($generalPreferences, $specificPreferences, $databasePreferences);
-        $this->preferences[$dataType] = $preferences;
-    }
-
-    /**
-     * Save preferences
-     *
-     * @param array $preferences
-     * @return void
-     */
-    public function save($preferences)
-    {
-        $configurableParts = ConfigurablePart::getParts();
-
-        $dataType = $this->getModuleLoader()->getDataType();
-        $this->getDataService()->delete(
-            $this->tableName,
-            [
-                'data_type' => $dataType
-            ]
-        );
-
-        $sanitizedPreferences = [];
-        foreach ($preferences as $key => $value) {
-            if (in_array($key, $configurableParts)) {
-                $sanitizedPreferences[$key] = $value;
-            }
-        }
-
-        $this->getDataService()->insert(
-            $this->tableName,
-            [
-                'data_type' => $dataType,
-                'preferences' => serialize($sanitizedPreferences),
-            ]
-        );
-    }
-
-    /**
-     * @param $dataType
-     * @return array
-     */
-    public function fetchPreferencesFromDatabase($dataType)
-    {
-        $preferences = [];
-        $record = $this->getDataService()->getRecord(
-            $this->tableName,
-            [
-                'data_type' => $dataType
-            ]
-        );
-
-        if (!empty($record)) {
-            $preferences = unserialize($record['preferences']);
-        }
-
-        return $preferences;
-    }
-
-    /**
-     * Returns the module settings.
-     *
-     * @return array
-     */
-    protected function fetchGlobalPreferencesFromTypoScript()
-    {
-        $settings = $this->getSettings();
-
-        $configurableParts = ConfigurablePart::getParts();
-        $preferences = [];
-        foreach ($settings as $key => $value) {
-            if (in_array($key, $configurableParts)) {
-                $preferences[$key] = $value;
-            }
-        }
-
-        return $preferences;
-    }
-
-    /**
-     * Returns the module settings.
-     *
-     * @param string $dataType
-     * @return array
-     */
-    protected function fetchExtraPreferencesFromTypoScript($dataType)
-    {
-        $generalSettings = $this->getSettings();
-
-        $preferences = [];
-        if (isset($generalSettings[$dataType . '.'])) {
-            $settings = $generalSettings[$dataType . '.'];
-
-            $configurableParts = ConfigurablePart::getParts();
-            foreach ($settings as $key => $value) {
-                if (in_array($key, $configurableParts)) {
-                    $preferences[$key] = $value;
-                }
-            }
-        }
-
-        return $preferences;
-    }
-
-    /**
-     * Returns the module settings.
-     *
-     * @return array
-     */
-    protected function getSettings()
-    {
-        /** @var BackendConfigurationManager $backendConfigurationManager */
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        $backendConfigurationManager = $objectManager->get(BackendConfigurationManager::class);
-        $configuration = $backendConfigurationManager->getTypoScriptSetup();
-        return $configuration['module.']['tx_vidi.']['settings.'];
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $preferences;
+
+	/**
+	 * @var string
+	 */
+	protected $tableName = 'tx_vidi_preference';
+
+	/**
+	 * @param string $key
+	 * @param string $dataType
+	 * @return mixed
+	 */
+	public function get($key, $dataType = '')
+	{
+
+		if (empty($dataType)) {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+
+		if (!$this->isLoaded($dataType)) {
+			$this->load($dataType);
+		}
+
+		$value = empty($this->preferences[$dataType][$key]) ? null : $this->preferences[$dataType][$key];
+		return $value;
+	}
+
+	/**
+	 * Tell whether the module is loaded.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	public function isLoaded($dataType)
+	{
+		return !empty($this->preferences[$dataType]);
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return array
+	 */
+	public function getAll($dataType = '')
+	{
+
+		if (empty($dataType)) {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+		$this->load($dataType);
+		return $this->preferences[$dataType];
+	}
+
+	/**
+	 * Get the md5 signature of the preferences.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	public function getSignature($dataType = '')
+	{
+		$preferences = $this->getAll($dataType);
+		return md5(serialize($preferences));
+	}
+
+	/**
+	 * Load preferences.
+	 *
+	 * @param string $dataType
+	 * @return void
+	 */
+	public function load($dataType)
+	{
+
+		// Fetch preferences from different sources and overlay them
+		$databasePreferences = $this->fetchPreferencesFromDatabase($dataType);
+		$generalPreferences = $this->fetchGlobalPreferencesFromTypoScript();
+		$specificPreferences = $this->fetchExtraPreferencesFromTypoScript($dataType);
+
+		$preferences = array_merge($generalPreferences, $specificPreferences, $databasePreferences);
+		$this->preferences[$dataType] = $preferences;
+	}
+
+	/**
+	 * Save preferences
+	 *
+	 * @param array $preferences
+	 * @return void
+	 */
+	public function save($preferences)
+	{
+		$configurableParts = ConfigurablePart::getParts();
+
+		$dataType = $this->getModuleLoader()->getDataType();
+		$this->getDataService()->delete(
+			$this->tableName,
+			[
+				'data_type' => $dataType
+			]
+		);
+
+		$sanitizedPreferences = [];
+		foreach ($preferences as $key => $value) {
+			if (in_array($key, $configurableParts)) {
+				$sanitizedPreferences[$key] = $value;
+			}
+		}
+
+		$this->getDataService()->insert(
+			$this->tableName,
+			[
+				'data_type' => $dataType,
+				'preferences' => serialize($sanitizedPreferences),
+			]
+		);
+	}
+
+	/**
+	 * @param $dataType
+	 * @return array
+	 */
+	public function fetchPreferencesFromDatabase($dataType)
+	{
+		$preferences = [];
+		$record = $this->getDataService()->getRecord(
+			$this->tableName,
+			[
+				'data_type' => $dataType
+			]
+		);
+
+		if (!empty($record)) {
+			$preferences = unserialize($record['preferences']);
+		}
+
+		return $preferences;
+	}
+
+	/**
+	 * Returns the module settings.
+	 *
+	 * @return array
+	 */
+	protected function fetchGlobalPreferencesFromTypoScript()
+	{
+		$settings = $this->getSettings();
+
+		$configurableParts = ConfigurablePart::getParts();
+		$preferences = [];
+		foreach ($settings as $key => $value) {
+			if (in_array($key, $configurableParts)) {
+				$preferences[$key] = $value;
+			}
+		}
+
+		return $preferences;
+	}
+
+	/**
+	 * Returns the module settings.
+	 *
+	 * @param string $dataType
+	 * @return array
+	 */
+	protected function fetchExtraPreferencesFromTypoScript($dataType)
+	{
+		$generalSettings = $this->getSettings();
+
+		$preferences = [];
+		if (isset($generalSettings[$dataType . '.'])) {
+			$settings = $generalSettings[$dataType . '.'];
+
+			$configurableParts = ConfigurablePart::getParts();
+			foreach ($settings as $key => $value) {
+				if (in_array($key, $configurableParts)) {
+					$preferences[$key] = $value;
+				}
+			}
+		}
+
+		return $preferences;
+	}
+
+	/**
+	 * Returns the module settings.
+	 *
+	 * @return array
+	 */
+	protected function getSettings()
+	{
+		/** @var BackendConfigurationManager $backendConfigurationManager */
+		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+		$backendConfigurationManager = $objectManager->get(BackendConfigurationManager::class);
+		$configuration = $backendConfigurationManager->getTypoScriptSetup();
+		return $configuration['module.']['tx_vidi.']['settings.'];
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
 }

Classes/Controller/UserPreferencesController.php

Spacing +2 added lines, -2 removed lines

@@ -29,10 +29,10 @@
 
         $dataType = $this->getModuleLoader()->getDataType();
 
-        $key = $dataType . '_' . $this->getBackendUserIdentifier() . '_' . $key;
+        $key = $dataType.'_'.$this->getBackendUserIdentifier().'_'.$key;
         $this->getCacheInstance()->set($key, $value, [], 0);
 
-        $key = $dataType . '_' . $this->getBackendUserIdentifier() . '_signature';
+        $key = $dataType.'_'.$this->getBackendUserIdentifier().'_signature';
         $this->getCacheInstance()->set($key, $preferenceSignature, [], 0);
 
         return 'OK';

Indentation +56 added lines, -56 removed lines

@@ -20,69 +20,69 @@
 class UserPreferencesController extends ActionController
 {
 
-    /**
-     * @param string $key
-     * @param string $value
-     * @param string $preferenceSignature
-     * @return string
-     */
-    public function saveAction($key, $value, $preferenceSignature)
-    {
+	/**
+	 * @param string $key
+	 * @param string $value
+	 * @param string $preferenceSignature
+	 * @return string
+	 */
+	public function saveAction($key, $value, $preferenceSignature)
+	{
 
-        $dataType = $this->getModuleLoader()->getDataType();
+		$dataType = $this->getModuleLoader()->getDataType();
 
-        $key = $dataType . '_' . $this->getBackendUserIdentifier() . '_' . $key;
-        $this->getCacheInstance()->set($key, $value, [], 0);
+		$key = $dataType . '_' . $this->getBackendUserIdentifier() . '_' . $key;
+		$this->getCacheInstance()->set($key, $value, [], 0);
 
-        $key = $dataType . '_' . $this->getBackendUserIdentifier() . '_signature';
-        $this->getCacheInstance()->set($key, $preferenceSignature, [], 0);
+		$key = $dataType . '_' . $this->getBackendUserIdentifier() . '_signature';
+		$this->getCacheInstance()->set($key, $preferenceSignature, [], 0);
 
-        return 'OK';
-    }
+		return 'OK';
+	}
 
-    /**
-     * @return int
-     */
-    protected function getBackendUserIdentifier()
-    {
-        return $this->getBackendUser()->user['uid'];
-    }
+	/**
+	 * @return int
+	 */
+	protected function getBackendUserIdentifier()
+	{
+		return $this->getBackendUser()->user['uid'];
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
-    /**
-     * @return AbstractFrontend
-     */
-    protected function getCacheInstance()
-    {
-        return $this->getCacheManager()->getCache('vidi');
-    }
+	/**
+	 * @return AbstractFrontend
+	 */
+	protected function getCacheInstance()
+	{
+		return $this->getCacheManager()->getCache('vidi');
+	}
 
-    /**
-     * Return the Cache Manager
-     *
-     * @return CacheManager
-     */
-    protected function getCacheManager()
-    {
-        return GeneralUtility::makeInstance(CacheManager::class);
-    }
+	/**
+	 * Return the Cache Manager
+	 *
+	 * @return CacheManager
+	 */
+	protected function getCacheManager()
+	{
+		return GeneralUtility::makeInstance(CacheManager::class);
+	}
 }

Classes/Grid/ColumnRendererAbstract.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
     {
         if (is_string($configuration)) {
             $configuration = $legacyParameterConfiguration;
-            GeneralUtility::deprecationLog('ColumnRendererAbstract: first parameter must now be an array. Please edit me in ' . get_class($this));
+            GeneralUtility::deprecationLog('ColumnRendererAbstract: first parameter must now be an array. Please edit me in '.get_class($this));
         }
         $this->configuration = $configuration;
     }
@@ -174,7 +174,7 @@ 
      * @see http://www.php.net/manual/function.htmlentities.php
      * @api
      */
-    protected function secure($value , $keepQuotes = false, $encoding = 'UTF-8')
+    protected function secure($value, $keepQuotes = false, $encoding = 'UTF-8')
     {
         $flags = $keepQuotes ? ENT_NOQUOTES : ENT_COMPAT;
         return htmlspecialchars($value, $flags, $encoding);

Indentation +186 added lines, -186 removed lines

@@ -19,191 +19,191 @@
 abstract class ColumnRendererAbstract implements ColumnRendererInterface
 {
 
-    /**
-     * The content object.
-     *
-     * @var Content
-     */
-    protected $object;
-
-    /**
-     * @var string
-     */
-    protected $fieldName;
-
-    /**
-     * @var int
-     */
-    protected $rowIndex;
-
-    /**
-     * @var array
-     */
-    protected $fieldConfiguration = [];
-
-    /**
-     * @var array
-     */
-    protected $gridRendererConfiguration = [];
-
-    /**
-     * @var array
-     */
-    protected $configuration = [];
-
-    /**
-     * Constructor of a Generic component in Vidi.
-     *
-     * @param array $configuration
-     * @param array $legacyParameterConfiguration
-     */
-    public function __construct($configuration = [], $legacyParameterConfiguration = array())
-    {
-        if (is_string($configuration)) {
-            $configuration = $legacyParameterConfiguration;
-            GeneralUtility::deprecationLog('ColumnRendererAbstract: first parameter must now be an array. Please edit me in ' . get_class($this));
-        }
-        $this->configuration = $configuration;
-    }
-
-    /**
-     * @return array
-     */
-    public function getConfiguration()
-    {
-        return $this->configuration;
-    }
-
-    /**
-     * @return Content
-     */
-    public function getObject()
-    {
-        return $this->object;
-    }
-
-    /**
-     * @param Content $object
-     * @return $this
-     */
-    public function setObject($object)
-    {
-        $this->object = $object;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getFieldName()
-    {
-        return $this->fieldName;
-    }
-
-    /**
-     * @param string $fieldName
-     * @return $this
-     */
-    public function setFieldName($fieldName)
-    {
-        $this->fieldName = $fieldName;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getRowIndex()
-    {
-        return $this->rowIndex;
-    }
-
-    /**
-     * @param int $rowIndex
-     * @return $this
-     */
-    public function setRowIndex($rowIndex)
-    {
-        $this->rowIndex = $rowIndex;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getFieldConfiguration()
-    {
-        return $this->fieldConfiguration;
-    }
-
-    /**
-     * @param array $fieldConfiguration
-     * @return $this
-     */
-    public function setFieldConfiguration($fieldConfiguration)
-    {
-        $this->fieldConfiguration = $fieldConfiguration;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getGridRendererConfiguration()
-    {
-        return $this->gridRendererConfiguration;
-    }
-
-    /**
-     * @param array $gridRendererConfiguration
-     * @return $this
-     */
-    public function setGridRendererConfiguration($gridRendererConfiguration)
-    {
-        $this->gridRendererConfiguration = $gridRendererConfiguration;
-        return $this;
-    }
-
-    /**
-     * Escapes special characters with their escaped counterparts as needed using PHPs htmlentities() function.
-     *
-     * @param string $value string to format
-     * @param bool $keepQuotes if TRUE, single and double quotes won't be replaced (sets ENT_NOQUOTES flag)
-     * @param string $encoding
-     * @return string
-     * @see http://www.php.net/manual/function.htmlentities.php
-     * @api
-     */
-    protected function secure($value , $keepQuotes = false, $encoding = 'UTF-8')
-    {
-        $flags = $keepQuotes ? ENT_NOQUOTES : ENT_COMPAT;
-        return htmlspecialchars($value, $flags, $encoding);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return object|ModuleLoader
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    /**
-     * @return object|IconFactory
-     */
-    protected function getIconFactory()
-    {
-        return GeneralUtility::makeInstance(IconFactory::class);
-    }
-
-    /**
-     * @return object|LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(LanguageService::class);
-    }
+	/**
+	 * The content object.
+	 *
+	 * @var Content
+	 */
+	protected $object;
+
+	/**
+	 * @var string
+	 */
+	protected $fieldName;
+
+	/**
+	 * @var int
+	 */
+	protected $rowIndex;
+
+	/**
+	 * @var array
+	 */
+	protected $fieldConfiguration = [];
+
+	/**
+	 * @var array
+	 */
+	protected $gridRendererConfiguration = [];
+
+	/**
+	 * @var array
+	 */
+	protected $configuration = [];
+
+	/**
+	 * Constructor of a Generic component in Vidi.
+	 *
+	 * @param array $configuration
+	 * @param array $legacyParameterConfiguration
+	 */
+	public function __construct($configuration = [], $legacyParameterConfiguration = array())
+	{
+		if (is_string($configuration)) {
+			$configuration = $legacyParameterConfiguration;
+			GeneralUtility::deprecationLog('ColumnRendererAbstract: first parameter must now be an array. Please edit me in ' . get_class($this));
+		}
+		$this->configuration = $configuration;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getConfiguration()
+	{
+		return $this->configuration;
+	}
+
+	/**
+	 * @return Content
+	 */
+	public function getObject()
+	{
+		return $this->object;
+	}
+
+	/**
+	 * @param Content $object
+	 * @return $this
+	 */
+	public function setObject($object)
+	{
+		$this->object = $object;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getFieldName()
+	{
+		return $this->fieldName;
+	}
+
+	/**
+	 * @param string $fieldName
+	 * @return $this
+	 */
+	public function setFieldName($fieldName)
+	{
+		$this->fieldName = $fieldName;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getRowIndex()
+	{
+		return $this->rowIndex;
+	}
+
+	/**
+	 * @param int $rowIndex
+	 * @return $this
+	 */
+	public function setRowIndex($rowIndex)
+	{
+		$this->rowIndex = $rowIndex;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getFieldConfiguration()
+	{
+		return $this->fieldConfiguration;
+	}
+
+	/**
+	 * @param array $fieldConfiguration
+	 * @return $this
+	 */
+	public function setFieldConfiguration($fieldConfiguration)
+	{
+		$this->fieldConfiguration = $fieldConfiguration;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getGridRendererConfiguration()
+	{
+		return $this->gridRendererConfiguration;
+	}
+
+	/**
+	 * @param array $gridRendererConfiguration
+	 * @return $this
+	 */
+	public function setGridRendererConfiguration($gridRendererConfiguration)
+	{
+		$this->gridRendererConfiguration = $gridRendererConfiguration;
+		return $this;
+	}
+
+	/**
+	 * Escapes special characters with their escaped counterparts as needed using PHPs htmlentities() function.
+	 *
+	 * @param string $value string to format
+	 * @param bool $keepQuotes if TRUE, single and double quotes won't be replaced (sets ENT_NOQUOTES flag)
+	 * @param string $encoding
+	 * @return string
+	 * @see http://www.php.net/manual/function.htmlentities.php
+	 * @api
+	 */
+	protected function secure($value , $keepQuotes = false, $encoding = 'UTF-8')
+	{
+		$flags = $keepQuotes ? ENT_NOQUOTES : ENT_COMPAT;
+		return htmlspecialchars($value, $flags, $encoding);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return object|ModuleLoader
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	/**
+	 * @return object|IconFactory
+	 */
+	protected function getIconFactory()
+	{
+		return GeneralUtility::makeInstance(IconFactory::class);
+	}
+
+	/**
+	 * @return object|LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(LanguageService::class);
+	}
 
 }

Classes/Configuration/ConfigurationUtility.php

Indentation +57 added lines, -57 removed lines

@@ -18,68 +18,68 @@
 class ConfigurationUtility implements SingletonInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $extensionKey = 'vidi';
+	/**
+	 * @var string
+	 */
+	protected $extensionKey = 'vidi';
 
-    /**
-     * @var array
-     */
-    protected $configuration = [];
+	/**
+	 * @var array
+	 */
+	protected $configuration = [];
 
-    /**
-     * Returns a class instance.
-     *
-     * @return ConfigurationUtility|object
-     * @throws \InvalidArgumentException
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(self::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return ConfigurationUtility|object
+	 * @throws \InvalidArgumentException
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(self::class);
+	}
 
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $configuration = $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get($this->extensionKey);
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$configuration = $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get($this->extensionKey);
 
-        // Fill up configuration array with relevant values.
-        foreach ($configuration as $key => $value) {
-            $this->configuration[$key] = $value;
-        }
-    }
+		// Fill up configuration array with relevant values.
+		foreach ($configuration as $key => $value) {
+			$this->configuration[$key] = $value;
+		}
+	}
 
-    /**
-     * Returns a setting key.
-     *
-     * @param string $key
-     * @return array
-     */
-    public function get($key)
-    {
-        return isset($this->configuration[$key]) ? $this->configuration[$key] : null;
-    }
+	/**
+	 * Returns a setting key.
+	 *
+	 * @param string $key
+	 * @return array
+	 */
+	public function get($key)
+	{
+		return isset($this->configuration[$key]) ? $this->configuration[$key] : null;
+	}
 
-    /**
-     * Set a setting key.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        $this->configuration[$key] = $value;
-    }
+	/**
+	 * Set a setting key.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		$this->configuration[$key] = $value;
+	}
 
-    /**
-     * @return array
-     */
-    public function getConfiguration()
-    {
-        return $this->configuration;
-    }
+	/**
+	 * @return array
+	 */
+	public function getConfiguration()
+	{
+		return $this->configuration;
+	}
 }