fabarea / vidi

Classes/Resolver/ContentObjectResolver.php

Indentation +83 added lines, -83 removed lines

@@ -20,87 +20,87 @@
 class ContentObjectResolver implements SingletonInterface
 {
 
-    /**
-     * @param Content $object
-     * @param string $fieldNameAndPath
-     * @return string
-     */
-    public function getDataType(Content $object, $fieldNameAndPath)
-    {
-
-        // Important to notice the field name can contains a path, e.g. metadata.title and must be sanitized.
-        $relationalFieldName = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath); // ex: metadata.title -> metadata
-
-        // Handle case when field name leads to a relation.
-        if ($object[$relationalFieldName] instanceof Content) {
-            $resolvedDataType = $object[$relationalFieldName]->getDataType();
-        } else {
-            $resolvedDataType = $object->getDataType();
-        }
-
-        return $resolvedDataType;
-    }
-
-    /**
-     * Fetch the value of an object according to a field path.
-     * The returned value can be a string, int or array of Content objects.
-     *
-     * @param Content $object
-     * @param string $fieldNameAndPath
-     * @param string $fieldName
-     * @param int $language
-     * @return mixed
-     */
-    public function getValue(Content $object, $fieldNameAndPath, $fieldName, $language = 0)
-    {
-
-        $resolvedContentObject = $this->getObject($object, $fieldNameAndPath);
-        $resolvedValue = $resolvedContentObject[$fieldName];
-
-        if (is_scalar($resolvedValue) && $language > 0) {
-            $resolvedValue = $this->getLanguageService()->getLocalizedFieldName($resolvedContentObject, $language, $fieldName);
-        }
-
-        return $resolvedValue;
-    }
-
-    /**
-     * Fetch the value of an object according to a field name and path.
-     * The returned value is a Content object.
-     *
-     * @param Content $object
-     * @param string $fieldNameAndPath
-     * @return Content
-     */
-    public function getObject(Content $object, $fieldNameAndPath)
-    {
-
-        // Important to notice the field name can contains a path, e.g. metadata.title and must be sanitized.
-        $fieldPath = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath); // ex: metadata.title -> metadata
-
-        // Handle case when field name leads to a relation.
-        if ($object[$fieldPath] instanceof Content) {
-            $resolvedObject = $object[$fieldPath];
-        } else {
-            $resolvedObject = $object;
-        }
-
-        return $resolvedObject;
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\FieldPathResolver::class);
-    }
-
-    /**
-     * @return \Fab\Vidi\Language\LanguageService|object
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Language\LanguageService::class);
-    }
+	/**
+	 * @param Content $object
+	 * @param string $fieldNameAndPath
+	 * @return string
+	 */
+	public function getDataType(Content $object, $fieldNameAndPath)
+	{
+
+		// Important to notice the field name can contains a path, e.g. metadata.title and must be sanitized.
+		$relationalFieldName = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath); // ex: metadata.title -> metadata
+
+		// Handle case when field name leads to a relation.
+		if ($object[$relationalFieldName] instanceof Content) {
+			$resolvedDataType = $object[$relationalFieldName]->getDataType();
+		} else {
+			$resolvedDataType = $object->getDataType();
+		}
+
+		return $resolvedDataType;
+	}
+
+	/**
+	 * Fetch the value of an object according to a field path.
+	 * The returned value can be a string, int or array of Content objects.
+	 *
+	 * @param Content $object
+	 * @param string $fieldNameAndPath
+	 * @param string $fieldName
+	 * @param int $language
+	 * @return mixed
+	 */
+	public function getValue(Content $object, $fieldNameAndPath, $fieldName, $language = 0)
+	{
+
+		$resolvedContentObject = $this->getObject($object, $fieldNameAndPath);
+		$resolvedValue = $resolvedContentObject[$fieldName];
+
+		if (is_scalar($resolvedValue) && $language > 0) {
+			$resolvedValue = $this->getLanguageService()->getLocalizedFieldName($resolvedContentObject, $language, $fieldName);
+		}
+
+		return $resolvedValue;
+	}
+
+	/**
+	 * Fetch the value of an object according to a field name and path.
+	 * The returned value is a Content object.
+	 *
+	 * @param Content $object
+	 * @param string $fieldNameAndPath
+	 * @return Content
+	 */
+	public function getObject(Content $object, $fieldNameAndPath)
+	{
+
+		// Important to notice the field name can contains a path, e.g. metadata.title and must be sanitized.
+		$fieldPath = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath); // ex: metadata.title -> metadata
+
+		// Handle case when field name leads to a relation.
+		if ($object[$fieldPath] instanceof Content) {
+			$resolvedObject = $object[$fieldPath];
+		} else {
+			$resolvedObject = $object;
+		}
+
+		return $resolvedObject;
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\FieldPathResolver::class);
+	}
+
+	/**
+	 * @return \Fab\Vidi\Language\LanguageService|object
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Language\LanguageService::class);
+	}
 }

Classes/Controller/UserPreferencesController.php

Indentation +56 added lines, -56 removed lines

@@ -18,69 +18,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 \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\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 \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend
-     */
-    protected function getCacheInstance()
-    {
-        return $this->getCacheManager()->getCache('vidi');
-    }
+	/**
+	 * @return \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend
+	 */
+	protected function getCacheInstance()
+	{
+		return $this->getCacheManager()->getCache('vidi');
+	}
 
