fabarea / vidi

Classes/Tool/AbstractTool.php

Indentation +37 added lines, -37 removed lines

@@ -18,42 +18,42 @@
 abstract class AbstractTool implements ToolInterface
 {
 
-    /**
-     * @param string $templateNameAndPath
-     * @return StandaloneView
-     * @throws \InvalidArgumentException
-     */
-    protected function initializeStandaloneView($templateNameAndPath)
-    {
-
-        $templateNameAndPath = GeneralUtility::getFileAbsFileName($templateNameAndPath);
-
-        /** @var StandaloneView $view */
-        $view = GeneralUtility::makeInstance(StandaloneView::class);
-
-        $view->setTemplatePathAndFilename($templateNameAndPath);
-        return $view;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     * @throws \InvalidArgumentException
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * @param string $templateNameAndPath
+	 * @return StandaloneView
+	 * @throws \InvalidArgumentException
+	 */
+	protected function initializeStandaloneView($templateNameAndPath)
+	{
+
+		$templateNameAndPath = GeneralUtility::getFileAbsFileName($templateNameAndPath);
+
+		/** @var StandaloneView $view */
+		$view = GeneralUtility::makeInstance(StandaloneView::class);
+
+		$view->setTemplatePathAndFilename($templateNameAndPath);
+		return $view;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
 }

Classes/Service/ContentService.php

Indentation +119 added lines, -119 removed lines

@@ -22,124 +22,124 @@
 class ContentService
 {
 
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var Content[]
-     */
-    protected $objects = [];
-
-    /**
-     * @var int
-     */
-    protected $numberOfObjects = 0;
-
-    /**
-     * Constructor
-     *
-     * @param string $dataType
-     */
-    public function __construct($dataType = '')
-    {
-        if (empty($dataType)) {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-        $this->dataType = $dataType;
-    }
-
-    /**
-     * Fetch the files given an object assuming
-     *
-     * @param Matcher $matcher
-     * @param Order $order The order
-     * @param int $limit
-     * @param int $offset
-     * @return $this
-     */
-    public function findBy(Matcher $matcher, Order $order = null, $limit = null, $offset = null)
-    {
-
-        // Query the repository.
-        $objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order, $limit, $offset);
-        $signalResult = $this->emitAfterFindContentObjectsSignal($objects, $matcher, $order, $limit, $offset);
-
-        // Reset objects variable after possible signal / slot processing.
-        $this->objects = $signalResult->getContentObjects();
-
-        // Count number of content objects.
-        if ($signalResult->getHasBeenProcessed()) {
-            $this->numberOfObjects = $signalResult->getNumberOfObjects();
-        } else {
-            $this->numberOfObjects = ContentRepositoryFactory::getInstance($this->dataType)->countBy($matcher);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Signal that is called after the content objects have been found.
-     *
-     * @param array $contentObjects
-     * @param Matcher $matcher
-     * @param Order $order
-     * @param int $limit
-     * @param int $offset
-     * @return AfterFindContentObjectsSignalArguments
-     */
-    protected function emitAfterFindContentObjectsSignal($contentObjects, Matcher $matcher, Order $order = null, $limit = 0, $offset = 0)
-    {
-
-        /** @var AfterFindContentObjectsSignalArguments $signalArguments */
-        $signalArguments = GeneralUtility::makeInstance(AfterFindContentObjectsSignalArguments::class);
-        $signalArguments->setDataType($this->dataType)
-            ->setContentObjects($contentObjects)
-            ->setMatcher($matcher)
-            ->setOrder($order)
-            ->setLimit($limit)
-            ->setOffset($offset)
-            ->setHasBeenProcessed(false);
-
-        $signalResult = $this->getSignalSlotDispatcher()->dispatch(ContentService::class, 'afterFindContentObjects', array($signalArguments));
-        return $signalResult[0];
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    /**
-     * Get the SignalSlot dispatcher.
-     *
-     * @return Dispatcher|object
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
-
-    /**
-     * @return Content[]
-     */
-    public function getObjects()
-    {
-        return $this->objects;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfObjects()
-    {
-        return $this->numberOfObjects;
-    }
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var Content[]
+	 */
+	protected $objects = [];
+
+	/**
+	 * @var int
+	 */
+	protected $numberOfObjects = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $dataType
+	 */
+	public function __construct($dataType = '')
+	{
+		if (empty($dataType)) {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+		$this->dataType = $dataType;
+	}
+
+	/**
+	 * Fetch the files given an object assuming
+	 *
+	 * @param Matcher $matcher
+	 * @param Order $order The order
+	 * @param int $limit
+	 * @param int $offset
+	 * @return $this
+	 */
+	public function findBy(Matcher $matcher, Order $order = null, $limit = null, $offset = null)
+	{
+
+		// Query the repository.
+		$objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order, $limit, $offset);
+		$signalResult = $this->emitAfterFindContentObjectsSignal($objects, $matcher, $order, $limit, $offset);
+
+		// Reset objects variable after possible signal / slot processing.
+		$this->objects = $signalResult->getContentObjects();
+
+		// Count number of content objects.
+		if ($signalResult->getHasBeenProcessed()) {
+			$this->numberOfObjects = $signalResult->getNumberOfObjects();
+		} else {
+			$this->numberOfObjects = ContentRepositoryFactory::getInstance($this->dataType)->countBy($matcher);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Signal that is called after the content objects have been found.
+	 *
+	 * @param array $contentObjects
+	 * @param Matcher $matcher
+	 * @param Order $order
+	 * @param int $limit
+	 * @param int $offset
+	 * @return AfterFindContentObjectsSignalArguments
+	 */
+	protected function emitAfterFindContentObjectsSignal($contentObjects, Matcher $matcher, Order $order = null, $limit = 0, $offset = 0)
+	{
+
+		/** @var AfterFindContentObjectsSignalArguments $signalArguments */
+		$signalArguments = GeneralUtility::makeInstance(AfterFindContentObjectsSignalArguments::class);
+		$signalArguments->setDataType($this->dataType)
+			->setContentObjects($contentObjects)
+			->setMatcher($matcher)
+			->setOrder($order)
+			->setLimit($limit)
+			->setOffset($offset)
+			->setHasBeenProcessed(false);
+
+		$signalResult = $this->getSignalSlotDispatcher()->dispatch(ContentService::class, 'afterFindContentObjects', array($signalArguments));
+		return $signalResult[0];
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher.
+	 *
+	 * @return Dispatcher|object
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
+
+	/**
+	 * @return Content[]
+	 */
+	public function getObjects()
+	{
+		return $this->objects;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfObjects()
+	{
+		return $this->numberOfObjects;
+	}
 
 }

Classes/Persistence/MatcherObjectFactory.php

Indentation +263 added lines, -263 removed lines

@@ -25,267 +25,267 @@
 class MatcherObjectFactory implements SingletonInterface
 {
 
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return $this
-     */
-    static public function getInstance(): self
-    {
-        return GeneralUtility::makeInstance(self::class);
-    }
-
-    /**
-     * Returns a matcher object.
-     *
-     * @param array $matches
-     * @param string $dataType
-     * @return Matcher
-     */
-    public function getMatcher(array $matches = [], $dataType = ''): Matcher
-    {
-        if ($dataType === '') {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-
-        /** @var $matcher Matcher */
-        $matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
-
-        $matcher = $this->applyCriteriaFromDataTables($matcher);
-        $matcher = $this->applyCriteriaFromMatchesArgument($matcher, $matches);
-
-        if ($this->isBackendMode()) {
-            $matcher = $this->applyCriteriaFromUrl($matcher);
-            $matcher = $this->applyCriteriaFromTSConfig($matcher);
-        }
-
-        // Trigger signal for post processing Matcher Object.
-        $this->emitPostProcessMatcherObjectSignal($matcher);
-
-        return $matcher;
-    }
-
-    /**
-     * Get a possible id from the URL and apply as filter criteria.
-     * Except if the main module belongs to the File. The id would be a combined identifier
-     * including the storage and a mount point.
-     *
-     * @param Matcher $matcher
-     * @return Matcher $matcher
-     */
-    protected function applyCriteriaFromUrl(Matcher $matcher): Matcher
-    {
-        if (GeneralUtility::_GP('id')
-            && !$this->getModuleLoader()->isPidIgnored()
-            && $this->getModuleLoader()->getMainModule() !== ModuleName::FILE) {
-            $matcher->equals('pid', GeneralUtility::_GP('id'));
-        }
-
-        return $matcher;
-    }
-
-    /**
-     * @param Matcher $matcher
-     * @return Matcher $matcher
-     */
-    protected function applyCriteriaFromTSConfig(Matcher $matcher): Matcher
-    {
-        $dataType = $matcher->getDataType();
-        $tsConfigPath = sprintf('tx_vidi.dataType.%s.constraints', $dataType);
-        $tsConfig = $this->getBackendUser()->getTSConfig($tsConfigPath);
-
-        if (is_array($tsConfig['properties']) && !empty($tsConfig['properties'])) {
-
-            foreach ($tsConfig['properties'] as $constraint) {
-
-                if (preg_match('/(.+) (>=|>|<|<=|=|like) (.+)/is', $constraint, $matches) && count($matches) === 4) {
-
-                    $operator = $matcher->getSupportedOperators()[strtolower(trim($matches[2]))];
-                    $operand = trim($matches[1]);
-                    $value = trim($matches[3]);
-
-                    $matcher->$operator($operand, $value);
-                } elseif (preg_match('/(.+) (in) (.+)/is', $constraint, $matches) && count($matches) === 4) {
-
-                    $operator = $matcher->getSupportedOperators()[trim($matches[2])];
-                    $operand = trim($matches[1]);
-                    $value = trim($matches[3]);
-                    $matcher->$operator($operand, GeneralUtility::trimExplode(',', $value, true));
-                }
-            }
-        }
-
-        return $matcher;
-    }
-
-    /**
-     * @param Matcher $matcher
-     * @param array $matches
-     * @return Matcher $matcher
-     */
-    protected function applyCriteriaFromMatchesArgument(Matcher $matcher, $matches): Matcher
-    {
-        foreach ($matches as $fieldNameAndPath => $value) {
-            // CSV values should be considered as "in" operator in the query, otherwise "equals".
-            $explodedValues = GeneralUtility::trimExplode(',', $value, true);
-            if (count($explodedValues) > 1) {
-                $matcher->in($fieldNameAndPath, $explodedValues);
-            } else {
-                $matcher->equals($fieldNameAndPath, $explodedValues[0]);
-            }
-        }
-
-        return $matcher;
-    }
-
-    /**
-     * Apply criteria specific to jQuery plugin DataTable.
-     *
-     * @param Matcher $matcher
-     * @return Matcher $matcher
-     */
-    protected function applyCriteriaFromDataTables(Matcher $matcher): Matcher
-    {
-
-        // Special case for Grid in the BE using jQuery DataTables plugin.
-        // Retrieve a possible search term from GP.
-        $query = GeneralUtility::_GP('search');
-        if (is_array($query)) {
-            if (!empty($query['value'])) {
-                $query = $query['value'];
-            } else {
-                $query = '';
-            }
-        }
-
-        if (strlen($query) > 0) {
-
-            // Parse the json query coming from the Visual Search.
-            $query = rawurldecode($query);
-            $queryParts = json_decode($query, true);
-
-            if (is_array($queryParts)) {
-                $matcher = $this->parseQuery($queryParts, $matcher);
-            } else {
-                $matcher->setSearchTerm($query);
-            }
-        }
-        return $matcher;
-    }
-
-    /**
-     * @param array $queryParts
-     * @param Matcher $matcher
-     * @return Matcher $matcher
-     */
-    protected function parseQuery(array $queryParts, Matcher $matcher): Matcher
-    {
-        $dataType = $matcher->getDataType();
-        foreach ($queryParts as $term) {
-            $fieldNameAndPath = key($term);
-
-            $resolvedDataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
-            $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
-
-            // Retrieve the value.
-            $value = current($term);
-
-            if (Tca::grid($resolvedDataType)->hasFacet($fieldName) && Tca::grid($resolvedDataType)->facet($fieldName)->canModifyMatcher()) {
-                $matcher = Tca::grid($resolvedDataType)->facet($fieldName)->modifyMatcher($matcher, $value);
-            } elseif (Tca::table($resolvedDataType)->hasField($fieldName)) {
-                // Check whether the field exists and set it as "equal" or "like".
-                if ($this->isOperatorEquals($fieldNameAndPath, $dataType, $value)) {
-                    $matcher->equals($fieldNameAndPath, $value);
-                } else {
-                    $matcher->like($fieldNameAndPath, $value);
-                }
-            } elseif ($fieldNameAndPath === 'text') {
-                // Special case if field is "text" which is a pseudo field in this case.
-                // Set the search term which means Vidi will
-                // search in various fields with operator "like". The fields come from key "searchFields" in the TCA.
-                $matcher->setSearchTerm($value);
-            }
-        }
-        return $matcher;
-    }
-
-    /**
-     * Tell whether the operator should be equals instead of like for a search, e.g. if the value is numerical.
-     *
-     * @param string $fieldName
-     * @param string $dataType
-     * @param string $value
-     * @return bool
-     */
-    protected function isOperatorEquals($fieldName, $dataType, $value): bool
-    {
-        return (Tca::table($dataType)->field($fieldName)->hasRelation() && MathUtility::canBeInterpretedAsInteger($value))
-            || Tca::table($dataType)->field($fieldName)->isNumerical();
-    }
-
-    /**
-     * Signal that is called for post-processing a matcher object.
-     *
-     * @param Matcher $matcher
-     */
-    protected function emitPostProcessMatcherObjectSignal(Matcher $matcher): void
-    {
-
-        if (strlen($matcher->getDataType()) <= 0) {
-
-            /** @var ModuleLoader $moduleLoader */
-            $moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
-            $matcher->setDataType($moduleLoader->getDataType());
-        }
-
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\Controller\Backend\ContentController', 'postProcessMatcherObject', array($matcher, $matcher->getDataType()));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher
-     *
-     * @return Dispatcher|object
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser(): BackendUserAuthentication
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Returns whether the current mode is Backend
-     *
-     * @return bool
-     */
-    protected function isBackendMode(): bool
-    {
-        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return $this
+	 */
+	static public function getInstance(): self
+	{
+		return GeneralUtility::makeInstance(self::class);
+	}
+
+	/**
+	 * Returns a matcher object.
+	 *
+	 * @param array $matches
+	 * @param string $dataType
+	 * @return Matcher
+	 */
+	public function getMatcher(array $matches = [], $dataType = ''): Matcher
+	{
+		if ($dataType === '') {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+
+		/** @var $matcher Matcher */
+		$matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
+
+		$matcher = $this->applyCriteriaFromDataTables($matcher);
+		$matcher = $this->applyCriteriaFromMatchesArgument($matcher, $matches);
+
+		if ($this->isBackendMode()) {
+			$matcher = $this->applyCriteriaFromUrl($matcher);
+			$matcher = $this->applyCriteriaFromTSConfig($matcher);
+		}
+
+		// Trigger signal for post processing Matcher Object.
+		$this->emitPostProcessMatcherObjectSignal($matcher);
+
+		return $matcher;
+	}
+
+	/**
+	 * Get a possible id from the URL and apply as filter criteria.
+	 * Except if the main module belongs to the File. The id would be a combined identifier
+	 * including the storage and a mount point.
+	 *
+	 * @param Matcher $matcher
+	 * @return Matcher $matcher
+	 */
+	protected function applyCriteriaFromUrl(Matcher $matcher): Matcher
+	{
+		if (GeneralUtility::_GP('id')
+			&& !$this->getModuleLoader()->isPidIgnored()
+			&& $this->getModuleLoader()->getMainModule() !== ModuleName::FILE) {
+			$matcher->equals('pid', GeneralUtility::_GP('id'));
+		}
+
+		return $matcher;
+	}
+
+	/**
+	 * @param Matcher $matcher
+	 * @return Matcher $matcher
+	 */
+	protected function applyCriteriaFromTSConfig(Matcher $matcher): Matcher
+	{
+		$dataType = $matcher->getDataType();
+		$tsConfigPath = sprintf('tx_vidi.dataType.%s.constraints', $dataType);
+		$tsConfig = $this->getBackendUser()->getTSConfig($tsConfigPath);
+
+		if (is_array($tsConfig['properties']) && !empty($tsConfig['properties'])) {
+
+			foreach ($tsConfig['properties'] as $constraint) {
+
+				if (preg_match('/(.+) (>=|>|<|<=|=|like) (.+)/is', $constraint, $matches) && count($matches) === 4) {
+
+					$operator = $matcher->getSupportedOperators()[strtolower(trim($matches[2]))];
+					$operand = trim($matches[1]);
+					$value = trim($matches[3]);
+
+					$matcher->$operator($operand, $value);
+				} elseif (preg_match('/(.+) (in) (.+)/is', $constraint, $matches) && count($matches) === 4) {
+
+					$operator = $matcher->getSupportedOperators()[trim($matches[2])];
+					$operand = trim($matches[1]);
+					$value = trim($matches[3]);
+					$matcher->$operator($operand, GeneralUtility::trimExplode(',', $value, true));
+				}
+			}
+		}
+
+		return $matcher;
+	}
+
+	/**
+	 * @param Matcher $matcher
+	 * @param array $matches
+	 * @return Matcher $matcher
+	 */
+	protected function applyCriteriaFromMatchesArgument(Matcher $matcher, $matches): Matcher
+	{
+		foreach ($matches as $fieldNameAndPath => $value) {
+			// CSV values should be considered as "in" operator in the query, otherwise "equals".
+			$explodedValues = GeneralUtility::trimExplode(',', $value, true);
+			if (count($explodedValues) > 1) {
+				$matcher->in($fieldNameAndPath, $explodedValues);
+			} else {
+				$matcher->equals($fieldNameAndPath, $explodedValues[0]);
+			}
+		}
+
+		return $matcher;
+	}
+
+	/**
+	 * Apply criteria specific to jQuery plugin DataTable.
+	 *
+	 * @param Matcher $matcher
+	 * @return Matcher $matcher
+	 */
+	protected function applyCriteriaFromDataTables(Matcher $matcher): Matcher
+	{
+
+		// Special case for Grid in the BE using jQuery DataTables plugin.
+		// Retrieve a possible search term from GP.
+		$query = GeneralUtility::_GP('search');
+		if (is_array($query)) {
+			if (!empty($query['value'])) {
+				$query = $query['value'];
+			} else {
+				$query = '';
+			}
+		}
+
+		if (strlen($query) > 0) {
+
+			// Parse the json query coming from the Visual Search.
+			$query = rawurldecode($query);
+			$queryParts = json_decode($query, true);
+
+			if (is_array($queryParts)) {
+				$matcher = $this->parseQuery($queryParts, $matcher);
+			} else {
+				$matcher->setSearchTerm($query);
+			}
+		}
+		return $matcher;
+	}
+
+	/**
+	 * @param array $queryParts
+	 * @param Matcher $matcher
+	 * @return Matcher $matcher
+	 */
+	protected function parseQuery(array $queryParts, Matcher $matcher): Matcher
+	{
+		$dataType = $matcher->getDataType();
+		foreach ($queryParts as $term) {
+			$fieldNameAndPath = key($term);
+
+			$resolvedDataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
+			$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
+
+			// Retrieve the value.
+			$value = current($term);
+
+			if (Tca::grid($resolvedDataType)->hasFacet($fieldName) && Tca::grid($resolvedDataType)->facet($fieldName)->canModifyMatcher()) {
+				$matcher = Tca::grid($resolvedDataType)->facet($fieldName)->modifyMatcher($matcher, $value);
+			} elseif (Tca::table($resolvedDataType)->hasField($fieldName)) {
+				// Check whether the field exists and set it as "equal" or "like".
+				if ($this->isOperatorEquals($fieldNameAndPath, $dataType, $value)) {
+					$matcher->equals($fieldNameAndPath, $value);
+				} else {
+					$matcher->like($fieldNameAndPath, $value);
+				}
+			} elseif ($fieldNameAndPath === 'text') {
+				// Special case if field is "text" which is a pseudo field in this case.
+				// Set the search term which means Vidi will
+				// search in various fields with operator "like". The fields come from key "searchFields" in the TCA.
+				$matcher->setSearchTerm($value);
+			}
+		}
+		return $matcher;
+	}
+
+	/**
+	 * Tell whether the operator should be equals instead of like for a search, e.g. if the value is numerical.
+	 *
+	 * @param string $fieldName
+	 * @param string $dataType
+	 * @param string $value
+	 * @return bool
+	 */
+	protected function isOperatorEquals($fieldName, $dataType, $value): bool
+	{
+		return (Tca::table($dataType)->field($fieldName)->hasRelation() && MathUtility::canBeInterpretedAsInteger($value))
+			|| Tca::table($dataType)->field($fieldName)->isNumerical();
+	}
+
+	/**
+	 * Signal that is called for post-processing a matcher object.
+	 *
+	 * @param Matcher $matcher
+	 */
+	protected function emitPostProcessMatcherObjectSignal(Matcher $matcher): void
+	{
+
+		if (strlen($matcher->getDataType()) <= 0) {
+
+			/** @var ModuleLoader $moduleLoader */
+			$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
+			$matcher->setDataType($moduleLoader->getDataType());
+		}
+
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\Controller\Backend\ContentController', 'postProcessMatcherObject', array($matcher, $matcher->getDataType()));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher
+	 *
+	 * @return Dispatcher|object
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser(): BackendUserAuthentication
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Returns whether the current mode is Backend
+	 *
+	 * @return bool
+	 */
+	protected function isBackendMode(): bool
+	{
+		return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
+	}
 }

Classes/Persistence/Query.php

Indentation +622 added lines, -622 removed lines

@@ -41,626 +41,626 @@
 class Query implements QueryInterface
 {
 
-    /**
-     * An inner join.
-     */
-    const JCR_JOIN_TYPE_INNER = '{http://www.jcp.org/jcr/1.0}joinTypeInner';
-
-    /**
-     * A left-outer join.
-     */
-    const JCR_JOIN_TYPE_LEFT_OUTER = '{http://www.jcp.org/jcr/1.0}joinTypeLeftOuter';
-
-    /**
-     * A right-outer join.
-     */
-    const JCR_JOIN_TYPE_RIGHT_OUTER = '{http://www.jcp.org/jcr/1.0}joinTypeRightOuter';
-
-    /**
-     * Charset of strings in QOM
-     */
-    const CHARSET = 'utf-8';
-
-    /**
-     * @var string
-     */
-    protected $sourceFieldName;
-
-    /**
-     * @var string
-     */
-    protected $type;
-
-    /**
-     * @var PersistenceManagerInterface
-     */
-    protected $persistenceManager;
-
-    /**
-     * @var QueryObjectModelFactory
-     */
-    protected $qomFactory;
-
-    /**
-     * @var SourceInterface
-     */
-    protected $source;
-
-    /**
-     * @var ConstraintInterface
-     */
-    protected $constraint;
-
-    /**
-     * @var Statement
-     */
-    protected $statement;
-
-    /**
-     * @var array
-     */
-    protected $orderings = [];
-
-    /**
-     * @var int
-     */
-    protected $limit;
-
-    /**
-     * @var int
-     */
-    protected $offset;
-
-    /**
-     * Apply DISTINCT upon property.
-     *
-     * @var string
-     */
-    protected $distinct;
-
-    /**
-     * The query settings.
-     *
-     * @var Typo3QuerySettings
-     */
-    public Typo3QuerySettings $typo3QuerySettings;
-
-    /**
-     * Constructs a query object working on the given class name
-     *
-     * @param string $type
-     */
-    public function __construct($type)
-    {
-        $this->type = $type;
-        $this->persistenceManager = GeneralUtility::makeInstance(PersistenceManagerInterface::class);
-        $this->qomFactory = GeneralUtility::makeInstance(QueryObjectModelFactory::class);
-    }
-
-    public function injectTypo3QuerySettings(Typo3QuerySettings $querySettings): void
-    {
-        $this->typo3QuerySettings = $querySettings;
-    }
-
-    /**
-     * Sets the Query Settings. These Query settings must match the settings expected by
-     * the specific Storage Backend.
-     *
-     * @param QuerySettingsInterface $typo3QuerySettings The Query Settings
-     * @return void
-     */
-    public function setTypo3QuerySettings(QuerySettingsInterface $typo3QuerySettings)
-    {
-        $this->typo3QuerySettings = $typo3QuerySettings;
-    }
-
-    /**
-     * Returns the Query Settings.
-     *
-     * @throws \Exception
-     * @return Typo3QuerySettings $querySettings The Query Settings
-     * @api This method is not part of FLOW3 API
-     */
-    public function getTypo3QuerySettings()
-    {
-        if (!$this->typo3QuerySettings instanceof QuerySettingsInterface) {
-            throw new Exception('Tried to get the query settings without setting them before.', 1248689115);
-        }
-
-        // Apply possible settings to the query.
-        if ($this->isBackendMode()) {
-            /** @var BackendConfigurationManager $backendConfigurationManager */
-            $backendConfigurationManager = GeneralUtility::makeInstance(BackendConfigurationManager::class);
-            $configuration = $backendConfigurationManager->getTypoScriptSetup();
-            $querySettings = array('respectSysLanguage');
-            foreach ($querySettings as $setting) {
-                if (isset($configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type . '.'][$setting])) {
-                    $value = (bool)$configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type . '.'][$setting];
-                    ObjectAccess::setProperty($this->typo3QuerySettings, $setting, $value);
-                }
-            }
-        }
-
-        return $this->typo3QuerySettings;
-    }
-
-    /**
-     * Returns the type this query cares for.
-     *
-     * @return string
-     * @api
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * Sets the source to fetch the result from
-     *
-     * @param SourceInterface $source
-     */
-    public function setSource(SourceInterface $source)
-    {
-        $this->source = $source;
-    }
-
-    /**
-     * Returns the selectorn name or an empty string, if the source is not a selector
-     * TODO This has to be checked at another place
-     *
-     * @return string The selector name
-     */
-    protected function getSelectorName()
-    {
-        if ($this->getSource() instanceof SelectorInterface) {
-            return $this->source->getSelectorName();
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Gets the node-tuple source for this query.
-     *
-     * @return SourceInterface the node-tuple source; non-null
-     */
-    public function getSource()
-    {
-        if ($this->source === null) {
-            $this->source = $this->qomFactory->selector($this->getType());
-        }
-        return $this->source;
-    }
-
-    /**
-     * Executes the query against the database and returns the result
-     *
-     * @return QueryResultInterface|array The query result object or an array if $this->getQuerySettings()->getReturnRawQueryResult() is true
-     * @api
-     */
-    public function execute($returnRawQueryResult = false)
-    {
-        /** @var VidiDbBackend $backend */
-        $backend = GeneralUtility::makeInstance(VidiDbBackend::class, $this);
-        return $backend->fetchResult();
-    }
-
-    /**
-     * Sets the property names to order the result by. Expected like this:
-     * array(
-     * 'foo' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING,
-     * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
-     * )
-     * where 'foo' and 'bar' are property names.
-     *
-     * @param array $orderings The property names to order by
-     * @return QueryInterface
-     * @api
-     */
-    public function setOrderings(array $orderings)
-    {
-        $this->orderings = $orderings;
-        return $this;
-    }
-
-    /**
-     * Returns the property names to order the result by. Like this:
-     * array(
-     * 'foo' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING,
-     * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
-     * )
-     *
-     * @return array
-     */
-    public function getOrderings()
-    {
-        return $this->orderings;
-    }
-
-    /**
-     * Sets the maximum size of the result set to limit. Returns $this to allow
-     * for chaining (fluid interface)
-     *
-     * @param integer $limit
-     * @throws \InvalidArgumentException
-     * @return QueryInterface
-     * @api
-     */
-    public function setLimit($limit)
-    {
-        if (!is_int($limit) || $limit < 1) {
-            throw new \InvalidArgumentException('The limit must be an integer >= 1', 1245071870);
-        }
-        $this->limit = $limit;
-        return $this;
-    }
-
-    /**
-     * Resets a previously set maximum size of the result set. Returns $this to allow
-     * for chaining (fluid interface)
-     *
-     * @return QueryInterface
-     * @api
-     */
-    public function unsetLimit()
-    {
-        unset($this->limit);
-        return $this;
-    }
-
-    /**
-     * Returns the maximum size of the result set to limit.
-     *
-     * @return integer
-     * @api
-     */
-    public function getLimit()
-    {
-        return $this->limit;
-    }
-
-    /**
-     * Sets the start offset of the result set to offset. Returns $this to
-     * allow for chaining (fluid interface)
-     *
-     * @param integer $offset
-     * @throws \InvalidArgumentException
-     * @return QueryInterface
-     * @api
-     */
-    public function setOffset($offset)
-    {
-        if (!is_int($offset) || $offset < 0) {
-            throw new \InvalidArgumentException('The offset must be a positive integer', 1245071872);
-        }
-        $this->offset = $offset;
-        return $this;
-    }
-
-    /**
-     * Returns the start offset of the result set.
-     *
-     * @return integer
-     * @api
-     */
-    public function getOffset()
-    {
-        return $this->offset;
-    }
-
-    /**
-     * The constraint used to limit the result set. Returns $this to allow
-     * for chaining (fluid interface)
-     *
-     * @param ConstraintInterface $constraint
-     * @return QueryInterface
-     * @api
-     */
-    public function matching($constraint)
-    {
-        $this->constraint = $constraint;
-        return $this;
-    }
-
-    /**
-     * Gets the constraint for this query.
-     *
-     * @return ConstraintInterface the constraint, or null if none
-     * @api
-     */
-    public function getConstraint()
-    {
-        return $this->constraint;
-    }
-
-    /**
-     * Performs a logical conjunction of the given constraints. The method takes one or more contraints and concatenates them with a boolean AND.
-     * It also scepts a single array of constraints to be concatenated.
-     *
-     * @param mixed $constraint1 The first of multiple constraints or an array of constraints.
-     * @throws InvalidNumberOfConstraintsException
-     * @return AndInterface
-     * @api
-     */
-    public function logicalAnd($constraint1)
-    {
-        if (is_array($constraint1)) {
-            $resultingConstraint = array_shift($constraint1);
-            $constraints = $constraint1;
-        } else {
-            $constraints = func_get_args();
-            $resultingConstraint = array_shift($constraints);
-        }
-        if ($resultingConstraint === null) {
-            throw new InvalidNumberOfConstraintsException('There must be at least one constraint or a non-empty array of constraints given.', 1401289500);
-        }
-        foreach ($constraints as $constraint) {
-            $resultingConstraint = $this->qomFactory->_and($resultingConstraint, $constraint);
-        }
-        return $resultingConstraint;
-    }
-
-    /**
-     * Performs a logical disjunction of the two given constraints
-     *
-     * @param mixed $constraint1 The first of multiple constraints or an array of constraints.
-     * @throws InvalidNumberOfConstraintsException
-     * @return OrInterface
-     * @api
-     */
-    public function logicalOr($constraint1)
-    {
-        if (is_array($constraint1)) {
-            $resultingConstraint = array_shift($constraint1);
-            $constraints = $constraint1;
-        } else {
-            $constraints = func_get_args();
-            $resultingConstraint = array_shift($constraints);
-        }
-        if ($resultingConstraint === null) {
-            throw new InvalidNumberOfConstraintsException('There must be at least one constraint or a non-empty array of constraints given.', 1401289501);
-        }
-        foreach ($constraints as $constraint) {
-            $resultingConstraint = $this->qomFactory->_or($resultingConstraint, $constraint);
-        }
-        return $resultingConstraint;
-    }
-
-    /**
-     * Performs a logical negation of the given constraint
-     *
-     * @param ConstraintInterface $constraint Constraint to negate
-     * @throws \RuntimeException
-     * @return NotInterface
-     * @api
-     */
-    public function logicalNot(ConstraintInterface $constraint)
-    {
-        return $this->qomFactory->not($constraint);
-    }
-
-    /**
-     * Returns an equals criterion used for matching objects against a query
-     *
-     * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
-     * @param boolean $caseSensitive Whether the equality test should be done case-sensitive
-     * @return ComparisonInterface
-     * @api
-     */
-    public function equals($propertyName, $operand, $caseSensitive = true)
-    {
-        if (is_object($operand) || $caseSensitive) {
-            $comparison = $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_EQUAL_TO, $operand);
-        } else {
-            $comparison = $this->qomFactory->comparison($this->qomFactory->lowerCase($this->qomFactory->propertyValue($propertyName, $this->getSelectorName())), QueryInterface::OPERATOR_EQUAL_TO, mb_strtolower($operand, \TYPO3\CMS\Extbase\Persistence\Generic\Query::CHARSET));
-        }
-        return $comparison;
-    }
-
-    /**
-     * Returns a like criterion used for matching objects against a query
-     *
-     * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
-     * @param boolean $caseSensitive Whether the matching should be done case-sensitive
-     * @return ComparisonInterface
-     * @api
-     */
-    public function like($propertyName, $operand, $caseSensitive = true)
-    {
-        return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_LIKE, $operand);
-    }
-
-    /**
-     * Returns a "contains" criterion used for matching objects against a query.
-     * It matches if the multivalued property contains the given operand.
-     *
-     * @param string $propertyName The name of the (multivalued) property to compare against
-     * @param mixed $operand The value to compare with
-     * @return ComparisonInterface
-     * @api
-     */
-    public function contains($propertyName, $operand)
-    {
-        return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_CONTAINS, $operand);
-    }
-
-    /**
-     * Returns an "in" criterion used for matching objects against a query. It
-     * matches if the property's value is contained in the multivalued operand.
-     *
-     * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with, multivalued
-     * @throws UnexpectedTypeException
-     * @return ComparisonInterface
-     * @api
-     */
-    public function in($propertyName, $operand)
-    {
-        if (!is_array($operand) && !$operand instanceof \ArrayAccess && !$operand instanceof \Traversable) {
-            throw new UnexpectedTypeException('The "in" operator must be given a mutlivalued operand (array, ArrayAccess, Traversable).', 1264678095);
-        }
-        return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_IN, $operand);
-    }
-
-    /**
-     * Returns a less than criterion used for matching objects against a query
-     *
-     * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
-     * @return ComparisonInterface
-     * @api
-     */
-    public function lessThan($propertyName, $operand)
-    {
-        return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_LESS_THAN, $operand);
-    }
-
-    /**
-     * Returns a less or equal than criterion used for matching objects against a query
-     *
-     * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
-     * @return ComparisonInterface
-     * @api
-     */
-    public function lessThanOrEqual($propertyName, $operand)
-    {
-        return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_LESS_THAN_OR_EQUAL_TO, $operand);
-    }
-
-    /**
-     * Returns a greater than criterion used for matching objects against a query
-     *
-     * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
-     * @return ComparisonInterface
-     * @api
-     */
-    public function greaterThan($propertyName, $operand)
-    {
-        return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_GREATER_THAN, $operand);
-    }
-
-    /**
-     * Returns a greater than or equal criterion used for matching objects against a query
-     *
-     * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
-     * @return ComparisonInterface
-     * @api
-     */
-    public function greaterThanOrEqual($propertyName, $operand)
-    {
-        return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_GREATER_THAN_OR_EQUAL_TO, $operand);
-    }
-
-    /**
-     * Returns the query result count.
-     *
-     * @return integer The query result count
-     * @api
-     */
-    public function count()
-    {
-        /** @var VidiDbBackend $backend */
-        $backend = GeneralUtility::makeInstance(VidiDbBackend::class, $this);
-        return $backend->countResult();
-    }
-
-    /**
-     * Returns an "isEmpty" criterion used for matching objects against a query.
-     * It matches if the multivalued property contains no values or is null.
-     *
-     * @param string $propertyName The name of the multivalued property to compare against
-     * @throws NotImplementedException
-     * @throws InvalidQueryException if used on a single-valued property
-     * @api
-     */
-    public function isEmpty($propertyName)
-    {
-        throw new NotImplementedException(__METHOD__);
-    }
-
-    /**
-     * @return string
-     */
-    public function getDistinct()
-    {
-        return $this->distinct;
-    }
-
-    /**
-     * @param string $distinct
-     * @return $this
-     */
-    public function setDistinct($distinct)
-    {
-        $this->distinct = $distinct;
-        return $this;
-    }
-
-    /**
-     * Sets the statement of this query. If you use this, you will lose the abstraction from a concrete storage
-     * backend (database).
-     *
-     * @param string|\TYPO3\CMS\Core\Database\PreparedStatement $statement The statement
-     * @param array $parameters An array of parameters. These will be bound to placeholders '?' in the $statement.
-     * @return QueryInterface
-     */
-    public function statement($statement, array $parameters = array())
-    {
-        $this->statement = $this->qomFactory->statement($statement, $parameters);
-        return $this;
-    }
-
-    /**
-     * Returns the statement of this query.
-     *
-     * @return Statement
-     */
-    public function getStatement()
-    {
-        return $this->statement;
-    }
-
-    /**
-     * Returns whether the current mode is Backend.
-     *
-     * @return bool
-     */
-    protected function isBackendMode()
-    {
-        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
-    }
-
-    /**
-     * @return string
-     */
-    public function getSourceFieldName()
-    {
-        return $this->sourceFieldName;
-    }
-
-    /**
-     * @param string $sourceFieldName
-     * @return $this
-     */
-    public function setSourceFieldName($sourceFieldName)
-    {
-        $this->sourceFieldName = $sourceFieldName;
-        return $this;
-    }
-
-    public function setQuerySettings(QuerySettingsInterface $querySettings)
-    {
-        $this->typo3QuerySettings = $querySettings;
-    }
-
-    public function getQuerySettings()
-    {
-        return $this->typo3QuerySettings;
-    }
+	/**
+	 * An inner join.
+	 */
+	const JCR_JOIN_TYPE_INNER = '{http://www.jcp.org/jcr/1.0}joinTypeInner';
+
+	/**
+	 * A left-outer join.
+	 */
+	const JCR_JOIN_TYPE_LEFT_OUTER = '{http://www.jcp.org/jcr/1.0}joinTypeLeftOuter';
+
+	/**
+	 * A right-outer join.
+	 */
+	const JCR_JOIN_TYPE_RIGHT_OUTER = '{http://www.jcp.org/jcr/1.0}joinTypeRightOuter';
+
+	/**
+	 * Charset of strings in QOM
+	 */
+	const CHARSET = 'utf-8';
+
+	/**
+	 * @var string
+	 */
+	protected $sourceFieldName;
+
+	/**
+	 * @var string
+	 */
+	protected $type;
+
+	/**
+	 * @var PersistenceManagerInterface
+	 */
+	protected $persistenceManager;
+
+	/**
+	 * @var QueryObjectModelFactory
+	 */
+	protected $qomFactory;
+
+	/**
+	 * @var SourceInterface
+	 */
+	protected $source;
+
+	/**
+	 * @var ConstraintInterface
+	 */
+	protected $constraint;
+
+	/**
+	 * @var Statement
+	 */
+	protected $statement;
+
+	/**
+	 * @var array
+	 */
+	protected $orderings = [];
+
+	/**
+	 * @var int
+	 */
+	protected $limit;
+
+	/**
+	 * @var int
+	 */
+	protected $offset;
+
+	/**
+	 * Apply DISTINCT upon property.
+	 *
+	 * @var string
+	 */
+	protected $distinct;
+
+	/**
+	 * The query settings.
+	 *
+	 * @var Typo3QuerySettings
+	 */
+	public Typo3QuerySettings $typo3QuerySettings;
+
+	/**
+	 * Constructs a query object working on the given class name
+	 *
+	 * @param string $type
+	 */
+	public function __construct($type)
+	{
+		$this->type = $type;
+		$this->persistenceManager = GeneralUtility::makeInstance(PersistenceManagerInterface::class);
+		$this->qomFactory = GeneralUtility::makeInstance(QueryObjectModelFactory::class);
+	}
+
+	public function injectTypo3QuerySettings(Typo3QuerySettings $querySettings): void
+	{
+		$this->typo3QuerySettings = $querySettings;
+	}
+
+	/**
+	 * Sets the Query Settings. These Query settings must match the settings expected by
+	 * the specific Storage Backend.
+	 *
+	 * @param QuerySettingsInterface $typo3QuerySettings The Query Settings
+	 * @return void
+	 */
+	public function setTypo3QuerySettings(QuerySettingsInterface $typo3QuerySettings)
+	{
+		$this->typo3QuerySettings = $typo3QuerySettings;
+	}
+
+	/**
+	 * Returns the Query Settings.
+	 *
+	 * @throws \Exception
+	 * @return Typo3QuerySettings $querySettings The Query Settings
+	 * @api This method is not part of FLOW3 API
+	 */
+	public function getTypo3QuerySettings()
+	{
+		if (!$this->typo3QuerySettings instanceof QuerySettingsInterface) {
+			throw new Exception('Tried to get the query settings without setting them before.', 1248689115);
+		}
+
+		// Apply possible settings to the query.
+		if ($this->isBackendMode()) {
+			/** @var BackendConfigurationManager $backendConfigurationManager */
+			$backendConfigurationManager = GeneralUtility::makeInstance(BackendConfigurationManager::class);
+			$configuration = $backendConfigurationManager->getTypoScriptSetup();
+			$querySettings = array('respectSysLanguage');
+			foreach ($querySettings as $setting) {
+				if (isset($configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type . '.'][$setting])) {
+					$value = (bool)$configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type . '.'][$setting];
+					ObjectAccess::setProperty($this->typo3QuerySettings, $setting, $value);
+				}
+			}
+		}
+
+		return $this->typo3QuerySettings;
+	}
+
+	/**
+	 * Returns the type this query cares for.
+	 *
+	 * @return string
+	 * @api
+	 */
+	public function getType()
+	{
+		return $this->type;
+	}
+
+	/**
+	 * Sets the source to fetch the result from
+	 *
+	 * @param SourceInterface $source
+	 */
+	public function setSource(SourceInterface $source)
+	{
+		$this->source = $source;
+	}
+
+	/**
+	 * Returns the selectorn name or an empty string, if the source is not a selector
+	 * TODO This has to be checked at another place
+	 *
+	 * @return string The selector name
+	 */
+	protected function getSelectorName()
+	{
+		if ($this->getSource() instanceof SelectorInterface) {
+			return $this->source->getSelectorName();
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * Gets the node-tuple source for this query.
+	 *
+	 * @return SourceInterface the node-tuple source; non-null
+	 */
+	public function getSource()
+	{
+		if ($this->source === null) {
+			$this->source = $this->qomFactory->selector($this->getType());
+		}
+		return $this->source;
+	}
+
+	/**
+	 * Executes the query against the database and returns the result
+	 *
+	 * @return QueryResultInterface|array The query result object or an array if $this->getQuerySettings()->getReturnRawQueryResult() is true
+	 * @api
+	 */
+	public function execute($returnRawQueryResult = false)
+	{
+		/** @var VidiDbBackend $backend */
+		$backend = GeneralUtility::makeInstance(VidiDbBackend::class, $this);
+		return $backend->fetchResult();
+	}
+
+	/**
+	 * Sets the property names to order the result by. Expected like this:
+	 * array(
+	 * 'foo' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING,
+	 * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
+	 * )
+	 * where 'foo' and 'bar' are property names.
+	 *
+	 * @param array $orderings The property names to order by
+	 * @return QueryInterface
+	 * @api
+	 */
+	public function setOrderings(array $orderings)
+	{
+		$this->orderings = $orderings;
+		return $this;
+	}
+
+	/**
+	 * Returns the property names to order the result by. Like this:
+	 * array(
+	 * 'foo' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING,
+	 * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
+	 * )
+	 *
+	 * @return array
+	 */
+	public function getOrderings()
+	{
+		return $this->orderings;
+	}
+
+	/**
+	 * Sets the maximum size of the result set to limit. Returns $this to allow
+	 * for chaining (fluid interface)
+	 *
+	 * @param integer $limit
+	 * @throws \InvalidArgumentException
+	 * @return QueryInterface
+	 * @api
+	 */
+	public function setLimit($limit)
+	{
+		if (!is_int($limit) || $limit < 1) {
+			throw new \InvalidArgumentException('The limit must be an integer >= 1', 1245071870);
+		}
+		$this->limit = $limit;
+		return $this;
+	}
+
+	/**
+	 * Resets a previously set maximum size of the result set. Returns $this to allow
+	 * for chaining (fluid interface)
+	 *
+	 * @return QueryInterface
+	 * @api
+	 */
+	public function unsetLimit()
+	{
+		unset($this->limit);
+		return $this;
+	}
+
+	/**
+	 * Returns the maximum size of the result set to limit.
+	 *
+	 * @return integer
+	 * @api
+	 */
+	public function getLimit()
+	{
+		return $this->limit;
+	}
+
+	/**
+	 * Sets the start offset of the result set to offset. Returns $this to
+	 * allow for chaining (fluid interface)
+	 *
+	 * @param integer $offset
+	 * @throws \InvalidArgumentException
+	 * @return QueryInterface
+	 * @api
+	 */
+	public function setOffset($offset)
+	{
+		if (!is_int($offset) || $offset < 0) {
+			throw new \InvalidArgumentException('The offset must be a positive integer', 1245071872);
+		}
+		$this->offset = $offset;
+		return $this;
+	}
+
+	/**
+	 * Returns the start offset of the result set.
+	 *
+	 * @return integer
+	 * @api
+	 */
+	public function getOffset()
+	{
+		return $this->offset;
+	}
+
+	/**
+	 * The constraint used to limit the result set. Returns $this to allow
+	 * for chaining (fluid interface)
+	 *
+	 * @param ConstraintInterface $constraint
+	 * @return QueryInterface
+	 * @api
+	 */
+	public function matching($constraint)
+	{
+		$this->constraint = $constraint;
+		return $this;
+	}
+
+	/**
+	 * Gets the constraint for this query.
+	 *
+	 * @return ConstraintInterface the constraint, or null if none
+	 * @api
+	 */
+	public function getConstraint()
+	{
+		return $this->constraint;
+	}
+
+	/**
+	 * Performs a logical conjunction of the given constraints. The method takes one or more contraints and concatenates them with a boolean AND.
+	 * It also scepts a single array of constraints to be concatenated.
+	 *
+	 * @param mixed $constraint1 The first of multiple constraints or an array of constraints.
+	 * @throws InvalidNumberOfConstraintsException
+	 * @return AndInterface
+	 * @api
+	 */
+	public function logicalAnd($constraint1)
+	{
+		if (is_array($constraint1)) {
+			$resultingConstraint = array_shift($constraint1);
+			$constraints = $constraint1;
+		} else {
+			$constraints = func_get_args();
+			$resultingConstraint = array_shift($constraints);
+		}
+		if ($resultingConstraint === null) {
+			throw new InvalidNumberOfConstraintsException('There must be at least one constraint or a non-empty array of constraints given.', 1401289500);
+		}
+		foreach ($constraints as $constraint) {
+			$resultingConstraint = $this->qomFactory->_and($resultingConstraint, $constraint);
+		}
+		return $resultingConstraint;
+	}
+
+	/**
+	 * Performs a logical disjunction of the two given constraints
+	 *
+	 * @param mixed $constraint1 The first of multiple constraints or an array of constraints.
+	 * @throws InvalidNumberOfConstraintsException
+	 * @return OrInterface
+	 * @api
+	 */
+	public function logicalOr($constraint1)
+	{
+		if (is_array($constraint1)) {
+			$resultingConstraint = array_shift($constraint1);
+			$constraints = $constraint1;
+		} else {
+			$constraints = func_get_args();
+			$resultingConstraint = array_shift($constraints);
+		}
+		if ($resultingConstraint === null) {
+			throw new InvalidNumberOfConstraintsException('There must be at least one constraint or a non-empty array of constraints given.', 1401289501);
+		}
+		foreach ($constraints as $constraint) {
+			$resultingConstraint = $this->qomFactory->_or($resultingConstraint, $constraint);
+		}
+		return $resultingConstraint;
+	}
+
+	/**
+	 * Performs a logical negation of the given constraint
+	 *
+	 * @param ConstraintInterface $constraint Constraint to negate
+	 * @throws \RuntimeException
+	 * @return NotInterface
+	 * @api
+	 */
+	public function logicalNot(ConstraintInterface $constraint)
+	{
+		return $this->qomFactory->not($constraint);
+	}
+
+	/**
+	 * Returns an equals criterion used for matching objects against a query
+	 *
+	 * @param string $propertyName The name of the property to compare against
+	 * @param mixed $operand The value to compare with
+	 * @param boolean $caseSensitive Whether the equality test should be done case-sensitive
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function equals($propertyName, $operand, $caseSensitive = true)
+	{
+		if (is_object($operand) || $caseSensitive) {
+			$comparison = $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_EQUAL_TO, $operand);
+		} else {
+			$comparison = $this->qomFactory->comparison($this->qomFactory->lowerCase($this->qomFactory->propertyValue($propertyName, $this->getSelectorName())), QueryInterface::OPERATOR_EQUAL_TO, mb_strtolower($operand, \TYPO3\CMS\Extbase\Persistence\Generic\Query::CHARSET));
+		}
+		return $comparison;
+	}
+
+	/**
+	 * Returns a like criterion used for matching objects against a query
+	 *
+	 * @param string $propertyName The name of the property to compare against
+	 * @param mixed $operand The value to compare with
+	 * @param boolean $caseSensitive Whether the matching should be done case-sensitive
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function like($propertyName, $operand, $caseSensitive = true)
+	{
+		return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_LIKE, $operand);
+	}
+
+	/**
+	 * Returns a "contains" criterion used for matching objects against a query.
+	 * It matches if the multivalued property contains the given operand.
+	 *
+	 * @param string $propertyName The name of the (multivalued) property to compare against
+	 * @param mixed $operand The value to compare with
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function contains($propertyName, $operand)
+	{
+		return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_CONTAINS, $operand);
+	}
+
+	/**
+	 * Returns an "in" criterion used for matching objects against a query. It
+	 * matches if the property's value is contained in the multivalued operand.
+	 *
+	 * @param string $propertyName The name of the property to compare against
+	 * @param mixed $operand The value to compare with, multivalued
+	 * @throws UnexpectedTypeException
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function in($propertyName, $operand)
+	{
+		if (!is_array($operand) && !$operand instanceof \ArrayAccess && !$operand instanceof \Traversable) {
+			throw new UnexpectedTypeException('The "in" operator must be given a mutlivalued operand (array, ArrayAccess, Traversable).', 1264678095);
+		}
+		return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_IN, $operand);
+	}
+
+	/**
+	 * Returns a less than criterion used for matching objects against a query
+	 *
+	 * @param string $propertyName The name of the property to compare against
+	 * @param mixed $operand The value to compare with
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function lessThan($propertyName, $operand)
+	{
+		return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_LESS_THAN, $operand);
+	}
+
+	/**
+	 * Returns a less or equal than criterion used for matching objects against a query
+	 *
+	 * @param string $propertyName The name of the property to compare against
+	 * @param mixed $operand The value to compare with
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function lessThanOrEqual($propertyName, $operand)
+	{
+		return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_LESS_THAN_OR_EQUAL_TO, $operand);
+	}
+
+	/**
+	 * Returns a greater than criterion used for matching objects against a query
+	 *
+	 * @param string $propertyName The name of the property to compare against
+	 * @param mixed $operand The value to compare with
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function greaterThan($propertyName, $operand)
+	{
+		return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_GREATER_THAN, $operand);
+	}
+
+	/**
+	 * Returns a greater than or equal criterion used for matching objects against a query
+	 *
+	 * @param string $propertyName The name of the property to compare against
+	 * @param mixed $operand The value to compare with
+	 * @return ComparisonInterface
+	 * @api
+	 */
+	public function greaterThanOrEqual($propertyName, $operand)
+	{
+		return $this->qomFactory->comparison($this->qomFactory->propertyValue($propertyName, $this->getSelectorName()), QueryInterface::OPERATOR_GREATER_THAN_OR_EQUAL_TO, $operand);
+	}
+
+	/**
+	 * Returns the query result count.
+	 *
+	 * @return integer The query result count
+	 * @api
+	 */
+	public function count()
+	{
+		/** @var VidiDbBackend $backend */
+		$backend = GeneralUtility::makeInstance(VidiDbBackend::class, $this);
+		return $backend->countResult();
+	}
+
+	/**
+	 * Returns an "isEmpty" criterion used for matching objects against a query.
+	 * It matches if the multivalued property contains no values or is null.
+	 *
+	 * @param string $propertyName The name of the multivalued property to compare against
+	 * @throws NotImplementedException
+	 * @throws InvalidQueryException if used on a single-valued property
+	 * @api
+	 */
+	public function isEmpty($propertyName)
+	{
+		throw new NotImplementedException(__METHOD__);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDistinct()
+	{
+		return $this->distinct;
+	}
+
+	/**
+	 * @param string $distinct
+	 * @return $this
+	 */
+	public function setDistinct($distinct)
+	{
+		$this->distinct = $distinct;
+		return $this;
+	}
+
+	/**
+	 * Sets the statement of this query. If you use this, you will lose the abstraction from a concrete storage
+	 * backend (database).
+	 *
+	 * @param string|\TYPO3\CMS\Core\Database\PreparedStatement $statement The statement
+	 * @param array $parameters An array of parameters. These will be bound to placeholders '?' in the $statement.
+	 * @return QueryInterface
+	 */
+	public function statement($statement, array $parameters = array())
+	{
+		$this->statement = $this->qomFactory->statement($statement, $parameters);
+		return $this;
+	}
+
+	/**
+	 * Returns the statement of this query.
+	 *
+	 * @return Statement
+	 */
+	public function getStatement()
+	{
+		return $this->statement;
+	}
+
+	/**
+	 * Returns whether the current mode is Backend.
+	 *
+	 * @return bool
+	 */
+	protected function isBackendMode()
+	{
+		return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSourceFieldName()
+	{
+		return $this->sourceFieldName;
+	}
+
+	/**
+	 * @param string $sourceFieldName
+	 * @return $this
+	 */
+	public function setSourceFieldName($sourceFieldName)
+	{
+		$this->sourceFieldName = $sourceFieldName;
+		return $this;
+	}
+
+	public function setQuerySettings(QuerySettingsInterface $querySettings)
+	{
+		$this->typo3QuerySettings = $querySettings;
+	}
+
+	public function getQuerySettings()
+	{
+		return $this->typo3QuerySettings;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -174,8 +174,8 @@
             $configuration = $backendConfigurationManager->getTypoScriptSetup();
             $querySettings = array('respectSysLanguage');
             foreach ($querySettings as $setting) {
-                if (isset($configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type . '.'][$setting])) {
-                    $value = (bool)$configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type . '.'][$setting];
+                if (isset($configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type.'.'][$setting])) {
+                    $value = (bool)$configuration['config.']['tx_vidi.']['persistence.']['backend.'][$this->type.'.'][$setting];
                     ObjectAccess::setProperty($this->typo3QuerySettings, $setting, $value);
                 }
             }

Classes/Facet/FacetSuggestionService.php

Indentation +104 added lines, -104 removed lines

@@ -21,109 +21,109 @@
 class FacetSuggestionService
 {
 
-    /**
-     * Retrieve possible suggestions for a field name
-     *
-     * @param string $fieldNameAndPath
-     * @return array
-     */
-    public function getSuggestions($fieldNameAndPath): array
-    {
-        $values = [];
-
-        $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
-        $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
-
-        if (Tca::grid()->facet($fieldNameAndPath)->hasSuggestions()) {
-            $values = Tca::grid()->facet($fieldNameAndPath)->getSuggestions();
-        } else if (Tca::table($dataType)->hasField($fieldName)) {
-
-            if (Tca::table($dataType)->field($fieldName)->hasRelation()) {
-
-                // Fetch the adequate repository
-                $foreignTable = Tca::table($dataType)->field($fieldName)->getForeignTable();
-                $contentRepository = ContentRepositoryFactory::getInstance($foreignTable);
-                $table = Tca::table($foreignTable);
-
-                // Initialize the matcher object.
-                $matcher = MatcherObjectFactory::getInstance()->getMatcher([], $foreignTable);
-
-                $numberOfValues = $contentRepository->countBy($matcher);
-                if ($numberOfValues <= $this->getLimit()) {
-
-                    $contents = $contentRepository->findBy($matcher);
-
-                    foreach ($contents as $content) {
-                        $values[] = array($content->getUid() => $content[$table->getLabelField()]);
-                    }
-                }
-            } elseif (!Tca::table($dataType)->field($fieldName)->isTextArea()) { // We don't want suggestion if field is text area.
-                // Fetch the adequate repository
-                /** @var ContentRepository $contentRepository */
-                $contentRepository = ContentRepositoryFactory::getInstance($dataType);
-
-                // Initialize some objects related to the query
-                $matcher = MatcherObjectFactory::getInstance()->getMatcher([], $dataType);
-
-                // Count the number of objects.
-                $numberOfValues = $contentRepository->countDistinctValues($fieldName, $matcher);
-
-                // Only returns suggestion if there are not too many for the browser.
-                if ($numberOfValues <= $this->getLimit()) {
-
-                    // Query the repository.
-                    $contents = $contentRepository->findDistinctValues($fieldName, $matcher);
-
-                    foreach ($contents as $content) {
-
-                        $value = $content[$fieldName];
-                        $label = $content[$fieldName];
-                        if (Tca::table($dataType)->field($fieldName)->isSelect()) {
-                            $label = Tca::table($dataType)->field($fieldName)->getLabelForItem($value);
-                        }
-
-                        $values[] = $label;
-                    }
-                }
-            }
-        }
-        return $values;
-    }
-
-    /**
-     * Return from settings the suggestion limit.
-     *
-     * @return int
-     */
-    protected function getLimit(): int
-    {
-        $settings = $this->getSettings();
-        $suggestionLimit = (int)$settings['suggestionLimit'];
-        if ($suggestionLimit <= 0) {
-            $suggestionLimit = 1000;
-        }
-        return $suggestionLimit;
-    }
-
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * Returns the module settings.
-     *
-     * @return array
-     */
-    protected function getSettings()
-    {
-        /** @var BackendConfigurationManager $backendConfigurationManager */
-        $backendConfigurationManager = GeneralUtility::makeInstance(BackendConfigurationManager::class);
-        $configuration = $backendConfigurationManager->getTypoScriptSetup();
-        return $configuration['module.']['tx_vidi.']['settings.'];
-    }
+	/**
+	 * Retrieve possible suggestions for a field name
+	 *
+	 * @param string $fieldNameAndPath
+	 * @return array
+	 */
+	public function getSuggestions($fieldNameAndPath): array
+	{
+		$values = [];
+
+		$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
+		$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+
+		if (Tca::grid()->facet($fieldNameAndPath)->hasSuggestions()) {
+			$values = Tca::grid()->facet($fieldNameAndPath)->getSuggestions();
+		} else if (Tca::table($dataType)->hasField($fieldName)) {
+
+			if (Tca::table($dataType)->field($fieldName)->hasRelation()) {
+
+				// Fetch the adequate repository
+				$foreignTable = Tca::table($dataType)->field($fieldName)->getForeignTable();
+				$contentRepository = ContentRepositoryFactory::getInstance($foreignTable);
+				$table = Tca::table($foreignTable);
+
+				// Initialize the matcher object.
+				$matcher = MatcherObjectFactory::getInstance()->getMatcher([], $foreignTable);
+
+				$numberOfValues = $contentRepository->countBy($matcher);
+				if ($numberOfValues <= $this->getLimit()) {
+
+					$contents = $contentRepository->findBy($matcher);
+
+					foreach ($contents as $content) {
+						$values[] = array($content->getUid() => $content[$table->getLabelField()]);
+					}
+				}
+			} elseif (!Tca::table($dataType)->field($fieldName)->isTextArea()) { // We don't want suggestion if field is text area.
+				// Fetch the adequate repository
+				/** @var ContentRepository $contentRepository */
+				$contentRepository = ContentRepositoryFactory::getInstance($dataType);
+
+				// Initialize some objects related to the query
+				$matcher = MatcherObjectFactory::getInstance()->getMatcher([], $dataType);
+
+				// Count the number of objects.
+				$numberOfValues = $contentRepository->countDistinctValues($fieldName, $matcher);
+
+				// Only returns suggestion if there are not too many for the browser.
+				if ($numberOfValues <= $this->getLimit()) {
+
+					// Query the repository.
+					$contents = $contentRepository->findDistinctValues($fieldName, $matcher);
+
+					foreach ($contents as $content) {
+
+						$value = $content[$fieldName];
+						$label = $content[$fieldName];
+						if (Tca::table($dataType)->field($fieldName)->isSelect()) {
+							$label = Tca::table($dataType)->field($fieldName)->getLabelForItem($value);
+						}
+
+						$values[] = $label;
+					}
+				}
+			}
+		}
+		return $values;
+	}
+
+	/**
+	 * Return from settings the suggestion limit.
+	 *
+	 * @return int
+	 */
+	protected function getLimit(): int
+	{
+		$settings = $this->getSettings();
+		$suggestionLimit = (int)$settings['suggestionLimit'];
+		if ($suggestionLimit <= 0) {
+			$suggestionLimit = 1000;
+		}
+		return $suggestionLimit;
+	}
+
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * Returns the module settings.
+	 *
+	 * @return array
+	 */
+	protected function getSettings()
+	{
+		/** @var BackendConfigurationManager $backendConfigurationManager */
+		$backendConfigurationManager = GeneralUtility::makeInstance(BackendConfigurationManager::class);
+		$configuration = $backendConfigurationManager->getTypoScriptSetup();
+		return $configuration['module.']['tx_vidi.']['settings.'];
+	}
 
 }

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