fabarea / vidi

Classes/ViewHelpers/LanguagesViewHelper.php

Indentation +20 added lines, -20 removed lines

@@ -17,27 +17,27 @@
  */
 class LanguagesViewHelper extends AbstractViewHelper
 {
-    /**
-     * Returns an array of available languages.
-     *
-     * @return array
-     */
-    public function render()
-    {
-        $languages[0] = $this->getLanguageService()->getDefaultFlag();
+	/**
+	 * Returns an array of available languages.
+	 *
+	 * @return array
+	 */
+	public function render()
+	{
+		$languages[0] = $this->getLanguageService()->getDefaultFlag();
 
-        foreach ($this->getLanguageService()->getLanguages() as $language) {
-            $languages[$language['uid']] = $language['flag'];
-        }
+		foreach ($this->getLanguageService()->getLanguages() as $language) {
+			$languages[$language['uid']] = $language['flag'];
+		}
 
-        return $languages;
-    }
+		return $languages;
+	}
 
-    /**
-     * @return LanguageService|object
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(LanguageService::class);
-    }
+	/**
+	 * @return LanguageService|object
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(LanguageService::class);
+	}
 }

Classes/ViewHelpers/IsRelatedToViewHelper.php

Indentation +42 added lines, -42 removed lines

@@ -18,46 +18,46 @@
  */
 class IsRelatedToViewHelper extends AbstractViewHelper
 {
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('relatedContent', Content::class, 'The related content', true);
-    }
-
-    /**
-     * Tells whether a Content is related to another content.
-     * The $fieldName corresponds to the relational field name
-     * between the first content object and the second.
-     *
-     * @return boolean
-     */
-    public function render()
-    {
-        /** @var Content $relatedContent */
-        $relatedContent = $this->arguments['relatedContent'];
-
-        $isChecked = false;
-
-        // Only computes whether the object is checked if one row is beeing edited.
-        $numberOfObjects = $this->templateVariableContainer->get('numberOfObjects');
-        if ($numberOfObjects === 1) {
-            /** @var Content $content */
-            $content = $this->templateVariableContainer->get('content');
-            $fieldName = $this->templateVariableContainer->get('fieldName');
-
-            // Build an array of user group uids
-            $relatedContentsIdentifiers = [];
-
-            /** @var Content $contentObject */
-            foreach ($content[$fieldName] as $contentObject) {
-                $relatedContentsIdentifiers[] = $contentObject->getUid();
-            }
-
-            $isChecked = in_array($relatedContent->getUid(), $relatedContentsIdentifiers, true);
-        }
-
-        return $isChecked;
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('relatedContent', Content::class, 'The related content', true);
+	}
+
+	/**
+	 * Tells whether a Content is related to another content.
+	 * The $fieldName corresponds to the relational field name
+	 * between the first content object and the second.
+	 *
+	 * @return boolean
+	 */
+	public function render()
+	{
+		/** @var Content $relatedContent */
+		$relatedContent = $this->arguments['relatedContent'];
+
+		$isChecked = false;
+
+		// Only computes whether the object is checked if one row is beeing edited.
+		$numberOfObjects = $this->templateVariableContainer->get('numberOfObjects');
+		if ($numberOfObjects === 1) {
+			/** @var Content $content */
+			$content = $this->templateVariableContainer->get('content');
+			$fieldName = $this->templateVariableContainer->get('fieldName');
+
+			// Build an array of user group uids
+			$relatedContentsIdentifiers = [];
+
+			/** @var Content $contentObject */
+			foreach ($content[$fieldName] as $contentObject) {
+				$relatedContentsIdentifiers[] = $contentObject->getUid();
+			}
+
+			$isChecked = in_array($relatedContent->getUid(), $relatedContentsIdentifiers, true);
+		}
+
+		return $isChecked;
+	}
 }

Classes/ViewHelpers/Content/AbstractContentViewHelper.php

Indentation +197 added lines, -197 removed lines

@@ -27,201 +27,201 @@
  */
 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/FindOneViewHelper.php

Indentation +153 added lines, -153 removed lines