-    /**
-     * Return the Cache Manager
-     *
-     * @return \TYPO3\CMS\Core\Cache\CacheManager
-     */
-    protected function getCacheManager()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class);
-    }
+	/**
+	 * Return the Cache Manager
+	 *
+	 * @return \TYPO3\CMS\Core\Cache\CacheManager
+	 */
+	protected function getCacheManager()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class);
+	}
 }

Classes/Command/VidiCommandController.php

Indentation +50 added lines, -50 removed lines

@@ -23,59 +23,59 @@
 class VidiCommandController extends Command
 {
 
-    /**
-     * Configure the command by defining the name, options and arguments
-     */
-    protected function configure()
-    {
-        $this->setDescription('Check TCA configuration for relations used in grid.')
-        ->addOption(
-        'table',
-        'c',
-        InputOption::VALUE_NONE,
-        'The table name. If not defined check for every table.'
-    );
-    }
+	/**
+	 * Configure the command by defining the name, options and arguments
+	 */
+	protected function configure()
+	{
+		$this->setDescription('Check TCA configuration for relations used in grid.')
+		->addOption(
+		'table',
+		'c',
+		InputOption::VALUE_NONE,
+		'The table name. If not defined check for every table.'
+	);
+	}
 
-    /**
-     * Executes the command for removing the lock file
-     *
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $io = new SymfonyStyle($input, $output);
-        foreach ($GLOBALS['TCA'] as $tableName => $TCA) {
-            $table = $input->getOption('table');
-            if ($table !== '' && $table !== $tableName) {
-                continue;
-            }
+	/**
+	 * Executes the command for removing the lock file
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+		$io = new SymfonyStyle($input, $output);
+		foreach ($GLOBALS['TCA'] as $tableName => $TCA) {
+			$table = $input->getOption('table');
+			if ($table !== '' && $table !== $tableName) {
+				continue;
+			}
 
-            $fields = Tca::grid($tableName)->getFields();
-            if (!empty($fields)) {
+			$fields = Tca::grid($tableName)->getFields();
+			if (!empty($fields)) {
 
-                $relations = $this->getGridAnalyserService()->checkRelationForTable($tableName);
-                if (!empty($relations)) {
+				$relations = $this->getGridAnalyserService()->checkRelationForTable($tableName);
+				if (!empty($relations)) {
 
-                    $io->text('');
-                    $io->text('--------------------------------------------------------------------');
-                    $io->text('');
-                    $io->text(sprintf('Relations for "%s"', $tableName));
-                    $io->text('');
-                    $io->text(implode("\n", $relations));
-                }
-            }
-        }
-    }
+					$io->text('');
+					$io->text('--------------------------------------------------------------------');
+					$io->text('');
+					$io->text(sprintf('Relations for "%s"', $tableName));
+					$io->text('');
+					$io->text(implode("\n", $relations));
+				}
+			}
+		}
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Grid\GridAnalyserService|object
-     */
-    protected function getGridAnalyserService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Grid\GridAnalyserService::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Grid\GridAnalyserService|object
+	 */
+	protected function getGridAnalyserService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Grid\GridAnalyserService::class);
+	}
 }

Classes/Service/ClipboardService.php

Indentation +71 added lines, -71 removed lines

