fabarea / vidi

Classes/ViewHelpers/Content/AbstractContentViewHelper.php

Indentation +201 added lines, -201 removed lines

@@ -27,206 +27,206 @@
 abstract class AbstractContentViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('type', 'string', 'Corresponds to the type of data to be fetched. It will basically be a table name e.g. fe_users.', false, '');
-        $this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, array());
-        $this->registerArgument('selection', 'int', 'A possible selection defined in the BE and stored in the database.', false, 0);
-        $this->registerArgument('ignoreEnableFields', 'bool', 'Whether to ignore enable fields or not (AKA hidden, deleted, starttime, ...).', false, false);
-        $this->registerArgument('aliases', 'array', 'Attribute "matches" does not support certain character such as "." in field name. Use this to create aliases.', false, array());
-    }
-
-    /**
-     * Generate a signature to be used for storing the result set.
-     *
-     * @param string $dataType
-     * @param array $matches
-     * @param array $orderings
-     * @param $limit
-     * @param $offset
-     * @return string
-     */
-    protected function getQuerySignature($dataType, array $matches, array $orderings, $limit, $offset)
-    {
-        $serializedMatches = serialize($matches);
-        $serializedOrderings = serialize($orderings);
-        return md5($dataType . $serializedMatches . $serializedOrderings . $limit . $offset);
-    }
-
-    /**
-     * Returns a matcher object.
-     *
-     * @param string $dataType
-     * @param array $matches
-     * @return Matcher
-     * @throws NotExistingClassException
-     * @throws \InvalidArgumentException
-     */
-    protected function getMatcher($dataType, $matches = array())
-    {
-
-        /** @var $matcher Matcher */
-        $matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
-
-        // @todo implement advanced selection parsing {or: {usergroup.title: {like: foo}}, {tstamp: {greaterThan: 1234}}}
-        foreach ($matches as $fieldNameAndPath => $value) {
-
-            // CSV values should be considered as "in" operator in Query, otherwise "equals".
-            $explodedValues = GeneralUtility::trimExplode(',', $value, true);
-
-            // The matching value contains a "1,2" as example
-            if (count($explodedValues) > 1) {
-
-                $resolvedDataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
-                $resolvedFieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
-
-                // "equals" if in presence of a relation.
-                // "in" if not a relation.
-                if (Tca::table($resolvedDataType)->field($resolvedFieldName)->hasRelation()) {
-                    foreach ($explodedValues as $explodedValue) {
-                        $matcher->equals($fieldNameAndPath, $explodedValue);
-                    }
-                } else {
-                    $matcher->in($fieldNameAndPath, $explodedValues);
-                }
-            } else {
-                $matcher->equals($fieldNameAndPath, $explodedValues[0]);
-            }
-        }
-
-        // Trigger signal for post processing Matcher Object.
-        $this->emitPostProcessMatcherObjectSignal($matcher->getDataType(), $matcher);
-
-        return $matcher;
-    }
-
-    /**
-     * Replace possible aliases.
-     *
-     * @param array $values
-     * @return array
-     */
-    protected function replacesAliases(array $values)
-    {
-
-        $aliases = $this->arguments['aliases'];
-
-        foreach ($aliases as $aliasName => $aliasValue) {
-            if (isset($values[$aliasName])) {
-                $values[$aliasValue] = $values[$aliasName];
-                unset($values[$aliasName]); // remove the alias.
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Returns an order object.
-     *
-     * @param string $dataType
-     * @param array $order
-     * @return Order
-     */
-    public function getOrder($dataType, array $order = array())
-    {
-        // Default orderings in case order is empty.
-        if (empty($order)) {
-            $order = Tca::table($dataType)->getDefaultOrderings();
-        }
-
-        $order = GeneralUtility::makeInstance(Order::class, $order);
-
-        // Trigger signal for post processing Order Object.
-        $this->emitPostProcessOrderObjectSignal($dataType, $order);
-
-        return $order;
-    }
-
-    /**
-     * @return ResultSetStorage
-     */
-    public function getResultSetStorage()
-    {
-        return GeneralUtility::makeInstance(ResultSetStorage::class);
-    }
-
-    /**
-     * Signal that is called for post-processing a "order" object.
-     *
-     * @param string $dataType
-     * @param Order $order
-     */
-    protected function emitPostProcessOrderObjectSignal($dataType, Order $order)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessOrderObject', array($order, $dataType));
-    }
-
-    /**
-     * Signal that is called for post-processing a "matcher" object.
-     *
-     * @param string $dataType
-     * @param Matcher $matcher
-     */
-    protected function emitPostProcessMatcherObjectSignal($dataType, Matcher $matcher)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessMatcherObject', array($matcher, $dataType));
-    }
-
-    /**
-     * Signal that is called for post-processing a "limit".
-     *
-     * @param string $dataType
-     * @param int $limit
-     */
-    protected function emitPostProcessLimitSignal($dataType, $limit)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($limit, $dataType));
-    }
-
-    /**
-     * Signal that is called for post-processing a "offset".
-     *
-     * @param string $dataType
-     * @param int $offset
-     */
-    protected function emitPostProcessOffsetSignal($dataType, $offset)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($offset, $dataType));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher
-     *
-     * @return Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
-
-    /**
-     * @param $ignoreEnableFields
-     * @return QuerySettingsInterface
-     */
-    protected function getDefaultQuerySettings($ignoreEnableFields)
-    {
-        /** @var Typo3QuerySettings $defaultQuerySettings */
-        $defaultQuerySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
-        $defaultQuerySettings->setIgnoreEnableFields($ignoreEnableFields);
-        return $defaultQuerySettings;
-    }
-
-    /**
-     * @return FieldPathResolver
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('type', 'string', 'Corresponds to the type of data to be fetched. It will basically be a table name e.g. fe_users.', false, '');
+		$this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, array());
+		$this->registerArgument('selection', 'int', 'A possible selection defined in the BE and stored in the database.', false, 0);
+		$this->registerArgument('ignoreEnableFields', 'bool', 'Whether to ignore enable fields or not (AKA hidden, deleted, starttime, ...).', false, false);
+		$this->registerArgument('aliases', 'array', 'Attribute "matches" does not support certain character such as "." in field name. Use this to create aliases.', false, array());
+	}
+
+	/**
+	 * Generate a signature to be used for storing the result set.
+	 *
+	 * @param string $dataType
+	 * @param array $matches
+	 * @param array $orderings
+	 * @param $limit
+	 * @param $offset
+	 * @return string
+	 */
+	protected function getQuerySignature($dataType, array $matches, array $orderings, $limit, $offset)
+	{
+		$serializedMatches = serialize($matches);
+		$serializedOrderings = serialize($orderings);
+		return md5($dataType . $serializedMatches . $serializedOrderings . $limit . $offset);
+	}
+
+	/**
+	 * Returns a matcher object.
+	 *
+	 * @param string $dataType
+	 * @param array $matches
+	 * @return Matcher
+	 * @throws NotExistingClassException
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMatcher($dataType, $matches = array())
+	{
+
+		/** @var $matcher Matcher */
+		$matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
+
+		// @todo implement advanced selection parsing {or: {usergroup.title: {like: foo}}, {tstamp: {greaterThan: 1234}}}
+		foreach ($matches as $fieldNameAndPath => $value) {
+
+			// CSV values should be considered as "in" operator in Query, otherwise "equals".
+			$explodedValues = GeneralUtility::trimExplode(',', $value, true);
+
+			// The matching value contains a "1,2" as example
+			if (count($explodedValues) > 1) {
+
+				$resolvedDataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
+				$resolvedFieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
+
+				// "equals" if in presence of a relation.
+				// "in" if not a relation.
+				if (Tca::table($resolvedDataType)->field($resolvedFieldName)->hasRelation()) {
+					foreach ($explodedValues as $explodedValue) {
+						$matcher->equals($fieldNameAndPath, $explodedValue);
+					}
+				} else {
+					$matcher->in($fieldNameAndPath, $explodedValues);
+				}
+			} else {
+				$matcher->equals($fieldNameAndPath, $explodedValues[0]);
+			}
+		}
+
+		// Trigger signal for post processing Matcher Object.
+		$this->emitPostProcessMatcherObjectSignal($matcher->getDataType(), $matcher);
+
+		return $matcher;
+	}
+
+	/**
+	 * Replace possible aliases.
+	 *
+	 * @param array $values
+	 * @return array
+	 */
+	protected function replacesAliases(array $values)
+	{
+
+		$aliases = $this->arguments['aliases'];
+
+		foreach ($aliases as $aliasName => $aliasValue) {
+			if (isset($values[$aliasName])) {
+				$values[$aliasValue] = $values[$aliasName];
+				unset($values[$aliasName]); // remove the alias.
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Returns an order object.
+	 *
+	 * @param string $dataType
+	 * @param array $order
+	 * @return Order
+	 */
+	public function getOrder($dataType, array $order = array())
+	{
+		// Default orderings in case order is empty.
+		if (empty($order)) {
+			$order = Tca::table($dataType)->getDefaultOrderings();
+		}
+
+		$order = GeneralUtility::makeInstance(Order::class, $order);
+
+		// Trigger signal for post processing Order Object.
+		$this->emitPostProcessOrderObjectSignal($dataType, $order);
+
+		return $order;
+	}
+
+	/**
+	 * @return ResultSetStorage
+	 */
+	public function getResultSetStorage()
+	{
+		return GeneralUtility::makeInstance(ResultSetStorage::class);
+	}
+
+	/**
+	 * Signal that is called for post-processing a "order" object.
+	 *
+	 * @param string $dataType
+	 * @param Order $order
+	 */
+	protected function emitPostProcessOrderObjectSignal($dataType, Order $order)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessOrderObject', array($order, $dataType));
+	}
+
+	/**
+	 * Signal that is called for post-processing a "matcher" object.
+	 *
+	 * @param string $dataType
+	 * @param Matcher $matcher
+	 */
+	protected function emitPostProcessMatcherObjectSignal($dataType, Matcher $matcher)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessMatcherObject', array($matcher, $dataType));
+	}
+
+	/**
+	 * Signal that is called for post-processing a "limit".
+	 *
+	 * @param string $dataType
+	 * @param int $limit
+	 */
+	protected function emitPostProcessLimitSignal($dataType, $limit)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($limit, $dataType));
+	}
+
+	/**
+	 * Signal that is called for post-processing a "offset".
+	 *
+	 * @param string $dataType
+	 * @param int $offset
+	 */
+	protected function emitPostProcessOffsetSignal($dataType, $offset)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($offset, $dataType));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher
+	 *
+	 * @return Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
+
+	/**
+	 * @param $ignoreEnableFields
+	 * @return QuerySettingsInterface
+	 */
+	protected function getDefaultQuerySettings($ignoreEnableFields)
+	{
+		/** @var Typo3QuerySettings $defaultQuerySettings */
+		$defaultQuerySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
+		$defaultQuerySettings->setIgnoreEnableFields($ignoreEnableFields);
+		return $defaultQuerySettings;
+	}
+
+	/**
+	 * @return FieldPathResolver
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
 
 }

Classes/ViewHelpers/Content/FindViewHelper.php

Indentation +65 added lines, -65 removed lines

@@ -19,70 +19,70 @@
 class FindViewHelper extends AbstractContentViewHelper
 {
 
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function initializeArguments()
-    {
-        parent::initializeArguments();
-
-        $this->registerArgument('orderings', 'array', 'Key / value array to be used for ordering. The key corresponds to a field name. The value can be "DESC" or "ASC".', false, array());
-        $this->registerArgument('limit', 'int', 'Limit the number of records being fetched.', false, 0);
-        $this->registerArgument('offset', 'int', 'Where to start the list of records.', false, 0);
-    }
-
-    /**
-     * Fetch and returns a list of content objects.
-     *
-     * @return array
-     * @throws \BadMethodCallException
-     */
-    public function render()
-    {
-        $selectionIdentifier = (int)$this->arguments['selection'];
-
-        if ($selectionIdentifier > 0) {
-
-            /** @var SelectionRepository $selectionRepository */
-            $selectionRepository = GeneralUtility::makeInstance(SelectionRepository::class);
-
-            /** @var Selection $selection */
-            $selection = $selectionRepository->findByUid($selectionIdentifier);
-            $matches = json_decode($selection->getQuery(), true);
-            $dataType = $selection->getDataType();
-        } else {
-            $dataType = $this->arguments['type'];
-            if (!empty($this->arguments['dataType'])) {
-                print 'Sorry to be so rude! There is something to change in the View Helper "v:find". Please replace attribute "dataType" by "type". This is a shorter syntax...';
-                exit();
-            }
-            $matches = $this->replacesAliases($this->arguments['matches']);
-        }
-
-        $orderings = $this->replacesAliases($this->arguments['orderings']);
-        $limit = $this->arguments['limit'];
-        $offset = $this->arguments['offset'];
-        $ignoreEnableFields = $this->arguments['ignoreEnableFields'];
-
-        $querySignature = $this->getQuerySignature($dataType, $matches, $orderings, $limit, $offset);
-
-        $resultSet = $this->getResultSetStorage()->get($querySignature);
-        if (!$resultSet) {
-            $matcher = $this->getMatcher($dataType, $matches);
-            $orderings = $this->getOrder($dataType, $orderings);
-
-            $this->emitPostProcessLimitSignal($dataType, $limit);
-            $this->emitPostProcessOffsetSignal($dataType, $offset);
-
-            $contentRepository = ContentRepositoryFactory::getInstance($dataType);
-            $contentRepository->setDefaultQuerySettings($this->getDefaultQuerySettings($ignoreEnableFields));
-
-            $resultSet = $contentRepository->findBy($matcher, $orderings, $limit, $offset);
-            $this->getResultSetStorage()->set($querySignature, $resultSet); // store the result set for performance sake.
-        }
-
-        return $resultSet;
-    }
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function initializeArguments()
+	{
+		parent::initializeArguments();
+
+		$this->registerArgument('orderings', 'array', 'Key / value array to be used for ordering. The key corresponds to a field name. The value can be "DESC" or "ASC".', false, array());
+		$this->registerArgument('limit', 'int', 'Limit the number of records being fetched.', false, 0);
+		$this->registerArgument('offset', 'int', 'Where to start the list of records.', false, 0);
+	}
+
+	/**
+	 * Fetch and returns a list of content objects.
+	 *
+	 * @return array
+	 * @throws \BadMethodCallException
+	 */
+	public function render()
+	{
+		$selectionIdentifier = (int)$this->arguments['selection'];
+
+		if ($selectionIdentifier > 0) {
+
+			/** @var SelectionRepository $selectionRepository */
+			$selectionRepository = GeneralUtility::makeInstance(SelectionRepository::class);
+
+			/** @var Selection $selection */
+			$selection = $selectionRepository->findByUid($selectionIdentifier);
+			$matches = json_decode($selection->getQuery(), true);
+			$dataType = $selection->getDataType();
+		} else {
+			$dataType = $this->arguments['type'];
+			if (!empty($this->arguments['dataType'])) {
+				print 'Sorry to be so rude! There is something to change in the View Helper "v:find". Please replace attribute "dataType" by "type". This is a shorter syntax...';
+				exit();
+			}
+			$matches = $this->replacesAliases($this->arguments['matches']);
+		}
+
+		$orderings = $this->replacesAliases($this->arguments['orderings']);
+		$limit = $this->arguments['limit'];
+		$offset = $this->arguments['offset'];
+		$ignoreEnableFields = $this->arguments['ignoreEnableFields'];
+
+		$querySignature = $this->getQuerySignature($dataType, $matches, $orderings, $limit, $offset);
+
+		$resultSet = $this->getResultSetStorage()->get($querySignature);
+		if (!$resultSet) {
+			$matcher = $this->getMatcher($dataType, $matches);
+			$orderings = $this->getOrder($dataType, $orderings);
+
+			$this->emitPostProcessLimitSignal($dataType, $limit);
+			$this->emitPostProcessOffsetSignal($dataType, $offset);
+
+			$contentRepository = ContentRepositoryFactory::getInstance($dataType);
+			$contentRepository->setDefaultQuerySettings($this->getDefaultQuerySettings($ignoreEnableFields));
+
+			$resultSet = $contentRepository->findBy($matcher, $orderings, $limit, $offset);
+			$this->getResultSetStorage()->set($querySignature, $resultSet); // store the result set for performance sake.
+		}
+
+		return $resultSet;
+	}
 
 }