@@ -22,157 +22,157 @@
  */
 class FindOneViewHelper extends AbstractViewHelper
 {
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        parent::initializeArguments();
-
-        $this->registerArgument('type', 'string', 'The content type', true, '');
-        $this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, []);
-        $this->registerArgument('identifier', 'int', 'The identifier of the object to be fetched.', false, 0);
-        $this->registerArgument('argumentName', 'string', 'The parameter name where to retrieve the identifier', false, 'tx_vidifrontend_pi1|uid');
-        $this->registerArgument('as', 'string', 'The alias object', false, 'object');
-    }
-
-    /**
-     * @return string Rendered string
-     * @api
-     */
-    public function render()
-    {
-        return static::renderStatic(
-            $this->arguments,
-            $this->buildRenderChildrenClosure(),
-            $this->renderingContext
-        );
-    }
-
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     *
-     * @return string
-     */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
-    {
-        // Fetch the object
-        $matches = self::computeMatches($arguments);
-        $matcher = self::getMatcher($arguments['type'], $matches);
-
-        $contentRepository = ContentRepositoryFactory::getInstance($arguments['type']);
-        $object = $contentRepository->findOneBy($matcher);
-
-        $output = '';
-        if ($object) {
-            // Render children with "as" variable.
-            $templateVariableContainer = $renderingContext->getTemplateVariableContainer();
-            $templateVariableContainer->add($arguments['as'], $object);
-            $output = $renderChildrenClosure();
-            $templateVariableContainer->remove($arguments['as']);
-        }
-
-        return $output;
-    }
-
-    /**
-     * @param array $arguments
-     * @return array
-     */
-    protected static function computeMatches(array $arguments)
-    {
-        $matches = [];
-
-        $argumentValue = self::getArgumentValue($arguments['argumentName']);
-        if ($argumentValue > 0) {
-            $matches['uid'] = $argumentValue;
-        }
-
-        if ($arguments['matches']) {
-            $matches = $arguments['matches'];
-        }
-
-        if ($arguments['identifier'] > 0) {
-            $matches['uid'] = $arguments['identifier'];
-        }
-
-        // We want a default value in any case.
-        if (!$matches) {
-            $matches['uid'] = 0;
-        }
-        return $matches;
-    }
-
-    /**
-     * Returns a matcher object.
-     *
-     * @param string $dataType
-     * @param array $matches
-     * @return Matcher
-     */
-    protected static function getMatcher($dataType, array $matches = [])
-    {
-        /** @var $matcher Matcher */
-        $matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
-
-        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 = self::getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
-                $resolvedFieldName = self::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]);
-            }
-        }
-
-        return $matcher;
-    }
-
-    /**
-     * @return FieldPathResolver
-     */
-    protected static function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * @param string $argumentName
-     * @return int
-     */
-    protected static function getArgumentValue($argumentName)
-    {
-        $value = ''; // default value
-
-        // Merge parameters
-        $parameters = GeneralUtility::_GET();
-        $post = GeneralUtility::_POST();
-        ArrayUtility::mergeRecursiveWithOverrule($parameters, $post);
-
-        // Traverse argument parts and retrieve value.
-        $argumentParts = GeneralUtility::trimExplode('|', $argumentName);
-        foreach ($argumentParts as $argumentPart) {
-            if (isset($parameters[$argumentPart])) {
-                $value = $parameters[$argumentPart];
-                $parameters = $value;
-            }
-        }
-
-        return (int)$value;
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		parent::initializeArguments();
+
+		$this->registerArgument('type', 'string', 'The content type', true, '');
+		$this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, []);
+		$this->registerArgument('identifier', 'int', 'The identifier of the object to be fetched.', false, 0);
+		$this->registerArgument('argumentName', 'string', 'The parameter name where to retrieve the identifier', false, 'tx_vidifrontend_pi1|uid');
+		$this->registerArgument('as', 'string', 'The alias object', false, 'object');
+	}
+
+	/**
+	 * @return string Rendered string
+	 * @api
+	 */
+	public function render()
+	{
+		return static::renderStatic(
+			$this->arguments,
+			$this->buildRenderChildrenClosure(),
+			$this->renderingContext
+		);
+	}
+
+	/**
+	 * @param array $arguments
+	 * @param \Closure $renderChildrenClosure
+	 * @param RenderingContextInterface $renderingContext
+	 *
+	 * @return string
+	 */
+	public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+	{
+		// Fetch the object
+		$matches = self::computeMatches($arguments);
+		$matcher = self::getMatcher($arguments['type'], $matches);
+
+		$contentRepository = ContentRepositoryFactory::getInstance($arguments['type']);
+		$object = $contentRepository->findOneBy($matcher);
+
+		$output = '';
+		if ($object) {
+			// Render children with "as" variable.
+			$templateVariableContainer = $renderingContext->getTemplateVariableContainer();
+			$templateVariableContainer->add($arguments['as'], $object);
+			$output = $renderChildrenClosure();
+			$templateVariableContainer->remove($arguments['as']);
+		}
+
+		return $output;
+	}
+
+	/**
+	 * @param array $arguments
+	 * @return array
+	 */
+	protected static function computeMatches(array $arguments)
+	{
+		$matches = [];
+
+		$argumentValue = self::getArgumentValue($arguments['argumentName']);
+		if ($argumentValue > 0) {
+			$matches['uid'] = $argumentValue;
+		}
+
+		if ($arguments['matches']) {
+			$matches = $arguments['matches'];
+		}
+
+		if ($arguments['identifier'] > 0) {
+			$matches['uid'] = $arguments['identifier'];
+		}
+
+		// We want a default value in any case.
+		if (!$matches) {
+			$matches['uid'] = 0;
+		}
+		return $matches;
+	}
+
+	/**
+	 * Returns a matcher object.
+	 *
+	 * @param string $dataType
+	 * @param array $matches
+	 * @return Matcher
+	 */
+	protected static function getMatcher($dataType, array $matches = [])
+	{
+		/** @var $matcher Matcher */
+		$matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
+
+		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 = self::getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
+				$resolvedFieldName = self::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]);
+			}
+		}
+
+		return $matcher;
+	}
+
+	/**
+	 * @return FieldPathResolver
+	 */
+	protected static function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * @param string $argumentName
+	 * @return int
+	 */
+	protected static function getArgumentValue($argumentName)
+	{
+		$value = ''; // default value
+
+		// Merge parameters
+		$parameters = GeneralUtility::_GET();
+		$post = GeneralUtility::_POST();
+		ArrayUtility::mergeRecursiveWithOverrule($parameters, $post);
+
+		// Traverse argument parts and retrieve value.
+		$argumentParts = GeneralUtility::trimExplode('|', $argumentName);
+		foreach ($argumentParts as $argumentPart) {
+			if (isset($parameters[$argumentPart])) {
+				$value = $parameters[$argumentPart];
+				$parameters = $value;
+			}
+		}
+
+		return (int)$value;
+	}
 }