@@ -18,83 +18,83 @@
 class ClipboardService implements SingletonInterface
 {
 
-    /**
-     * Get the Matcher object of the clipboard.
-     *
-     * @return Matcher
-     */
-    public function getMatcher()
-    {
-        $matcher = $this->getBackendUser()->getModuleData($this->getDataKey());
-        if (!$matcher) {
-            /** @var $matcher Matcher */
-            $matcher = GeneralUtility::makeInstance(\Fab\Vidi\Persistence\Matcher::class);
-        }
-        return $matcher;
-    }
+	/**
+	 * Get the Matcher object of the clipboard.
+	 *
+	 * @return Matcher
+	 */
+	public function getMatcher()
+	{
+		$matcher = $this->getBackendUser()->getModuleData($this->getDataKey());
+		if (!$matcher) {
+			/** @var $matcher Matcher */
+			$matcher = GeneralUtility::makeInstance(\Fab\Vidi\Persistence\Matcher::class);
+		}
+		return $matcher;
+	}
 
-    /**
-     * Tell whether the clipboard has items or not.
-     *
-     * @return bool
-     */
-    public function hasItems()
-    {
-        $matcher = $this->getMatcher();
+	/**
+	 * Tell whether the clipboard has items or not.
+	 *
+	 * @return bool
+	 */
+	public function hasItems()
+	{
+		$matcher = $this->getMatcher();
 
-        $inCriteria = $matcher->getIn();
-        $likeCriteria = $matcher->getLike();
-        $searchTerm = $matcher->getSearchTerm();
+		$inCriteria = $matcher->getIn();
+		$likeCriteria = $matcher->getLike();
+		$searchTerm = $matcher->getSearchTerm();
 
-        $hasItems = !empty($inCriteria) || !empty($likeCriteria) || !empty($searchTerm);
-        return $hasItems;
-    }
+		$hasItems = !empty($inCriteria) || !empty($likeCriteria) || !empty($searchTerm);
+		return $hasItems;
+	}
 
-    /**
-     * Save data into the clipboard.
-     *
-     * @param Matcher $matches
-     */
-    public function save(Matcher $matches)
-    {
-        $this->getBackendUser()->pushModuleData($this->getDataKey(), $matches);
-    }
+	/**
+	 * Save data into the clipboard.
+	 *
+	 * @param Matcher $matches
+	 */
+	public function save(Matcher $matches)
+	{
+		$this->getBackendUser()->pushModuleData($this->getDataKey(), $matches);
+	}
 
-    /**
-     * Completely empty the clipboard for a data type.
-     *
-     * @return void
-     */
-    public function flush()
-    {
-        $this->getBackendUser()->pushModuleData($this->getDataKey(), null);
-    }
+	/**
+	 * Completely empty the clipboard for a data type.
+	 *
+	 * @return void
+	 */
+	public function flush()
+	{
+		$this->getBackendUser()->pushModuleData($this->getDataKey(), null);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getDataKey()
-    {
-        return 'vidi_clipboard_' . $this->getModuleLoader()->getDataType();
-    }
+	/**
+	 * @return string
+	 */
+	protected function getDataKey()
+	{
+		return 'vidi_clipboard_' . $this->getModuleLoader()->getDataType();
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }

Classes/Service/BackendUserPreferenceService.php

Indentation +46 added lines, -46 removed lines

@@ -16,54 +16,54 @@
 class BackendUserPreferenceService
 {
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Vidi\Service\BackendUserPreferenceService|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Service\BackendUserPreferenceService::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Vidi\Service\BackendUserPreferenceService|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Service\BackendUserPreferenceService::class);
+	}
 
-    /**
-     * Returns a configuration key for the current BE User.
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        $result = '';
-        if ($this->getBackendUser() && !empty($this->getBackendUser()->uc[$key])) {
-            $result = $this->getBackendUser()->uc[$key];
+	/**
+	 * Returns a configuration key for the current BE User.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		$result = '';
+		if ($this->getBackendUser() && !empty($this->getBackendUser()->uc[$key])) {
+			$result = $this->getBackendUser()->uc[$key];
 
-        }
-        return $result;
-    }
+		}
+		return $result;
+	}
 
-    /**
-     * Set a configuration for the current BE User.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        if ($this->getBackendUser()) {
-            $this->getBackendUser()->uc[$key] = $value;
-            $this->getBackendUser()->writeUC();
-        }
-    }
+	/**
+	 * Set a configuration for the current BE User.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		if ($this->getBackendUser()) {
+			$this->getBackendUser()->uc[$key] = $value;
+			$this->getBackendUser()->writeUC();
+		}
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }

Classes/Persistence/PagerObjectFactory.php

Indentation +37 added lines, -37 removed lines

@@ -17,48 +17,48 @@
 class PagerObjectFactory implements SingletonInterface
 {
 
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return \Fab\Vidi\Persistence\PagerObjectFactory|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\PagerObjectFactory::class);
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return \Fab\Vidi\Persistence\PagerObjectFactory|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\PagerObjectFactory::class);
+	}
 
-    /**
-     * Returns a pager object.
-     *
-     * @return \Fab\Vidi\Persistence\Pager
-     */
-    public function getPager()
-    {
+	/**
+	 * Returns a pager object.
+	 *
+	 * @return \Fab\Vidi\Persistence\Pager
+	 */
+	public function getPager()
+	{
 
-        /** @var $pager \Fab\Vidi\Persistence\Pager */
-        $pager = GeneralUtility::makeInstance(\Fab\Vidi\Persistence\Pager::class);
+		/** @var $pager \Fab\Vidi\Persistence\Pager */
+		$pager = GeneralUtility::makeInstance(\Fab\Vidi\Persistence\Pager::class);
 
-        // Set items per page
-        if (GeneralUtility::_GET('length') !== null) {
-            $limit = (int)GeneralUtility::_GET('length');
-            $pager->setLimit($limit);
-        }
+		// Set items per page
+		if (GeneralUtility::_GET('length') !== null) {
+			$limit = (int)GeneralUtility::_GET('length');
+			$pager->setLimit($limit);
+		}
 
-        // Set offset
-        $offset = 0;
-        if (GeneralUtility::_GET('start') !== null) {
-            $offset = (int)GeneralUtility::_GET('start');
-        }
-        $pager->setOffset($offset);
+		// Set offset
+		$offset = 0;
+		if (GeneralUtility::_GET('start') !== null) {
+			$offset = (int)GeneralUtility::_GET('start');
+		}
+		$pager->setOffset($offset);
 
-        // set page
-        $page = 1;
-        if ($pager->getLimit() > 0) {
-            $page = round($pager->getOffset() / $pager->getLimit());
-        }
-        $pager->setPage($page);
+		// set page
+		$page = 1;
+		if ($pager->getLimit() > 0) {
+			$page = round($pager->getOffset() / $pager->getLimit());
+		}
+		$pager->setPage($page);
 
-        return $pager;
-    }
+		return $pager;
+	}
 
 }