Classes/ViewHelpers/Be/AdditionalAssetsViewHelper.php

Indentation +35 added lines, -35 removed lines

@@ -20,43 +20,43 @@
 class AdditionalAssetsViewHelper extends AbstractBackendViewHelper
 {
 
-    /**
-     * Load the assets (JavaScript, CSS) for this Vidi module.
-     *
-     * @return void
-     * @api
-     */
-    public function render()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        /** @var ModuleLoader $moduleLoader */
-        $moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
+	/**
+	 * Load the assets (JavaScript, CSS) for this Vidi module.
+	 *
+	 * @return void
+	 * @api
+	 */
+	public function render()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		/** @var ModuleLoader $moduleLoader */
+		$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
 
-        foreach ($moduleLoader->getAdditionalStyleSheetFiles() as $addCssFile) {
-            $fileNameAndPath = $this->resolvePath($addCssFile);
-            $pageRenderer->addCssFile($fileNameAndPath);
-        }
+		foreach ($moduleLoader->getAdditionalStyleSheetFiles() as $addCssFile) {
+			$fileNameAndPath = $this->resolvePath($addCssFile);
+			$pageRenderer->addCssFile($fileNameAndPath);
+		}
 
-        foreach ($moduleLoader->getAdditionalJavaScriptFiles() as $addJsFile) {
-            $fileNameAndPath = $this->resolvePath($addJsFile);
-            $pageRenderer->addJsFile($fileNameAndPath);
-        }
-    }
+		foreach ($moduleLoader->getAdditionalJavaScriptFiles() as $addJsFile) {
+			$fileNameAndPath = $this->resolvePath($addJsFile);
+			$pageRenderer->addJsFile($fileNameAndPath);
+		}
+	}
 