Classes/ViewHelpers/Content/CountViewHelper.php

Indentation +20 added lines, -20 removed lines

@@ -16,27 +16,27 @@
  */
 class CountViewHelper extends AbstractContentViewHelper
 {
-    /**
-     * Count a result set.
-     *
-     * @return int
-     */
-    public function render()
-    {
-        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();
-        }
-        $dataType = $this->arguments['type'];
-        $matches = $this->replacesAliases($this->arguments['matches']);
-        $ignoreEnableFields = $this->arguments['ignoreEnableFields'];
+	/**
+	 * Count a result set.
+	 *
+	 * @return int
+	 */
+	public function render()
+	{
+		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();
+		}
+		$dataType = $this->arguments['type'];
+		$matches = $this->replacesAliases($this->arguments['matches']);
+		$ignoreEnableFields = $this->arguments['ignoreEnableFields'];
 
-        $matcher = $this->getMatcher($dataType, $matches);
+		$matcher = $this->getMatcher($dataType, $matches);
 
-        $contentRepository = ContentRepositoryFactory::getInstance($dataType);
-        $contentRepository->setDefaultQuerySettings($this->getDefaultQuerySettings($ignoreEnableFields));
+		$contentRepository = ContentRepositoryFactory::getInstance($dataType);
+		$contentRepository->setDefaultQuerySettings($this->getDefaultQuerySettings($ignoreEnableFields));
 
-        $numberOfObjects = ContentRepositoryFactory::getInstance($dataType)->countBy($matcher);
-        return $numberOfObjects;
-    }
+		$numberOfObjects = ContentRepositoryFactory::getInstance($dataType)->countBy($matcher);
+		return $numberOfObjects;
+	}
 }

Classes/ViewHelpers/Content/FindViewHelper.php

Indentation +53 added lines, -53 removed lines

