fabarea / vidi

Classes/Processor/ContentObjectProcessor.php

Indentation +112 added lines, -112 removed lines

@@ -23,116 +23,116 @@
  */
 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/Processor/MarkerProcessor.php

Indentation +94 added lines, -94 removed lines

@@ -20,109 +20,109 @@
  */
 class MarkerProcessor implements SingletonInterface
 {
-    /**
-     * @var array
-     */
-    protected $wellKnownMarkers = array(
-        '{*}',
-        '{counter}',
-        '{date}',
-        '{creation_date}'
-    );
+	/**
+	 * @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);
+	/**
+	 * @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();
+		// 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);
+				$updateValue = $this->searchAndReplace($updateValue, $currentValue);
+				$updateValue = $this->replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime);
 
-                $contentData[$fieldName] = $updateValue;
-            }
-        }
+				$contentData[$fieldName] = $updateValue;
+			}
+		}
 
-        $signalArguments->setContentData($contentData);
-        return array($signalArguments);
-    }
+		$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),
-        );
+	/**
+	 * @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);
-    }
+		// 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];
+	/**
+	 * @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;
-    }
+			// 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;
-    }
+	/**
+	 * @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);
-    }
+	/**
+	 * @return ContentObjectResolver
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance(ContentObjectResolver::class);
+	}
 }

Classes/Domain/Repository/SelectionRepository.php

Indentation +49 added lines, -49 removed lines

@@ -19,62 +19,62 @@
  */
 class SelectionRepository extends Repository
 {
-    /**
-     * @param string $dataType
-     * @return QueryResult
-     */
-    public function findByDataTypeForCurrentBackendUser($dataType)
-    {
-        $query = $this->createQuery();
+	/**
+	 * @param string $dataType
+	 * @return QueryResult
+	 */
+	public function findByDataTypeForCurrentBackendUser($dataType)
+	{
+		$query = $this->createQuery();
 
-        // Compute the OR part
-        if ($this->getBackendUser()->isAdmin()) {
-            $logicalOr = $query->logicalOr([$query->equals('visibility', Selection::VISIBILITY_EVERYONE), $query->equals('visibility', Selection::VISIBILITY_ADMIN_ONLY), $query->equals('cruser_id', $this->getBackendUser()->user['uid'])]);
-        } else {
-            $logicalOr = $query->logicalOr([$query->equals('visibility', Selection::VISIBILITY_EVERYONE), $query->equals('cruser_id', $this->getBackendUser()->user['uid'])]);
-        }
+		// Compute the OR part
+		if ($this->getBackendUser()->isAdmin()) {
+			$logicalOr = $query->logicalOr([$query->equals('visibility', Selection::VISIBILITY_EVERYONE), $query->equals('visibility', Selection::VISIBILITY_ADMIN_ONLY), $query->equals('cruser_id', $this->getBackendUser()->user['uid'])]);
+		} else {
+			$logicalOr = $query->logicalOr([$query->equals('visibility', Selection::VISIBILITY_EVERYONE), $query->equals('cruser_id', $this->getBackendUser()->user['uid'])]);
+		}
 
-        // Add matching criteria
-        $query->matching(
-            $query->logicalAnd([$query->equals('dataType', $dataType), $logicalOr])
-        );
+		// Add matching criteria
+		$query->matching(
+			$query->logicalAnd([$query->equals('dataType', $dataType), $logicalOr])
+		);
 
-        // Set ordering
-        $query->setOrderings(
-            array('name' => QueryInterface::ORDER_ASCENDING)
-        );
+		// Set ordering
+		$query->setOrderings(
+			array('name' => QueryInterface::ORDER_ASCENDING)
+		);
 
-        return $query->execute();
-    }
+		return $query->execute();
+	}
 
-    /**
-     * @param string $dataType
-     * @return QueryResult
-     */
-    public function findForEveryone($dataType)
-    {
-        $query = $this->createQuery();
+	/**
+	 * @param string $dataType
+	 * @return QueryResult
+	 */
+	public function findForEveryone($dataType)
+	{
+		$query = $this->createQuery();
 
-        // Add matching criteria
-        $query->matching(
-            $query->logicalAnd([$query->equals('dataType', $dataType), $query->equals('visibility', Selection::VISIBILITY_EVERYONE)])
-        );
+		// Add matching criteria
+		$query->matching(
+			$query->logicalAnd([$query->equals('dataType', $dataType), $query->equals('visibility', Selection::VISIBILITY_EVERYONE)])
+		);
 
-        // Set ordering
-        $query->setOrderings(
-            array('name' => QueryInterface::ORDER_ASCENDING)
-        );
+		// Set ordering
+		$query->setOrderings(
+			array('name' => QueryInterface::ORDER_ASCENDING)
+		);
 
-        return $query->execute();
-    }
+		return $query->execute();
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }

Classes/Domain/Repository/ContentRepository.php

Indentation +828 added lines, -828 removed lines

@@ -36,832 +36,832 @@
  */
 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);
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -215,7 +215,7 @@ 
             foreach ($order->getOrderings() as $ordering => $direction) {
                 if ($this->hasForeignRelationIn($ordering)) {
                     $relationalField = $this->getForeignRelationFrom($ordering);
-                    $matcher->like($relationalField . '.uid', '');
+                    $matcher->like($relationalField.'.uid', '');
                 }
             }
         }