-    /**
-     * Resolve a resource path.
-     *
-     * @param string $uri
-     * @return string
-     */
-    protected function resolvePath($uri)
-    {
-        $uri = GeneralUtility::getFileAbsFileName($uri);
-        $uri = substr($uri, strlen(Environment::getPublicPath() . '/'));
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend() && $uri !== false) {
-            $uri = '../' . $uri;
-        }
-        return $uri;
-    }
+	/**
+	 * Resolve a resource path.
+	 *
+	 * @param string $uri
+	 * @return string
+	 */
+	protected function resolvePath($uri)
+	{
+		$uri = GeneralUtility::getFileAbsFileName($uri);
+		$uri = substr($uri, strlen(Environment::getPublicPath() . '/'));
+		if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend() && $uri !== false) {
+			$uri = '../' . $uri;
+		}
+		return $uri;
+	}
 
 }

Classes/ViewHelpers/Render/ComponentsViewHelper.php

Indentation +45 added lines, -45 removed lines

@@ -18,57 +18,57 @@
  */
 class ComponentsViewHelper extends AbstractViewHelper
 {
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('part', 'string', 'Template part', true);
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('part', 'string', 'Template part', true);
+	}
 
-    /**
-     * Escapes special characters with their escaped counterparts as needed using PHPs strip_tags() function.
-     *
-     * @return mixed
-     */
-    public function render()
-    {
-        return static::renderStatic(
-            $this->arguments,
-            $this->buildRenderChildrenClosure(),
-            $this->renderingContext
-        );
-    }
+	/**
+	 * Escapes special characters with their escaped counterparts as needed using PHPs strip_tags() function.
+	 *
+	 * @return mixed
+	 */
+	public function render()
+	{
+		return static::renderStatic(
+			$this->arguments,
+			$this->buildRenderChildrenClosure(),
+			$this->renderingContext
+		);
+	}
 