Classes/Persistence/OrderObjectFactory.php

Indentation +39 added lines, -39 removed lines

@@ -18,43 +18,43 @@
 class OrderObjectFactory implements SingletonInterface
 {
 
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return \Fab\Vidi\Persistence\OrderObjectFactory|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\OrderObjectFactory::class);
-    }
-
-    /**
-     * Returns an order object.
-     *
-     * @param string $dataType
-     * @return \Fab\Vidi\Persistence\Order|object
-     */
-    public function getOrder($dataType = '')
-    {
-
-        // Default ordering
-        $order = Tca::table($dataType)->getDefaultOrderings();
-
-        // Retrieve a possible id of the column from the request
-        $orderings = GeneralUtility::_GP('order');
-
-        if (is_array($orderings) && isset($orderings[0])) {
-            $columnPosition = $orderings[0]['column'];
-            $direction = $orderings[0]['dir'];
-
-            if ($columnPosition > 0) {
-                $field = Tca::grid()->getFieldNameByPosition($columnPosition);
-
-                $order = array(
-                    $field => strtoupper($direction)
-                );
-            }
-        }
-        return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\Order::class, $order);
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return \Fab\Vidi\Persistence\OrderObjectFactory|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\OrderObjectFactory::class);
+	}
+
+	/**
+	 * Returns an order object.
+	 *
+	 * @param string $dataType
+	 * @return \Fab\Vidi\Persistence\Order|object
+	 */
+	public function getOrder($dataType = '')
+	{
+
+		// Default ordering
+		$order = Tca::table($dataType)->getDefaultOrderings();
+
+		// Retrieve a possible id of the column from the request
+		$orderings = GeneralUtility::_GP('order');
+
+		if (is_array($orderings) && isset($orderings[0])) {
+			$columnPosition = $orderings[0]['column'];
+			$direction = $orderings[0]['dir'];
+
+			if ($columnPosition > 0) {
+				$field = Tca::grid()->getFieldNameByPosition($columnPosition);
+
+				$order = array(
+					$field => strtoupper($direction)
+				);
+			}
+		}
+		return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\Order::class, $order);
+	}
 }

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;
+	}
 }

Classes/Configuration/TcaGridAspect.php

Indentation +92 added lines, -92 removed lines