@@ -444,16 +444,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;
     }
@@ -638,7 +638,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);
                 }
@@ -708,17 +708,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;
                     }
                 }
 
@@ -770,7 +770,7 @@ 
         $table = Tca::table($this->dataType);
         if ($table->field($fieldName)->isGroup()) {
             $valueParts = explode('.', $value, 2);
-            $fieldName = $fieldName . '.' . $valueParts[0];
+            $fieldName = $fieldName.'.'.$valueParts[0];
             $value = $valueParts[1];
         }
 

Classes/Domain/Repository/ContentRepositoryFactory.php

Indentation +33 added lines, -33 removed lines

@@ -17,41 +17,41 @@
  */
 class ContentRepositoryFactory implements SingletonInterface
 {
-    /**
-     * @var array
-     */
-    protected static $instances = [];
+	/**
+	 * @var array
+	 */
+	protected static $instances = [];
 
-    /**
-     * Returns a class instance of a repository.
-     * If not data type is given, get the value from the module loader.
-     *
-     * @param string $dataType
-     * @param string $sourceFieldName
-     * @return ContentRepository
-     */
-    public static function getInstance($dataType = null, $sourceFieldName = '')
-    {
-        /** @var ModuleLoader $moduleLoader */
-        if (is_null($dataType)) {
-            // Try to get the data type from the module loader.
-            $moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
-            $dataType = $moduleLoader->getDataType();
-        }
+	/**
+	 * Returns a class instance of a repository.
+	 * If not data type is given, get the value from the module loader.
+	 *
+	 * @param string $dataType
+	 * @param string $sourceFieldName
+	 * @return ContentRepository
+	 */
+	public static function getInstance($dataType = null, $sourceFieldName = '')
+	{
+		/** @var ModuleLoader $moduleLoader */
+		if (is_null($dataType)) {
+			// Try to get the data type from the module loader.
+			$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
+			$dataType = $moduleLoader->getDataType();
+		}
 
-        // This should not happen.
-        if (!$dataType) {
-            throw new \RuntimeException('No data type given nor could be fetched by the module loader.', 1376118278);
-        }
+		// This should not happen.
+		if (!$dataType) {
+			throw new \RuntimeException('No data type given nor could be fetched by the module loader.', 1376118278);
+		}
 
-        if (empty(self::$instances[$dataType])) {
-            $className = 'Fab\Vidi\Domain\Repository\ContentRepository';
-            self::$instances[$dataType] = GeneralUtility::makeInstance($className, $dataType, $sourceFieldName);
-        }
+		if (empty(self::$instances[$dataType])) {
+			$className = 'Fab\Vidi\Domain\Repository\ContentRepository';
+			self::$instances[$dataType] = GeneralUtility::makeInstance($className, $dataType, $sourceFieldName);
+		}
 
-        /** @var ContentRepository $contentRepository */
-        $contentRepository = self::$instances[$dataType];
-        $contentRepository->setSourceFieldName($sourceFieldName);
-        return $contentRepository;
-    }
+		/** @var ContentRepository $contentRepository */
+		$contentRepository = self::$instances[$dataType];
+		$contentRepository->setSourceFieldName($sourceFieldName);
+		return $contentRepository;
+	}
 }

Classes/Domain/Model/Selection.php

Indentation +141 added lines, -141 removed lines