-    /**
-     * Applies strip_tags() on the specified value.
-     *
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
-    {
-        /** @var ModuleLoader $moduleLoader */
-        $moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
+	/**
+	 * Applies strip_tags() on the specified value.
+	 *
+	 * @param array $arguments
+	 * @param \Closure $renderChildrenClosure
+	 * @param RenderingContextInterface $renderingContext
+	 * @return string
+	 */
+	public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+	{
+		/** @var ModuleLoader $moduleLoader */
+		$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
 
-        $part = $arguments['part'];
+		$part = $arguments['part'];
 
-        $getComponents = 'get' . ucfirst($part) . 'Components';
-        $components = $moduleLoader->$getComponents();
+		$getComponents = 'get' . ucfirst($part) . 'Components';
+		$components = $moduleLoader->$getComponents();
 
-        $result = '';
-        foreach ($components as $component) {
-            $viewHelper = GeneralUtility::makeInstance($component);
+		$result = '';
+		foreach ($components as $component) {
+			$viewHelper = GeneralUtility::makeInstance($component);
 
-            // Get possible arguments but remove first one.
-            $arguments = func_get_args();
-            array_shift($arguments);
-            $result .= call_user_func_array(array($viewHelper, 'render'), $arguments);
-        }
+			// Get possible arguments but remove first one.
+			$arguments = func_get_args();
+			array_shift($arguments);
+			$result .= call_user_func_array(array($viewHelper, 'render'), $arguments);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
         $part = $arguments['part'];
 
-        $getComponents = 'get' . ucfirst($part) . 'Components';
+        $getComponents = 'get'.ucfirst($part).'Components';
         $components = $moduleLoader->$getComponents();
 
         $result = '';

Classes/Configuration/TcaGridAspect.php

Indentation +74 added lines, -74 removed lines

@@ -20,89 +20,89 @@
 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');
+	/**
+	 * 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);
+		$dataTypes = GeneralUtility::trimExplode(',', $configuration['data_types'], true);
 
-        if (ExtensionManagementUtility::isLoaded('vidi_frontend')) {
+		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);
-        }
+			$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);
-        }
+		foreach ($dataTypes as $dataType) {
+			$this->ensureMinimumTcaForGrid($dataType);
+		}
 
-        return array($GLOBALS['TCA']);
-    }
+		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'] = [];
-        }
+	/**
+	 * @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']['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,
-                ],
-            ];
-        }
-    }
+		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'];
-    }
+	/**
+	 * 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']);
-    }
+	/**
+	 * Tell whether the table has a label field.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	protected function hasLabelField($dataType)
+	{
+		return isset($GLOBALS['TCA'][$dataType]['ctrl']['label']);
+	}
 
 }

Classes/Tca/Tca.php

Indentation +129 added lines, -129 removed lines

@@ -24,134 +24,134 @@
 class Tca implements SingletonInterface, TcaServiceInterface
 {
 
-    /**
-     * Fields that are considered as system.
-     *
-     * @var array
-     */
-    static protected $systemFields = array(
-        'uid',
-        'pid',
-        'tstamp',
-        'crdate',
-        'deleted',
-        'hidden',
-        'sys_language_uid',
-        'l18n_parent',
-        'l18n_diffsource',
-        't3ver_oid',
-        't3ver_id',
-        't3ver_wsid',
-        't3ver_label',
-        't3ver_state',
-        't3ver_stage',
-        't3ver_count',
-        't3ver_tstamp',
-        't3_origuid',
-    );
-
-    /**
-     * @var array
-     */
-    static protected $instances;
-
-    /**
-     * Returns a class instance of a corresponding TCA service.
-     * If the class instance does not exist, create one.
-     *
-     * @throws NotExistingClassException
-     * @param string $dataType
-     * @param string $serviceType
-     * @return TcaServiceInterface
-     * @throws InvalidKeyInArrayException
-     * @throws \InvalidArgumentException
-     */
-    static protected function getService($dataType, $serviceType)
-    {
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend() && empty($dataType)) {
-
-            /** @var ModuleLoader $moduleLoader */
-            $moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
-            $dataType = $moduleLoader->getDataType();
-        }
-
-        if (empty(self::$instances[$dataType][$serviceType])) {
-            $className = sprintf('Fab\Vidi\Tca\%sService', ucfirst($serviceType));
-
-            // Signal to pre-process the TCA of the given $dataType.
-            self::emitPreProcessTcaSignal($dataType, $serviceType);
-
-            $instance = GeneralUtility::makeInstance($className, $dataType, $serviceType);
-            self::$instances[$dataType][$serviceType] = $instance;
-        }
-        return self::$instances[$dataType][$serviceType];
-    }
-
-    /**
-     * Returns a "grid" service instance.
-     *
-     * @param string|Content $tableNameOrContentObject
-     * @return GridService
-     * @throws NotExistingClassException
-     */
-    static public function grid($tableNameOrContentObject = '')
-    {
-        $tableName = $tableNameOrContentObject instanceof Content ? $tableNameOrContentObject->getDataType() : $tableNameOrContentObject;
-        return self::getService($tableName, self::TYPE_GRID);
-    }
-
-    /**
-     * Returns a "table" service instance ("ctrl" part of the TCA).
-     *
-     * @param string|Content $tableNameOrContentObject
-     * @return TableService
-     * @throws NotExistingClassException
-     */
-    static public function table($tableNameOrContentObject = '')
-    {
-        $tableName = $tableNameOrContentObject instanceof Content ? $tableNameOrContentObject->getDataType() : $tableNameOrContentObject;
-        return self::getService($tableName, self::TYPE_TABLE);
-    }
-
-    /**
-     * @return array
-     */
-    public static function getInstanceStorage()
-    {
-        return self::$instances;
-    }
-
-    /**
-     * @return array
-     */
-    public static function getSystemFields()
-    {
-        return self::$systemFields;
-    }
-
-    /**
-     * Signal that is called after the content repository for a content type has been instantiated.
-     *
-     * @param string $dataType
-     * @param string $serviceType
-     * @throws InvalidSlotException
-     * @throws InvalidSlotReturnException
-     * @throws \InvalidArgumentException
-     */
-    static protected function emitPreProcessTcaSignal($dataType, $serviceType)
-    {
-        self::getSignalSlotDispatcher()->dispatch(Tca::class, 'preProcessTca', array($dataType, $serviceType));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher
-     *
-     * @return Dispatcher
-     * @throws \InvalidArgumentException
-     */
-    static protected function getSignalSlotDispatcher()
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
+	/**
+	 * Fields that are considered as system.
+	 *
+	 * @var array
+	 */
+	static protected $systemFields = array(
+		'uid',
+		'pid',
+		'tstamp',
+		'crdate',
+		'deleted',
+		'hidden',
+		'sys_language_uid',
+		'l18n_parent',
+		'l18n_diffsource',
+		't3ver_oid',
+		't3ver_id',
+		't3ver_wsid',
+		't3ver_label',
+		't3ver_state',
+		't3ver_stage',
+		't3ver_count',
+		't3ver_tstamp',
+		't3_origuid',
+	);
+
+	/**
+	 * @var array
+	 */
+	static protected $instances;
+
+	/**
+	 * Returns a class instance of a corresponding TCA service.
+	 * If the class instance does not exist, create one.
+	 *
+	 * @throws NotExistingClassException
+	 * @param string $dataType
+	 * @param string $serviceType
+	 * @return TcaServiceInterface
+	 * @throws InvalidKeyInArrayException
+	 * @throws \InvalidArgumentException
+	 */
+	static protected function getService($dataType, $serviceType)
+	{
+		if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend() && empty($dataType)) {
+
+			/** @var ModuleLoader $moduleLoader */
+			$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
+			$dataType = $moduleLoader->getDataType();
+		}
+
+		if (empty(self::$instances[$dataType][$serviceType])) {
+			$className = sprintf('Fab\Vidi\Tca\%sService', ucfirst($serviceType));
+
+			// Signal to pre-process the TCA of the given $dataType.
+			self::emitPreProcessTcaSignal($dataType, $serviceType);
+
+			$instance = GeneralUtility::makeInstance($className, $dataType, $serviceType);
+			self::$instances[$dataType][$serviceType] = $instance;
+		}
+		return self::$instances[$dataType][$serviceType];
+	}
+
+	/**
+	 * Returns a "grid" service instance.
+	 *
+	 * @param string|Content $tableNameOrContentObject
+	 * @return GridService
+	 * @throws NotExistingClassException
+	 */
+	static public function grid($tableNameOrContentObject = '')
+	{
+		$tableName = $tableNameOrContentObject instanceof Content ? $tableNameOrContentObject->getDataType() : $tableNameOrContentObject;
+		return self::getService($tableName, self::TYPE_GRID);
+	}
+
+	/**
+	 * Returns a "table" service instance ("ctrl" part of the TCA).
+	 *
+	 * @param string|Content $tableNameOrContentObject
+	 * @return TableService
+	 * @throws NotExistingClassException
+	 */
+	static public function table($tableNameOrContentObject = '')
+	{
+		$tableName = $tableNameOrContentObject instanceof Content ? $tableNameOrContentObject->getDataType() : $tableNameOrContentObject;
+		return self::getService($tableName, self::TYPE_TABLE);
+	}
+
+	/**
+	 * @return array
+	 */
+	public static function getInstanceStorage()
+	{
+		return self::$instances;
+	}
+
+	/**
+	 * @return array
+	 */
+	public static function getSystemFields()
+	{
+		return self::$systemFields;
+	}
+
+	/**
+	 * Signal that is called after the content repository for a content type has been instantiated.
+	 *
+	 * @param string $dataType
+	 * @param string $serviceType
+	 * @throws InvalidSlotException
+	 * @throws InvalidSlotReturnException
+	 * @throws \InvalidArgumentException
+	 */
+	static protected function emitPreProcessTcaSignal($dataType, $serviceType)
+	{
+		self::getSignalSlotDispatcher()->dispatch(Tca::class, 'preProcessTca', array($dataType, $serviceType));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher
+	 *
+	 * @return Dispatcher
+	 * @throws \InvalidArgumentException
+	 */
+	static protected function getSignalSlotDispatcher()
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
 
 }

ext_tables.php

Indentation +165 added lines, -165 removed lines

@@ -19,169 +19,169 @@
 
 call_user_func(function () {
 
-    // Check from Vidi configuration what default module should be loaded.
-    // Make sure the class exists to avoid a Runtime Error
-
-    // Add content main module before 'user'
-    if (!isset($GLOBALS['TBE_MODULES']['content'])) {
-
-        // Position module "content" after module "user" manually. No API is available for that, it seems...
-        $modules = [];
-        foreach ($GLOBALS['TBE_MODULES'] as $key => $val) {
-            if ($key === 'user') {
-                $modules['content'] = '';
-            }
-            $modules[$key] = $val;
-        }
-        $GLOBALS['TBE_MODULES'] = $modules;
-
-        // Register "data management" module.
-        ExtensionManagementUtility::addModule(
-            'content',
-            '',
-            '',
-            '',
-            [
-                'name' => 'content',
-                'access' => 'user,group',
-                'labels' => [
-                    'll_ref' => 'LLL:EXT:vidi/Resources/Private/Language/content_module.xlf',
-                ],
-            ]
-        );
-    }
-
-    $configuration = GeneralUtility::makeInstance(
-        ExtensionConfiguration::class
-    )->get('vidi');
-
-    $pids = GeneralUtility::trimExplode(',', $configuration['default_pid'], true);
-    $defaultPid = array_shift($pids);
-    $defaultPids = [];
-    foreach ($pids as $dataTypeAndPid) {
-        $parts = GeneralUtility::trimExplode(':', $dataTypeAndPid);
-        if (count($parts) === 2) {
-            $defaultPids[$parts[0]] = $parts[1];
-        }
-    }
-
-    // Loop around the data types and register them to be displayed within a BE module.
-    if ($configuration['data_types']) {
-
-        $dataTypes = GeneralUtility::trimExplode(',', $configuration['data_types'], true);
-        foreach ($dataTypes as $dataType) {
-
-
-            /** @var ModuleLoader $moduleLoader */
-            $moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class, $dataType);
-
-            // Special case already defined in Vidi.
-            if ($dataType === 'fe_users') {
-                $languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_users.xlf';
-                $icon = 'EXT:vidi/Resources/Public/Images/fe_users.svg';
-            } elseif ($dataType === 'fe_groups') {
-                $languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_groups.xlf';
-                $icon = 'EXT:vidi/Resources/Public/Images/fe_groups.svg';
-            } else {
-                /** @var LanguageFileGenerator $languageService */
-                $languageService = GeneralUtility::makeInstance(LanguageFileGenerator::class);
-                $languageFile = $languageService->generate($dataType);
-                $icon = '';
-            }
-
-            $pid = $defaultPids[$dataType] ?? $defaultPid;
-
-            /** @var ModuleLoader $moduleLoader */
-            $moduleLoader->setIcon($icon)
-                ->setModuleLanguageFile($languageFile)
-                ->setDefaultPid($pid)
-                ->register();
-        }
-    }
-
-    // Possible Static TS loading
-    if (true === isset($configuration['autoload_typoscript']) && false === (bool)$configuration['autoload_typoscript']) {
-        ExtensionManagementUtility::addStaticFile('vidi', 'Configuration/TypoScript', 'Vidi: versatile and interactive display');
-    }
-
-    // Register List2 only if beta feature is enabled.
-    // @todo let see what we do with that
-    #if ($configuration['activate_beta_features']) {
-    #	$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
-    #
-    #	if (!$configuration['hide_module_list']) {
-    #		$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module_transitional.xlf';
-    #	}
-    #
-    #	\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-    #		'vidi',
-    #		'web', // Make module a submodule of 'web'
-    #		'm1', // Submodule key
-    #		'after:list', // Position
-    #		array(
-    #			'Content' => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
-    #			'Tool' => 'welcome, work',
-    #			'Facet' => 'autoSuggest, autoSuggests',
-    #			'Selection' => 'edit, update, create, delete, list, show',
-    #			'UserPreferences' => 'save',
-    #			'Clipboard' => 'save, flush, show',
-    #		), array(
-    #			'access' => 'user,group',
-    #			'icon' => 'EXT:vidi/Resources/Public/Images/list.png',
-    #			'labels' => $labelFile,
-    #		)
-    #	);
-    #}
-    #if ($configuration['hide_module_list']) {
-    #
-    #	// Default User TSConfig to be added in any case.
-    #	TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
-    #
-    #		# Hide the module in the BE.
-    #		options.hideModules.web := addToList(list)
-    #	');
-    #}
-
-    /** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
-    $signalSlotDispatcher = GeneralUtility::makeInstance(Dispatcher::class);
-
-    // Connect "processContentData" signal slot with the "ContentObjectProcessor".
-    $signalSlotDispatcher->connect(
-        'Fab\Vidi\Controller\Backend\ContentController',
-        'processContentData',
-        ContentObjectProcessor::class,
-        'processRelations',
-        true
-    );
-
-    // Connect "processContentData" signal with the "MarkerProcessor".
-    $signalSlotDispatcher->connect(
-        'Fab\Vidi\Controller\Backend\ContentController',
-        'processContentData',
-        MarkerProcessor::class,
-        'processMarkers',
-        true
-    );
-
-    // Register default Tools for Vidi.
-    ToolRegistry::getInstance()->register('*', ModulePreferencesTool::class);
-    ToolRegistry::getInstance()->register('*', RelationAnalyserTool::class);
-    ToolRegistry::getInstance()->register('*', ConfiguredPidTool::class);
-
-    // Add new sprite icon.
-    $icons = [
-        'go' => 'EXT:vidi/Resources/Public/Images/bullet_go.png',
-        'query' => 'EXT:vidi/Resources/Public/Images/drive_disk.png',
-    ];
-    /** @var IconRegistry $iconRegistry */
-    $iconRegistry = GeneralUtility::makeInstance(IconRegistry::class);
-    foreach ($icons as $key => $icon) {
-        $iconRegistry->registerIcon('extensions-vidi-' . $key,
-            BitmapIconProvider::class,
-            [
-                'source' => $icon
-            ]
-        );
-    }
-    unset($iconRegistry);
+	// Check from Vidi configuration what default module should be loaded.
+	// Make sure the class exists to avoid a Runtime Error
+
+	// Add content main module before 'user'
+	if (!isset($GLOBALS['TBE_MODULES']['content'])) {
+
+		// Position module "content" after module "user" manually. No API is available for that, it seems...
+		$modules = [];
+		foreach ($GLOBALS['TBE_MODULES'] as $key => $val) {
+			if ($key === 'user') {
+				$modules['content'] = '';
+			}
+			$modules[$key] = $val;
+		}
+		$GLOBALS['TBE_MODULES'] = $modules;
+
+		// Register "data management" module.
+		ExtensionManagementUtility::addModule(
+			'content',
+			'',
+			'',
+			'',
+			[
+				'name' => 'content',
+				'access' => 'user,group',
+				'labels' => [
+					'll_ref' => 'LLL:EXT:vidi/Resources/Private/Language/content_module.xlf',
+				],
+			]
+		);
+	}
+
+	$configuration = GeneralUtility::makeInstance(
+		ExtensionConfiguration::class
+	)->get('vidi');
+
+	$pids = GeneralUtility::trimExplode(',', $configuration['default_pid'], true);
+	$defaultPid = array_shift($pids);
+	$defaultPids = [];
+	foreach ($pids as $dataTypeAndPid) {
+		$parts = GeneralUtility::trimExplode(':', $dataTypeAndPid);
+		if (count($parts) === 2) {
+			$defaultPids[$parts[0]] = $parts[1];
+		}
+	}
+
+	// Loop around the data types and register them to be displayed within a BE module.
+	if ($configuration['data_types']) {
+
+		$dataTypes = GeneralUtility::trimExplode(',', $configuration['data_types'], true);
+		foreach ($dataTypes as $dataType) {
+
+
+			/** @var ModuleLoader $moduleLoader */
+			$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class, $dataType);
+
+			// Special case already defined in Vidi.
+			if ($dataType === 'fe_users') {
+				$languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_users.xlf';
+				$icon = 'EXT:vidi/Resources/Public/Images/fe_users.svg';
+			} elseif ($dataType === 'fe_groups') {
+				$languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_groups.xlf';
+				$icon = 'EXT:vidi/Resources/Public/Images/fe_groups.svg';
+			} else {
+				/** @var LanguageFileGenerator $languageService */
+				$languageService = GeneralUtility::makeInstance(LanguageFileGenerator::class);
+				$languageFile = $languageService->generate($dataType);
+				$icon = '';
+			}
+
+			$pid = $defaultPids[$dataType] ?? $defaultPid;
+
+			/** @var ModuleLoader $moduleLoader */
+			$moduleLoader->setIcon($icon)
+				->setModuleLanguageFile($languageFile)
+				->setDefaultPid($pid)
+				->register();
+		}
+	}
+
+	// Possible Static TS loading
+	if (true === isset($configuration['autoload_typoscript']) && false === (bool)$configuration['autoload_typoscript']) {
+		ExtensionManagementUtility::addStaticFile('vidi', 'Configuration/TypoScript', 'Vidi: versatile and interactive display');
+	}
+
+	// Register List2 only if beta feature is enabled.
+	// @todo let see what we do with that
+	#if ($configuration['activate_beta_features']) {
+	#	$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
+	#
+	#	if (!$configuration['hide_module_list']) {
+	#		$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module_transitional.xlf';
+	#	}
+	#
+	#	\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
+	#		'vidi',
+	#		'web', // Make module a submodule of 'web'
+	#		'm1', // Submodule key
+	#		'after:list', // Position
+	#		array(
+	#			'Content' => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
+	#			'Tool' => 'welcome, work',
+	#			'Facet' => 'autoSuggest, autoSuggests',
+	#			'Selection' => 'edit, update, create, delete, list, show',
+	#			'UserPreferences' => 'save',
+	#			'Clipboard' => 'save, flush, show',
+	#		), array(
+	#			'access' => 'user,group',
+	#			'icon' => 'EXT:vidi/Resources/Public/Images/list.png',
+	#			'labels' => $labelFile,
+	#		)
+	#	);
+	#}
+	#if ($configuration['hide_module_list']) {
+	#
+	#	// Default User TSConfig to be added in any case.
+	#	TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
+	#
+	#		# Hide the module in the BE.
+	#		options.hideModules.web := addToList(list)
+	#	');
+	#}
+
+	/** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
+	$signalSlotDispatcher = GeneralUtility::makeInstance(Dispatcher::class);
+
+	// Connect "processContentData" signal slot with the "ContentObjectProcessor".
+	$signalSlotDispatcher->connect(
+		'Fab\Vidi\Controller\Backend\ContentController',
+		'processContentData',
+		ContentObjectProcessor::class,
+		'processRelations',
+		true
+	);
+
+	// Connect "processContentData" signal with the "MarkerProcessor".
+	$signalSlotDispatcher->connect(
+		'Fab\Vidi\Controller\Backend\ContentController',
+		'processContentData',
+		MarkerProcessor::class,
+		'processMarkers',
+		true
+	);
+
+	// Register default Tools for Vidi.
+	ToolRegistry::getInstance()->register('*', ModulePreferencesTool::class);
+	ToolRegistry::getInstance()->register('*', RelationAnalyserTool::class);
+	ToolRegistry::getInstance()->register('*', ConfiguredPidTool::class);
+
+	// Add new sprite icon.
+	$icons = [
+		'go' => 'EXT:vidi/Resources/Public/Images/bullet_go.png',
+		'query' => 'EXT:vidi/Resources/Public/Images/drive_disk.png',
+	];
+	/** @var IconRegistry $iconRegistry */
+	$iconRegistry = GeneralUtility::makeInstance(IconRegistry::class);
+	foreach ($icons as $key => $icon) {
+		$iconRegistry->registerIcon('extensions-vidi-' . $key,
+			BitmapIconProvider::class,
+			[
+				'source' => $icon
+			]
+		);
+	}
+	unset($iconRegistry);
 });

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 
 defined('TYPO3') or die();
 
-call_user_func(function () {
+call_user_func(function() {
 
     // Check from Vidi configuration what default module should be loaded.
     // Make sure the class exists to avoid a Runtime Error
@@ -176,7 +176,7 @@ 
     /** @var IconRegistry $iconRegistry */
     $iconRegistry = GeneralUtility::makeInstance(IconRegistry::class);
     foreach ($icons as $key => $icon) {
-        $iconRegistry->registerIcon('extensions-vidi-' . $key,
+        $iconRegistry->registerIcon('extensions-vidi-'.$key,
             BitmapIconProvider::class,
             [
                 'source' => $icon