fabarea / vidi

Classes/Resolver/FieldPathResolver.php

Indentation +107 added lines, -107 removed lines

@@ -25,111 +25,111 @@
 class FieldPathResolver implements SingletonInterface
 {
 
-    /**
-     * Remove the prefixing path from the file name.
-     *
-     * @param string $fieldNameAndPath
-     * @param string $dataType
-     * @return string
-     */
-    public function stripFieldPath($fieldNameAndPath, $dataType = '')
-    {
-
-        $dataType = $this->getContextualDataType($dataType);
-
-        if ($this->containsPath($fieldNameAndPath, $dataType)) {
-
-            // Corresponds to the field name of the foreign table.
-            $fieldParts = GeneralUtility::trimExplode('.', $fieldNameAndPath);
-            $fieldName = $fieldParts[1];
-        } else {
-            $fieldName = $fieldNameAndPath;
-        }
-        return $fieldName;
-    }
-
-    /**
-     * Remove the suffixing field name
-     *
-     * @param string $fieldNameAndPath
-     * @param string $dataType
-     * @return string
-     */
-    public function stripFieldName($fieldNameAndPath, $dataType = '')
-    {
-
-        $dataType = $this->getContextualDataType($dataType);
-
-        if ($this->containsPath($fieldNameAndPath, $dataType)) {
-
-            // Corresponds to the field name of the foreign table.
-            $fieldParts = GeneralUtility::trimExplode('.', $fieldNameAndPath);
-            $fieldName = $fieldParts[0];
-        } else {
-            $fieldName = $fieldNameAndPath;
-        }
-        return $fieldName;
-    }
-
-    /**
-     * Returns the class names to be applied to a cell ("td").
-     *
-     * @param string $fieldNameAndPath
-     * @param string $dataType
-     * @return string
-     */
-    public function getDataType($fieldNameAndPath, $dataType = '')
-    {
-
-        $dataType = $this->getContextualDataType($dataType);
-
-        if ($this->containsPath($fieldNameAndPath, $dataType)) {
-
-            // Compute the foreign data type.
-            $fieldParts = GeneralUtility::trimExplode('.', $fieldNameAndPath);
-            $fieldNameAndPath = $fieldParts[0];
-            $dataType = Tca::table($dataType)->field($fieldNameAndPath)->getForeignTable();
-        }
-        return $dataType;
-    }
-
-    /**
-     * Return the data type according to the context.
-     *
-     * @param $dataType
-     * @return string
-     */
-    public function getContextualDataType($dataType)
-    {
-
-        if (!$dataType) {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-        return $dataType;
-    }
-
-    /**
-     * Tell whether the field name contains a path, e.g. metadata.title
-     * But resolves the case when the field is composite e.g "items.sys_file_metadata" and looks as field path but is not!
-     * A composite field = a field for a MM relation  of type "group" where the table name is appended.
-     *
-     * @param string $fieldNameAndPath
-     * @param string $dataType
-     * @return boolean
-     */
-    public function containsPath($fieldNameAndPath, $dataType)
-    {
-        $doesContainPath = strpos($fieldNameAndPath, '.') > 0 && !Tca::table($dataType)->hasField($fieldNameAndPath); // -> will make sure it is not a composite field name.
-        return $doesContainPath;
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * Remove the prefixing path from the file name.
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param string $dataType
+	 * @return string
+	 */
+	public function stripFieldPath($fieldNameAndPath, $dataType = '')
+	{
+
+		$dataType = $this->getContextualDataType($dataType);
+
+		if ($this->containsPath($fieldNameAndPath, $dataType)) {
+
+			// Corresponds to the field name of the foreign table.
+			$fieldParts = GeneralUtility::trimExplode('.', $fieldNameAndPath);
+			$fieldName = $fieldParts[1];
+		} else {
+			$fieldName = $fieldNameAndPath;
+		}
+		return $fieldName;
+	}
+
+	/**
+	 * Remove the suffixing field name
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param string $dataType
+	 * @return string
+	 */
+	public function stripFieldName($fieldNameAndPath, $dataType = '')
+	{
+
+		$dataType = $this->getContextualDataType($dataType);
+
+		if ($this->containsPath($fieldNameAndPath, $dataType)) {
+
+			// Corresponds to the field name of the foreign table.
+			$fieldParts = GeneralUtility::trimExplode('.', $fieldNameAndPath);
+			$fieldName = $fieldParts[0];
+		} else {
+			$fieldName = $fieldNameAndPath;
+		}
+		return $fieldName;
+	}
+
+	/**
+	 * Returns the class names to be applied to a cell ("td").
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param string $dataType
+	 * @return string
+	 */
+	public function getDataType($fieldNameAndPath, $dataType = '')
+	{
+
+		$dataType = $this->getContextualDataType($dataType);
+
+		if ($this->containsPath($fieldNameAndPath, $dataType)) {
+
+			// Compute the foreign data type.
+			$fieldParts = GeneralUtility::trimExplode('.', $fieldNameAndPath);
+			$fieldNameAndPath = $fieldParts[0];
+			$dataType = Tca::table($dataType)->field($fieldNameAndPath)->getForeignTable();
+		}
+		return $dataType;
+	}
+
+	/**
+	 * Return the data type according to the context.
+	 *
+	 * @param $dataType
+	 * @return string
+	 */
+	public function getContextualDataType($dataType)
+	{
+
+		if (!$dataType) {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+		return $dataType;
+	}
+
+	/**
+	 * Tell whether the field name contains a path, e.g. metadata.title
+	 * But resolves the case when the field is composite e.g "items.sys_file_metadata" and looks as field path but is not!
+	 * A composite field = a field for a MM relation  of type "group" where the table name is appended.
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param string $dataType
+	 * @return boolean
+	 */
+	public function containsPath($fieldNameAndPath, $dataType)
+	{
+		$doesContainPath = strpos($fieldNameAndPath, '.') > 0 && !Tca::table($dataType)->hasField($fieldNameAndPath); // -> will make sure it is not a composite field name.
+		return $doesContainPath;
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 }

Classes/Processor/MarkerProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             $replace = $structure[2];
 
             // Perhaps needs to be improved here if $search contains "/" precisely.
-            $updateValue = preg_replace('/' . $search . '/isU', $replace, $currentValue);
+            $updateValue = preg_replace('/'.$search.'/isU', $replace, $currentValue);
         }
         return $updateValue;
     }

Indentation +109 added lines, -109 removed lines

@@ -20,114 +20,114 @@
 class MarkerProcessor implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $wellKnownMarkers = array(
-        '{*}',
-        '{counter}',
-        '{date}',
-        '{creation_date}'
-    );
-
-    /**
-     * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
-     */
-    public function processMarkers(ProcessContentDataSignalArguments $signalArguments)
-    {
-
-        $contentData = $signalArguments->getContentData();
-        $creationTime = $this->getCreationTime($signalArguments);
-
-        // Process markers
-        foreach ($signalArguments->getContentData() as $fieldName => $updateValue) {
-            if (is_scalar($updateValue)) {
-
-                $currentValue = $this->getContentObjectResolver()->getValue(
-                    $signalArguments->getContentObject(),
-                    $signalArguments->getFieldNameAndPath(),
-                    $fieldName,
-                    $signalArguments->getLanguage()
-                );
-                $counter = $signalArguments->getCounter();
-
-                $updateValue = $this->searchAndReplace($updateValue, $currentValue);
-                $updateValue = $this->replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime);
-
-                $contentData[$fieldName] = $updateValue;
-            }
-        }
-
-        $signalArguments->setContentData($contentData);
-        return array($signalArguments);
-    }
-
-    /**
-     * @param string $updateValue
-     * @param string $currentValue
-     * @param int $counter
-     * @param $creationTime
-     * @return string
-     */
-    protected function replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime)
-    {
-
-        // Replaces values.
-        $replaces = array(
-            $currentValue,
-            $counter,
-            date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']),
-            date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'], $creationTime),
-        );
-
-        // Replace me!
-        return str_replace($this->wellKnownMarkers, $replaces, $updateValue);
-    }
-
-    /**
-     * @param string $updateValue
-     * @param string $currentValue
-     * @return string
-     */
-    protected function searchAndReplace($updateValue, $currentValue)
-    {
-
-        if (strpos($updateValue, 's/') !== false) {
-            $structure = explode('/', $updateValue);
-            $search = $structure[1];
-            $replace = $structure[2];
-
-            // Perhaps needs to be improved here if $search contains "/" precisely.
-            $updateValue = preg_replace('/' . $search . '/isU', $replace, $currentValue);
-        }
-        return $updateValue;
-    }
-
-    /**
-     * @param ProcessContentDataSignalArguments $signalArguments
-     * @return int
-     */
-    protected function getCreationTime(ProcessContentDataSignalArguments $signalArguments)
-    {
-        $creationTime = 0;
-        $creationTimeField = Tca::table($signalArguments->getContentObject()->getDataType())->getTimeCreationField();
-        if ($creationTimeField) {
-            $creationTime = $this->getContentObjectResolver()->getValue(
-                $signalArguments->getContentObject(),
-                $signalArguments->getFieldNameAndPath(),
-                $creationTimeField
-            );
-        }
-        return $creationTime;
-    }
-
-    /**
-     * @return ContentObjectResolver
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance(ContentObjectResolver::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $wellKnownMarkers = array(
+		'{*}',
+		'{counter}',
+		'{date}',
+		'{creation_date}'
+	);
+
+	/**
+	 * @param ProcessContentDataSignalArguments $signalArguments
+	 * @return array
+	 */
+	public function processMarkers(ProcessContentDataSignalArguments $signalArguments)
+	{
+
+		$contentData = $signalArguments->getContentData();
+		$creationTime = $this->getCreationTime($signalArguments);
+
+		// Process markers
+		foreach ($signalArguments->getContentData() as $fieldName => $updateValue) {
+			if (is_scalar($updateValue)) {
+
+				$currentValue = $this->getContentObjectResolver()->getValue(
+					$signalArguments->getContentObject(),
+					$signalArguments->getFieldNameAndPath(),
+					$fieldName,
+					$signalArguments->getLanguage()
+				);
+				$counter = $signalArguments->getCounter();
+
+				$updateValue = $this->searchAndReplace($updateValue, $currentValue);
+				$updateValue = $this->replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime);
+
+				$contentData[$fieldName] = $updateValue;
+			}
+		}
+
+		$signalArguments->setContentData($contentData);
+		return array($signalArguments);
+	}
+
+	/**
+	 * @param string $updateValue
+	 * @param string $currentValue
+	 * @param int $counter
+	 * @param $creationTime
+	 * @return string
+	 */
+	protected function replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime)
+	{
+
+		// Replaces values.
+		$replaces = array(
+			$currentValue,
+			$counter,
+			date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']),
+			date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'], $creationTime),
+		);
+
+		// Replace me!
+		return str_replace($this->wellKnownMarkers, $replaces, $updateValue);
+	}
+
+	/**
+	 * @param string $updateValue
+	 * @param string $currentValue
+	 * @return string
+	 */
+	protected function searchAndReplace($updateValue, $currentValue)
+	{
+
+		if (strpos($updateValue, 's/') !== false) {
+			$structure = explode('/', $updateValue);
+			$search = $structure[1];
+			$replace = $structure[2];
+
+			// Perhaps needs to be improved here if $search contains "/" precisely.
+			$updateValue = preg_replace('/' . $search . '/isU', $replace, $currentValue);
+		}
+		return $updateValue;
+	}
+
+	/**
+	 * @param ProcessContentDataSignalArguments $signalArguments
+	 * @return int
+	 */
+	protected function getCreationTime(ProcessContentDataSignalArguments $signalArguments)
+	{
+		$creationTime = 0;
+		$creationTimeField = Tca::table($signalArguments->getContentObject()->getDataType())->getTimeCreationField();
+		if ($creationTimeField) {
+			$creationTime = $this->getContentObjectResolver()->getValue(
+				$signalArguments->getContentObject(),
+				$signalArguments->getFieldNameAndPath(),
+				$creationTimeField
+			);
+		}
+		return $creationTime;
+	}
+
+	/**
+	 * @return ContentObjectResolver
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance(ContentObjectResolver::class);
+	}
 
 }

Classes/Processor/ContentObjectProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
                 $relatedValues = $this->getRelatedValues($object, $fieldNameAndPath, $fieldName);
 
                 foreach ($values as $value) {
-                    $appendOrRemove = $savingBehavior . 'Relations';
+                    $appendOrRemove = $savingBehavior.'Relations';
                     $relatedValues = $this->$appendOrRemove($value, $relatedValues);
                 }
 

Indentation +117 added lines, -117 removed lines

@@ -23,121 +23,121 @@
 class ContentObjectProcessor implements SingletonInterface
 {
 
-    /**
-     * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
-     */
-    public function processRelations(ProcessContentDataSignalArguments $signalArguments)
-    {
-
-        $contentObject = $signalArguments->getContentObject();
-        $fieldNameAndPath = $signalArguments->getFieldNameAndPath();
-        $contentData = $signalArguments->getContentData();
-        $savingBehavior = $signalArguments->getSavingBehavior();
-
-        if ($savingBehavior !== SavingBehavior::REPLACE) {
-            $contentData = $this->appendOrRemoveRelations($contentObject, $fieldNameAndPath, $contentData, $savingBehavior);
-            $signalArguments->setContentData($contentData);
-        }
-
-        return array($signalArguments);
-    }
-
-    /**
-     * @param Content $object
-     * @param $fieldNameAndPath
-     * @param array $contentData
-     * @param string $savingBehavior
-     * @return array
-     */
-    protected function appendOrRemoveRelations(Content $object, $fieldNameAndPath, array $contentData, $savingBehavior)
-    {
-
-        foreach ($contentData as $fieldName => $values) {
-
-            $resolvedObject = $this->getContentObjectResolver()->getObject($object, $fieldNameAndPath);
-
-            if (Tca::table($resolvedObject)->field($fieldName)->hasMany()) {
-
-                // true means CSV values must be converted to array.
-                if (!is_array($values)) {
-                    $values = GeneralUtility::trimExplode(',', $values);
-                }
-                $relatedValues = $this->getRelatedValues($object, $fieldNameAndPath, $fieldName);
-
-                foreach ($values as $value) {
-                    $appendOrRemove = $savingBehavior . 'Relations';
-                    $relatedValues = $this->$appendOrRemove($value, $relatedValues);
-                }
-
-                $contentData[$fieldName] = $relatedValues;
-            }
-        }
-        return $contentData;
-    }
-
-    /**
-     * @param $value
-     * @param array $relatedValues
-     * @return array
-     */
-    protected function appendRelations($value, array $relatedValues)
-    {
-        if (!in_array($value, $relatedValues)) {
-            $relatedValues[] = $value;
-        }
-        return $relatedValues;
-    }
-
-    /**
-     * @param $value
-     * @param array $relatedValues
-     * @return array
-     */
-    protected function removeRelations($value, array $relatedValues)
-    {
-        if (in_array($value, $relatedValues)) {
-            $key = array_search($value, $relatedValues);
-            unset($relatedValues[$key]);
-        }
-        return $relatedValues;
-    }
-
-    /**
-     * @param Content $object
-     * @param string $fieldNameAndPath
-     * @param string $fieldName
-     * @return array
-     */
-    protected function getRelatedValues(Content $object, $fieldNameAndPath, $fieldName)
-    {
-
-        $values = [];
-        $relatedContentObjects = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, $fieldName);
-
-        if (is_array($relatedContentObjects)) {
-            /** @var Content $relatedContentObject */
-            foreach ($relatedContentObjects as $relatedContentObject) {
-                $values[] = $relatedContentObject->getUid();
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * @return ContentObjectResolver|object
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance(ContentObjectResolver::class);
-    }
-
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
+	/**
+	 * @param ProcessContentDataSignalArguments $signalArguments
+	 * @return array
+	 */
+	public function processRelations(ProcessContentDataSignalArguments $signalArguments)
+	{
+
+		$contentObject = $signalArguments->getContentObject();
+		$fieldNameAndPath = $signalArguments->getFieldNameAndPath();
+		$contentData = $signalArguments->getContentData();
+		$savingBehavior = $signalArguments->getSavingBehavior();
+
+		if ($savingBehavior !== SavingBehavior::REPLACE) {
+			$contentData = $this->appendOrRemoveRelations($contentObject, $fieldNameAndPath, $contentData, $savingBehavior);
+			$signalArguments->setContentData($contentData);
+		}
+
+		return array($signalArguments);
+	}
+
+	/**
+	 * @param Content $object
+	 * @param $fieldNameAndPath
+	 * @param array $contentData
+	 * @param string $savingBehavior
+	 * @return array
+	 */
+	protected function appendOrRemoveRelations(Content $object, $fieldNameAndPath, array $contentData, $savingBehavior)
+	{
+
+		foreach ($contentData as $fieldName => $values) {
+
+			$resolvedObject = $this->getContentObjectResolver()->getObject($object, $fieldNameAndPath);
+
+			if (Tca::table($resolvedObject)->field($fieldName)->hasMany()) {
+
+				// true means CSV values must be converted to array.
+				if (!is_array($values)) {
+					$values = GeneralUtility::trimExplode(',', $values);
+				}
+				$relatedValues = $this->getRelatedValues($object, $fieldNameAndPath, $fieldName);
+
+				foreach ($values as $value) {
+					$appendOrRemove = $savingBehavior . 'Relations';
+					$relatedValues = $this->$appendOrRemove($value, $relatedValues);
+				}
+
+				$contentData[$fieldName] = $relatedValues;
+			}
+		}
+		return $contentData;
+	}
+
+	/**
+	 * @param $value
+	 * @param array $relatedValues
+	 * @return array
+	 */
+	protected function appendRelations($value, array $relatedValues)
+	{
+		if (!in_array($value, $relatedValues)) {
+			$relatedValues[] = $value;
+		}
+		return $relatedValues;
+	}
+
+	/**
+	 * @param $value
+	 * @param array $relatedValues
+	 * @return array
+	 */
+	protected function removeRelations($value, array $relatedValues)
+	{
+		if (in_array($value, $relatedValues)) {
+			$key = array_search($value, $relatedValues);
+			unset($relatedValues[$key]);
+		}
+		return $relatedValues;
+	}
+
+	/**
+	 * @param Content $object
+	 * @param string $fieldNameAndPath
+	 * @param string $fieldName
+	 * @return array
+	 */
+	protected function getRelatedValues(Content $object, $fieldNameAndPath, $fieldName)
+	{
+
+		$values = [];
+		$relatedContentObjects = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, $fieldName);
+
+		if (is_array($relatedContentObjects)) {
+			/** @var Content $relatedContentObject */
+			foreach ($relatedContentObjects as $relatedContentObject) {
+				$values[] = $relatedContentObject->getUid();
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * @return ContentObjectResolver|object
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance(ContentObjectResolver::class);
+	}
+
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
 }

Classes/Domain/Validator/LanguageValidator.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     {
 
         if (!$this->getLanguageService()->languageExists((int)$language)) {
-            throw new \Exception('The language "' . $language . '" does not exist', 1351605542);
+            throw new \Exception('The language "'.$language.'" does not exist', 1351605542);
         }
     }
 

Indentation +20 added lines, -20 removed lines

@@ -16,27 +16,27 @@
 class LanguageValidator
 {
 
-    /**
-     * Check whether the $language is valid.
-     *
-     * @param int $language
-     * @throws \Exception
-     * @return void
-     */
-    public function validate($language)
-    {
+	/**
+	 * Check whether the $language is valid.
+	 *
+	 * @param int $language
+	 * @throws \Exception
+	 * @return void
+	 */
+	public function validate($language)
+	{
 
-        if (!$this->getLanguageService()->languageExists((int)$language)) {
-            throw new \Exception('The language "' . $language . '" does not exist', 1351605542);
-        }
-    }
+		if (!$this->getLanguageService()->languageExists((int)$language)) {
+			throw new \Exception('The language "' . $language . '" does not exist', 1351605542);
+		}
+	}
 
-    /**
-     * @return LanguageService|object
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(LanguageService::class);
-    }
+	/**
+	 * @return LanguageService|object
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(LanguageService::class);
+	}
 
 }

Classes/Domain/Repository/ContentRepository.php

Spacing +10 added lines, -10 removed lines

@@ -211,7 +211,7 @@ 
             foreach ($order->getOrderings() as $ordering => $direction) {
                 if ($this->hasForeignRelationIn($ordering)) {
                     $relationalField = $this->getForeignRelationFrom($ordering);
-                    $matcher->like($relationalField . '.uid', '');
+                    $matcher->like($relationalField.'.uid', '');
                 }
             }
         }
@@ -446,16 +446,16 @@ 
     public function __call($methodName, $arguments)
     {
         if (substr($methodName, 0, 6) === 'findBy' && strlen($methodName) > 7) {
-            $propertyName = strtolower(substr(substr($methodName, 6), 0, 1)) . substr(substr($methodName, 6), 1);
+            $propertyName = strtolower(substr(substr($methodName, 6), 0, 1)).substr(substr($methodName, 6), 1);
             $result = $this->processMagicCall($propertyName, $arguments[0]);
         } elseif (substr($methodName, 0, 9) === 'findOneBy' && strlen($methodName) > 10) {
-            $propertyName = strtolower(substr(substr($methodName, 9), 0, 1)) . substr(substr($methodName, 9), 1);
+            $propertyName = strtolower(substr(substr($methodName, 9), 0, 1)).substr(substr($methodName, 9), 1);
             $result = $this->processMagicCall($propertyName, $arguments[0], 'one');
         } elseif (substr($methodName, 0, 7) === 'countBy' && strlen($methodName) > 8) {
-            $propertyName = strtolower(substr(substr($methodName, 7), 0, 1)) . substr(substr($methodName, 7), 1);
+            $propertyName = strtolower(substr(substr($methodName, 7), 0, 1)).substr(substr($methodName, 7), 1);
             $result = $this->processMagicCall($propertyName, $arguments[0], 'count');
         } else {
-            throw new UnsupportedMethodException('The method "' . $methodName . '" is not supported by the repository.', 1360838010);
+            throw new UnsupportedMethodException('The method "'.$methodName.'" is not supported by the repository.', 1360838010);
         }
         return $result;
     }
@@ -640,7 +640,7 @@ 
 
                     if (Tca::table($dataType)->hasField($fieldName) && Tca::table($dataType)->field($fieldName)->hasRelation()) {
                         $foreignTable = Tca::table($dataType)->field($fieldName)->getForeignTable();
-                        $fieldNameAndPath = $fieldNameAndPath . '.' . Tca::table($foreignTable)->getLabelField();
+                        $fieldNameAndPath = $fieldNameAndPath.'.'.Tca::table($foreignTable)->getLabelField();
                     }
                     $constraints[] = $query->like($fieldNameAndPath, $likeClause);
                 }
@@ -712,17 +712,17 @@ 
 
                 if (Tca::table($dataType)->field($fieldName)->hasRelation()) {
                     if (MathUtility::canBeInterpretedAsInteger($operand)) {
-                        $fieldNameAndPath = $fieldName . '.uid';
+                        $fieldNameAndPath = $fieldName.'.uid';
                     } else {
                         $foreignTableName = Tca::table($dataType)->field($fieldName)->getForeignTable();
                         $foreignTable = Tca::table($foreignTableName);
-                        $fieldNameAndPath = $fieldName . '.' . $foreignTable->getLabelField();
+                        $fieldNameAndPath = $fieldName.'.'.$foreignTable->getLabelField();
                     }
 
                     // If different means we should restore the prepended path segment for proper SQL parser.
                     // This is true for a composite field, e.g items.sys_file_metadata for categories.
                     if ($fieldName !== $fieldPath) {
-                        $fieldNameAndPath = $fieldPath . '.' . $fieldNameAndPath;
+                        $fieldNameAndPath = $fieldPath.'.'.$fieldNameAndPath;
                     }
                 }
 
@@ -768,7 +768,7 @@ 
         if ($table->field($fieldName)->isGroup()) {
 
             $valueParts = explode('.', $value, 2);
-            $fieldName = $fieldName . '.' . $valueParts[0];
+            $fieldName = $fieldName.'.'.$valueParts[0];
             $value = $valueParts[1];
         }
 

Indentation +844 added lines, -844 removed lines

@@ -37,849 +37,849 @@
 class ContentRepository implements RepositoryInterface
 {
 
-    /**
-     * Tell whether it is a raw result (array) or object being returned.
-     *
-     * @var bool
-     */
-    protected $rawResult = false;
-
-    /**
-     * The data type to be returned, e.g fe_users, fe_groups, tt_content, etc...
-     *
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * The source field is useful in the context of MM relations to know who is the caller
-     * e.g findByItems which eventually corresponds to a field name.
-     *
-     * @var string
-     */
-    protected $sourceFieldName = '';
-
-    /**
-     * @var array
-     */
-    protected $errorMessages = [];
-
-    /**
-     * @var QuerySettingsInterface
-     */
-    protected $defaultQuerySettings;
-
-    /**
-     * @var DataHandler
-     */
-    protected $dataHandler;
-
-    /**
-     * Constructor
-     *
-     * @param string $dataType
-     */
-    public function __construct($dataType)
-    {
-        $this->dataType = $dataType;
-    }
-
-    /**
-     * Returns all objects of this repository.
-     *
-     * @return Content[]
-     */
-    public function findAll()
-    {
-        $query = $this->createQuery();
-        return $query->execute();
-    }
-
-    /**
-     * Returns all "distinct" values for a given property.
-     *
-     * @param string $propertyName
-     * @param Matcher $matcher
-     * @param Order|null $order
-     * @return Content[]
-     */
-    public function findDistinctValues($propertyName, Matcher $matcher = null, Order $order = null): array
-    {
-        $query = $this->createQuery();
-        $query->setDistinct($propertyName);
-
-        // Remove empty values from selection.
-        $constraint = $query->logicalNot($query->equals($propertyName, ''));
-
-        // Add some additional constraints from the Matcher object.
-        $matcherConstraint = null;
-        if ($matcher !== null) {
-            $matcherConstraint = $this->computeConstraints($query, $matcher);
-        }
-
-        // Assemble the final constraints or not.
-        if ($matcherConstraint) {
-            $query->logicalAnd([$matcherConstraint, $constraint]);
-            $query->matching($query->logicalAnd([$matcherConstraint, $constraint]));
-        } else {
-            $query->matching($constraint);
-        }
-
-        if ($order) {
-            $query->setOrderings($order->getOrderings());
-        }
-
-        return $query->execute();
-    }
-
-    /**
-     * Returns all "distinct" values for a given property.
-     *
-     * @param string $propertyName
-     * @param Matcher $matcher
-     * @return int
-     */
-    public function countDistinctValues($propertyName, Matcher $matcher = null): int
-    {
-        $query = $this->createQuery();
-        $query->setDistinct($propertyName);
-
-        // Remove empty values from selection.
-        $constraint = $query->logicalNot($query->equals($propertyName, ''));
-
-        // Add some additional constraints from the Matcher object.
-        $matcherConstraint = null;
-        if (!is_null($matcher)) {
-            $matcherConstraint = $this->computeConstraints($query, $matcher);
-        }
-
-        // Assemble the final constraints or not.
-        if ($matcherConstraint) {
-            $query->logicalAnd([$matcherConstraint, $constraint]);
-            $query->matching($query->logicalAnd([$matcherConstraint, $constraint]));
-        } else {
-            $query->matching($constraint);
-        }
-
-        return $query->count();
-    }
-
-    /**
-     * Finds an object matching the given identifier.
-     *
-     * @param int $uid The identifier of the object to find
-     * @return Content|null
-     * @api
-     */
-    public function findByUid($uid)
-    {
-        return $this->findByIdentifier($uid);
-    }
-
-    /**
-     * Finds all Contents given specified matches.
-     *
-     * @param string $propertyName
-     * @param array $values
-     * @return Content[]
-     */
-    public function findIn($propertyName, array $values): array
-    {
-        $query = $this->createQuery();
-        $query->matching($query->in($propertyName, $values));
-        return $query->execute();
-    }
-
-    /**
-     * Finds all Contents given specified matches.
-     *
-     * @param Matcher $matcher
-     * @param Order $order The order
-     * @param int $limit
-     * @param int $offset
-     * @return Content[]
-     */
-    public function findBy(Matcher $matcher, Order $order = null, $limit = null, $offset = null): array
-    {
-
-        $query = $this->createQuery();
-
-        $limit = (int)$limit; // make sure to cast
-        if ($limit > 0) {
-            $query->setLimit($limit);
-        }
-
-        if ($order) {
-            $query->setOrderings($order->getOrderings());
-
-            // Loops around the orderings adding if necessary a dummy condition
-            // to make sure the relations can be resolved when transforming the query to plain SQL.
-            foreach ($order->getOrderings() as $ordering => $direction) {
-                if ($this->hasForeignRelationIn($ordering)) {
-                    $relationalField = $this->getForeignRelationFrom($ordering);
-                    $matcher->like($relationalField . '.uid', '');
-                }
-            }
-        }
-
-        if ($offset) {
-            $query->setOffset($offset);
-        }
-
-        $constraints = $this->computeConstraints($query, $matcher);
-
-        if ($constraints) {
-            $query->matching($constraints);
-        }
-
-        return $query->execute();
-    }
-
-    /**
-     * Find one Content object given specified matches.
-     *
-     * @param Matcher $matcher
-     * @return Content
-     */
-    public function findOneBy(Matcher $matcher): Content
-    {
-
-        $query = $this->createQuery();
-
-        $constraints = $this->computeConstraints($query, $matcher);
-
-        if ($constraints) {
-            $query->matching($constraints);
-        }
-
-        $query->setLimit(1); // only take one!
-
-        $resultSet = $query->execute();
-        if ($resultSet) {
-            $resultSet = current($resultSet);
-        }
-        return $resultSet;
-    }
-
-    /**
-     * Count all Contents given specified matches.
-     *
-     * @param Matcher $matcher
-     * @return int
-     */
-    public function countBy(Matcher $matcher): int
-    {
-
-        $query = $this->createQuery();
-
-        $constraints = $this->computeConstraints($query, $matcher);
-
-        if ($constraints) {
-            $query->matching($constraints);
-        }
-
-        return $query->count();
-    }
-
-    /**
-     * Update a content with new information.
-     *
-     * @param Content $content
-     * @param $language
-     * @return bool
-     */
-    public function localize($content, $language): bool
-    {
-
-        // Security check
-        $this->getContentValidator()->validate($content);
-        $this->getLanguageValidator()->validate($language);
-
-        $dataType = $content->getDataType();
-        $handler = $this->getDataHandlerFactory()->action(ProcessAction::LOCALIZE)->forType($dataType)->getDataHandler();
-
-        $handlerResult = $handler->processLocalize($content, $language);
-        $this->errorMessages = $handler->getErrorMessages();
-        return $handlerResult;
-    }
-
-    /**
-     * Update a content with new information.
-     *
-     * @param Content $content
-     * @return bool
-     */
-    public function update($content)
-    {
-
-        // Security check.
-        $this->getContentValidator()->validate($content);
-
-        $dataType = $content->getDataType();
-        $handler = $this->getDataHandlerFactory()->action(ProcessAction::UPDATE)->forType($dataType)->getDataHandler();
-
-        $handlerResult = $handler->processUpdate($content);
-        $this->errorMessages = $handler->getErrorMessages();
-        return $handlerResult;
-    }
-
-    /**
-     * Removes an object from this repository.
-     *
-     * @param Content $content
-     * @return boolean
-     */
-    public function remove($content)
-    {
-        $dataType = $content->getDataType();
-        $handler = $this->getDataHandlerFactory()->action(ProcessAction::REMOVE)->forType($dataType)->getDataHandler();
-
-        $handlerResult = $handler->processRemove($content);
-        $this->errorMessages = $handler->getErrorMessages();
-        return $handlerResult;
-    }
-
-    /**
-     * Move a content within this repository.
-     * The $target corresponds to the pid to move the records to.
-     * It can also be a negative value in case of sorting. The negative value would be the uid of its predecessor.
-     *
-     * @param Content $content
-     * @param string $target
-     * @return bool
-     */
-    public function move($content, $target): bool
-    {
-
-        // Security check.
-        $this->getContentValidator()->validate($content);
-
-        $dataType = $content->getDataType();
-        $handler = $this->getDataHandlerFactory()->action(ProcessAction::MOVE)->forType($dataType)->getDataHandler();
-
-        $handlerResult = $handler->processMove($content, $target);
-        $this->errorMessages = $handler->getErrorMessages();
-        return $handlerResult;
-    }
-
-    /**
-     * Copy a content within this repository.
-     *
-     * @param Content $content
-     * @return bool
-     */
-    public function copy($content, $target): bool
-    {
-
-        // Security check.
-        $this->getContentValidator()->validate($content);
-
-        $dataType = $content->getDataType();
-        $handler = $this->getDataHandlerFactory()->action(ProcessAction::COPY)->forType($dataType)->getDataHandler();
-
-        $handlerResult = $handler->processCopy($content, $target);
-        $this->errorMessages = $handler->getErrorMessages();
-        return $handlerResult;
-    }
-
-    /**
-     * Adds an object to this repository.
-     *
-     * @param object $object The object to add
-     * @return void
-     * @api
-     */
-    public function add($object)
-    {
-        throw new \BadMethodCallException('Repository does not support the add() method.', 1375805599);
-    }
-
-    /**
-     * Returns the total number objects of this repository.
-     *
-     * @return integer The object count
-     * @api
-     */
-    public function countAll()
-    {
-        $query = $this->createQuery();
-        return $query->count();
-    }
-
-    /**
-     * Removes all objects of this repository as if remove() was called for
-     * all of them.
-     *
-     * @return void
-     * @api
-     */
-    public function removeAll()
-    {
-        // TODO: Implement removeAll() method.
-    }
-
-    /**
-     * Finds an object matching the given identifier.
-     *
-     * @param mixed $identifier The identifier of the object to find
-     * @return Content|null
-     * @api
-     */
-    public function findByIdentifier($identifier)
-    {
-        $query = $this->createQuery();
-
-        $result = $query->matching(
-            $query->equals('uid', $identifier)
-        )
-            ->execute();
-
-        if (is_array($result)) {
-            $result = current($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Dispatches magic methods (findBy[Property]())
-     *
-     * @param string $methodName The name of the magic method
-     * @param string $arguments The arguments of the magic method
-     * @return mixed
-     * @api
-     */
-    public function __call($methodName, $arguments)
-    {
-        if (substr($methodName, 0, 6) === 'findBy' && strlen($methodName) > 7) {
-            $propertyName = strtolower(substr(substr($methodName, 6), 0, 1)) . substr(substr($methodName, 6), 1);
-            $result = $this->processMagicCall($propertyName, $arguments[0]);
-        } elseif (substr($methodName, 0, 9) === 'findOneBy' && strlen($methodName) > 10) {
-            $propertyName = strtolower(substr(substr($methodName, 9), 0, 1)) . substr(substr($methodName, 9), 1);
-            $result = $this->processMagicCall($propertyName, $arguments[0], 'one');
-        } elseif (substr($methodName, 0, 7) === 'countBy' && strlen($methodName) > 8) {
-            $propertyName = strtolower(substr(substr($methodName, 7), 0, 1)) . substr(substr($methodName, 7), 1);
-            $result = $this->processMagicCall($propertyName, $arguments[0], 'count');
-        } else {
-            throw new UnsupportedMethodException('The method "' . $methodName . '" is not supported by the repository.', 1360838010);
-        }
-        return $result;
-    }
-
-    /**
-     * Returns a query for objects of this repository
-     *
-     * @return Query
-     * @api
-     */
-    public function createQuery()
-    {
-        /** @var Query $query */
-        $query = GeneralUtility::makeInstance(Query::class, $this->dataType);
-        $query->setSourceFieldName($this->sourceFieldName);
-
-        if ($this->defaultQuerySettings) {
-            $query->setTypo3QuerySettings($this->defaultQuerySettings);
-        } else {
-
-            // Initialize and pass the query settings at this level.
-            $querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
-
-            // Default choice for the BE.
-            if ($this->isBackendMode()) {
-                $querySettings->setIgnoreEnableFields(true);
-            }
-
-            $query->setTypo3QuerySettings($querySettings);
-        }
-
-        return $query;
-    }
-
-    /**
-     * Sets the property names to order the result by per default.
-     * Expected like this:
-     * array(
-     * 'foo' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING,
-     * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
-     * )
-     *
-     * @param array $defaultOrderings The property names to order by
-     * @return void
-     * @api
-     */
-    public function setDefaultOrderings(array $defaultOrderings)
-    {
-        throw new \BadMethodCallException('Repository does not support the setDefaultOrderings() method.', 1375805598);
-    }
-
-    /**
-     * Sets the default query settings to be used in this repository
-     *
-     * @param QuerySettingsInterface $defaultQuerySettings The query settings to be used by default
-     * @return void
-     * @api
-     */
-    public function setDefaultQuerySettings(QuerySettingsInterface $defaultQuerySettings)
-    {
-        $this->defaultQuerySettings = $defaultQuerySettings;
-    }
-
-    /**
-     * @return void
-     */
-    public function resetDefaultQuerySettings(): void
-    {
-        $this->defaultQuerySettings = null;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function getErrorMessages(): array
-    {
-        return $this->errorMessages;
-    }
-
-    /**
-     * @param string $sourceFieldName
-     * @return $this
-     */
-    public function setSourceFieldName($sourceFieldName): self
-    {
-        $this->sourceFieldName = $sourceFieldName;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType(): string
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * Tell whether the order has a foreign table in its expression, e.g. "metadata.title".
-     *
-     * @param string $ordering
-     * @return bool
-     */
-    protected function hasForeignRelationIn($ordering): bool
-    {
-        return strpos($ordering, '.') !== false;
-    }
-
-    /**
-     * Extract the foreign relation of the ordering "metadata.title" -> "metadata"
-     *
-     * @param string $ordering
-     * @return string
-     */
-    protected function getForeignRelationFrom($ordering): string
-    {
-        $parts = explode('.', $ordering);
-        return $parts[0];
-    }
-
-    /**
-     * Get the constraints
-     *
-     * @param Query $query
-     * @param Matcher $matcher
-     * @return ConstraintInterface|null
-     */
-    protected function computeConstraints(Query $query, Matcher $matcher): ?ConstraintInterface
-    {
-        $constraints = null;
-
-        $collectedConstraints = [];
-
-        // Search term
-        $constraint = $this->computeSearchTermConstraint($query, $matcher);
-        if ($constraint) {
-            $collectedConstraints[] = $constraint;
-        }
-
-        foreach ($matcher->getSupportedOperators() as $operator) {
-            $constraint = $this->computeConstraint($query, $matcher, $operator);
-            if ($constraint) {
-                $collectedConstraints[] = $constraint;
-            }
-        }
-
-        if (count($collectedConstraints) > 1) {
-            $logical = $matcher->getDefaultLogicalSeparator();
-            $constraints = $query->$logical($collectedConstraints);
-        } elseif (!empty($collectedConstraints)) {
-
-            // true means there is one constraint only and should become the result
-            $constraints = current($collectedConstraints);
-        }
-
-        // Trigger signal for post processing the computed constraints object.
-        $constraints = $this->emitPostProcessConstraintsSignal($query, $constraints);
-
-        return $constraints;
-    }
-
-    /**
-     * Computes the search constraint and returns it.
-     *
-     * @param Query $query
-     * @param Matcher $matcher
-     * @return ConstraintInterface|null
-     */
-    protected function computeSearchTermConstraint(Query $query, Matcher $matcher): ?ConstraintInterface
-    {
-
-        $result = null;
-
-        // Search term case
-        if ($matcher->getSearchTerm()) {
-
-            $fields = GeneralUtility::trimExplode(',', Tca::table($this->dataType)->getSearchFields(), true);
-
-            $constraints = [];
-            $likeClause = sprintf('%%%s%%', $matcher->getSearchTerm());
-            foreach ($fields as $fieldNameAndPath) {
-                if ($this->isSuitableForLike($fieldNameAndPath, $matcher->getSearchTerm())) {
-
-                    $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->dataType);
-                    $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->dataType);
-
-                    if (Tca::table($dataType)->hasField($fieldName) && Tca::table($dataType)->field($fieldName)->hasRelation()) {
-                        $foreignTable = Tca::table($dataType)->field($fieldName)->getForeignTable();
-                        $fieldNameAndPath = $fieldNameAndPath . '.' . Tca::table($foreignTable)->getLabelField();
-                    }
-                    $constraints[] = $query->like($fieldNameAndPath, $likeClause);
-                }
-            }
-            $logical = $matcher->getLogicalSeparatorForSearchTerm();
-            $result = $query->$logical($constraints);
-        }
-
-        return $result;
-    }
-
-    /**
-     * It does not make sense to have a "like" in presence of numerical field, e.g "uid".
-     * Tell whether the given value makes sense for a "like" clause.
-     *
-     * @param string $fieldNameAndPath
-     * @param string $value
-     * @return bool
-     */
-    protected function isSuitableForLike($fieldNameAndPath, $value): bool
-    {
-        $isSuitable = true;
-
-        // true means it is a string
-        if (!MathUtility::canBeInterpretedAsInteger($value)) {
-
-            $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->dataType);
-            $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->dataType);
-
-            if (Tca::table($dataType)->field($fieldName)->isNumerical()
-                && !Tca::table($dataType)->field($fieldName)->hasRelation()
-            ) {
-                $isSuitable = false;
-            }
-        }
-
-        return $isSuitable;
-    }
-
-    /**
-     * Computes the constraint for matches and returns it.
-     *
-     * @param Query $query
-     * @param Matcher $matcher
-     * @param string $operator
-     * @return ConstraintInterface|null
-     */
-    protected function computeConstraint(Query $query, Matcher $matcher, $operator): ?ConstraintInterface
-    {
-        $result = null;
-
-        $operatorName = ucfirst($operator);
-        $getCriteria = sprintf('get%s', $operatorName);
-        $criteria = $matcher->$getCriteria();
-
-        if (!empty($criteria)) {
-            $constraints = [];
-
-            foreach ($criteria as $criterion) {
-
-                $fieldNameAndPath = $criterion['fieldNameAndPath'];
-                $operand = $criterion['operand'];
-
-                // Compute a few variables...
-                // $dataType is generally equals to $this->dataType but not always... if fieldName is a path.
-                $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->dataType);
-                $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->dataType);
-                $fieldPath = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath, $this->dataType);
-
-                if (Tca::table($dataType)->field($fieldName)->hasRelation()) {
-                    if (MathUtility::canBeInterpretedAsInteger($operand)) {
-                        $fieldNameAndPath = $fieldName . '.uid';
-                    } else {
-                        $foreignTableName = Tca::table($dataType)->field($fieldName)->getForeignTable();
-                        $foreignTable = Tca::table($foreignTableName);
-                        $fieldNameAndPath = $fieldName . '.' . $foreignTable->getLabelField();
-                    }
-
-                    // If different means we should restore the prepended path segment for proper SQL parser.
-                    // This is true for a composite field, e.g items.sys_file_metadata for categories.
-                    if ($fieldName !== $fieldPath) {
-                        $fieldNameAndPath = $fieldPath . '.' . $fieldNameAndPath;
-                    }
-                }
-
-                if (strpos($operator, 'not') === 0) {
-                    $strippedOperator = strtolower(substr($operator, 3));
-                    $constraints[] = $query->logicalNot($query->$strippedOperator($fieldNameAndPath, $criterion['operand']));
-                } else {
-                    $constraints[] = $query->$operator($fieldNameAndPath, $criterion['operand']);
-                }
-            }
-
-            $getLogicalSeparator = sprintf('getLogicalSeparatorFor%s', $operatorName);
-            $logical = method_exists($matcher, $getLogicalSeparator)
-                ? $matcher->$getLogicalSeparator()
-                : $matcher->getDefaultLogicalSeparator();
-
-            $result = $query->$logical($constraints);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return DataHandler
-     */
-    protected function getDataHandler(): DataHandler
-    {
-        if (!$this->dataHandler) {
-            $this->dataHandler = GeneralUtility::makeInstance(DataHandler::class);
-        }
-        return $this->dataHandler;
-    }
-
-    /**
-     * Handle the magic call by properly creating a Query object and returning its result.
-     *
-     * @param string $propertyName
-     * @param string $value
-     * @param string $flag
-     * @return mixed
-     */
-    protected function processMagicCall($propertyName, $value, $flag = '')
-    {
-
-        $fieldName = Property::name($propertyName)->of($this->dataType)->toFieldName();
-
-        /** @var $matcher Matcher */
-        $matcher = GeneralUtility::makeInstance(Matcher::class, [], $this->getDataType());
-
-        $table = Tca::table($this->dataType);
-        if ($table->field($fieldName)->isGroup()) {
-
-            $valueParts = explode('.', $value, 2);
-            $fieldName = $fieldName . '.' . $valueParts[0];
-            $value = $valueParts[1];
-        }
-
-        $matcher->equals($fieldName, $value);
-
-        if ($flag === 'count') {
-            $result = $this->countBy($matcher);
-        } else {
-            $result = $this->findBy($matcher);
-        }
-        return $flag === 'one' && !empty($result) ? reset($result) : $result;
-    }
-
-    /**
-     * @return DataHandlerFactory|object
-     */
-    protected function getDataHandlerFactory()
-    {
-        return GeneralUtility::makeInstance(DataHandlerFactory::class);
-    }
-
-    /**
-     * Returns whether the current mode is Backend
-     *
-     * @return bool
-     */
-    protected function isBackendMode(): bool
-    {
-        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
-    }
-
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * @return ContentValidator|object
-     */
-    protected function getContentValidator(): ContentValidator
-    {
-        return GeneralUtility::makeInstance(ContentValidator::class);
-    }
-
-    /**
-     * @return LanguageValidator|object
-     */
-    protected function getLanguageValidator(): LanguageValidator
-    {
-        return GeneralUtility::makeInstance(LanguageValidator::class);
-    }
-
-    /**
-     * Signal that is called for post-processing the computed constraints object.
-     *
-     * @param Query $query
-     * @param ConstraintInterface|null $constraints
-     * @return ConstraintInterface|null $constraints
-     */
-    protected function emitPostProcessConstraintsSignal(Query $query, $constraints): ?ConstraintInterface
-    {
-        /** @var ConstraintContainer $constraintContainer */
-        $constraintContainer = GeneralUtility::makeInstance(ConstraintContainer::class);
-        $result = $this->getSignalSlotDispatcher()->dispatch(
-            self::class,
-            'postProcessConstraintsObject',
-            [
-                $query,
-                $constraints,
-                $constraintContainer
-            ]
-        );
-
-        // Backward compatibility.
-        $processedConstraints = $result[1];
-
-        // New way to transmit the constraints.
-        if ($constraintContainer->getConstraint()) {
-            $processedConstraints = $constraintContainer->getConstraint();
-        }
-        return $processedConstraints;
-    }
-
-    /**
-     * @return Dispatcher
-     */
-    protected function getSignalSlotDispatcher(): Dispatcher
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
+	/**
+	 * Tell whether it is a raw result (array) or object being returned.
+	 *
+	 * @var bool
+	 */
+	protected $rawResult = false;
+
+	/**
+	 * The data type to be returned, e.g fe_users, fe_groups, tt_content, etc...
+	 *
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * The source field is useful in the context of MM relations to know who is the caller
+	 * e.g findByItems which eventually corresponds to a field name.
+	 *
+	 * @var string
+	 */
+	protected $sourceFieldName = '';
+
+	/**
+	 * @var array
+	 */
+	protected $errorMessages = [];
+
+	/**
+	 * @var QuerySettingsInterface
+	 */
+	protected $defaultQuerySettings;
+
+	/**
+	 * @var DataHandler
+	 */
+	protected $dataHandler;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $dataType
+	 */
+	public function __construct($dataType)
+	{
+		$this->dataType = $dataType;
+	}
+
+	/**
+	 * Returns all objects of this repository.
+	 *
+	 * @return Content[]
+	 */
+	public function findAll()
+	{
+		$query = $this->createQuery();
+		return $query->execute();
+	}
+
+	/**
+	 * Returns all "distinct" values for a given property.
+	 *
+	 * @param string $propertyName
+	 * @param Matcher $matcher
+	 * @param Order|null $order
+	 * @return Content[]
+	 */
+	public function findDistinctValues($propertyName, Matcher $matcher = null, Order $order = null): array
+	{
+		$query = $this->createQuery();
+		$query->setDistinct($propertyName);
+
+		// Remove empty values from selection.
+		$constraint = $query->logicalNot($query->equals($propertyName, ''));
+
+		// Add some additional constraints from the Matcher object.
+		$matcherConstraint = null;
+		if ($matcher !== null) {
+			$matcherConstraint = $this->computeConstraints($query, $matcher);
+		}
+
+		// Assemble the final constraints or not.
+		if ($matcherConstraint) {
+			$query->logicalAnd([$matcherConstraint, $constraint]);
+			$query->matching($query->logicalAnd([$matcherConstraint, $constraint]));
+		} else {
+			$query->matching($constraint);
+		}
+
+		if ($order) {
+			$query->setOrderings($order->getOrderings());
+		}
+
+		return $query->execute();
+	}
+
+	/**
+	 * Returns all "distinct" values for a given property.
+	 *
+	 * @param string $propertyName
+	 * @param Matcher $matcher
+	 * @return int
+	 */
+	public function countDistinctValues($propertyName, Matcher $matcher = null): int
+	{
+		$query = $this->createQuery();
+		$query->setDistinct($propertyName);
+
+		// Remove empty values from selection.
+		$constraint = $query->logicalNot($query->equals($propertyName, ''));
+
+		// Add some additional constraints from the Matcher object.
+		$matcherConstraint = null;
+		if (!is_null($matcher)) {
+			$matcherConstraint = $this->computeConstraints($query, $matcher);
+		}
+
+		// Assemble the final constraints or not.
+		if ($matcherConstraint) {
+			$query->logicalAnd([$matcherConstraint, $constraint]);
+			$query->matching($query->logicalAnd([$matcherConstraint, $constraint]));
+		} else {
+			$query->matching($constraint);
+		}
+
+		return $query->count();
+	}
+
+	/**
+	 * Finds an object matching the given identifier.
+	 *
+	 * @param int $uid The identifier of the object to find
+	 * @return Content|null
+	 * @api
+	 */
+	public function findByUid($uid)
+	{
+		return $this->findByIdentifier($uid);
+	}
+
+	/**
+	 * Finds all Contents given specified matches.
+	 *
+	 * @param string $propertyName
+	 * @param array $values
+	 * @return Content[]
+	 */
+	public function findIn($propertyName, array $values): array
+	{
+		$query = $this->createQuery();
+		$query->matching($query->in($propertyName, $values));
+		return $query->execute();
+	}
+
+	/**
+	 * Finds all Contents given specified matches.
+	 *
+	 * @param Matcher $matcher
+	 * @param Order $order The order
+	 * @param int $limit
+	 * @param int $offset
+	 * @return Content[]
+	 */
+	public function findBy(Matcher $matcher, Order $order = null, $limit = null, $offset = null): array
+	{
+
+		$query = $this->createQuery();
+
+		$limit = (int)$limit; // make sure to cast
+		if ($limit > 0) {
+			$query->setLimit($limit);
+		}
+
+		if ($order) {
+			$query->setOrderings($order->getOrderings());
+
+			// Loops around the orderings adding if necessary a dummy condition
+			// to make sure the relations can be resolved when transforming the query to plain SQL.
+			foreach ($order->getOrderings() as $ordering => $direction) {
+				if ($this->hasForeignRelationIn($ordering)) {
+					$relationalField = $this->getForeignRelationFrom($ordering);
+					$matcher->like($relationalField . '.uid', '');
+				}
+			}
+		}
+
+		if ($offset) {
+			$query->setOffset($offset);
+		}
+
+		$constraints = $this->computeConstraints($query, $matcher);
+
+		if ($constraints) {
+			$query->matching($constraints);
+		}
+
+		return $query->execute();
+	}
+
+	/**
+	 * Find one Content object given specified matches.
+	 *
+	 * @param Matcher $matcher
+	 * @return Content
+	 */
+	public function findOneBy(Matcher $matcher): Content
+	{
+
+		$query = $this->createQuery();
+
+		$constraints = $this->computeConstraints($query, $matcher);
+
+		if ($constraints) {
+			$query->matching($constraints);
+		}
+
+		$query->setLimit(1); // only take one!
+
+		$resultSet = $query->execute();
+		if ($resultSet) {
+			$resultSet = current($resultSet);
+		}
+		return $resultSet;
+	}
+
+	/**
+	 * Count all Contents given specified matches.
+	 *
+	 * @param Matcher $matcher
+	 * @return int
+	 */
+	public function countBy(Matcher $matcher): int
+	{
+
+		$query = $this->createQuery();
+
+		$constraints = $this->computeConstraints($query, $matcher);
+
+		if ($constraints) {
+			$query->matching($constraints);
+		}
+
+		return $query->count();
+	}
+
+	/**
+	 * Update a content with new information.
+	 *
+	 * @param Content $content
+	 * @param $language
+	 * @return bool
+	 */
+	public function localize($content, $language): bool
+	{
+
+		// Security check
+		$this->getContentValidator()->validate($content);
+		$this->getLanguageValidator()->validate($language);
+
+		$dataType = $content->getDataType();
+		$handler = $this->getDataHandlerFactory()->action(ProcessAction::LOCALIZE)->forType($dataType)->getDataHandler();
+
+		$handlerResult = $handler->processLocalize($content, $language);
+		$this->errorMessages = $handler->getErrorMessages();
+		return $handlerResult;
+	}
+
+	/**
+	 * Update a content with new information.
+	 *
+	 * @param Content $content
+	 * @return bool
+	 */
+	public function update($content)
+	{
+
+		// Security check.
+		$this->getContentValidator()->validate($content);
+
+		$dataType = $content->getDataType();
+		$handler = $this->getDataHandlerFactory()->action(ProcessAction::UPDATE)->forType($dataType)->getDataHandler();
+
+		$handlerResult = $handler->processUpdate($content);
+		$this->errorMessages = $handler->getErrorMessages();
+		return $handlerResult;
+	}
+
+	/**
+	 * Removes an object from this repository.
+	 *
+	 * @param Content $content
+	 * @return boolean
+	 */
+	public function remove($content)
+	{
+		$dataType = $content->getDataType();
+		$handler = $this->getDataHandlerFactory()->action(ProcessAction::REMOVE)->forType($dataType)->getDataHandler();
+
+		$handlerResult = $handler->processRemove($content);
+		$this->errorMessages = $handler->getErrorMessages();
+		return $handlerResult;
+	}
+
+	/**
+	 * Move a content within this repository.
+	 * The $target corresponds to the pid to move the records to.
+	 * It can also be a negative value in case of sorting. The negative value would be the uid of its predecessor.
+	 *
+	 * @param Content $content
+	 * @param string $target
+	 * @return bool
+	 */
+	public function move($content, $target): bool
+	{
+
+		// Security check.
+		$this->getContentValidator()->validate($content);
+
+		$dataType = $content->getDataType();
+		$handler = $this->getDataHandlerFactory()->action(ProcessAction::MOVE)->forType($dataType)->getDataHandler();
+
+		$handlerResult = $handler->processMove($content, $target);
+		$this->errorMessages = $handler->getErrorMessages();
+		return $handlerResult;
+	}
+
+	/**
+	 * Copy a content within this repository.
+	 *
+	 * @param Content $content
+	 * @return bool
+	 */
+	public function copy($content, $target): bool
+	{
+
+		// Security check.
+		$this->getContentValidator()->validate($content);
+
+		$dataType = $content->getDataType();
+		$handler = $this->getDataHandlerFactory()->action(ProcessAction::COPY)->forType($dataType)->getDataHandler();
+
+		$handlerResult = $handler->processCopy($content, $target);
+		$this->errorMessages = $handler->getErrorMessages();
+		return $handlerResult;
+	}
+
+	/**
+	 * Adds an object to this repository.
+	 *
+	 * @param object $object The object to add
+	 * @return void
+	 * @api
+	 */
+	public function add($object)
+	{
+		throw new \BadMethodCallException('Repository does not support the add() method.', 1375805599);
+	}
+
+	/**
+	 * Returns the total number objects of this repository.
+	 *
+	 * @return integer The object count
+	 * @api
+	 */
+	public function countAll()
+	{
+		$query = $this->createQuery();
+		return $query->count();
+	}
+
+	/**
+	 * Removes all objects of this repository as if remove() was called for
+	 * all of them.
+	 *
+	 * @return void
+	 * @api
+	 */
+	public function removeAll()
+	{
+		// TODO: Implement removeAll() method.
+	}
+
+	/**
+	 * Finds an object matching the given identifier.
+	 *
+	 * @param mixed $identifier The identifier of the object to find
+	 * @return Content|null
+	 * @api
+	 */
+	public function findByIdentifier($identifier)
+	{
+		$query = $this->createQuery();
+
+		$result = $query->matching(
+			$query->equals('uid', $identifier)
+		)
+			->execute();
+
+		if (is_array($result)) {
+			$result = current($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Dispatches magic methods (findBy[Property]())
+	 *
+	 * @param string $methodName The name of the magic method
+	 * @param string $arguments The arguments of the magic method
+	 * @return mixed
+	 * @api
+	 */
+	public function __call($methodName, $arguments)
+	{
+		if (substr($methodName, 0, 6) === 'findBy' && strlen($methodName) > 7) {
+			$propertyName = strtolower(substr(substr($methodName, 6), 0, 1)) . substr(substr($methodName, 6), 1);
+			$result = $this->processMagicCall($propertyName, $arguments[0]);
+		} elseif (substr($methodName, 0, 9) === 'findOneBy' && strlen($methodName) > 10) {
+			$propertyName = strtolower(substr(substr($methodName, 9), 0, 1)) . substr(substr($methodName, 9), 1);
+			$result = $this->processMagicCall($propertyName, $arguments[0], 'one');
+		} elseif (substr($methodName, 0, 7) === 'countBy' && strlen($methodName) > 8) {
+			$propertyName = strtolower(substr(substr($methodName, 7), 0, 1)) . substr(substr($methodName, 7), 1);
+			$result = $this->processMagicCall($propertyName, $arguments[0], 'count');
+		} else {
+			throw new UnsupportedMethodException('The method "' . $methodName . '" is not supported by the repository.', 1360838010);
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns a query for objects of this repository
+	 *
+	 * @return Query
+	 * @api
+	 */
+	public function createQuery()
+	{
+		/** @var Query $query */
+		$query = GeneralUtility::makeInstance(Query::class, $this->dataType);
+		$query->setSourceFieldName($this->sourceFieldName);
+
+		if ($this->defaultQuerySettings) {
+			$query->setTypo3QuerySettings($this->defaultQuerySettings);
+		} else {
+
+			// Initialize and pass the query settings at this level.
+			$querySettings = GeneralUtility::makeInstance(Typo3QuerySettings::class);
+
+			// Default choice for the BE.
+			if ($this->isBackendMode()) {
+				$querySettings->setIgnoreEnableFields(true);
+			}
+
+			$query->setTypo3QuerySettings($querySettings);
+		}
+
+		return $query;
+	}
+
+	/**
+	 * Sets the property names to order the result by per default.
+	 * Expected like this:
+	 * array(
+	 * 'foo' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_ASCENDING,
+	 * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
+	 * )
+	 *
+	 * @param array $defaultOrderings The property names to order by
+	 * @return void
+	 * @api
+	 */
+	public function setDefaultOrderings(array $defaultOrderings)
+	{
+		throw new \BadMethodCallException('Repository does not support the setDefaultOrderings() method.', 1375805598);
+	}
+
+	/**
+	 * Sets the default query settings to be used in this repository
+	 *
+	 * @param QuerySettingsInterface $defaultQuerySettings The query settings to be used by default
+	 * @return void
+	 * @api
+	 */
+	public function setDefaultQuerySettings(QuerySettingsInterface $defaultQuerySettings)
+	{
+		$this->defaultQuerySettings = $defaultQuerySettings;
+	}
+
+	/**
+	 * @return void
+	 */
+	public function resetDefaultQuerySettings(): void
+	{
+		$this->defaultQuerySettings = null;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function getErrorMessages(): array
+	{
+		return $this->errorMessages;
+	}
+
+	/**
+	 * @param string $sourceFieldName
+	 * @return $this
+	 */
+	public function setSourceFieldName($sourceFieldName): self
+	{
+		$this->sourceFieldName = $sourceFieldName;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType(): string
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * Tell whether the order has a foreign table in its expression, e.g. "metadata.title".
+	 *
+	 * @param string $ordering
+	 * @return bool
+	 */
+	protected function hasForeignRelationIn($ordering): bool
+	{
+		return strpos($ordering, '.') !== false;
+	}
+
+	/**
+	 * Extract the foreign relation of the ordering "metadata.title" -> "metadata"
+	 *
+	 * @param string $ordering
+	 * @return string
+	 */
+	protected function getForeignRelationFrom($ordering): string
+	{
+		$parts = explode('.', $ordering);
+		return $parts[0];
+	}
+
+	/**
+	 * Get the constraints
+	 *
+	 * @param Query $query
+	 * @param Matcher $matcher
+	 * @return ConstraintInterface|null
+	 */
+	protected function computeConstraints(Query $query, Matcher $matcher): ?ConstraintInterface
+	{
+		$constraints = null;
+
+		$collectedConstraints = [];
+
+		// Search term
+		$constraint = $this->computeSearchTermConstraint($query, $matcher);
+		if ($constraint) {
+			$collectedConstraints[] = $constraint;
+		}
+
+		foreach ($matcher->getSupportedOperators() as $operator) {
+			$constraint = $this->computeConstraint($query, $matcher, $operator);
+			if ($constraint) {
+				$collectedConstraints[] = $constraint;
+			}
+		}
+
+		if (count($collectedConstraints) > 1) {
+			$logical = $matcher->getDefaultLogicalSeparator();
+			$constraints = $query->$logical($collectedConstraints);
+		} elseif (!empty($collectedConstraints)) {
+
+			// true means there is one constraint only and should become the result
+			$constraints = current($collectedConstraints);
+		}
+
+		// Trigger signal for post processing the computed constraints object.
+		$constraints = $this->emitPostProcessConstraintsSignal($query, $constraints);
+
+		return $constraints;
+	}
+
+	/**
+	 * Computes the search constraint and returns it.
+	 *
+	 * @param Query $query
+	 * @param Matcher $matcher
+	 * @return ConstraintInterface|null
+	 */
+	protected function computeSearchTermConstraint(Query $query, Matcher $matcher): ?ConstraintInterface
+	{
+
+		$result = null;
+
+		// Search term case
+		if ($matcher->getSearchTerm()) {
+
+			$fields = GeneralUtility::trimExplode(',', Tca::table($this->dataType)->getSearchFields(), true);
+
+			$constraints = [];
+			$likeClause = sprintf('%%%s%%', $matcher->getSearchTerm());
+			foreach ($fields as $fieldNameAndPath) {
+				if ($this->isSuitableForLike($fieldNameAndPath, $matcher->getSearchTerm())) {
+
+					$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->dataType);
+					$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->dataType);
+
+					if (Tca::table($dataType)->hasField($fieldName) && Tca::table($dataType)->field($fieldName)->hasRelation()) {
+						$foreignTable = Tca::table($dataType)->field($fieldName)->getForeignTable();
+						$fieldNameAndPath = $fieldNameAndPath . '.' . Tca::table($foreignTable)->getLabelField();
+					}
+					$constraints[] = $query->like($fieldNameAndPath, $likeClause);
+				}
+			}
+			$logical = $matcher->getLogicalSeparatorForSearchTerm();
+			$result = $query->$logical($constraints);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * It does not make sense to have a "like" in presence of numerical field, e.g "uid".
+	 * Tell whether the given value makes sense for a "like" clause.
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param string $value
+	 * @return bool
+	 */
+	protected function isSuitableForLike($fieldNameAndPath, $value): bool
+	{
+		$isSuitable = true;
+
+		// true means it is a string
+		if (!MathUtility::canBeInterpretedAsInteger($value)) {
+
+			$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->dataType);
+			$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->dataType);
+
+			if (Tca::table($dataType)->field($fieldName)->isNumerical()
+				&& !Tca::table($dataType)->field($fieldName)->hasRelation()
+			) {
+				$isSuitable = false;
+			}
+		}
+
+		return $isSuitable;
+	}
+
+	/**
+	 * Computes the constraint for matches and returns it.
+	 *
+	 * @param Query $query
+	 * @param Matcher $matcher
+	 * @param string $operator
+	 * @return ConstraintInterface|null
+	 */
+	protected function computeConstraint(Query $query, Matcher $matcher, $operator): ?ConstraintInterface
+	{
+		$result = null;
+
+		$operatorName = ucfirst($operator);
+		$getCriteria = sprintf('get%s', $operatorName);
+		$criteria = $matcher->$getCriteria();
+
+		if (!empty($criteria)) {
+			$constraints = [];
+
+			foreach ($criteria as $criterion) {
+
+				$fieldNameAndPath = $criterion['fieldNameAndPath'];
+				$operand = $criterion['operand'];
+
+				// Compute a few variables...
+				// $dataType is generally equals to $this->dataType but not always... if fieldName is a path.
+				$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->dataType);
+				$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->dataType);
+				$fieldPath = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath, $this->dataType);
+
+				if (Tca::table($dataType)->field($fieldName)->hasRelation()) {
+					if (MathUtility::canBeInterpretedAsInteger($operand)) {
+						$fieldNameAndPath = $fieldName . '.uid';
+					} else {
+						$foreignTableName = Tca::table($dataType)->field($fieldName)->getForeignTable();
+						$foreignTable = Tca::table($foreignTableName);
+						$fieldNameAndPath = $fieldName . '.' . $foreignTable->getLabelField();
+					}
+
+					// If different means we should restore the prepended path segment for proper SQL parser.
+					// This is true for a composite field, e.g items.sys_file_metadata for categories.
+					if ($fieldName !== $fieldPath) {
+						$fieldNameAndPath = $fieldPath . '.' . $fieldNameAndPath;
+					}
+				}
+
+				if (strpos($operator, 'not') === 0) {
+					$strippedOperator = strtolower(substr($operator, 3));
+					$constraints[] = $query->logicalNot($query->$strippedOperator($fieldNameAndPath, $criterion['operand']));
+				} else {
+					$constraints[] = $query->$operator($fieldNameAndPath, $criterion['operand']);
+				}
+			}
+
+			$getLogicalSeparator = sprintf('getLogicalSeparatorFor%s', $operatorName);
+			$logical = method_exists($matcher, $getLogicalSeparator)
+				? $matcher->$getLogicalSeparator()
+				: $matcher->getDefaultLogicalSeparator();
+
+			$result = $query->$logical($constraints);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return DataHandler
+	 */
+	protected function getDataHandler(): DataHandler
+	{
+		if (!$this->dataHandler) {
+			$this->dataHandler = GeneralUtility::makeInstance(DataHandler::class);
+		}
+		return $this->dataHandler;
+	}
+
+	/**
+	 * Handle the magic call by properly creating a Query object and returning its result.
+	 *
+	 * @param string $propertyName
+	 * @param string $value
+	 * @param string $flag
+	 * @return mixed
+	 */
+	protected function processMagicCall($propertyName, $value, $flag = '')
+	{
+
+		$fieldName = Property::name($propertyName)->of($this->dataType)->toFieldName();
+
+		/** @var $matcher Matcher */
+		$matcher = GeneralUtility::makeInstance(Matcher::class, [], $this->getDataType());
+
+		$table = Tca::table($this->dataType);
+		if ($table->field($fieldName)->isGroup()) {
+
+			$valueParts = explode('.', $value, 2);
+			$fieldName = $fieldName . '.' . $valueParts[0];
+			$value = $valueParts[1];
+		}
+
+		$matcher->equals($fieldName, $value);
+
+		if ($flag === 'count') {
+			$result = $this->countBy($matcher);
+		} else {
+			$result = $this->findBy($matcher);
+		}
+		return $flag === 'one' && !empty($result) ? reset($result) : $result;
+	}
+
+	/**
+	 * @return DataHandlerFactory|object
+	 */
+	protected function getDataHandlerFactory()
+	{
+		return GeneralUtility::makeInstance(DataHandlerFactory::class);
+	}
+
+	/**
+	 * Returns whether the current mode is Backend
+	 *
+	 * @return bool
+	 */
+	protected function isBackendMode(): bool
+	{
+		return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
+	}
+
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * @return ContentValidator|object
+	 */
+	protected function getContentValidator(): ContentValidator
+	{
+		return GeneralUtility::makeInstance(ContentValidator::class);
+	}
+
+	/**
+	 * @return LanguageValidator|object
+	 */
+	protected function getLanguageValidator(): LanguageValidator
+	{
+		return GeneralUtility::makeInstance(LanguageValidator::class);
+	}
+
+	/**
+	 * Signal that is called for post-processing the computed constraints object.
+	 *
+	 * @param Query $query
+	 * @param ConstraintInterface|null $constraints
+	 * @return ConstraintInterface|null $constraints
+	 */
+	protected function emitPostProcessConstraintsSignal(Query $query, $constraints): ?ConstraintInterface
+	{
+		/** @var ConstraintContainer $constraintContainer */
+		$constraintContainer = GeneralUtility::makeInstance(ConstraintContainer::class);
+		$result = $this->getSignalSlotDispatcher()->dispatch(
+			self::class,
+			'postProcessConstraintsObject',
+			[
+				$query,
+				$constraints,
+				$constraintContainer
+			]
+		);
+
+		// Backward compatibility.
+		$processedConstraints = $result[1];
+
+		// New way to transmit the constraints.
+		if ($constraintContainer->getConstraint()) {
+			$processedConstraints = $constraintContainer->getConstraint();
+		}
+		return $processedConstraints;
+	}
+
+	/**
+	 * @return Dispatcher
+	 */
+	protected function getSignalSlotDispatcher(): Dispatcher
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
 
 }

Classes/Tca/FieldService.php

Spacing +1 added lines, -1 removed lines

@@ -484,7 +484,7 @@
             && isset($this->tca['exclude'])
             && $this->tca['exclude']
         ) {
-            $hasAccess = $this->getBackendUser()->check('non_exclude_fields', $this->tableName . ':' . $this->fieldName);
+            $hasAccess = $this->getBackendUser()->check('non_exclude_fields', $this->tableName.':'.$this->fieldName);
         }
         return $hasAccess;
     }

Indentation +772 added lines, -772 removed lines

@@ -17,777 +17,777 @@
 class FieldService extends AbstractTca
 {
 
-    /**
-     * @var string
-     */
-    protected $fieldName;
-
-    /**
-     * @var string
-     */
-    protected $compositeField;
-
-    /**
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * @var array
-     */
-    protected $tca;
-
-    /**
-     * @param string $fieldName
-     * @param array $tca
-     * @param string $tableName
-     * @param string $compositeField
-     * @return \Fab\Vidi\Tca\FieldService
-     */
-    public function __construct($fieldName, array $tca, $tableName, $compositeField = '')
-    {
-        $this->fieldName = $fieldName;
-        $this->tca = $tca;
-        $this->tableName = $tableName;
-        $this->compositeField = $compositeField;
-    }
-
-    /**
-     * Tells whether the field is considered as system field, e.g. uid, crdate, tstamp, etc...
-     *
-     * @return bool
-     */
-    public function isSystem()
-    {
-        return in_array($this->fieldName, Tca::getSystemFields());
-    }
-
-    /**
-     * Tells the opposition of isSystem()
-     *
-     * @return bool
-     */
-    public function isNotSystem()
-    {
-        return !$this->isSystem();
-    }
-
-    /**
-     * Returns the configuration for a $field
-     *
-     * @throws \Exception
-     * @return array
-     */
-    public function getConfiguration()
-    {
-        return empty($this->tca['config']) ? [] : $this->tca['config'];
-    }
-
-    /**
-     * Returns a key of the configuration.
-     * If the key can not to be found, returns null.
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        $configuration = $this->getConfiguration();
-        return empty($configuration[$key]) ? null : $configuration[$key];
-    }
-
-    /**
-     * Returns the foreign field of a given field (opposite relational field).
-     * If no relation exists, returns null.
-     *
-     * @return string|null
-     */
-    public function getForeignField()
-    {
-        $result = null;
-        $configuration = $this->getConfiguration();
-
-        if (!empty($configuration['foreign_field'])) {
-            $result = $configuration['foreign_field'];
-        } elseif ($this->hasRelationManyToMany()) {
-
-            $foreignTable = $this->getForeignTable();
-            $manyToManyTable = $this->getManyToManyTable();
-
-            // Load TCA service of foreign field.
-            $tcaForeignTableService = Tca::table($foreignTable);
-
-            // Look into the MM relations checking for the opposite field
-            foreach ($tcaForeignTableService->getFields() as $fieldName) {
-                if ($manyToManyTable == $tcaForeignTableService->field($fieldName)->getManyToManyTable()) {
-                    $result = $fieldName;
-                    break;
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Returns the foreign table of a given field (opposite relational table).
-     * If no relation exists, returns null.
-     *
-     * @return string|null
-     */
-    public function getForeignTable()
-    {
-        $result = null;
-        $configuration = $this->getConfiguration();
-
-        if (!empty($configuration['foreign_table'])) {
-            $result = $configuration['foreign_table'];
-        } elseif ($this->isGroup()) {
-            $fieldParts = explode('.', $this->compositeField, 2);
-            $result = $fieldParts[1];
-        }
-        return $result;
-    }
-
-    /**
-     * Returns the foreign clause.
-     * If no foreign order exists, returns empty string.
-     *
-     * @return string
-     */
-    public function getForeignClause()
-    {
-        $result = '';
-        $configuration = $this->getConfiguration();
-
-        if (!empty($configuration['foreign_table_where'])) {
-            $parts = explode('ORDER BY', $configuration['foreign_table_where']);
-            if (!empty($parts[0])) {
-                $result = $parts[0];
-            }
-        }
-
-        // Substitute some variables
-        return $this->substituteKnownMarkers($result);
-    }
-
-    /**
-     * Substitute some known markers from the where clause in the Frontend Context.
-     *
-     * @param string $clause
-     * @return string
-     */
-    protected function substituteKnownMarkers($clause)
-    {
-        if ($clause && $this->isFrontendMode()) {
-
-            $searches = array(
-                '###CURRENT_PID###',
-                '###REC_FIELD_sys_language_uid###'
-            );
-
-            $replaces = array(
-                $this->getFrontendObject()->id,
-                $this->getFrontendObject()->sys_language_uid,
-            );
-
-            $clause = str_replace($searches, $replaces, $clause);
-        }
-        return $clause;
-    }
-
-    /**
-     * Returns the foreign order of the current field.
-     * If no foreign order exists, returns empty string.
-     *
-     * @return string
-     */
-    public function getForeignOrder()
-    {
-        $result = '';
-        $configuration = $this->getConfiguration();
-
-        if (!empty($configuration['foreign_table_where'])) {
-            $parts = explode('ORDER BY', $configuration['foreign_table_where']);
-            if (!empty($parts[1])) {
-                $result = $parts[1];
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Returns the MM table of a field.
-     * If no relation exists, returns null.
-     *
-     * @return string|null
-     */
-    public function getManyToManyTable()
-    {
-        $configuration = $this->getConfiguration();
-        return empty($configuration['MM']) ? null : $configuration['MM'];
-    }
-
-    /**
-     * Returns a possible additional table name used in MM relations.
-     * If no table name exists, returns null.
-     *
-     * @return string|null
-     */
-    public function getAdditionalTableNameCondition()
-    {
-        $result = null;
-        $configuration = $this->getConfiguration();
-
-        if (!empty($configuration['MM_match_fields']['tablenames'])) {
-            $result = $configuration['MM_match_fields']['tablenames'];
-        } elseif ($this->isGroup()) {
-
-            // @todo check if $this->fieldName could be simply used as $result
-            $fieldParts = explode('.', $this->compositeField, 2);
-            $result = $fieldParts[1];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns a possible additional conditions for MM tables such as "tablenames", "fieldname", etc...
-     *
-     * @return array
-     */
-    public function getAdditionalMMCondition()
-    {
-        $additionalMMConditions = [];
-        $configuration = $this->getConfiguration();
-
-        if (!empty($configuration['MM_match_fields'])) {
-            $additionalMMConditions = $configuration['MM_match_fields'];
-        }
-
-        // Add in any case a table name for "group"
-        if ($this->isGroup()) {
-
-            // @todo check if $this->fieldName could be simply used as $result
-            $fieldParts = explode('.', $this->compositeField, 2);
-            $additionalMMConditions = array(
-                'tablenames' => $fieldParts[1],
-            );
-        }
-        return $additionalMMConditions;
-    }
-
-    /**
-     * Returns whether the field name is the opposite in MM relation.
-     *
-     * @return bool
-     */
-    public function isOppositeRelation()
-    {
-        $configuration = $this->getConfiguration();
-        return isset($configuration['MM_opposite_field']);
-    }
-
-    /**
-     * Returns the configuration for a $field.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function getType()
-    {
-
-        if ($this->isSystem()) {
-            $fieldType = FieldType::NUMBER;
-        } else {
-            $configuration = $this->getConfiguration();
-
-            if (empty($configuration['type'])) {
-                throw new \Exception(sprintf('No field type found for "%s" in table "%s"', $this->fieldName, $this->tableName), 1385556627);
-            }
-
-            $fieldType = $configuration['type'];
-
-            if ($configuration['type'] === FieldType::SELECT && !empty($configuration['size']) && $configuration['size'] > 1) {
-                $fieldType = FieldType::MULTISELECT;
-            } elseif (!empty($configuration['foreign_table'])
-                && ($configuration['foreign_table'] == 'sys_file_reference' || $configuration['foreign_table'] == 'sys_file')
-            ) {
-                $fieldType = FieldType::FILE;
-            } elseif (!empty($configuration['eval'])) {
-                $parts = GeneralUtility::trimExplode(',', $configuration['eval']);
-                if (in_array('datetime', $parts)) {
-                    $fieldType = FieldType::DATETIME;
-                } elseif (in_array('date', $parts)) {
-                    $fieldType = FieldType::DATE;
-                } elseif (in_array('email', $parts)) {
-                    $fieldType = FieldType::EMAIL;
-                } elseif (in_array('int', $parts) || in_array('double2', $parts)) {
-                    $fieldType = FieldType::NUMBER;
-                }
-            }
-
-            // Do some legacy conversion
-            if ($fieldType === 'input') {
-                $fieldType = FieldType::TEXT;
-            } elseif ($fieldType === 'text') {
-                $fieldType = FieldType::TEXTAREA;
-            }
-        }
-        return $fieldType;
-    }
-
-    /**
-     * Return the default value.
-     *
-     * @return bool
-     */
-    public function getDefaultValue()
-    {
-        $configuration = $this->getConfiguration();
-        return isset($configuration['default']) ? $configuration['default'] : null;
-    }
-
-    /**
-     * Get the translation of a label given a column.
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        $label = '';
-        if ($this->hasLabel()) {
-            try {
-                $label = LocalizationUtility::translate($this->tca['label'], '');
-            } catch (\InvalidArgumentException $e) {
-            }
-            if (empty($label)) {
-                $label = $this->tca['label'];
-            }
-        }
-        return $label;
-    }
-
-    /**
-     * Get the translation of a label given a column.
-     *
-     * @param string $itemValue the item value to search for.
-     * @return string
-     */
-    public function getLabelForItem($itemValue)
-    {
-
-        // Early return whether there is nothing to be translated as label.
-        if (is_null($itemValue)) {
-            return '';
-        } elseif (is_string($itemValue) && $itemValue === '') {
-            return $itemValue;
-        }
-
-        $configuration = $this->getConfiguration();
-        if (!empty($configuration['items']) && is_array($configuration['items'])) {
-            foreach ($configuration['items'] as $item) {
-                if ($item[1] == $itemValue) {
-                    try {
-                        $label = LocalizationUtility::translate($item[0], '');
-                    } catch (\InvalidArgumentException $e) {
-                    }
-                    if (empty($label)) {
-                        $label = $item[0];
-                    }
-                    break;
-                }
-            }
-        }
-
-        // Try fetching a label from a possible itemsProcFunc
-        if (!isset($label) && is_scalar($itemValue)) {
-            $items = $this->fetchItemsFromUserFunction();
-            if (!empty($items[$itemValue])) {
-                $label = $items[$itemValue];
-            }
-        }
-
-        // Returns a label if it has been found, otherwise returns the item value as fallback.
-        return isset($label) ? $label : $itemValue;
-    }
-
-    /**
-     * Retrieve items from User Function.
-     *
-     * @return array
-     */
-    protected function fetchItemsFromUserFunction()
-    {
-        $values = [];
-
-        $configuration = $this->getConfiguration();
-        if (!empty($configuration['itemsProcFunc'])) {
-            $parts = explode('php:', $configuration['itemsProcFunc']);
-            if (!empty($parts[1])) {
-
-                list($class, $method) = explode('->', $parts[1]);
-
-                $parameters['items'] = [];
-                $object = GeneralUtility::makeInstance($class);
-                $object->$method($parameters);
-
-                foreach ($parameters['items'] as $items) {
-                    $values[$items[1]] = $items[0];
-                }
-            }
-        }
-        return $values;
-    }
-
-    /**
-     * Get a possible icon given a field name an an item.
-     *
-     * @param string $itemValue the item value to search for.
-     * @return string
-     */
-    public function getIconForItem($itemValue)
-    {
-        $result = '';
-        $configuration = $this->getConfiguration();
-        if (!empty($configuration['items']) && is_array($configuration['items'])) {
-            foreach ($configuration['items'] as $item) {
-                if ($item[1] == $itemValue) {
-                    $result = empty($item[2]) ? '' : $item[2];
-                    break;
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Returns whether the field has a label.
-     *
-     * @return bool
-     */
-    public function hasLabel()
-    {
-        return empty($this->tca['label']) ? false : true;
-    }
-
-    /**
-     * Tell whether the current BE User has access to this field.
-     *
-     * @return bool
-     */
-    public function hasAccess()
-    {
-        $hasAccess = true;
-        if ($this->isBackendMode()
-            && Tca::table($this->tableName)->hasAccess()
-            && isset($this->tca['exclude'])
-            && $this->tca['exclude']
-        ) {
-            $hasAccess = $this->getBackendUser()->check('non_exclude_fields', $this->tableName . ':' . $this->fieldName);
-        }
-        return $hasAccess;
-    }
-
-    /**
-     * Returns whether the field is numerical.
-     *
-     * @return bool
-     */
-    public function isNumerical()
-    {
-        $result = $this->isSystem();
-        if ($result === false) {
-            $configuration = $this->getConfiguration();
-            $parts = [];
-            if (!empty($configuration['eval'])) {
-                $parts = GeneralUtility::trimExplode(',', $configuration['eval']);
-            }
-            $result = in_array('int', $parts) || in_array('float', $parts);
-        }
-        return $result;
-    }
-
-    /**
-     * Returns whether the field is of type text area.
-     *
-     * @return bool
-     */
-    public function isTextArea()
-    {
-        return $this->getType() === FieldType::TEXTAREA;
-    }
-    /**
-     * Returns whether the field is of type text area.
-     *
-     * @return bool
-     */
-    public function isText()
-    {
-        return $this->getType() === FieldType::TEXT;
-    }
-
-    /**
-     * Returns whether the field is displayed as a tree.
-     *
-     * @return bool
-     */
-    public function isRenderModeTree()
-    {
-        $configuration = $this->getConfiguration();
-        return isset($configuration['renderMode']) && $configuration['renderMode'] == FieldType::TREE;
-    }
-
-    /**
-     * Returns whether the field is of type select.
-     *
-     * @return bool
-     */
-    public function isSelect()
-    {
-        return $this->getType() === FieldType::SELECT;
-    }
-
-    /**
-     * Returns whether the field is of type select.
-     *
-     * @return bool
-     */
-    public function isMultipleSelect()
-    {
-        return $this->getType() === FieldType::MULTISELECT;
-    }
-
-    /**
-     * Returns whether the field is of type select.
-     *
-     * @return bool
-     */
-    public function isCheckBox()
-    {
-        return $this->getType() === FieldType::CHECKBOX;
-    }
-
-    /**
-     * Returns whether the field is of type db.
-     *
-     * @return bool
-     */
-    public function isGroup()
-    {
-        return $this->getType() === 'group';
-    }
-
-    /**
-     * Returns whether the field is language aware.
-     *
-     * @return bool
-     */
-    public function isLocalized()
-    {
-        $isLocalized = false;
-        if (isset($this->tca['l10n_mode'])) {
-
-            if ($this->tca['l10n_mode'] == 'prefixLangTitle' || $this->tca['l10n_mode'] == 'mergeIfNotBlank') {
-                $isLocalized = true;
-            }
-        }
-        return $isLocalized;
-    }
-
-    /**
-     * Returns whether the field is required.
-     *
-     * @return bool
-     */
-    public function isRequired()
-    {
-        $configuration = $this->getConfiguration();
-
-        $isRequired = false;
-        if (isset($configuration['minitems'])) {
-            // is required of a select?
-            $isRequired = $configuration['minitems'] == 1 ? true : false;
-        } elseif (isset($configuration['eval'])) {
-            $parts = GeneralUtility::trimExplode(',', $configuration['eval'], true);
-            $isRequired = in_array('required', $parts);
-        }
-        return $isRequired;
-    }
-
-    /**
-     * Returns an array containing the configuration of a column.
-     *
-     * @return array
-     */
-    public function getField()
-    {
-        return $this->tca;
-    }
-
-    /**
-     * Returns the relation type
-     *
-     * @return string
-     */
-    public function relationDataType()
-    {
-        $configuration = $this->getConfiguration();
-        return empty($configuration['foreign_table']) ? '' : $configuration['foreign_table'];
-    }
-
-    /**
-     * Returns whether the field has relation (one to many, many to many)
-     *
-     * @return bool
-     */
-    public function hasRelation()
-    {
-        return null !== $this->getForeignTable();
-    }
-
-    /**
-     * Returns whether the field has no relation (one to many, many to many)
-     *
-     * @return bool
-     */
-    public function hasNoRelation()
-    {
-        return !$this->hasRelation();
-    }
-
-    /**
-     * Returns whether the field has a "many" objects connected including "many-to-many" or "one-to-many".
-     *
-     * @return bool
-     */
-    public function hasMany()
-    {
-        $configuration = $this->getConfiguration();
-        return $this->hasRelation() && ($configuration['maxitems'] > 1 || isset($configuration['foreign_table_field']));
-    }
-
-    /**
-     * Returns whether the field has relation "one" object connected including of "one-to-one" or "many-to-one".
-     *
-     * @return bool
-     */
-    public function hasOne()
-    {
-        $configuration = $this->getConfiguration();
-        return !isset($configuration['MM']) && $this->hasRelation() && ($configuration['maxitems'] == 1 || !isset($configuration['maxitems']));
-    }
-
-    /**
-     * Returns whether the field has many-to-one relation.
-     *
-     * @return bool
-     */
-    public function hasRelationManyToOne()
-    {
-        $result = false;
-
-        $foreignField = $this->getForeignField();
-        if (!empty($foreignField)) {
-
-            // Load TCA service of the foreign field.
-            $foreignTable = $this->getForeignTable();
-            $result = $this->hasOne() && Tca::table($foreignTable)->field($foreignField)->hasMany();
-        }
-        return $result;
-    }
-
-    /**
-     * Returns whether the field has one-to-many relation.
-     *
-     * @return bool
-     */
-    public function hasRelationOneToMany()
-    {
-        $result = false;
-
-        $foreignField = $this->getForeignField();
-        if (!empty($foreignField)) {
-
-            // Load TCA service of the foreign field.
-            $foreignTable = $this->getForeignTable();
-            $result = $this->hasMany() && Tca::table($foreignTable)->field($foreignField)->hasOne();
-        }
-        return $result;
-    }
-
-    /**
-     * Returns whether the field has one-to-one relation.
-     *
-     * @return bool
-     */
-    public function hasRelationOneToOne()
-    {
-        $result = false;
-
-        $foreignField = $this->getForeignField();
-        if (!empty($foreignField)) {
-
-            // Load TCA service of foreign field.
-            $foreignTable = $this->getForeignTable();
-            $result = $this->hasOne() && Tca::table($foreignTable)->field($foreignField)->hasOne();
-        }
-        return $result;
-    }
-
-    /**
-     * Returns whether the field has many to many relation.
-     *
-     * @return bool
-     */
-    public function hasRelationManyToMany()
-    {
-        $configuration = $this->getConfiguration();
-        return $this->hasRelation() && (isset($configuration['MM']) || isset($configuration['foreign_table_field']));
-    }
-
-    /**
-     * Returns whether the field has many to many relation using comma separated values (legacy).
-     *
-     * @return bool
-     */
-    public function hasRelationWithCommaSeparatedValues()
-    {
-        $configuration = $this->getConfiguration();
-        return $this->hasRelation() && !isset($configuration['MM']) && !isset($configuration['foreign_field']) && $configuration['maxitems'] > 1;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTca()
-    {
-        return $this->tca['columns'];
-    }
-
-    /**
-     * @return string
-     */
-    public function getCompositeField()
-    {
-        return $this->compositeField;
-    }
-
-    /**
-     * @param string $compositeField
-     */
-    public function setCompositeField($compositeField)
-    {
-        $this->compositeField = $compositeField;
-    }
-
-    /**
-     * Returns an instance of the Frontend object.
-     *
-     * @return TypoScriptFrontendController
-     */
-    protected function getFrontendObject()
-    {
-        return $GLOBALS['TSFE'];
-    }
+	/**
+	 * @var string
+	 */
+	protected $fieldName;
+
+	/**
+	 * @var string
+	 */
+	protected $compositeField;
+
+	/**
+	 * @var string
+	 */
+	protected $tableName;
+
+	/**
+	 * @var array
+	 */
+	protected $tca;
+
+	/**
+	 * @param string $fieldName
+	 * @param array $tca
+	 * @param string $tableName
+	 * @param string $compositeField
+	 * @return \Fab\Vidi\Tca\FieldService
+	 */
+	public function __construct($fieldName, array $tca, $tableName, $compositeField = '')
+	{
+		$this->fieldName = $fieldName;
+		$this->tca = $tca;
+		$this->tableName = $tableName;
+		$this->compositeField = $compositeField;
+	}
+
+	/**
+	 * Tells whether the field is considered as system field, e.g. uid, crdate, tstamp, etc...
+	 *
+	 * @return bool
+	 */
+	public function isSystem()
+	{
+		return in_array($this->fieldName, Tca::getSystemFields());
+	}
+
+	/**
+	 * Tells the opposition of isSystem()
+	 *
+	 * @return bool
+	 */
+	public function isNotSystem()
+	{
+		return !$this->isSystem();
+	}
+
+	/**
+	 * Returns the configuration for a $field
+	 *
+	 * @throws \Exception
+	 * @return array
+	 */
+	public function getConfiguration()
+	{
+		return empty($this->tca['config']) ? [] : $this->tca['config'];
+	}
+
+	/**
+	 * Returns a key of the configuration.
+	 * If the key can not to be found, returns null.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		$configuration = $this->getConfiguration();
+		return empty($configuration[$key]) ? null : $configuration[$key];
+	}
+
+	/**
+	 * Returns the foreign field of a given field (opposite relational field).
+	 * If no relation exists, returns null.
+	 *
+	 * @return string|null
+	 */
+	public function getForeignField()
+	{
+		$result = null;
+		$configuration = $this->getConfiguration();
+
+		if (!empty($configuration['foreign_field'])) {
+			$result = $configuration['foreign_field'];
+		} elseif ($this->hasRelationManyToMany()) {
+
+			$foreignTable = $this->getForeignTable();
+			$manyToManyTable = $this->getManyToManyTable();
+
+			// Load TCA service of foreign field.
+			$tcaForeignTableService = Tca::table($foreignTable);
+
+			// Look into the MM relations checking for the opposite field
+			foreach ($tcaForeignTableService->getFields() as $fieldName) {
+				if ($manyToManyTable == $tcaForeignTableService->field($fieldName)->getManyToManyTable()) {
+					$result = $fieldName;
+					break;
+				}
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns the foreign table of a given field (opposite relational table).
+	 * If no relation exists, returns null.
+	 *
+	 * @return string|null
+	 */
+	public function getForeignTable()
+	{
+		$result = null;
+		$configuration = $this->getConfiguration();
+
+		if (!empty($configuration['foreign_table'])) {
+			$result = $configuration['foreign_table'];
+		} elseif ($this->isGroup()) {
+			$fieldParts = explode('.', $this->compositeField, 2);
+			$result = $fieldParts[1];
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns the foreign clause.
+	 * If no foreign order exists, returns empty string.
+	 *
+	 * @return string
+	 */
+	public function getForeignClause()
+	{
+		$result = '';
+		$configuration = $this->getConfiguration();
+
+		if (!empty($configuration['foreign_table_where'])) {
+			$parts = explode('ORDER BY', $configuration['foreign_table_where']);
+			if (!empty($parts[0])) {
+				$result = $parts[0];
+			}
+		}
+
+		// Substitute some variables
+		return $this->substituteKnownMarkers($result);
+	}
+
+	/**
+	 * Substitute some known markers from the where clause in the Frontend Context.
+	 *
+	 * @param string $clause
+	 * @return string
+	 */
+	protected function substituteKnownMarkers($clause)
+	{
+		if ($clause && $this->isFrontendMode()) {
+
+			$searches = array(
+				'###CURRENT_PID###',
+				'###REC_FIELD_sys_language_uid###'
+			);
+
+			$replaces = array(
+				$this->getFrontendObject()->id,
+				$this->getFrontendObject()->sys_language_uid,
+			);
+
+			$clause = str_replace($searches, $replaces, $clause);
+		}
+		return $clause;
+	}
+
+	/**
+	 * Returns the foreign order of the current field.
+	 * If no foreign order exists, returns empty string.
+	 *
+	 * @return string
+	 */
+	public function getForeignOrder()
+	{
+		$result = '';
+		$configuration = $this->getConfiguration();
+
+		if (!empty($configuration['foreign_table_where'])) {
+			$parts = explode('ORDER BY', $configuration['foreign_table_where']);
+			if (!empty($parts[1])) {
+				$result = $parts[1];
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns the MM table of a field.
+	 * If no relation exists, returns null.
+	 *
+	 * @return string|null
+	 */
+	public function getManyToManyTable()
+	{
+		$configuration = $this->getConfiguration();
+		return empty($configuration['MM']) ? null : $configuration['MM'];
+	}
+
+	/**
+	 * Returns a possible additional table name used in MM relations.
+	 * If no table name exists, returns null.
+	 *
+	 * @return string|null
+	 */
+	public function getAdditionalTableNameCondition()
+	{
+		$result = null;
+		$configuration = $this->getConfiguration();
+
+		if (!empty($configuration['MM_match_fields']['tablenames'])) {
+			$result = $configuration['MM_match_fields']['tablenames'];
+		} elseif ($this->isGroup()) {
+
+			// @todo check if $this->fieldName could be simply used as $result
+			$fieldParts = explode('.', $this->compositeField, 2);
+			$result = $fieldParts[1];
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Returns a possible additional conditions for MM tables such as "tablenames", "fieldname", etc...
+	 *
+	 * @return array
+	 */
+	public function getAdditionalMMCondition()
+	{
+		$additionalMMConditions = [];
+		$configuration = $this->getConfiguration();
+
+		if (!empty($configuration['MM_match_fields'])) {
+			$additionalMMConditions = $configuration['MM_match_fields'];
+		}
+
+		// Add in any case a table name for "group"
+		if ($this->isGroup()) {
+
+			// @todo check if $this->fieldName could be simply used as $result
+			$fieldParts = explode('.', $this->compositeField, 2);
+			$additionalMMConditions = array(
+				'tablenames' => $fieldParts[1],
+			);
+		}
+		return $additionalMMConditions;
+	}
+
+	/**
+	 * Returns whether the field name is the opposite in MM relation.
+	 *
+	 * @return bool
+	 */
+	public function isOppositeRelation()
+	{
+		$configuration = $this->getConfiguration();
+		return isset($configuration['MM_opposite_field']);
+	}
+
+	/**
+	 * Returns the configuration for a $field.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function getType()
+	{
+
+		if ($this->isSystem()) {
+			$fieldType = FieldType::NUMBER;
+		} else {
+			$configuration = $this->getConfiguration();
+
+			if (empty($configuration['type'])) {
+				throw new \Exception(sprintf('No field type found for "%s" in table "%s"', $this->fieldName, $this->tableName), 1385556627);
+			}
+
+			$fieldType = $configuration['type'];
+
+			if ($configuration['type'] === FieldType::SELECT && !empty($configuration['size']) && $configuration['size'] > 1) {
+				$fieldType = FieldType::MULTISELECT;
+			} elseif (!empty($configuration['foreign_table'])
+				&& ($configuration['foreign_table'] == 'sys_file_reference' || $configuration['foreign_table'] == 'sys_file')
+			) {
+				$fieldType = FieldType::FILE;
+			} elseif (!empty($configuration['eval'])) {
+				$parts = GeneralUtility::trimExplode(',', $configuration['eval']);
+				if (in_array('datetime', $parts)) {
+					$fieldType = FieldType::DATETIME;
+				} elseif (in_array('date', $parts)) {
+					$fieldType = FieldType::DATE;
+				} elseif (in_array('email', $parts)) {
+					$fieldType = FieldType::EMAIL;
+				} elseif (in_array('int', $parts) || in_array('double2', $parts)) {
+					$fieldType = FieldType::NUMBER;
+				}
+			}
+
+			// Do some legacy conversion
+			if ($fieldType === 'input') {
+				$fieldType = FieldType::TEXT;
+			} elseif ($fieldType === 'text') {
+				$fieldType = FieldType::TEXTAREA;
+			}
+		}
+		return $fieldType;
+	}
+
+	/**
+	 * Return the default value.
+	 *
+	 * @return bool
+	 */
+	public function getDefaultValue()
+	{
+		$configuration = $this->getConfiguration();
+		return isset($configuration['default']) ? $configuration['default'] : null;
+	}
+
+	/**
+	 * Get the translation of a label given a column.
+	 *
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		$label = '';
+		if ($this->hasLabel()) {
+			try {
+				$label = LocalizationUtility::translate($this->tca['label'], '');
+			} catch (\InvalidArgumentException $e) {
+			}
+			if (empty($label)) {
+				$label = $this->tca['label'];
+			}
+		}
+		return $label;
+	}
+
+	/**
+	 * Get the translation of a label given a column.
+	 *
+	 * @param string $itemValue the item value to search for.
+	 * @return string
+	 */
+	public function getLabelForItem($itemValue)
+	{
+
+		// Early return whether there is nothing to be translated as label.
+		if (is_null($itemValue)) {
+			return '';
+		} elseif (is_string($itemValue) && $itemValue === '') {
+			return $itemValue;
+		}
+
+		$configuration = $this->getConfiguration();
+		if (!empty($configuration['items']) && is_array($configuration['items'])) {
+			foreach ($configuration['items'] as $item) {
+				if ($item[1] == $itemValue) {
+					try {
+						$label = LocalizationUtility::translate($item[0], '');
+					} catch (\InvalidArgumentException $e) {
+					}
+					if (empty($label)) {
+						$label = $item[0];
+					}
+					break;
+				}
+			}
+		}
+
+		// Try fetching a label from a possible itemsProcFunc
+		if (!isset($label) && is_scalar($itemValue)) {
+			$items = $this->fetchItemsFromUserFunction();
+			if (!empty($items[$itemValue])) {
+				$label = $items[$itemValue];
+			}
+		}
+
+		// Returns a label if it has been found, otherwise returns the item value as fallback.
+		return isset($label) ? $label : $itemValue;
+	}
+
+	/**
+	 * Retrieve items from User Function.
+	 *
+	 * @return array
+	 */
+	protected function fetchItemsFromUserFunction()
+	{
+		$values = [];
+
+		$configuration = $this->getConfiguration();
+		if (!empty($configuration['itemsProcFunc'])) {
+			$parts = explode('php:', $configuration['itemsProcFunc']);
+			if (!empty($parts[1])) {
+
+				list($class, $method) = explode('->', $parts[1]);
+
+				$parameters['items'] = [];
+				$object = GeneralUtility::makeInstance($class);
+				$object->$method($parameters);
+
+				foreach ($parameters['items'] as $items) {
+					$values[$items[1]] = $items[0];
+				}
+			}
+		}
+		return $values;
+	}
+
+	/**
+	 * Get a possible icon given a field name an an item.
+	 *
+	 * @param string $itemValue the item value to search for.
+	 * @return string
+	 */
+	public function getIconForItem($itemValue)
+	{
+		$result = '';
+		$configuration = $this->getConfiguration();
+		if (!empty($configuration['items']) && is_array($configuration['items'])) {
+			foreach ($configuration['items'] as $item) {
+				if ($item[1] == $itemValue) {
+					$result = empty($item[2]) ? '' : $item[2];
+					break;
+				}
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns whether the field has a label.
+	 *
+	 * @return bool
+	 */
+	public function hasLabel()
+	{
+		return empty($this->tca['label']) ? false : true;
+	}
+
+	/**
+	 * Tell whether the current BE User has access to this field.
+	 *
+	 * @return bool
+	 */
+	public function hasAccess()
+	{
+		$hasAccess = true;
+		if ($this->isBackendMode()
+			&& Tca::table($this->tableName)->hasAccess()
+			&& isset($this->tca['exclude'])
+			&& $this->tca['exclude']
+		) {
+			$hasAccess = $this->getBackendUser()->check('non_exclude_fields', $this->tableName . ':' . $this->fieldName);
+		}
+		return $hasAccess;
+	}
+
+	/**
+	 * Returns whether the field is numerical.
+	 *
+	 * @return bool
+	 */
+	public function isNumerical()
+	{
+		$result = $this->isSystem();
+		if ($result === false) {
+			$configuration = $this->getConfiguration();
+			$parts = [];
+			if (!empty($configuration['eval'])) {
+				$parts = GeneralUtility::trimExplode(',', $configuration['eval']);
+			}
+			$result = in_array('int', $parts) || in_array('float', $parts);
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns whether the field is of type text area.
+	 *
+	 * @return bool
+	 */
+	public function isTextArea()
+	{
+		return $this->getType() === FieldType::TEXTAREA;
+	}
+	/**
+	 * Returns whether the field is of type text area.
+	 *
+	 * @return bool
+	 */
+	public function isText()
+	{
+		return $this->getType() === FieldType::TEXT;
+	}
+
+	/**
+	 * Returns whether the field is displayed as a tree.
+	 *
+	 * @return bool
+	 */
+	public function isRenderModeTree()
+	{
+		$configuration = $this->getConfiguration();
+		return isset($configuration['renderMode']) && $configuration['renderMode'] == FieldType::TREE;
+	}
+
+	/**
+	 * Returns whether the field is of type select.
+	 *
+	 * @return bool
+	 */
+	public function isSelect()
+	{
+		return $this->getType() === FieldType::SELECT;
+	}
+
+	/**
+	 * Returns whether the field is of type select.
+	 *
+	 * @return bool
+	 */
+	public function isMultipleSelect()
+	{
+		return $this->getType() === FieldType::MULTISELECT;
+	}
+
+	/**
+	 * Returns whether the field is of type select.
+	 *
+	 * @return bool
+	 */
+	public function isCheckBox()
+	{
+		return $this->getType() === FieldType::CHECKBOX;
+	}
+
+	/**
+	 * Returns whether the field is of type db.
+	 *
+	 * @return bool
+	 */
+	public function isGroup()
+	{
+		return $this->getType() === 'group';
+	}
+
+	/**
+	 * Returns whether the field is language aware.
+	 *
+	 * @return bool
+	 */
+	public function isLocalized()
+	{
+		$isLocalized = false;
+		if (isset($this->tca['l10n_mode'])) {
+
+			if ($this->tca['l10n_mode'] == 'prefixLangTitle' || $this->tca['l10n_mode'] == 'mergeIfNotBlank') {
+				$isLocalized = true;
+			}
+		}
+		return $isLocalized;
+	}
+
+	/**
+	 * Returns whether the field is required.
+	 *
+	 * @return bool
+	 */
+	public function isRequired()
+	{
+		$configuration = $this->getConfiguration();
+
+		$isRequired = false;
+		if (isset($configuration['minitems'])) {
+			// is required of a select?
+			$isRequired = $configuration['minitems'] == 1 ? true : false;
+		} elseif (isset($configuration['eval'])) {
+			$parts = GeneralUtility::trimExplode(',', $configuration['eval'], true);
+			$isRequired = in_array('required', $parts);
+		}
+		return $isRequired;
+	}
+
+	/**
+	 * Returns an array containing the configuration of a column.
+	 *
+	 * @return array
+	 */
+	public function getField()
+	{
+		return $this->tca;
+	}
+
+	/**
+	 * Returns the relation type
+	 *
+	 * @return string
+	 */
+	public function relationDataType()
+	{
+		$configuration = $this->getConfiguration();
+		return empty($configuration['foreign_table']) ? '' : $configuration['foreign_table'];
+	}
+
+	/**
+	 * Returns whether the field has relation (one to many, many to many)
+	 *
+	 * @return bool
+	 */
+	public function hasRelation()
+	{
+		return null !== $this->getForeignTable();
+	}
+
+	/**
+	 * Returns whether the field has no relation (one to many, many to many)
+	 *
+	 * @return bool
+	 */
+	public function hasNoRelation()
+	{
+		return !$this->hasRelation();
+	}
+
+	/**
+	 * Returns whether the field has a "many" objects connected including "many-to-many" or "one-to-many".
+	 *
+	 * @return bool
+	 */
+	public function hasMany()
+	{
+		$configuration = $this->getConfiguration();
+		return $this->hasRelation() && ($configuration['maxitems'] > 1 || isset($configuration['foreign_table_field']));
+	}
+
+	/**
+	 * Returns whether the field has relation "one" object connected including of "one-to-one" or "many-to-one".
+	 *
+	 * @return bool
+	 */
+	public function hasOne()
+	{
+		$configuration = $this->getConfiguration();
+		return !isset($configuration['MM']) && $this->hasRelation() && ($configuration['maxitems'] == 1 || !isset($configuration['maxitems']));
+	}
+
+	/**
+	 * Returns whether the field has many-to-one relation.
+	 *
+	 * @return bool
+	 */
+	public function hasRelationManyToOne()
+	{
+		$result = false;
+
+		$foreignField = $this->getForeignField();
+		if (!empty($foreignField)) {
+
+			// Load TCA service of the foreign field.
+			$foreignTable = $this->getForeignTable();
+			$result = $this->hasOne() && Tca::table($foreignTable)->field($foreignField)->hasMany();
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns whether the field has one-to-many relation.
+	 *
+	 * @return bool
+	 */
+	public function hasRelationOneToMany()
+	{
+		$result = false;
+
+		$foreignField = $this->getForeignField();
+		if (!empty($foreignField)) {
+
+			// Load TCA service of the foreign field.
+			$foreignTable = $this->getForeignTable();
+			$result = $this->hasMany() && Tca::table($foreignTable)->field($foreignField)->hasOne();
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns whether the field has one-to-one relation.
+	 *
+	 * @return bool
+	 */
+	public function hasRelationOneToOne()
+	{
+		$result = false;
+
+		$foreignField = $this->getForeignField();
+		if (!empty($foreignField)) {
+
+			// Load TCA service of foreign field.
+			$foreignTable = $this->getForeignTable();
+			$result = $this->hasOne() && Tca::table($foreignTable)->field($foreignField)->hasOne();
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns whether the field has many to many relation.
+	 *
+	 * @return bool
+	 */
+	public function hasRelationManyToMany()
+	{
+		$configuration = $this->getConfiguration();
+		return $this->hasRelation() && (isset($configuration['MM']) || isset($configuration['foreign_table_field']));
+	}
+
+	/**
+	 * Returns whether the field has many to many relation using comma separated values (legacy).
+	 *
+	 * @return bool
+	 */
+	public function hasRelationWithCommaSeparatedValues()
+	{
+		$configuration = $this->getConfiguration();
+		return $this->hasRelation() && !isset($configuration['MM']) && !isset($configuration['foreign_field']) && $configuration['maxitems'] > 1;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getTca()
+	{
+		return $this->tca['columns'];
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getCompositeField()
+	{
+		return $this->compositeField;
+	}
+
+	/**
+	 * @param string $compositeField
+	 */
+	public function setCompositeField($compositeField)
+	{
+		$this->compositeField = $compositeField;
+	}
+
+	/**
+	 * Returns an instance of the Frontend object.
+	 *
+	 * @return TypoScriptFrontendController
+	 */
+	protected function getFrontendObject()
+	{
+		return $GLOBALS['TSFE'];
+	}
 
 }

Classes/Tca/TableService.php

Spacing +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
     public function getDefaultOrderSql()
     {
         // "sortby" typically has "sorting" as value.
-        $order = $this->get('sortby') ? $this->get('sortby') . ' ASC' : $this->get('default_sortby');
+        $order = $this->get('sortby') ? $this->get('sortby').' ASC' : $this->get('default_sortby');
         return $order;
     }
 

Indentation +442 added lines, -442 removed lines

@@ -20,447 +20,447 @@
 class TableService extends AbstractTca
 {
 
-    /**
-     * @var array
-     */
-    protected $tca;
-
-    /**
-     * @var array
-     */
-    protected $columnTca;
-
-    /**
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * @var array
-     */
-    protected $instances;
-
-    /**
-     * @throws InvalidKeyInArrayException
-     * @param string $tableName
-     * @return \Fab\Vidi\Tca\TableService
-     */
-    public function __construct($tableName)
-    {
-        $this->tableName = $tableName;
-        if (empty($GLOBALS['TCA'][$this->tableName])) {
-            throw new InvalidKeyInArrayException(sprintf('No TCA existence for table "%s"', $this->tableName), 1356945106);
-        }
-        $this->tca = $GLOBALS['TCA'][$this->tableName]['ctrl'];
-        $this->columnTca = $GLOBALS['TCA'][$this->tableName]['columns'];
-    }
-
-    /**
-     * Tell whether the table has a label field.
-     *
-     * @throws InvalidKeyInArrayException
-     * @return string
-     */
-    public function hasLabelField()
-    {
-        return $this->has('label');
-    }
-
-    /**
-     * Get the label name of table name.
-     *
-     * @throws InvalidKeyInArrayException
-     * @return string
-     */
-    public function getLabelField()
-    {
-        $labelField = $this->get('label');
-        if (empty($labelField)) {
-            throw new InvalidKeyInArrayException(sprintf('No label configured for table "%s"', $this->tableName), 1385586726);
-        }
-        return $labelField;
-    }
-
-    /**
-     * Returns the translated label of the table name.
-     *
-     * @return string
-     */
-    public function getLabel()
-    {
-        $label = '';
-        try {
-            $label = LocalizationUtility::translate($this->getLabelField(), '');
-        } catch (\InvalidArgumentException $e) {
-        }
-        if (empty($label)) {
-            $label = $this->getLabelField();
-        }
-        return $label;
-    }
-
-    /**
-     * Returns the title of the table.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        $title = '';
-        try {
-            $title = LocalizationUtility::translate((string)$this->get('title'), '');
-        } catch (\InvalidArgumentException $e) {
-        }
-        if (empty($title)) {
-            $title = $this->get('title');
-        }
-        return $title;
-    }
-
-    /**
-     * Return the "disabled" field.
-     *
-     * @throws InvalidKeyInArrayException
-     * @return string|null
-     */
-    public function getHiddenField()
-    {
-        $hiddenField = null;
-        $enableColumns = $this->get('enablecolumns');
-        if (is_array($enableColumns) && !empty($enableColumns['disabled'])) {
-            $hiddenField = $enableColumns['disabled'];
-        }
-        return $hiddenField;
-    }
-
-    /**
-     * Return the "starttime" field.
-     *
-     * @throws InvalidKeyInArrayException
-     * @return string|null
-     */
-    public function getStartTimeField()
-    {
-        $startTimeField = null;
-        $enableColumns = $this->get('enablecolumns');
-        if (is_array($enableColumns) && !empty($enableColumns['starttime'])) {
-            $startTimeField = $enableColumns['starttime'];
-        }
-        return $startTimeField;
-    }
-
-    /**
-     * Return the "endtime" field.
-     *
-     * @throws InvalidKeyInArrayException
-     * @return string|null
-     */
-    public function getEndTimeField()
-    {
-        $endTimeField = null;
-        $enableColumns = $this->get('enablecolumns');
-        if (is_array($enableColumns) && !empty($enableColumns['endtime'])) {
-            $endTimeField = $enableColumns['endtime'];
-        }
-        return $endTimeField;
-    }
-
-    /**
-     * Tells whether the table is hidden.
-     *
-     * @return bool
-     */
-    public function isHidden()
-    {
-        return isset($this->tca['hideTable']) ? $this->tca['hideTable'] : false;
-    }
-
-    /**
-     * Tells whether the table is not hidden.
-     *
-     * @return bool
-     */
-    public function isNotHidden()
-    {
-        return !$this->isHidden();
-    }
-
-    /**
-     * Get the "deleted" field for the table.
-     *
-     * @return string|null
-     */
-    public function getDeletedField()
-    {
-        return $this->get('delete');
-    }
-
-    /**
-     * Get the modification time stamp field.
-     *
-     * @return string|null
-     */
-    public function getTimeModificationField()
-    {
-        return $this->get('tstamp');
-    }
-
-    /**
-     * Get the creation time stamp field.
-     *
-     * @return string|null
-     */
-    public function getTimeCreationField()
-    {
-        return $this->get('crdate');
-    }
-
-    /**
-     * Get the language field for the table.
-     *
-     * @return string|null
-     */
-    public function getLanguageField()
-    {
-        return $this->get('languageField');
-    }
-
-    /**
-     * Get the field which points to the parent.
-     *
-     * @return string|null
-     */
-    public function getLanguageParentField()
-    {
-        return $this->get('transOrigPointerField');
-    }
-
-    /**
-     * Returns the default order in the form of a SQL segment.
-     *
-     * @return string|null
-     */
-    public function getDefaultOrderSql()
-    {
-        // "sortby" typically has "sorting" as value.
-        $order = $this->get('sortby') ? $this->get('sortby') . ' ASC' : $this->get('default_sortby');
-        return $order;
-    }
-
-    /**
-     * Returns the parsed default orderings.
-     * Returns array looks like array('title' => 'ASC');
-     *
-     * @return array
-     */
-    public function getDefaultOrderings()
-    {
-
-        // first clean up the sql segment
-        $defaultOrder = str_replace('ORDER BY', '', $this->getDefaultOrderSql());
-        $defaultOrderParts = GeneralUtility::trimExplode(',', $defaultOrder, true);
-
-        $orderings = [];
-        foreach ($defaultOrderParts as $defaultOrderPart) {
-            $parts = GeneralUtility::trimExplode(' ', $defaultOrderPart);
-            if (empty($parts[1])) {
-                $parts[1] = QueryInterface::ORDER_DESCENDING;
-            }
-            $orderings[$parts[0]] = $parts[1];
-        }
-
-        return $orderings;
-    }
-
-    /**
-     * Returns the searchable fields.
-     *
-     * @return string|null
-     */
-    public function getSearchFields()
-    {
-        return $this->get('searchFields');
-    }
-
-    /**
-     * Returns an array containing the field names.
-     *
-     * @return array
-     */
-    public function getFields()
-    {
-        return array_keys($this->columnTca);
-    }
-
-    /**
-     * Returns an array containing the fields and their configuration.
-     *
-     * @return array
-     */
-    public function getFieldsAndConfiguration()
-    {
-        return $this->columnTca;
-    }
-
-    /**
-     * Tell whether we have a field "sorting".
-     *
-     * @return bool
-     */
-    public function hasSortableField()
-    {
-        return $this->has('sortby');
-    }
-
-    /**
-     * Tell whether the field exists or not.
-     *
-     * @param string $fieldName
-     * @return bool
-     */
-    public function hasField($fieldName)
-    {
-        if ($this->isComposite($fieldName)) {
-            $parts = explode('.', $fieldName);
-            list ($strippedFieldPath, $possibleTableName) = $parts;
-            $hasField = isset($this->columnTca[$strippedFieldPath], $GLOBALS['TCA'][$possibleTableName]);
-
-            // Continue checking that the $strippedFieldName is of type "group"
-            if (isset($GLOBALS['TCA'][$this->tableName]['columns'][$strippedFieldPath]) && count($parts) > 2) {
-                $hasField = Tca::table($this->tableName)->field($strippedFieldPath)->isGroup(); // Group
-            } elseif (isset($this->columnTca[$strippedFieldPath]['config']['readOnly']) && (bool)$this->columnTca[$strippedFieldPath]['config']['readOnly']) {
-                $hasField = false; // handle case metadata.fe_groups where "fe_groups" is a tableName.
-            }
-        } else {
-            $hasField = isset($this->columnTca[$fieldName]) || in_array($fieldName, Tca::getSystemFields(), true);
-        }
-        return $hasField;
-    }
-
-    /**
-     * Tell whether the field name contains a path, e.g. metadata.title
-     *
-     * @param string $fieldName
-     * @return boolean
-     */
-    public function isComposite($fieldName)
-    {
-        return strpos($fieldName, '.') > 0;
-    }
-
-    /**
-     * Tells whether the $key exists.
-     *
-     * @param string $key
-     * @return string
-     */
-    public function has($key)
-    {
-        return isset($this->tca[$key]);
-    }
-
-    /**
-     * Tells whether the table name has "workspace" support.
-     *
-     * @return string
-     */
-    public function hasWorkspaceSupport()
-    {
-        return isset($this->tca['versioningWS']);
-    }
-
-    /**
-     * Tells whether the table name has "language" support.
-     *
-     * @return string
-     */
-    public function hasLanguageSupport()
-    {
-        return isset($this->tca['languageField']);
-    }
-
-    /**
-     * Return configuration value given a key.
-     *
-     * @param string $key
-     * @return string|null
-     */
-    public function get($key)
-    {
-        return $this->has($key) ? $this->tca[$key] : null;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTca()
-    {
-        return $this->tca;
-    }
-
-    /**
-     * Tell whether the current BE User has access to this field.
-     *
-     * @return bool
-     */
-    public function hasAccess()
-    {
-        $hasAccess = true;
-        if ($this->isBackendMode()) {
-            $hasAccess = $this->getBackendUser()->check('tables_modify', $this->tableName);
-        }
-        return $hasAccess;
-    }
-
-    /**
-     * @param string $fieldName
-     * @throws \Exception
-     * @return FieldService
-     */
-    public function field($fieldName)
-    {
-
-        // In case field contains items.tx_table for field type "group"
-        $compositeField = '';
-        if (strpos($fieldName, '.') !== false) {
-            $compositeField = $fieldName;
-            $fieldParts = explode('.', $compositeField, 2);
-            $fieldName = $fieldParts[0];
-
-            // Special when field has been instantiated without the field name and path.
-            if (!empty($this->instances[$fieldName])) {
-                /** @var FieldService $field */
-                $field = $this->instances[$fieldName];
-                $field->setCompositeField($compositeField);
-            }
-        }
-
-        // True for system fields such as uid, pid that don't necessarily have a TCA.
-        if (empty($this->columnTca[$fieldName]) && in_array($fieldName, Tca::getSystemFields())) {
-            $this->columnTca[$fieldName] = [];
-        } elseif (empty($this->columnTca[$fieldName])) {
-            $message = sprintf(
-                'Does the field really exist? No TCA entry found for field "%s" for table "%s"',
-                $fieldName,
-                $this->tableName
-            );
-            throw new \Exception($message, 1385554481);
-        }
-
-
-        if (empty($this->instances[$fieldName])) {
-
-            $instance = GeneralUtility::makeInstance(
-                'Fab\Vidi\Tca\FieldService',
-                $fieldName,
-                $this->columnTca[$fieldName],
-                $this->tableName,
-                $compositeField
-            );
-
-            $this->instances[$fieldName] = $instance;
-        }
-        return $this->instances[$fieldName];
-    }
+	/**
+	 * @var array
+	 */
+	protected $tca;
+
+	/**
+	 * @var array
+	 */
+	protected $columnTca;
+
+	/**
+	 * @var string
+	 */
+	protected $tableName;
+
+	/**
+	 * @var array
+	 */
+	protected $instances;
+
+	/**
+	 * @throws InvalidKeyInArrayException
+	 * @param string $tableName
+	 * @return \Fab\Vidi\Tca\TableService
+	 */
+	public function __construct($tableName)
+	{
+		$this->tableName = $tableName;
+		if (empty($GLOBALS['TCA'][$this->tableName])) {
+			throw new InvalidKeyInArrayException(sprintf('No TCA existence for table "%s"', $this->tableName), 1356945106);
+		}
+		$this->tca = $GLOBALS['TCA'][$this->tableName]['ctrl'];
+		$this->columnTca = $GLOBALS['TCA'][$this->tableName]['columns'];
+	}
+
+	/**
+	 * Tell whether the table has a label field.
+	 *
+	 * @throws InvalidKeyInArrayException
+	 * @return string
+	 */
+	public function hasLabelField()
+	{
+		return $this->has('label');
+	}
+
+	/**
+	 * Get the label name of table name.
+	 *
+	 * @throws InvalidKeyInArrayException
+	 * @return string
+	 */
+	public function getLabelField()
+	{
+		$labelField = $this->get('label');
+		if (empty($labelField)) {
+			throw new InvalidKeyInArrayException(sprintf('No label configured for table "%s"', $this->tableName), 1385586726);
+		}
+		return $labelField;
+	}
+
+	/**
+	 * Returns the translated label of the table name.
+	 *
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		$label = '';
+		try {
+			$label = LocalizationUtility::translate($this->getLabelField(), '');
+		} catch (\InvalidArgumentException $e) {
+		}
+		if (empty($label)) {
+			$label = $this->getLabelField();
+		}
+		return $label;
+	}
+
+	/**
+	 * Returns the title of the table.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		$title = '';
+		try {
+			$title = LocalizationUtility::translate((string)$this->get('title'), '');
+		} catch (\InvalidArgumentException $e) {
+		}
+		if (empty($title)) {
+			$title = $this->get('title');
+		}
+		return $title;
+	}
+
+	/**
+	 * Return the "disabled" field.
+	 *
+	 * @throws InvalidKeyInArrayException
+	 * @return string|null
+	 */
+	public function getHiddenField()
+	{
+		$hiddenField = null;
+		$enableColumns = $this->get('enablecolumns');
+		if (is_array($enableColumns) && !empty($enableColumns['disabled'])) {
+			$hiddenField = $enableColumns['disabled'];
+		}
+		return $hiddenField;
+	}
+
+	/**
+	 * Return the "starttime" field.
+	 *
+	 * @throws InvalidKeyInArrayException
+	 * @return string|null
+	 */
+	public function getStartTimeField()
+	{
+		$startTimeField = null;
+		$enableColumns = $this->get('enablecolumns');
+		if (is_array($enableColumns) && !empty($enableColumns['starttime'])) {
+			$startTimeField = $enableColumns['starttime'];
+		}
+		return $startTimeField;
+	}
+
+	/**
+	 * Return the "endtime" field.
+	 *
+	 * @throws InvalidKeyInArrayException
+	 * @return string|null
+	 */
+	public function getEndTimeField()
+	{
+		$endTimeField = null;
+		$enableColumns = $this->get('enablecolumns');
+		if (is_array($enableColumns) && !empty($enableColumns['endtime'])) {
+			$endTimeField = $enableColumns['endtime'];
+		}
+		return $endTimeField;
+	}
+
+	/**
+	 * Tells whether the table is hidden.
+	 *
+	 * @return bool
+	 */
+	public function isHidden()
+	{
+		return isset($this->tca['hideTable']) ? $this->tca['hideTable'] : false;
+	}
+
+	/**
+	 * Tells whether the table is not hidden.
+	 *
+	 * @return bool
+	 */
+	public function isNotHidden()
+	{
+		return !$this->isHidden();
+	}
+
+	/**
+	 * Get the "deleted" field for the table.
+	 *
+	 * @return string|null
+	 */
+	public function getDeletedField()
+	{
+		return $this->get('delete');
+	}
+
+	/**
+	 * Get the modification time stamp field.
+	 *
+	 * @return string|null
+	 */
+	public function getTimeModificationField()
+	{
+		return $this->get('tstamp');
+	}
+
+	/**
+	 * Get the creation time stamp field.
+	 *
+	 * @return string|null
+	 */
+	public function getTimeCreationField()
+	{
+		return $this->get('crdate');
+	}
+
+	/**
+	 * Get the language field for the table.
+	 *
+	 * @return string|null
+	 */
+	public function getLanguageField()
+	{
+		return $this->get('languageField');
+	}
+
+	/**
+	 * Get the field which points to the parent.
+	 *
+	 * @return string|null
+	 */
+	public function getLanguageParentField()
+	{
+		return $this->get('transOrigPointerField');
+	}
+
+	/**
+	 * Returns the default order in the form of a SQL segment.
+	 *
+	 * @return string|null
+	 */
+	public function getDefaultOrderSql()
+	{
+		// "sortby" typically has "sorting" as value.
+		$order = $this->get('sortby') ? $this->get('sortby') . ' ASC' : $this->get('default_sortby');
+		return $order;
+	}
+
+	/**
+	 * Returns the parsed default orderings.
+	 * Returns array looks like array('title' => 'ASC');
+	 *
+	 * @return array
+	 */
+	public function getDefaultOrderings()
+	{
+
+		// first clean up the sql segment
+		$defaultOrder = str_replace('ORDER BY', '', $this->getDefaultOrderSql());
+		$defaultOrderParts = GeneralUtility::trimExplode(',', $defaultOrder, true);
+
+		$orderings = [];
+		foreach ($defaultOrderParts as $defaultOrderPart) {
+			$parts = GeneralUtility::trimExplode(' ', $defaultOrderPart);
+			if (empty($parts[1])) {
+				$parts[1] = QueryInterface::ORDER_DESCENDING;
+			}
+			$orderings[$parts[0]] = $parts[1];
+		}
+
+		return $orderings;
+	}
+
+	/**
+	 * Returns the searchable fields.
+	 *
+	 * @return string|null
+	 */
+	public function getSearchFields()
+	{
+		return $this->get('searchFields');
+	}
+
+	/**
+	 * Returns an array containing the field names.
+	 *
+	 * @return array
+	 */
+	public function getFields()
+	{
+		return array_keys($this->columnTca);
+	}
+
+	/**
+	 * Returns an array containing the fields and their configuration.
+	 *
+	 * @return array
+	 */
+	public function getFieldsAndConfiguration()
+	{
+		return $this->columnTca;
+	}
+
+	/**
+	 * Tell whether we have a field "sorting".
+	 *
+	 * @return bool
+	 */
+	public function hasSortableField()
+	{
+		return $this->has('sortby');
+	}
+
+	/**
+	 * Tell whether the field exists or not.
+	 *
+	 * @param string $fieldName
+	 * @return bool
+	 */
+	public function hasField($fieldName)
+	{
+		if ($this->isComposite($fieldName)) {
+			$parts = explode('.', $fieldName);
+			list ($strippedFieldPath, $possibleTableName) = $parts;
+			$hasField = isset($this->columnTca[$strippedFieldPath], $GLOBALS['TCA'][$possibleTableName]);
+
+			// Continue checking that the $strippedFieldName is of type "group"
+			if (isset($GLOBALS['TCA'][$this->tableName]['columns'][$strippedFieldPath]) && count($parts) > 2) {
+				$hasField = Tca::table($this->tableName)->field($strippedFieldPath)->isGroup(); // Group
+			} elseif (isset($this->columnTca[$strippedFieldPath]['config']['readOnly']) && (bool)$this->columnTca[$strippedFieldPath]['config']['readOnly']) {
+				$hasField = false; // handle case metadata.fe_groups where "fe_groups" is a tableName.
+			}
+		} else {
+			$hasField = isset($this->columnTca[$fieldName]) || in_array($fieldName, Tca::getSystemFields(), true);
+		}
+		return $hasField;
+	}
+
+	/**
+	 * Tell whether the field name contains a path, e.g. metadata.title
+	 *
+	 * @param string $fieldName
+	 * @return boolean
+	 */
+	public function isComposite($fieldName)
+	{
+		return strpos($fieldName, '.') > 0;
+	}
+
+	/**
+	 * Tells whether the $key exists.
+	 *
+	 * @param string $key
+	 * @return string
+	 */
+	public function has($key)
+	{
+		return isset($this->tca[$key]);
+	}
+
+	/**
+	 * Tells whether the table name has "workspace" support.
+	 *
+	 * @return string
+	 */
+	public function hasWorkspaceSupport()
+	{
+		return isset($this->tca['versioningWS']);
+	}
+
+	/**
+	 * Tells whether the table name has "language" support.
+	 *
+	 * @return string
+	 */
+	public function hasLanguageSupport()
+	{
+		return isset($this->tca['languageField']);
+	}
+
+	/**
+	 * Return configuration value given a key.
+	 *
+	 * @param string $key
+	 * @return string|null
+	 */
+	public function get($key)
+	{
+		return $this->has($key) ? $this->tca[$key] : null;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getTca()
+	{
+		return $this->tca;
+	}
+
+	/**
+	 * Tell whether the current BE User has access to this field.
+	 *
+	 * @return bool
+	 */
+	public function hasAccess()
+	{
+		$hasAccess = true;
+		if ($this->isBackendMode()) {
+			$hasAccess = $this->getBackendUser()->check('tables_modify', $this->tableName);
+		}
+		return $hasAccess;
+	}
+
+	/**
+	 * @param string $fieldName
+	 * @throws \Exception
+	 * @return FieldService
+	 */
+	public function field($fieldName)
+	{
+
+		// In case field contains items.tx_table for field type "group"
+		$compositeField = '';
+		if (strpos($fieldName, '.') !== false) {
+			$compositeField = $fieldName;
+			$fieldParts = explode('.', $compositeField, 2);
+			$fieldName = $fieldParts[0];
+
+			// Special when field has been instantiated without the field name and path.
+			if (!empty($this->instances[$fieldName])) {
+				/** @var FieldService $field */
+				$field = $this->instances[$fieldName];
+				$field->setCompositeField($compositeField);
+			}
+		}
+
+		// True for system fields such as uid, pid that don't necessarily have a TCA.
+		if (empty($this->columnTca[$fieldName]) && in_array($fieldName, Tca::getSystemFields())) {
+			$this->columnTca[$fieldName] = [];
+		} elseif (empty($this->columnTca[$fieldName])) {
+			$message = sprintf(
+				'Does the field really exist? No TCA entry found for field "%s" for table "%s"',
+				$fieldName,
+				$this->tableName
+			);
+			throw new \Exception($message, 1385554481);
+		}
+
+
+		if (empty($this->instances[$fieldName])) {
+
+			$instance = GeneralUtility::makeInstance(
+				'Fab\Vidi\Tca\FieldService',
+				$fieldName,
+				$this->columnTca[$fieldName],
+				$this->tableName,
+				$compositeField
+			);
+
+			$this->instances[$fieldName] = $instance;
+		}
+		return $this->instances[$fieldName];
+	}
 
 }

Classes/ViewHelpers/Grid/Column/ConfigurationViewHelper.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             // -------------------
             // mData: internal name of DataTable plugin and can not contains a path, e.g. metadata.title
             // columnName: whole field name with path
-            $output .= sprintf('Vidi._columns.push({ "data": "%s", "sortable": %s, "visible": %s, "width": "%s", "class": "%s", "columnName": "%s" });' . PHP_EOL,
+            $output .= sprintf('Vidi._columns.push({ "data": "%s", "sortable": %s, "visible": %s, "width": "%s", "class": "%s", "columnName": "%s" });'.PHP_EOL,
                 $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath), // Suitable field name for the DataTable plugin.
                 Tca::grid()->isSortable($fieldNameAndPath) ? 'true' : 'false',
                 Tca::grid()->isVisible($fieldNameAndPath) ? 'true' : 'false',

Indentation +55 added lines, -55 removed lines

@@ -19,67 +19,67 @@
 class ConfigurationViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Render the columns of the grid.
-     *
-     * @throws NotExistingFieldException
-     * @return string
-     */
-    public function render()
-    {
-        $output = '';
+	/**
+	 * Render the columns of the grid.
+	 *
+	 * @throws NotExistingFieldException
+	 * @return string
+	 */
+	public function render()
+	{
+		$output = '';
 
-        foreach (Tca::grid()->getFields() as $fieldNameAndPath => $configuration) {
+		foreach (Tca::grid()->getFields() as $fieldNameAndPath => $configuration) {
 
-            // Early failure if field does not exist.
-            if (!$this->isAllowed($fieldNameAndPath)) {
-                $message = sprintf('Property "%s" does not exist!', $fieldNameAndPath);
-                throw new NotExistingFieldException($message, 1375369594);
-            }
+			// Early failure if field does not exist.
+			if (!$this->isAllowed($fieldNameAndPath)) {
+				$message = sprintf('Property "%s" does not exist!', $fieldNameAndPath);
+				throw new NotExistingFieldException($message, 1375369594);
+			}
 
-            // mData vs columnName
-            // -------------------
-            // mData: internal name of DataTable plugin and can not contains a path, e.g. metadata.title
-            // columnName: whole field name with path
-            $output .= sprintf('Vidi._columns.push({ "data": "%s", "sortable": %s, "visible": %s, "width": "%s", "class": "%s", "columnName": "%s" });' . PHP_EOL,
-                $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath), // Suitable field name for the DataTable plugin.
-                Tca::grid()->isSortable($fieldNameAndPath) ? 'true' : 'false',
-                Tca::grid()->isVisible($fieldNameAndPath) ? 'true' : 'false',
-                Tca::grid()->getWidth($fieldNameAndPath),
-                Tca::grid()->getClass($fieldNameAndPath),
-                $fieldNameAndPath
-            );
-        }
+			// mData vs columnName
+			// -------------------
+			// mData: internal name of DataTable plugin and can not contains a path, e.g. metadata.title
+			// columnName: whole field name with path
+			$output .= sprintf('Vidi._columns.push({ "data": "%s", "sortable": %s, "visible": %s, "width": "%s", "class": "%s", "columnName": "%s" });' . PHP_EOL,
+				$this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath), // Suitable field name for the DataTable plugin.
+				Tca::grid()->isSortable($fieldNameAndPath) ? 'true' : 'false',
+				Tca::grid()->isVisible($fieldNameAndPath) ? 'true' : 'false',
+				Tca::grid()->getWidth($fieldNameAndPath),
+				Tca::grid()->getClass($fieldNameAndPath),
+				$fieldNameAndPath
+			);
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 
-    /**
-     * Tell whether the field looks ok to be displayed within the Grid.
-     *
-     * @param string $fieldNameAndPath
-     * @return boolean
-     */
-    protected function isAllowed($fieldNameAndPath)
-    {
-        $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
-        $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+	/**
+	 * Tell whether the field looks ok to be displayed within the Grid.
+	 *
+	 * @param string $fieldNameAndPath
+	 * @return boolean
+	 */
+	protected function isAllowed($fieldNameAndPath)
+	{
+		$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
+		$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
 
-        $isAllowed = false;
-        if (Tca::grid()->hasRenderers($fieldNameAndPath)) {
-            $isAllowed = true;
-        } elseif (Tca::table()->field($fieldNameAndPath)->isSystem() || Tca::table($dataType)->hasField($fieldName)) {
-            $isAllowed = true;
-        }
+		$isAllowed = false;
+		if (Tca::grid()->hasRenderers($fieldNameAndPath)) {
+			$isAllowed = true;
+		} elseif (Tca::table()->field($fieldNameAndPath)->isSystem() || Tca::table($dataType)->hasField($fieldName)) {
+			$isAllowed = true;
+		}
 
-        return $isAllowed;
-    }
+		return $isAllowed;
+	}
 
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
 }

Classes/ViewHelpers/Content/AbstractContentViewHelper.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     {
         $serializedMatches = serialize($matches);
         $serializedOrderings = serialize($orderings);
-        return md5($dataType . $serializedMatches . $serializedOrderings . $limit . $offset);
+        return md5($dataType.$serializedMatches.$serializedOrderings.$limit.$offset);
     }
 
     /**

Indentation +201 added lines, -201 removed lines

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