@@ -16,145 +16,145 @@
  */
 class Selection extends AbstractEntity
 {
-    public const VISIBILITY_EVERYONE = 0;
-    public const VISIBILITY_PRIVATE = 1;
-    public const VISIBILITY_ADMIN_ONLY = 2;
-
-    /**
-     * @var int
-     */
-    protected $visibility;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var string
-     */
-    protected $query;
-
-    /**
-     * @var string
-     */
-    protected $speakingQuery;
-
-    /**
-     * @var int
-     */
-    protected $owner;
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType)
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType()
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * @param string $query
-     * @return $this
-     */
-    public function setQuery($query)
-    {
-        $this->query = $query;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getQuery()
-    {
-        return $this->query;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSpeakingQuery()
-    {
-        return $this->speakingQuery;
-    }
-
-    /**
-     * @param string $speakingQuery
-     * @return $this
-     */
-    public function setSpeakingQuery($speakingQuery)
-    {
-        $this->speakingQuery = $speakingQuery;
-        return $this;
-    }
-
-    /**
-     * @param string $name
-     * @return $this
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param int $visibility
-     * @return $this
-     */
-    public function setVisibility($visibility)
-    {
-        $this->visibility = $visibility;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getVisibility()
-    {
-        return $this->visibility;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOwner()
-    {
-        return $this->owner;
-    }
-
-    /**
-     * @param int $owner
-     * @return $this
-     */
-    public function setOwner($owner)
-    {
-        $this->owner = $owner;
-        return $this;
-    }
+	public const VISIBILITY_EVERYONE = 0;
+	public const VISIBILITY_PRIVATE = 1;
+	public const VISIBILITY_ADMIN_ONLY = 2;
+
+	/**
+	 * @var int
+	 */
+	protected $visibility;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var string
+	 */
+	protected $query;
+
+	/**
+	 * @var string
+	 */
+	protected $speakingQuery;
+
+	/**
+	 * @var int
+	 */
+	protected $owner;
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType)
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType()
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * @param string $query
+	 * @return $this
+	 */
+	public function setQuery($query)
+	{
+		$this->query = $query;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getQuery()
+	{
+		return $this->query;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSpeakingQuery()
+	{
+		return $this->speakingQuery;
+	}
+
+	/**
+	 * @param string $speakingQuery
+	 * @return $this
+	 */
+	public function setSpeakingQuery($speakingQuery)
+	{
+		$this->speakingQuery = $speakingQuery;
+		return $this;
+	}
+
+	/**
+	 * @param string $name
+	 * @return $this
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param int $visibility
+	 * @return $this
+	 */
+	public function setVisibility($visibility)
+	{
+		$this->visibility = $visibility;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getVisibility()
+	{
+		return $this->visibility;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getOwner()
+	{
+		return $this->owner;
+	}
+
+	/**
+	 * @param int $owner
+	 * @return $this
+	 */
+	public function setOwner($owner)
+	{
+		$this->owner = $owner;
+		return $this;
+	}
 }

Classes/Domain/Model/Content.php

Indentation +436 added lines, -436 removed lines

@@ -28,440 +28,440 @@
  */
 class Content implements \ArrayAccess
 {
-    /**
-     * @var int
-     */
-    protected $uid;
-
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * Constructor for a Content object.
-     *
-     * @param string $dataType will basically correspond to a table name, e.g fe_users, tt_content, ...
-     * @param array $contentData
-     * @return \Fab\Vidi\Domain\Model\Content
-     * @throws \InvalidArgumentException
-     * @throws NotExistingClassException
-     */
-    public function __construct($dataType, array $contentData = array())
-    {
-        $this->dataType = $dataType;
-        $this->uid = empty($contentData['uid']) ? null : (int)$contentData['uid'];
-
-        /** @var TableService $table */
-        $table = Tca::table($dataType);
-
-        // Initialize the array containing the allowed fields to be filled-in.
-        $fields = array('pid');
-
-        // If a creation time stamp has been defined for this data type.
-        if ($table->getTimeCreationField()) {
-            $fields[] = $table->getTimeCreationField();
-        }
-
-        // If an update time stamp has been defined for this data type.
-        if ($table->getTimeModificationField()) {
-            $fields[] = $table->getTimeModificationField();
-        }
-
-        // Merge the other fields allowed for this data type.
-        $fields = array_merge($fields, $table->getFields());
-
-        // Fetch excluded fields from the grid.
-        if ($this->isBackendMode()) {
-            $fields = $this->filterForConfiguration($fields);
-            $fields = $this->filterForBackendUser($fields);
-        }
-
-        // Get column to be displayed
-        foreach ($fields as $fieldName) {
-            if (array_key_exists($fieldName, $contentData)) {
-                $propertyName = Field::name($fieldName)->of($dataType)->toPropertyName();
-                $this->$propertyName = $contentData[$fieldName];
-            }
-        }
-    }
-
-    /**
-     * Dispatches magic methods (findBy[Property]())
-     *
-     * @param string $methodName The name of the magic method
-     * @param string $arguments The arguments of the magic method
-     * @throws UnsupportedMethodException
-     * @return mixed
-     * @api
-     */
-    public function __call($methodName, $arguments)
-    {
-        $value = null;
-        if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
-
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-            $field = Tca::table($this->dataType)->field($fieldName);
-
-            $value = $this->$propertyName;
-
-            // true means it is a relation and it is not yet resolved.
-            if ($this->hasRelation($propertyName) && is_scalar($this->$propertyName)) {
-                $value = $this->resolveRelation($propertyName);
-            } elseif ($field->getType() === FieldType::RADIO || $field->getType() === FieldType::SELECT) {
-                // Attempt to convert the value into a label for radio and select fields.
-                $label = Tca::table($this->getDataType())->field($fieldName)->getLabelForItem($value);
-                if ($label) {
-                    $value = $label;
-                }
-            }
-        } elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
-            $this->$propertyName = $arguments[0];
-        }
-        return $value;
-    }
-
-    /**
-     * Tell whether the property has a relation.
-     *
-     * @param string $propertyName
-     * @return bool
-     */
-    protected function hasRelation($propertyName)
-    {
-        $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-        return Tca::table($this->dataType)->field($fieldName)->hasRelation();
-    }
-
-    /**
-     * Try to "resolve" the property whether it has a relation.
-     * If the property has not relation it simply returns the same value.
-     *
-     * @throws \RuntimeException
-     * @param string $propertyName
-     * @return mixed
-     */
-    protected function resolveRelation($propertyName)
-    {
-        // Convert property name to field name and get the foreign data type.
-        $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-        $foreignDataType = Tca::table($this->dataType)->field($fieldName)->relationDataType();
-
-        // Get the foreign repository instance form the factory
-        /** @var ContentRepository $foreignContentRepository */
-        $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType, $fieldName);
-
-        if (Tca::table($this->dataType)->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
-            // Fetch values from repository
-            $values = GeneralUtility::trimExplode(',', $this->$propertyName);
-            $this->$propertyName = $foreignContentRepository->findIn('uid', $values);
-        } elseif (Tca::table($this->dataType)->field($fieldName)->hasMany()) {
-            // Include relation many-to-many and one-to-many
-            // Tca::table($this->dataType)->field($fieldName)->hasRelationOneToMany()
-            // Tca::table($this->dataType)->field($fieldName)->hasRelationManyToMany()
-
-            $foreignFieldName = Tca::table($this->dataType)->field($fieldName)->getForeignField();
-            if (empty($foreignFieldName)) {
-                $message = sprintf(
-                    'Missing "foreign_field" key for field "%s" in table "%s".',
-                    $fieldName,
-                    $this->dataType
-                );
-                throw new \RuntimeException($message, 1376149186);
-            }
-
-            // Fetch values from repository.
-            $foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
-            $findByProperty = 'findBy' . ucfirst($foreignPropertyName);
-
-            // Date picker (type == group) are special fields because property path must contain the table name
-            // to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
-            $propertyValue = $this->uid;
-            if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
-                $propertyValue = $this->dataType . '.' . $this->uid;
-            }
-
-            $this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
-        } elseif (Tca::table($this->dataType)->field($fieldName)->hasOne()) {
-            $fieldConfiguration = Tca::table($this->dataType)->field($fieldName)->getConfiguration();
-
-            // First case, we are on the "good side" of the relation, just query the repository
-            if (empty($fieldConfiguration['foreign_field'])) {
-                $this->$propertyName = $foreignContentRepository->findByUid($this->$propertyName);
-            } else {
-                // Second case, we are the "bad side" of the relation, query the foreign repository
-                // e.g. in case of one-to-one relation.
-
-                // We must query the opposite side to get the identifier of the foreign object.
-                $foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
-                $foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
-                $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
-                $find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
-
-                /** @var Content $foreignObject */
-                $this->$propertyName = $foreignContentRepository->$find($this->getUid());
-            }
-        }
-        return $this->$propertyName;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUid()
-    {
-        return $this->uid;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType()
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * Whether a offset exists
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     * @param mixed $offset
-     * @return boolean true on success or false on failure.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function offsetExists($offset)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        return isset($this->$offset);
-    }
-
-    /**
-     * Offset to retrieve
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     * @param mixed $offset
-     * @return mixed Can return all value types.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function offsetGet($offset)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        $getter = 'get' . ucfirst($offset);
-        return $this->$getter();
-    }
-
-    /**
-     * Offset to set
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     * @param mixed $offset
-     * @param mixed $value
-     * @return $this
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function offsetSet($offset, $value)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        $setter = 'set' . ucfirst($offset);
-        $this->$setter($value);
-        return $this;
-    }
-
-    /**
-     * Offset to unset
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     * @param mixed $offset
-     * @throws NotImplementedException
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        $message = 'Un-setting value for Array object is not supported';
-        throw new NotImplementedException($message, 1376132306);
-    }
-
-    /**
-     * Convert this to array
-     *
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function toArray()
-    {
-        $result['uid'] = $this->uid;
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-            $result[$fieldName] = $value;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert this object to an array containing the resolved values.
-     *
-     * @param bool $resolveRelations
-     * @return array
-     * @throws \Exception
-     */
-    public function toValues($resolveRelations = true)
-    {
-        $result['uid'] = $this->uid;
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-
-            $result[$fieldName] = $value;
-            if ($resolveRelations) {
-                $field = Tca::table($this->dataType)->field($fieldName);
-
-                $resolvedValue = '';
-                if ($field->getType() === FieldType::FILE) {
-                    if ($field->hasMany()) {
-                        $files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
-
-                        $resolvedValue = [];
-                        foreach ($files as $file) {
-                            $resolvedValue[] = $file->getIdentifier();
-                        }
-                    } else {
-                        $files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
-                        if (!empty($files)) {
-                            $resolvedValue = current($files)->getIdentifier();
-                        }
-                    }
-
-                    // Reset value
-                    $result[$fieldName] = $resolvedValue;
-                } elseif (Tca::table($this->dataType)->field($fieldName)->hasRelation()) {
-                    $objects = $this[$fieldName];
-                    if (is_array($objects)) {
-                        $resolvedValue = [];
-                        foreach ($objects as $object) {
-                            /** @var $object Content */
-                            $labelField = Tca::table($object->getDataType())->getLabelField();
-                            $resolvedValue[] = $object[$labelField];
-                        }
-                    } elseif ($objects instanceof Content) {
-                        $labelField = Tca::table($objects->getDataType())->getLabelField();
-                        $resolvedValue = $objects[$labelField];
-                    }
-
-                    // Reset value
-                    $result[$fieldName] = $resolvedValue;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Return the properties of this object.
-     *
-     * @return array
-     */
-    public function toProperties()
-    {
-        $result[] = 'uid';
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $result[] = $propertyName;
-        }
-        return $result;
-    }
-
-    /**
-     * Return the properties of this object.
-     *
-     * @return array
-     */
-    public function toFields()
-    {
-        $result[] = 'uid';
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $result[] = Property::name($propertyName)->of($this)->toFieldName();
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $labelField = Tca::table($this->dataType)->getLabelField();
-        return $this[$labelField];
-    }
-
-    /**
-     * Remove fields according to BE User permission.
-     *
-     * @param $fields
-     * @return array
-     * @throws \Exception
-     */
-    protected function filterForBackendUser($fields)
-    {
-        if (!$this->getBackendUser()->isAdmin()) {
-            foreach ($fields as $key => $fieldName) {
-                if (Tca::table($this->dataType)->hasField($fieldName) && !Tca::table($this->dataType)->field($fieldName)->hasAccess()) {
-                    unset($fields[$key]);
-                }
-            }
-        }
-        return $fields;
-    }
-
-    /**
-     * Remove fields according to Grid configuration.
-     *
-     * @param $fields
-     * @return array
-     */
-    protected function filterForConfiguration($fields)
-    {
-        $excludedFields = Tca::grid($this->dataType)->getExcludedFields();
-        foreach ($fields as $key => $field) {
-            if (in_array($field, $excludedFields)) {
-                unset($fields[$key]);
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Returns whether the current mode is Backend
-     *
-     * @return bool
-     */
-    protected function isBackendMode()
-    {
-        return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
-        ;
-    }
+	/**
+	 * @var int
+	 */
+	protected $uid;
+
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * Constructor for a Content object.
+	 *
+	 * @param string $dataType will basically correspond to a table name, e.g fe_users, tt_content, ...
+	 * @param array $contentData
+	 * @return \Fab\Vidi\Domain\Model\Content
+	 * @throws \InvalidArgumentException
+	 * @throws NotExistingClassException
+	 */
+	public function __construct($dataType, array $contentData = array())
+	{
+		$this->dataType = $dataType;
+		$this->uid = empty($contentData['uid']) ? null : (int)$contentData['uid'];
+
+		/** @var TableService $table */
+		$table = Tca::table($dataType);
+
+		// Initialize the array containing the allowed fields to be filled-in.
+		$fields = array('pid');
+
+		// If a creation time stamp has been defined for this data type.
+		if ($table->getTimeCreationField()) {
+			$fields[] = $table->getTimeCreationField();
+		}
+
+		// If an update time stamp has been defined for this data type.
+		if ($table->getTimeModificationField()) {
+			$fields[] = $table->getTimeModificationField();
+		}
+
+		// Merge the other fields allowed for this data type.
+		$fields = array_merge($fields, $table->getFields());
+
+		// Fetch excluded fields from the grid.
+		if ($this->isBackendMode()) {
+			$fields = $this->filterForConfiguration($fields);
+			$fields = $this->filterForBackendUser($fields);
+		}
+
+		// Get column to be displayed
+		foreach ($fields as $fieldName) {
+			if (array_key_exists($fieldName, $contentData)) {
+				$propertyName = Field::name($fieldName)->of($dataType)->toPropertyName();
+				$this->$propertyName = $contentData[$fieldName];
+			}
+		}
+	}
+
+	/**
+	 * Dispatches magic methods (findBy[Property]())
+	 *
+	 * @param string $methodName The name of the magic method
+	 * @param string $arguments The arguments of the magic method
+	 * @throws UnsupportedMethodException
+	 * @return mixed
+	 * @api
+	 */
+	public function __call($methodName, $arguments)
+	{
+		$value = null;
+		if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
+			$propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+			$field = Tca::table($this->dataType)->field($fieldName);
+
+			$value = $this->$propertyName;
+
+			// true means it is a relation and it is not yet resolved.
+			if ($this->hasRelation($propertyName) && is_scalar($this->$propertyName)) {
+				$value = $this->resolveRelation($propertyName);
+			} elseif ($field->getType() === FieldType::RADIO || $field->getType() === FieldType::SELECT) {
+				// Attempt to convert the value into a label for radio and select fields.
+				$label = Tca::table($this->getDataType())->field($fieldName)->getLabelForItem($value);
+				if ($label) {
+					$value = $label;
+				}
+			}
+		} elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
+			$propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+			$this->$propertyName = $arguments[0];
+		}
+		return $value;
+	}
+
+	/**
+	 * Tell whether the property has a relation.
+	 *
+	 * @param string $propertyName
+	 * @return bool
+	 */
+	protected function hasRelation($propertyName)
+	{
+		$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+		return Tca::table($this->dataType)->field($fieldName)->hasRelation();
+	}
+
+	/**
+	 * Try to "resolve" the property whether it has a relation.
+	 * If the property has not relation it simply returns the same value.
+	 *
+	 * @throws \RuntimeException
+	 * @param string $propertyName
+	 * @return mixed
+	 */
+	protected function resolveRelation($propertyName)
+	{
+		// Convert property name to field name and get the foreign data type.
+		$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+		$foreignDataType = Tca::table($this->dataType)->field($fieldName)->relationDataType();
+
+		// Get the foreign repository instance form the factory
+		/** @var ContentRepository $foreignContentRepository */
+		$foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType, $fieldName);
+
+		if (Tca::table($this->dataType)->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
+			// Fetch values from repository
+			$values = GeneralUtility::trimExplode(',', $this->$propertyName);
+			$this->$propertyName = $foreignContentRepository->findIn('uid', $values);
+		} elseif (Tca::table($this->dataType)->field($fieldName)->hasMany()) {
+			// Include relation many-to-many and one-to-many
+			// Tca::table($this->dataType)->field($fieldName)->hasRelationOneToMany()
+			// Tca::table($this->dataType)->field($fieldName)->hasRelationManyToMany()
+
+			$foreignFieldName = Tca::table($this->dataType)->field($fieldName)->getForeignField();
+			if (empty($foreignFieldName)) {
+				$message = sprintf(
+					'Missing "foreign_field" key for field "%s" in table "%s".',
+					$fieldName,
+					$this->dataType
+				);
+				throw new \RuntimeException($message, 1376149186);
+			}
+
+			// Fetch values from repository.
+			$foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
+			$findByProperty = 'findBy' . ucfirst($foreignPropertyName);
+
+			// Date picker (type == group) are special fields because property path must contain the table name
+			// to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
+			$propertyValue = $this->uid;
+			if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
+				$propertyValue = $this->dataType . '.' . $this->uid;
+			}
+
+			$this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
+		} elseif (Tca::table($this->dataType)->field($fieldName)->hasOne()) {
+			$fieldConfiguration = Tca::table($this->dataType)->field($fieldName)->getConfiguration();
+
+			// First case, we are on the "good side" of the relation, just query the repository
+			if (empty($fieldConfiguration['foreign_field'])) {
+				$this->$propertyName = $foreignContentRepository->findByUid($this->$propertyName);
+			} else {
+				// Second case, we are the "bad side" of the relation, query the foreign repository
+				// e.g. in case of one-to-one relation.
+
+				// We must query the opposite side to get the identifier of the foreign object.
+				$foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
+				$foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
+				$foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
+				$find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
+
+				/** @var Content $foreignObject */
+				$this->$propertyName = $foreignContentRepository->$find($this->getUid());
+			}
+		}
+		return $this->$propertyName;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUid()
+	{
+		return $this->uid;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType()
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * Whether a offset exists
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 * @param mixed $offset
+	 * @return boolean true on success or false on failure.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function offsetExists($offset)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		return isset($this->$offset);
+	}
+
+	/**
+	 * Offset to retrieve
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 * @param mixed $offset
+	 * @return mixed Can return all value types.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function offsetGet($offset)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		$getter = 'get' . ucfirst($offset);
+		return $this->$getter();
+	}
+
+	/**
+	 * Offset to set
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 * @param mixed $offset
+	 * @param mixed $value
+	 * @return $this
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		$setter = 'set' . ucfirst($offset);
+		$this->$setter($value);
+		return $this;
+	}
+
+	/**
+	 * Offset to unset
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 * @param mixed $offset
+	 * @throws NotImplementedException
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		$message = 'Un-setting value for Array object is not supported';
+		throw new NotImplementedException($message, 1376132306);
+	}
+
+	/**
+	 * Convert this to array
+	 *
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function toArray()
+	{
+		$result['uid'] = $this->uid;
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+			$result[$fieldName] = $value;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Convert this object to an array containing the resolved values.
+	 *
+	 * @param bool $resolveRelations
+	 * @return array
+	 * @throws \Exception
+	 */
+	public function toValues($resolveRelations = true)
+	{
+		$result['uid'] = $this->uid;
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+
+			$result[$fieldName] = $value;
+			if ($resolveRelations) {
+				$field = Tca::table($this->dataType)->field($fieldName);
+
+				$resolvedValue = '';
+				if ($field->getType() === FieldType::FILE) {
+					if ($field->hasMany()) {
+						$files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
+
+						$resolvedValue = [];
+						foreach ($files as $file) {
+							$resolvedValue[] = $file->getIdentifier();
+						}
+					} else {
+						$files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
+						if (!empty($files)) {
+							$resolvedValue = current($files)->getIdentifier();
+						}
+					}
+
+					// Reset value
+					$result[$fieldName] = $resolvedValue;
+				} elseif (Tca::table($this->dataType)->field($fieldName)->hasRelation()) {
+					$objects = $this[$fieldName];
+					if (is_array($objects)) {
+						$resolvedValue = [];
+						foreach ($objects as $object) {
+							/** @var $object Content */
+							$labelField = Tca::table($object->getDataType())->getLabelField();
+							$resolvedValue[] = $object[$labelField];
+						}
+					} elseif ($objects instanceof Content) {
+						$labelField = Tca::table($objects->getDataType())->getLabelField();
+						$resolvedValue = $objects[$labelField];
+					}
+
+					// Reset value
+					$result[$fieldName] = $resolvedValue;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Return the properties of this object.
+	 *
+	 * @return array
+	 */
+	public function toProperties()
+	{
+		$result[] = 'uid';
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$result[] = $propertyName;
+		}
+		return $result;
+	}
+
+	/**
+	 * Return the properties of this object.
+	 *
+	 * @return array
+	 */
+	public function toFields()
+	{
+		$result[] = 'uid';
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$result[] = Property::name($propertyName)->of($this)->toFieldName();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		$labelField = Tca::table($this->dataType)->getLabelField();
+		return $this[$labelField];
+	}
+
+	/**
+	 * Remove fields according to BE User permission.
+	 *
+	 * @param $fields
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function filterForBackendUser($fields)
+	{
+		if (!$this->getBackendUser()->isAdmin()) {
+			foreach ($fields as $key => $fieldName) {
+				if (Tca::table($this->dataType)->hasField($fieldName) && !Tca::table($this->dataType)->field($fieldName)->hasAccess()) {
+					unset($fields[$key]);
+				}
+			}
+		}
+		return $fields;
+	}
+
+	/**
+	 * Remove fields according to Grid configuration.
+	 *
+	 * @param $fields
+	 * @return array
+	 */
+	protected function filterForConfiguration($fields)
+	{
+		$excludedFields = Tca::grid($this->dataType)->getExcludedFields();
+		foreach ($fields as $key => $field) {
+			if (in_array($field, $excludedFields)) {
+				unset($fields[$key]);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Returns whether the current mode is Backend
+	 *
+	 * @return bool
+	 */
+	protected function isBackendMode()
+	{
+		return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend();
+		;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -99,7 +99,7 @@ 
     {
         $value = null;
         if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)).substr(substr($methodName, 3), 1);
 
             $fieldName = Property::name($propertyName)->of($this)->toFieldName();
             $field = Tca::table($this->dataType)->field($fieldName);
@@ -117,7 +117,7 @@ 
                 }
             }
         } elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)).substr(substr($methodName, 3), 1);
             $this->$propertyName = $arguments[0];
         }
         return $value;
@@ -174,13 +174,13 @@ 
 
             // Fetch values from repository.
             $foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
-            $findByProperty = 'findBy' . ucfirst($foreignPropertyName);
+            $findByProperty = 'findBy'.ucfirst($foreignPropertyName);
 
             // Date picker (type == group) are special fields because property path must contain the table name
             // to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
             $propertyValue = $this->uid;
             if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
-                $propertyValue = $this->dataType . '.' . $this->uid;
+                $propertyValue = $this->dataType.'.'.$this->uid;
             }
 
             $this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
@@ -198,7 +198,7 @@ 
                 $foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
                 $foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
                 $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
-                $find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
+                $find = 'findOneBy'.GeneralUtility::underscoredToUpperCamelCase($foreignField);
 
                 /** @var Content $foreignObject */
                 $this->$propertyName = $foreignContentRepository->$find($this->getUid());
@@ -250,7 +250,7 @@ 
     public function offsetGet($offset)
     {
         $offset = Field::name($offset)->of($this)->toPropertyName();
-        $getter = 'get' . ucfirst($offset);
+        $getter = 'get'.ucfirst($offset);
         return $this->$getter();
     }
 
@@ -267,7 +267,7 @@ 
     public function offsetSet($offset, $value)
     {
         $offset = Field::name($offset)->of($this)->toPropertyName();
-        $setter = 'set' . ucfirst($offset);
+        $setter = 'set'.ucfirst($offset);
         $this->$setter($value);
         return $this;
     }

Classes/Domain/Validator/LanguageValidator.php

Indentation +20 added lines, -20 removed lines

@@ -16,25 +16,25 @@
  */
 class LanguageValidator
 {
-    /**
-     * 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);
-        }
-    }
+	/**
+	 * 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);
+		}
+	}
 
-    /**
-     * @return LanguageService|object
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(LanguageService::class);
-    }
+	/**
+	 * @return LanguageService|object
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(LanguageService::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public function validate($language)
     {
         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);
         }
     }
 

Classes/Domain/Validator/MatchesValidator.php

Indentation +15 added lines, -15 removed lines

@@ -17,19 +17,19 @@
  */
 class MatchesValidator extends AbstractValidator
 {
-    /**
-     * Check if $matches is valid. If it is not valid, throw an exception.
-     *
-     * @param mixed $matches
-     * @return void
-     */
-    public function isValid($matches)
-    {
-        foreach ($matches as $fieldName => $value) {
-            if (!Tca::table()->hasField($fieldName)) {
-                $message = sprintf('Field "%s" is not allowed. Actually, it is not configured in the TCA.', $fieldName);
-                $this->addError($message, 1380019718);
-            }
-        }
-    }
+	/**
+	 * Check if $matches is valid. If it is not valid, throw an exception.
+	 *
+	 * @param mixed $matches
+	 * @return void
+	 */
+	public function isValid($matches)
+	{
+		foreach ($matches as $fieldName => $value) {
+			if (!Tca::table()->hasField($fieldName)) {
+				$message = sprintf('Field "%s" is not allowed. Actually, it is not configured in the TCA.', $fieldName);
+				$this->addError($message, 1380019718);
+			}
+		}
+	}
 }