@@ -21,97 +21,97 @@
 class TcaGridAspect implements TableConfigurationPostProcessingHookInterface
 {
 
-    /**
-     * Scans each data type of the TCA and add a Grid TCA if missing.
-     *
-     * @return array
-     */
-    public function processData()
-    {
-        $configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('vidi');
-
-        $dataTypes = GeneralUtility::trimExplode(',', $configuration['data_types'], true);
-
-        if (ExtensionManagementUtility::isLoaded('vidi_frontend')) {
-
-            $extendedConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('vidi_frontend');
-            $vidiFrontendContentTypes = GeneralUtility::trimExplode(',', $extendedConfiguration['content_types'], true);
-            $extendedDataTypes = array_merge($dataTypes, $vidiFrontendContentTypes);
-            $dataTypes = array_unique($extendedDataTypes);
-        }
-
-        foreach ($dataTypes as $dataType) {
-            $this->ensureMinimumTcaForGrid($dataType);
-        }
-
-        return array($GLOBALS['TCA']);
-    }
-
-    /**
-     * @param string $dataType
-     */
-    protected function ensureMinimumTcaForGrid($dataType)
-    {
-        $labelField = $this->getLabelField($dataType);
-        if (empty($GLOBALS['TCA'][$dataType]['grid'])) {
-            $GLOBALS['TCA'][$dataType]['grid'] = [];
-        }
-
-        if (empty($GLOBALS['TCA'][$dataType]['grid']['facets'])) {
-            $GLOBALS['TCA'][$dataType]['grid']['facets'] = [
-                'uid',
-                $labelField,
-            ];
-        }
-
-        if (empty($GLOBALS['TCA'][$dataType]['grid']['columns'])) {
-            $GLOBALS['TCA'][$dataType]['grid']['columns'] = [
-                '__checkbox' => [
-                    'renderer' => CheckBoxRenderer::class,
-                ],
-                'uid' => [
-                    'visible' => false,
-                    'label' => '',
-                    'width' => '5px',
-                ],
-                $labelField => [
-                    'editable' => true,
-                ],
-                '__buttons' => [
-                    'renderer' => ButtonGroupRenderer::class,
-                ],
-            ];
-        }
-    }
-
-    /**
-     * Get the label name of table name.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    protected function getLabelField($dataType)
-    {
-        return $GLOBALS['TCA'][$dataType]['ctrl']['label'];
-    }
-
-    /**
-     * Tell whether the table has a label field.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    protected function hasLabelField($dataType)
-    {
-        return isset($GLOBALS['TCA'][$dataType]['ctrl']['label']);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Extbase\Object\ObjectManager
-     */
-    protected function getObjectManager()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-    }
+	/**
+	 * Scans each data type of the TCA and add a Grid TCA if missing.
+	 *
+	 * @return array
+	 */
+	public function processData()
+	{
+		$configuration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('vidi');
+
+		$dataTypes = GeneralUtility::trimExplode(',', $configuration['data_types'], true);
+
+		if (ExtensionManagementUtility::isLoaded('vidi_frontend')) {
+
+			$extendedConfiguration = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('vidi_frontend');
+			$vidiFrontendContentTypes = GeneralUtility::trimExplode(',', $extendedConfiguration['content_types'], true);
+			$extendedDataTypes = array_merge($dataTypes, $vidiFrontendContentTypes);
+			$dataTypes = array_unique($extendedDataTypes);
+		}
+
+		foreach ($dataTypes as $dataType) {
+			$this->ensureMinimumTcaForGrid($dataType);
+		}
+
+		return array($GLOBALS['TCA']);
+	}
+
+	/**
+	 * @param string $dataType
+	 */
+	protected function ensureMinimumTcaForGrid($dataType)
+	{
+		$labelField = $this->getLabelField($dataType);
+		if (empty($GLOBALS['TCA'][$dataType]['grid'])) {
+			$GLOBALS['TCA'][$dataType]['grid'] = [];
+		}
+
+		if (empty($GLOBALS['TCA'][$dataType]['grid']['facets'])) {
+			$GLOBALS['TCA'][$dataType]['grid']['facets'] = [
+				'uid',
+				$labelField,
+			];
+		}
+
+		if (empty($GLOBALS['TCA'][$dataType]['grid']['columns'])) {
+			$GLOBALS['TCA'][$dataType]['grid']['columns'] = [
+				'__checkbox' => [
+					'renderer' => CheckBoxRenderer::class,
+				],
+				'uid' => [
+					'visible' => false,
+					'label' => '',
+					'width' => '5px',
+				],
+				$labelField => [
+					'editable' => true,
+				],
+				'__buttons' => [
+					'renderer' => ButtonGroupRenderer::class,
+				],
+			];
+		}
+	}
+
+	/**
+	 * Get the label name of table name.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	protected function getLabelField($dataType)
+	{
+		return $GLOBALS['TCA'][$dataType]['ctrl']['label'];
+	}
+
+	/**
+	 * Tell whether the table has a label field.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	protected function hasLabelField($dataType)
+	{
+		return isset($GLOBALS['TCA'][$dataType]['ctrl']['label']);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Extbase\Object\ObjectManager
+	 */
+	protected function getObjectManager()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+	}
 
 }