@@ -19,68 +19,68 @@
  */
 class FindViewHelper extends AbstractContentViewHelper
 {
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function initializeArguments()
-    {
-        parent::initializeArguments();
+	/**
+	 * @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);
-    }
+		$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'];
+	/**
+	 * 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);
+		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']);
-        }
+			/** @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'];
+		$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);
+		$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);
+		$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);
+			$this->emitPostProcessLimitSignal($dataType, $limit);
+			$this->emitPostProcessOffsetSignal($dataType, $offset);
 
-            $contentRepository = ContentRepositoryFactory::getInstance($dataType);
-            $contentRepository->setDefaultQuerySettings($this->getDefaultQuerySettings($ignoreEnableFields));
+			$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.
-        }
+			$resultSet = $contentRepository->findBy($matcher, $orderings, $limit, $offset);
+			$this->getResultSetStorage()->set($querySignature, $resultSet); // store the result set for performance sake.
+		}
 
-        return $resultSet;
-    }
+		return $resultSet;
+	}
 }

Classes/ViewHelpers/Be/AdditionalAssetsViewHelper.php

Indentation +35 added lines, -35 removed lines

@@ -20,42 +20,42 @@
  */
 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/Be/RequireJsViewHelper.php

Indentation +15 added lines, -15 removed lines

@@ -19,21 +19,21 @@
  */
 class RequireJsViewHelper extends AbstractBackendViewHelper
 {
-    /**
-     * Load RequireJS code.
-     *
-     * @return void
-     */
-    public function render()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * Load RequireJS code.
+	 *
+	 * @return void
+	 */
+	public function render()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $content = $this->renderChildren();
-        $pageRenderer->addJsInlineCode('vidi-inline', $content);
+		$content = $this->renderChildren();
+		$pageRenderer->addJsInlineCode('vidi-inline', $content);
 
-        $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:vidi/Resources/Public/');
-        $configuration['paths']['Fab/Vidi'] = $publicResourcesPath . 'JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Vidi/Vidi/Main');
-    }
+		$publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:vidi/Resources/Public/');
+		$configuration['paths']['Fab/Vidi'] = $publicResourcesPath . 'JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Vidi/Vidi/Main');
+	}
 }

Classes/ViewHelpers/Selection/VisibilityOptionsViewHelper.php

Indentation +23 added lines, -23 removed lines

@@ -18,30 +18,30 @@
  */
 class VisibilityOptionsViewHelper extends AbstractViewHelper
 {
-    /**
-     * Returns the options for the visibility field of a Selection.
-     *
-     * @return array
-     */
-    public function render()
-    {
-        $options[Selection::VISIBILITY_PRIVATE] = LocalizationUtility::translate('LLL:EXT:vidi/Resources/Private/Language/tx_vidi_selection.xlf:visibility.private', 'vidi');
-        $options[Selection::VISIBILITY_EVERYONE] = LocalizationUtility::translate('LLL:EXT:vidi/Resources/Private/Language/tx_vidi_selection.xlf:visibility.everyone', 'vidi');
+	/**
+	 * Returns the options for the visibility field of a Selection.
+	 *
+	 * @return array
+	 */
+	public function render()
+	{
+		$options[Selection::VISIBILITY_PRIVATE] = LocalizationUtility::translate('LLL:EXT:vidi/Resources/Private/Language/tx_vidi_selection.xlf:visibility.private', 'vidi');
+		$options[Selection::VISIBILITY_EVERYONE] = LocalizationUtility::translate('LLL:EXT:vidi/Resources/Private/Language/tx_vidi_selection.xlf:visibility.everyone', 'vidi');
 
-        if ($this->getBackendUser()->isAdmin()) {
-            $options[Selection::VISIBILITY_ADMIN_ONLY] = LocalizationUtility::translate('LLL:EXT:vidi/Resources/Private/Language/tx_vidi_selection.xlf:visibility.admin_only', 'vidi');
-        }
-        return $options;
-    }
+		if ($this->getBackendUser()->isAdmin()) {
+			$options[Selection::VISIBILITY_ADMIN_ONLY] = LocalizationUtility::translate('LLL:EXT:vidi/Resources/Private/Language/tx_vidi_selection.xlf:visibility.admin_only', 'vidi');
+		}
+		return $options;
+	}
 
 
-    /**
-     * 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'];
+	}
 }