fabarea / vidi

Classes/DataHandler/CoreDataHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
      *
      * @param Content $content
      * @param string $target
-     * @return bool
+     * @return boolean|null
      */
     public function processCopy(Content $content, $target)
     {

Indentation +135 added lines, -135 removed lines

@@ -18,140 +18,140 @@
 class CoreDataHandler extends AbstractDataHandler
 {
 
-    /**
-     * @var array
-     */
-    protected $dataHandler;
-
-    /**
-     * Process Content with action "update".
-     *
-     * @param Content $content
-     * @throws \Exception
-     * @return bool
-     */
-    public function processUpdate(Content $content)
-    {
-
-        $values = [];
-
-        // Check the field to be updated exists
-        foreach ($content->toArray() as $fieldName => $value) {
-            if (!Tca::table($content->getDataType())->hasField($fieldName)) {
-                $message = sprintf('It looks field "%s" does not exist for data type "%s"', $fieldName, $content->getDataType());
-                throw new \Exception($message, 1390668497);
-            }
-
-            // Flatten value if array given which is required for the DataHandler.
-            if (is_array($value)) {
-                $value = implode(',', $value);
-            }
-            $values[$fieldName] = $value;
-        }
-
-        $data[$content->getDataType()][$content->getUid()] = $values;
-
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start($data, array());
-        $dataHandler->process_datamap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * Process Content with action "remove".
-     *
-     * @param Content $content
-     * @return bool
-     */
-    public function processRemove(Content $content)
-    {
-
-        // Build command
-        $cmd[$content->getDataType()][$content->getUid()]['delete'] = 1;
-
-        /** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start([], $cmd);
-        $dataHandler->process_datamap();
-        $dataHandler->process_cmdmap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * Process Content with action "copy".
-     *
-     * @param Content $content
-     * @param string $target
-     * @return bool
-     */
-    public function processCopy(Content $content, $target)
-    {
-        // TODO: Implement processCopy() method.
-    }
-
-    /**
-     * Process Content with action "move".
-     * 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 int $target corresponds
-     * @return bool
-     */
-    public function processMove(Content $content, $target)
-    {
-
-        // Build command
-        $cmd[$content->getDataType()][$content->getUid()]['move'] = $target;
-
-        /** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start([], $cmd);
-        $dataHandler->process_datamap();
-        $dataHandler->process_cmdmap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * Process Content with action "localize".
-     *
-     * @param Content $content
-     * @param int $language
-     * @return bool
-     */
-    public function processLocalize(Content $content, $language)
-    {
-
-        $command[$content->getDataType()][$content->getUid()]['localize'] = $language;
-
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start([], $command);
-        $dataHandler->process_datamap();
-        $dataHandler->process_cmdmap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\DataHandling\DataHandler
-     */
-    protected function getDataHandler()
-    {
-        if (!$this->dataHandler) {
-            $this->dataHandler = GeneralUtility::makeInstance('TYPO3\CMS\Core\DataHandling\DataHandler');
-        }
-        return $this->dataHandler;
-    }
+	/**
+	 * @var array
+	 */
+	protected $dataHandler;
+
+	/**
+	 * Process Content with action "update".
+	 *
+	 * @param Content $content
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processUpdate(Content $content)
+	{
+
+		$values = [];
+
+		// Check the field to be updated exists
+		foreach ($content->toArray() as $fieldName => $value) {
+			if (!Tca::table($content->getDataType())->hasField($fieldName)) {
+				$message = sprintf('It looks field "%s" does not exist for data type "%s"', $fieldName, $content->getDataType());
+				throw new \Exception($message, 1390668497);
+			}
+
+			// Flatten value if array given which is required for the DataHandler.
+			if (is_array($value)) {
+				$value = implode(',', $value);
+			}
+			$values[$fieldName] = $value;
+		}
+
+		$data[$content->getDataType()][$content->getUid()] = $values;
+
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start($data, array());
+		$dataHandler->process_datamap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * Process Content with action "remove".
+	 *
+	 * @param Content $content
+	 * @return bool
+	 */
+	public function processRemove(Content $content)
+	{
+
+		// Build command
+		$cmd[$content->getDataType()][$content->getUid()]['delete'] = 1;
+
+		/** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start([], $cmd);
+		$dataHandler->process_datamap();
+		$dataHandler->process_cmdmap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * Process Content with action "copy".
+	 *
+	 * @param Content $content
+	 * @param string $target
+	 * @return bool
+	 */
+	public function processCopy(Content $content, $target)
+	{
+		// TODO: Implement processCopy() method.
+	}
+
+	/**
+	 * Process Content with action "move".
+	 * 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 int $target corresponds
+	 * @return bool
+	 */
+	public function processMove(Content $content, $target)
+	{
+
+		// Build command
+		$cmd[$content->getDataType()][$content->getUid()]['move'] = $target;
+
+		/** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start([], $cmd);
+		$dataHandler->process_datamap();
+		$dataHandler->process_cmdmap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * Process Content with action "localize".
+	 *
+	 * @param Content $content
+	 * @param int $language
+	 * @return bool
+	 */
+	public function processLocalize(Content $content, $language)
+	{
+
+		$command[$content->getDataType()][$content->getUid()]['localize'] = $language;
+
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start([], $command);
+		$dataHandler->process_datamap();
+		$dataHandler->process_cmdmap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\DataHandling\DataHandler
+	 */
+	protected function getDataHandler()
+	{
+		if (!$this->dataHandler) {
+			$this->dataHandler = GeneralUtility::makeInstance('TYPO3\CMS\Core\DataHandling\DataHandler');
+		}
+		return $this->dataHandler;
+	}
 
 }

Classes/Domain/Model/Content.php

Doc Comments +1 added lines, -1 removed lines

@@ -385,7 +385,7 @@
     /**
      * Return the properties of this object.
      *
-     * @return array
+     * @return string[]
      */
     public function toFields()
     {

Indentation +445 added lines, -445 removed lines

@@ -23,450 +23,450 @@
 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 \Fab\Vidi\Exception\NotExistingClassException
-     */
-    public function __construct($dataType, array $contentData = array())
-    {
-
-        $this->dataType = $dataType;
-        $this->uid = empty($contentData['uid']) ? null : (int)$contentData['uid'];
-
-        /** @var \Fab\Vidi\Tca\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 \TYPO3\CMS\Extbase\Persistence\Generic\Exception\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 \Fab\Vidi\Domain\Repository\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 \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Returns whether the current mode is Backend
-     *
-     * @return bool
-     */
-    protected function isBackendMode()
-    {
-        return TYPO3_MODE === 'BE';
-    }
+	/**
+	 * @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 \Fab\Vidi\Exception\NotExistingClassException
+	 */
+	public function __construct($dataType, array $contentData = array())
+	{
+
+		$this->dataType = $dataType;
+		$this->uid = empty($contentData['uid']) ? null : (int)$contentData['uid'];
+
+		/** @var \Fab\Vidi\Tca\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 \TYPO3\CMS\Extbase\Persistence\Generic\Exception\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 \Fab\Vidi\Domain\Repository\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 \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Returns whether the current mode is Backend
+	 *
+	 * @return bool
+	 */
+	protected function isBackendMode()
+	{
+		return TYPO3_MODE === 'BE';
+	}
 
 }

Spacing +7 added lines, -7 removed lines

@@ -95,7 +95,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);
@@ -115,7 +115,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;
@@ -173,13 +173,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);
@@ -199,7 +199,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());
@@ -252,7 +252,7 @@ 
     public function offsetGet($offset)
     {
         $offset = Field::name($offset)->of($this)->toPropertyName();
-        $getter = 'get' . ucfirst($offset);
+        $getter = 'get'.ucfirst($offset);
         return $this->$getter();
     }
 
@@ -269,7 +269,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/Grid/GridAnalyserService.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
      *
      * @param string $tableName
      * @param string $fieldName
-     * @return array
+     * @return string[]
      */
     protected function checkRelationManyToMany($tableName, $fieldName)
     {
@@ -115,7 +115,7 @@ 
      * @param string $tableName
      * @param string $fieldName
      * @param string $relationType
-     * @return array
+     * @return string[]
      */
     protected function checkRelationOf($tableName, $fieldName, $relationType)
     {

Indentation +102 added lines, -102 removed lines

@@ -16,114 +16,114 @@
 class GridAnalyserService
 {
 
-    /**
-     * Check relation for table.
-     *
-     * @param $tableName
-     * @return array
-     */
-    public function checkRelationForTable($tableName)
-    {
+	/**
+	 * Check relation for table.
+	 *
+	 * @param $tableName
+	 * @return array
+	 */
+	public function checkRelationForTable($tableName)
+	{
 
-        $relations = [];
-        $table = Tca::table($tableName);
+		$relations = [];
+		$table = Tca::table($tableName);
 
-        $missingOppositionRelationMessage = <<<EOF
+		$missingOppositionRelationMessage = <<<EOF
 
   WARNING! Could not define relation precisely. This is not necessarily a problem
   if the opposite relation is not required in a Grid. But consider adding the opposite
   TCA configuration if so.
 EOF;
 
-        foreach (Tca::grid($tableName)->getFields() as $fieldName => $configuration) {
-
-            if ($table->hasField($fieldName)) {
-                if ($table->field($fieldName)->hasMany()) {
-                    if ($table->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
-                        $_relations = $this->checkRelationOf($tableName, $fieldName, 'comma separated values');
-                        $relations = array_merge($relations, $_relations);
-                    } elseif ($table->field($fieldName)->hasRelationManyToMany()) {
-                        $_relations = $this->checkRelationManyToMany($tableName, $fieldName);
-                        $relations = array_merge($relations, $_relations);
-
-                    } elseif ($table->field($fieldName)->hasRelationOneToMany()) {
-                        $_relations = $this->checkRelationOf($tableName, $fieldName, 'one-to-many');
-                        $relations = array_merge($relations, $_relations);
-                    } else {
-                        $relations[] = sprintf('* field: "%s", relation: ?-to-many%s', $fieldName, $missingOppositionRelationMessage);
-                    }
-                    $relations[] = '';
-                } elseif ($table->field($fieldName)->hasOne()) {
-
-                    if ($table->field($fieldName)->hasRelationOneToOne()) {
-                        $relations[] = sprintf('* one-to-one "%s"', $fieldName);
-                    } elseif ($table->field($fieldName)->hasRelationManyToOne()) {
-                        $_relations = $this->checkRelationOf($tableName, $fieldName, 'many-to-one');
-                        $relations = array_merge($relations, $_relations);
-                    } else {
-                        $relations[] = sprintf('* field: "%s", relation: ?-to-one%s', $fieldName, $missingOppositionRelationMessage);
-                    }
-                    $relations[] = '';
-                }
-            }
-        }
-        return $relations;
-    }
-
-    /**
-     * Convenience method for printing out relation many-to-many.
-     *
-     * @param string $tableName
-     * @param string $fieldName
-     * @return array
-     */
-    protected function checkRelationManyToMany($tableName, $fieldName)
-    {
-
-        $output = [];
-
-        $table = Tca::table($tableName);
-        $output[] = sprintf('* field: "%s", relation: many-to-many', $fieldName);
-
-        $foreignTable = $table->field($fieldName)->getForeignTable();
-        $manyToManyTable = $table->field($fieldName)->getManyToManyTable();
-        $foreignField = $table->field($fieldName)->getForeignField();
-
-        if (!$foreignField) {
-            $output[] = sprintf('  ERROR! Can not found foreign field for "%s". Perhaps missing opposite configuration?', $fieldName);
-        } elseif (!$foreignTable) {
-            $output[] = sprintf('  ERROR! Can not found foreign table for "%s". Perhaps missing opposite configuration?', $fieldName);
-        } elseif (!$manyToManyTable) {
-            $output[] = sprintf('  ERROR! Can not found relation table (MM) for "%s". Perhaps missing opposite configuration?', $fieldName);
-        } else {
-            $output[] = sprintf('  %s.%s <--> %s <--> %s.%s', $tableName, $fieldName, $manyToManyTable, $foreignTable, $foreignField);
-        }
-
-        $output[] = '';
-        return $output;
-    }
-
-    /**
-     * Convenience method for printing out relation.
-     *
-     * @param string $tableName
-     * @param string $fieldName
-     * @param string $relationType
-     * @return array
-     */
-    protected function checkRelationOf($tableName, $fieldName, $relationType)
-    {
-
-        $output = [];
-
-        $table = Tca::table($tableName);
-        $output[] = sprintf('* field: "%s", relation: %s', $fieldName, $relationType);
-
-        $foreignTable = $table->field($fieldName)->getForeignTable();
-        $foreignField = $table->field($fieldName)->getForeignField();
-        $output[] = sprintf('  %s.%s <--> %s.%s', $tableName, $fieldName, $foreignTable, $foreignField);
-        $output[] = '';
-
-        return $output;
-    }
+		foreach (Tca::grid($tableName)->getFields() as $fieldName => $configuration) {
+
+			if ($table->hasField($fieldName)) {
+				if ($table->field($fieldName)->hasMany()) {
+					if ($table->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
+						$_relations = $this->checkRelationOf($tableName, $fieldName, 'comma separated values');
+						$relations = array_merge($relations, $_relations);
+					} elseif ($table->field($fieldName)->hasRelationManyToMany()) {
+						$_relations = $this->checkRelationManyToMany($tableName, $fieldName);
+						$relations = array_merge($relations, $_relations);
+
+					} elseif ($table->field($fieldName)->hasRelationOneToMany()) {
+						$_relations = $this->checkRelationOf($tableName, $fieldName, 'one-to-many');
+						$relations = array_merge($relations, $_relations);
+					} else {
+						$relations[] = sprintf('* field: "%s", relation: ?-to-many%s', $fieldName, $missingOppositionRelationMessage);
+					}
+					$relations[] = '';
+				} elseif ($table->field($fieldName)->hasOne()) {
+
+					if ($table->field($fieldName)->hasRelationOneToOne()) {
+						$relations[] = sprintf('* one-to-one "%s"', $fieldName);
+					} elseif ($table->field($fieldName)->hasRelationManyToOne()) {
+						$_relations = $this->checkRelationOf($tableName, $fieldName, 'many-to-one');
+						$relations = array_merge($relations, $_relations);
+					} else {
+						$relations[] = sprintf('* field: "%s", relation: ?-to-one%s', $fieldName, $missingOppositionRelationMessage);
+					}
+					$relations[] = '';
+				}
+			}
+		}
+		return $relations;
+	}
+
+	/**
+	 * Convenience method for printing out relation many-to-many.
+	 *
+	 * @param string $tableName
+	 * @param string $fieldName
+	 * @return array
+	 */
+	protected function checkRelationManyToMany($tableName, $fieldName)
+	{
+
+		$output = [];
+
+		$table = Tca::table($tableName);
+		$output[] = sprintf('* field: "%s", relation: many-to-many', $fieldName);
+
+		$foreignTable = $table->field($fieldName)->getForeignTable();
+		$manyToManyTable = $table->field($fieldName)->getManyToManyTable();
+		$foreignField = $table->field($fieldName)->getForeignField();
+
+		if (!$foreignField) {
+			$output[] = sprintf('  ERROR! Can not found foreign field for "%s". Perhaps missing opposite configuration?', $fieldName);
+		} elseif (!$foreignTable) {
+			$output[] = sprintf('  ERROR! Can not found foreign table for "%s". Perhaps missing opposite configuration?', $fieldName);
+		} elseif (!$manyToManyTable) {
+			$output[] = sprintf('  ERROR! Can not found relation table (MM) for "%s". Perhaps missing opposite configuration?', $fieldName);
+		} else {
+			$output[] = sprintf('  %s.%s <--> %s <--> %s.%s', $tableName, $fieldName, $manyToManyTable, $foreignTable, $foreignField);
+		}
+
+		$output[] = '';
+		return $output;
+	}
+
+	/**
+	 * Convenience method for printing out relation.
+	 *
+	 * @param string $tableName
+	 * @param string $fieldName
+	 * @param string $relationType
+	 * @return array
+	 */
+	protected function checkRelationOf($tableName, $fieldName, $relationType)
+	{
+
+		$output = [];
+
+		$table = Tca::table($tableName);
+		$output[] = sprintf('* field: "%s", relation: %s', $fieldName, $relationType);
+
+		$foreignTable = $table->field($fieldName)->getForeignTable();
+		$foreignField = $table->field($fieldName)->getForeignField();
+		$output[] = sprintf('  %s.%s <--> %s.%s', $tableName, $fieldName, $foreignTable, $foreignField);
+		$output[] = '';
+
+		return $output;
+	}
 }

Classes/Language/LanguageService.php

Doc Comments +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
      *
      * @param Content $object
      * @param int $language
-     * @return string
+     * @return boolean
      */
     public function hasLocalization(Content $object, $language)
     {

Indentation +173 added lines, -173 removed lines

@@ -19,178 +19,178 @@
 class LanguageService implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $languages;
-
-    /**
-     * @var array
-     */
-    protected $defaultIcon;
-
-    /**
-     * Store the localized records to boost up performance.
-     *
-     * @var array
-     */
-    protected $localizedRecordStorage;
-
-    /**
-     * Returns available language records.
-     * The method stores the records in the property to speed up the process as the method can be often called.
-     *
-     * @return array
-     */
-    public function getLanguages()
-    {
-        if (is_null($this->languages)) {
-
-            $tableName = 'sys_language';
-
-            $clause = '1 = 1';
-            $clause .= BackendUtility::deleteClause($tableName);
-            $clause .= BackendUtility::BEenableFields($tableName);
-            $this->languages = $this->getDatabaseConnection()->exec_SELECTgetRows('*', $tableName, $clause);
-        }
-        return $this->languages;
-    }
-
-    /**
-     * Returns a localized record according to a Content object and a language identifier.
-     * Notice! This method does not overlay anything but simply returns the raw localized record.
-     *
-     * @param Content $object
-     * @param int $language
-     * @return Content
-     */
-    public function getLocalizedContent(Content $object, $language)
-    {
-
-        // We want to cache data per Content object. Retrieve the Object hash.
-        $objectHash = spl_object_hash($object);
-
-        // Initialize the storage
-        if (empty($this->localizedRecordStorage[$objectHash])) {
-            $this->localizedRecordStorage[$objectHash] = [];
-        }
-
-        if (empty($this->localizedRecordStorage[$objectHash][$language])) {
-
-            $clause = sprintf('%s = %s AND %s = %s',
-                Tca::table($object)->getLanguageParentField(), // e.g. l10n_parent
-                $object->getUid(),
-                Tca::table($object)->getLanguageField(), // e.g. sys_language_uid
-                $language
-            );
-
-            $clause .= BackendUtility::deleteClause($object->getDataType());
-            $localizedRecord = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', $object->getDataType(), $clause);
-
-            if ($localizedRecord) {
-                $localizedContent = GeneralUtility::makeInstance('Fab\Vidi\Domain\Model\Content', $object->getDataType(), $localizedRecord);
-                $this->localizedRecordStorage[$objectHash][$language] = $localizedContent;
-            } else {
-                $this->localizedRecordStorage[$objectHash][$language] = []; // We want an array at least, even if empty.
-            }
-        }
-
-        return $this->localizedRecordStorage[$objectHash][$language];
-    }
-
-    /**
-     * Tell whether the given Content object has a localization.
-     *
-     * @param Content $object
-     * @param int $language
-     * @return string
-     */
-    public function hasLocalization(Content $object, $language)
-    {
-        $localizedRecord = $this->getLocalizedContent($object, $language);
-        return !empty($localizedRecord);
-    }
-
-    /**
-     * Returns a localized field according to a Content object and a language identifier.
-     * Notice! If there is not translation, simply returns an empty string.
-     *
-     * @param Content $object
-     * @param int $language
-     * @param string $fieldName
-     * @return string
-     */
-    public function getLocalizedFieldName(Content $object, $language, $fieldName)
-    {
-        $localizedRecord = $this->getLocalizedContent($object, $language);
-        return empty($localizedRecord) ? '' : $localizedRecord[$fieldName];
-    }
-
-    /**
-     * Returns the default language configured by TSConfig.
-     *
-     * @return array
-     */
-    public function getDefaultFlag()
-    {
-
-        if (is_null($this->defaultIcon)) {
-
-            $defaultFlag = ''; // default value
-
-            $tsConfig = BackendUtility::getModTSconfig(0, 'mod.SHARED');
-
-            // Fallback non sprite-configuration
-            if (($pos = strrpos($tsConfig['properties']['defaultLanguageFlag'], '.')) !== false) {
-                $defaultFlag = substr($tsConfig['properties']['defaultLanguageFlag'], 0, $pos);
-            }
-
-            $this->defaultIcon = $defaultFlag;
-        }
-
-        return $this->defaultIcon;
-    }
-
-    /**
-     * Returns whether the system includes language records.
-     *
-     * @return bool
-     */
-    public function hasLanguages()
-    {
-        $languages = $this->getLanguages();
-        return !empty($languages);
-    }
-
-    /**
-     * Tell whether the given language exists.
-     *
-     * @param int $language
-     * @return bool
-     */
-    public function languageExists($language)
-    {
-        $languages = $this->getLanguages();
-
-        $LanguageExists = false;
-        foreach ($languages as $_language) {
-            if ((int)$_language['uid'] === (int)$language) {
-                $LanguageExists = true;
-                break;
-            }
-        }
-
-        return $LanguageExists;
-    }
-
-    /**
-     * Returns a pointer to the database.
-     *
-     * @return \TYPO3\CMS\Core\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * @var array
+	 */
+	protected $languages;
+
+	/**
+	 * @var array
+	 */
+	protected $defaultIcon;
+
+	/**
+	 * Store the localized records to boost up performance.
+	 *
+	 * @var array
+	 */
+	protected $localizedRecordStorage;
+
+	/**
+	 * Returns available language records.
+	 * The method stores the records in the property to speed up the process as the method can be often called.
+	 *
+	 * @return array
+	 */
+	public function getLanguages()
+	{
+		if (is_null($this->languages)) {
+
+			$tableName = 'sys_language';
+
+			$clause = '1 = 1';
+			$clause .= BackendUtility::deleteClause($tableName);
+			$clause .= BackendUtility::BEenableFields($tableName);
+			$this->languages = $this->getDatabaseConnection()->exec_SELECTgetRows('*', $tableName, $clause);
+		}
+		return $this->languages;
+	}
+
+	/**
+	 * Returns a localized record according to a Content object and a language identifier.
+	 * Notice! This method does not overlay anything but simply returns the raw localized record.
+	 *
+	 * @param Content $object
+	 * @param int $language
+	 * @return Content
+	 */
+	public function getLocalizedContent(Content $object, $language)
+	{
+
+		// We want to cache data per Content object. Retrieve the Object hash.
+		$objectHash = spl_object_hash($object);
+
+		// Initialize the storage
+		if (empty($this->localizedRecordStorage[$objectHash])) {
+			$this->localizedRecordStorage[$objectHash] = [];
+		}
+
+		if (empty($this->localizedRecordStorage[$objectHash][$language])) {
+
+			$clause = sprintf('%s = %s AND %s = %s',
+				Tca::table($object)->getLanguageParentField(), // e.g. l10n_parent
+				$object->getUid(),
+				Tca::table($object)->getLanguageField(), // e.g. sys_language_uid
+				$language
+			);
+
+			$clause .= BackendUtility::deleteClause($object->getDataType());
+			$localizedRecord = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', $object->getDataType(), $clause);
+
+			if ($localizedRecord) {
+				$localizedContent = GeneralUtility::makeInstance('Fab\Vidi\Domain\Model\Content', $object->getDataType(), $localizedRecord);
+				$this->localizedRecordStorage[$objectHash][$language] = $localizedContent;
+			} else {
+				$this->localizedRecordStorage[$objectHash][$language] = []; // We want an array at least, even if empty.
+			}
+		}
+
+		return $this->localizedRecordStorage[$objectHash][$language];
+	}
+
+	/**
+	 * Tell whether the given Content object has a localization.
+	 *
+	 * @param Content $object
+	 * @param int $language
+	 * @return string
+	 */
+	public function hasLocalization(Content $object, $language)
+	{
+		$localizedRecord = $this->getLocalizedContent($object, $language);
+		return !empty($localizedRecord);
+	}
+
+	/**
+	 * Returns a localized field according to a Content object and a language identifier.
+	 * Notice! If there is not translation, simply returns an empty string.
+	 *
+	 * @param Content $object
+	 * @param int $language
+	 * @param string $fieldName
+	 * @return string
+	 */
+	public function getLocalizedFieldName(Content $object, $language, $fieldName)
+	{
+		$localizedRecord = $this->getLocalizedContent($object, $language);
+		return empty($localizedRecord) ? '' : $localizedRecord[$fieldName];
+	}
+
+	/**
+	 * Returns the default language configured by TSConfig.
+	 *
+	 * @return array
+	 */
+	public function getDefaultFlag()
+	{
+
+		if (is_null($this->defaultIcon)) {
+
+			$defaultFlag = ''; // default value
+
+			$tsConfig = BackendUtility::getModTSconfig(0, 'mod.SHARED');
+
+			// Fallback non sprite-configuration
+			if (($pos = strrpos($tsConfig['properties']['defaultLanguageFlag'], '.')) !== false) {
+				$defaultFlag = substr($tsConfig['properties']['defaultLanguageFlag'], 0, $pos);
+			}
+
+			$this->defaultIcon = $defaultFlag;
+		}
+
+		return $this->defaultIcon;
+	}
+
+	/**
+	 * Returns whether the system includes language records.
+	 *
+	 * @return bool
+	 */
+	public function hasLanguages()
+	{
+		$languages = $this->getLanguages();
+		return !empty($languages);
+	}
+
+	/**
+	 * Tell whether the given language exists.
+	 *
+	 * @param int $language
+	 * @return bool
+	 */
+	public function languageExists($language)
+	{
+		$languages = $this->getLanguages();
+
+		$LanguageExists = false;
+		foreach ($languages as $_language) {
+			if ((int)$_language['uid'] === (int)$language) {
+				$LanguageExists = true;
+				break;
+			}
+		}
+
+		return $LanguageExists;
+	}
+
+	/**
+	 * Returns a pointer to the database.
+	 *
+	 * @return \TYPO3\CMS\Core\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 
 }

Classes/Persistence/Matcher.php

Doc Comments +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
     }
 
     /**
-     * @return array
+     * @return string
      */
     public function getDefaultLogicalSeparator()
     {

Indentation +466 added lines, -466 removed lines

@@ -13,470 +13,470 @@
  */
 class Matcher
 {
-    /**
-     * The logical OR
-     */
-    const LOGICAL_OR = 'logicalOr';
-
-    /**
-     * The logical AND
-     */
-    const LOGICAL_AND = 'logicalAnd';
-
-    /**
-     * @var string
-     */
-    protected $dataType = '';
-
-    /**
-     * @var string
-     */
-    protected $searchTerm = '';
-
-    /**
-     * @var array
-     */
-    protected $supportedOperators = [
-        '=' => 'equals',
-        'in' => 'in',
-        'like' => 'like',
-        '>' => 'greaterThan',
-        '>=' => 'greaterThanOrEqual',
-        '<' => 'lessThan',
-        '<=' => 'lessThanOrEqual'
-    ];
-
-    /**
-     * @var array
-     */
-    protected $equals = [];
-
-    /**
-     * @var array
-     */
-    protected $greaterThan = [];
-
-    /**
-     * @var array
-     */
-    protected $greaterThanOrEqual = [];
-
-    /**
-     * @var array
-     */
-    protected $lessThan = [];
-
-    /**
-     * @var array
-     */
-    protected $lessThanOrEqual = [];
-
-    /**
-     * @var array
-     */
-    protected $in = [];
-
-    /**
-     * @var array
-     */
-    protected $like = [];
-
-    /**
-     * @var string
-     */
-    protected $defaultLogicalSeparator = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForEquals = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForGreaterThan = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForGreaterThanOrEqual = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForLessThan = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForLessThanOrEqual = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForIn = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForLike = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForSearchTerm = self::LOGICAL_OR;
-
-    /**
-     * Constructs a new Matcher
-     *
-     * @param array $matches associative [$field => $value]
-     * @param string $dataType which corresponds to an entry of the TCA (table name).
-     * @return \Fab\Vidi\Persistence\Matcher
-     */
-    public function __construct($matches = [], $dataType = '')
-    {
-        $this->dataType = $dataType;
-        $this->matches = $matches;
-    }
-
-    /**
-     * @param string $searchTerm
-     * @return \Fab\Vidi\Persistence\Matcher
-     */
-    public function setSearchTerm($searchTerm)
-    {
-        $this->searchTerm = $searchTerm;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSearchTerm()
-    {
-        return $this->searchTerm;
-    }
-
-    /**
-     * @return array
-     */
-    public function getEquals()
-    {
-        return $this->equals;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function equals($fieldNameAndPath, $operand)
-    {
-        $this->equals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getGreaterThan()
-    {
-        return $this->greaterThan;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function greaterThan($fieldNameAndPath, $operand)
-    {
-        $this->greaterThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getGreaterThanOrEqual()
-    {
-        return $this->greaterThanOrEqual;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function greaterThanOrEqual($fieldNameAndPath, $operand)
-    {
-        $this->greaterThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLessThan()
-    {
-        return $this->lessThan;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function lessThan($fieldNameAndPath, $operand)
-    {
-        $this->lessThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLessThanOrEqual()
-    {
-        return $this->lessThanOrEqual;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function lessThanOrEqual($fieldNameAndPath, $operand)
-    {
-        $this->lessThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLike()
-    {
-        return $this->like;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function in($fieldNameAndPath, $operand)
-    {
-        $this->in[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getIn()
-    {
-        return $this->in;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @param bool $addWildCard
-     * @return $this
-     */
-    public function like($fieldNameAndPath, $operand, $addWildCard = true)
-    {
-        $wildCardSymbol = $addWildCard ? '%' : '';
-        $this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getDefaultLogicalSeparator()
-    {
-        return $this->defaultLogicalSeparator;
-    }
-
-    /**
-     * @param string $defaultLogicalSeparator
-     * @return $this
-     */
-    public function setDefaultLogicalSeparator($defaultLogicalSeparator)
-    {
-        $this->defaultLogicalSeparator = $defaultLogicalSeparator;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForEquals()
-    {
-        return $this->logicalSeparatorForEquals;
-    }
-
-    /**
-     * @param string $logicalSeparatorForEquals
-     * @return $this
-     */
-    public function setLogicalSeparatorForEquals($logicalSeparatorForEquals)
-    {
-        $this->logicalSeparatorForEquals = $logicalSeparatorForEquals;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForGreaterThan()
-    {
-        return $this->logicalSeparatorForGreaterThan;
-    }
-
-    /**
-     * @param string $logicalSeparatorForGreaterThan
-     * @return $this
-     */
-    public function setLogicalSeparatorForGreaterThan($logicalSeparatorForGreaterThan)
-    {
-        $this->logicalSeparatorForGreaterThan = $logicalSeparatorForGreaterThan;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForGreaterThanOrEqual()
-    {
-        return $this->logicalSeparatorForGreaterThanOrEqual;
-    }
-
-    /**
-     * @param string $logicalSeparatorForGreaterThanOrEqual
-     * @return $this
-     */
-    public function setLogicalSeparatorForGreaterThanOrEqual($logicalSeparatorForGreaterThanOrEqual)
-    {
-        $this->logicalSeparatorForGreaterThanOrEqual = $logicalSeparatorForGreaterThanOrEqual;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLessThan()
-    {
-        return $this->logicalSeparatorForLessThan;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLessThan
-     * @return $this
-     */
-    public function setLogicalSeparatorForLessThan($logicalSeparatorForLessThan)
-    {
-        $this->logicalSeparatorForLessThan = $logicalSeparatorForLessThan;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLessThanOrEqual()
-    {
-        return $this->logicalSeparatorForLessThanOrEqual;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLessThanOrEqual
-     * @return $this
-     */
-    public function setLogicalSeparatorForLessThanOrEqual($logicalSeparatorForLessThanOrEqual)
-    {
-        $this->logicalSeparatorForLessThanOrEqual = $logicalSeparatorForLessThanOrEqual;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForIn()
-    {
-        return $this->logicalSeparatorForIn;
-    }
-
-    /**
-     * @param string $logicalSeparatorForIn
-     * @return $this
-     */
-    public function setLogicalSeparatorForIn($logicalSeparatorForIn)
-    {
-        $this->logicalSeparatorForIn = $logicalSeparatorForIn;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLike()
-    {
-        return $this->logicalSeparatorForLike;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLike
-     * @return $this
-     */
-    public function setLogicalSeparatorForLike($logicalSeparatorForLike)
-    {
-        $this->logicalSeparatorForLike = $logicalSeparatorForLike;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForSearchTerm()
-    {
-        return $this->logicalSeparatorForSearchTerm;
-    }
-
-    /**
-     * @param string $logicalSeparatorForSearchTerm
-     * @return $this
-     */
-    public function setLogicalSeparatorForSearchTerm($logicalSeparatorForSearchTerm)
-    {
-        $this->logicalSeparatorForSearchTerm = $logicalSeparatorForSearchTerm;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSupportedOperators()
-    {
-        return $this->supportedOperators;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType()
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType)
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
+	/**
+	 * The logical OR
+	 */
+	const LOGICAL_OR = 'logicalOr';
+
+	/**
+	 * The logical AND
+	 */
+	const LOGICAL_AND = 'logicalAnd';
+
+	/**
+	 * @var string
+	 */
+	protected $dataType = '';
+
+	/**
+	 * @var string
+	 */
+	protected $searchTerm = '';
+
+	/**
+	 * @var array
+	 */
+	protected $supportedOperators = [
+		'=' => 'equals',
+		'in' => 'in',
+		'like' => 'like',
+		'>' => 'greaterThan',
+		'>=' => 'greaterThanOrEqual',
+		'<' => 'lessThan',
+		'<=' => 'lessThanOrEqual'
+	];
+
+	/**
+	 * @var array
+	 */
+	protected $equals = [];
+
+	/**
+	 * @var array
+	 */
+	protected $greaterThan = [];
+
+	/**
+	 * @var array
+	 */
+	protected $greaterThanOrEqual = [];
+
+	/**
+	 * @var array
+	 */
+	protected $lessThan = [];
+
+	/**
+	 * @var array
+	 */
+	protected $lessThanOrEqual = [];
+
+	/**
+	 * @var array
+	 */
+	protected $in = [];
+
+	/**
+	 * @var array
+	 */
+	protected $like = [];
+
+	/**
+	 * @var string
+	 */
+	protected $defaultLogicalSeparator = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForEquals = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForGreaterThan = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForGreaterThanOrEqual = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForLessThan = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForLessThanOrEqual = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForIn = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForLike = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForSearchTerm = self::LOGICAL_OR;
+
+	/**
+	 * Constructs a new Matcher
+	 *
+	 * @param array $matches associative [$field => $value]
+	 * @param string $dataType which corresponds to an entry of the TCA (table name).
+	 * @return \Fab\Vidi\Persistence\Matcher
+	 */
+	public function __construct($matches = [], $dataType = '')
+	{
+		$this->dataType = $dataType;
+		$this->matches = $matches;
+	}
+
+	/**
+	 * @param string $searchTerm
+	 * @return \Fab\Vidi\Persistence\Matcher
+	 */
+	public function setSearchTerm($searchTerm)
+	{
+		$this->searchTerm = $searchTerm;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSearchTerm()
+	{
+		return $this->searchTerm;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getEquals()
+	{
+		return $this->equals;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function equals($fieldNameAndPath, $operand)
+	{
+		$this->equals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getGreaterThan()
+	{
+		return $this->greaterThan;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function greaterThan($fieldNameAndPath, $operand)
+	{
+		$this->greaterThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getGreaterThanOrEqual()
+	{
+		return $this->greaterThanOrEqual;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function greaterThanOrEqual($fieldNameAndPath, $operand)
+	{
+		$this->greaterThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLessThan()
+	{
+		return $this->lessThan;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function lessThan($fieldNameAndPath, $operand)
+	{
+		$this->lessThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLessThanOrEqual()
+	{
+		return $this->lessThanOrEqual;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function lessThanOrEqual($fieldNameAndPath, $operand)
+	{
+		$this->lessThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLike()
+	{
+		return $this->like;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function in($fieldNameAndPath, $operand)
+	{
+		$this->in[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getIn()
+	{
+		return $this->in;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @param bool $addWildCard
+	 * @return $this
+	 */
+	public function like($fieldNameAndPath, $operand, $addWildCard = true)
+	{
+		$wildCardSymbol = $addWildCard ? '%' : '';
+		$this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getDefaultLogicalSeparator()
+	{
+		return $this->defaultLogicalSeparator;
+	}
+
+	/**
+	 * @param string $defaultLogicalSeparator
+	 * @return $this
+	 */
+	public function setDefaultLogicalSeparator($defaultLogicalSeparator)
+	{
+		$this->defaultLogicalSeparator = $defaultLogicalSeparator;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForEquals()
+	{
+		return $this->logicalSeparatorForEquals;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForEquals
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForEquals($logicalSeparatorForEquals)
+	{
+		$this->logicalSeparatorForEquals = $logicalSeparatorForEquals;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForGreaterThan()
+	{
+		return $this->logicalSeparatorForGreaterThan;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForGreaterThan
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForGreaterThan($logicalSeparatorForGreaterThan)
+	{
+		$this->logicalSeparatorForGreaterThan = $logicalSeparatorForGreaterThan;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForGreaterThanOrEqual()
+	{
+		return $this->logicalSeparatorForGreaterThanOrEqual;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForGreaterThanOrEqual
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForGreaterThanOrEqual($logicalSeparatorForGreaterThanOrEqual)
+	{
+		$this->logicalSeparatorForGreaterThanOrEqual = $logicalSeparatorForGreaterThanOrEqual;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLessThan()
+	{
+		return $this->logicalSeparatorForLessThan;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLessThan
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLessThan($logicalSeparatorForLessThan)
+	{
+		$this->logicalSeparatorForLessThan = $logicalSeparatorForLessThan;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLessThanOrEqual()
+	{
+		return $this->logicalSeparatorForLessThanOrEqual;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLessThanOrEqual
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLessThanOrEqual($logicalSeparatorForLessThanOrEqual)
+	{
+		$this->logicalSeparatorForLessThanOrEqual = $logicalSeparatorForLessThanOrEqual;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForIn()
+	{
+		return $this->logicalSeparatorForIn;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForIn
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForIn($logicalSeparatorForIn)
+	{
+		$this->logicalSeparatorForIn = $logicalSeparatorForIn;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLike()
+	{
+		return $this->logicalSeparatorForLike;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLike
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLike($logicalSeparatorForLike)
+	{
+		$this->logicalSeparatorForLike = $logicalSeparatorForLike;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForSearchTerm()
+	{
+		return $this->logicalSeparatorForSearchTerm;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForSearchTerm
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForSearchTerm($logicalSeparatorForSearchTerm)
+	{
+		$this->logicalSeparatorForSearchTerm = $logicalSeparatorForSearchTerm;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSupportedOperators()
+	{
+		return $this->supportedOperators;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType()
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType)
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -288,7 +288,7 @@
     public function like($fieldNameAndPath, $operand, $addWildCard = true)
     {
         $wildCardSymbol = $addWildCard ? '%' : '';
-        $this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
+        $this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol.$operand.$wildCardSymbol];
         return $this;
     }
 

Classes/Persistence/Query.php

Doc Comments +2 added lines, -2 removed lines

@@ -290,7 +290,7 @@ 
      * 'bar' => \TYPO3\CMS\Extbase\Persistence\QueryInterface::ORDER_DESCENDING
      * )
      *
-     * @return array
+     * @return integer
      * @api
      */
     public function getOrderings()
@@ -483,7 +483,7 @@ 
      * Returns a like criterion used for matching objects against a query
      *
      * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
+     * @param string $operand The value to compare with
      * @param boolean $caseSensitive Whether the matching should be done case-sensitive
      * @return \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ComparisonInterface
      * @api

Spacing +2 added lines, -2 removed lines

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

Indentation +644 added lines, -644 removed lines

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

Classes/Persistence/Storage/VidiDbBackend.php

Doc Comments +3 added lines, -2 removed lines

@@ -231,7 +231,7 @@ 
     /**
      * Parses the query and returns the SQL statement parts.
      *
-     * @param QueryInterface $query The query
+     * @param \Fab\Vidi\Persistence\Query $query The query
      * @param array &$parameters
      * @return array The SQL statement parts
      */
@@ -774,6 +774,7 @@ 
      * @param string &$sqlString The query part with placeholders
      * @param array $parameters The parameters
      * @param string $tableName
+     * @param string $sqlString
      *
      * @throws Exception
      */
@@ -1071,7 +1072,7 @@ 
      *
      * @param SourceInterface $source The source (selector od join)
      * @param array $row
-     * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
+     * @param \Fab\Vidi\Persistence\QuerySettings $querySettings The TYPO3 CMS specific query settings
      * @return array
      */
     protected function doLanguageAndWorkspaceOverlay(SourceInterface $source, array $row, $querySettings)

Unused Use Statements -1 removed lines

@@ -18,7 +18,6 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Versioning\VersionState;
 use TYPO3\CMS\Extbase\Persistence\Generic\Exception;
-use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap;
 use TYPO3\CMS\Extbase\Persistence\Generic\Qom\ComparisonInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Qom\DynamicOperandInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Qom\JoinInterface;

Spacing +44 added lines, -44 removed lines

@@ -127,7 +127,7 @@ 
         $fieldNames = array_keys($identifier);
         $suffixedFieldNames = [];
         foreach ($fieldNames as $fieldName) {
-            $suffixedFieldNames[] = $fieldName . '=?';
+            $suffixedFieldNames[] = $fieldName.'=?';
         }
         return implode(' AND ', $suffixedFieldNames);
     }
@@ -188,7 +188,7 @@ 
             if (isset($statementParts['keywords']['distinct'])) {
                 unset($statementParts['keywords']['distinct']);
                 $distinctField = $this->query->getDistinct() ? $this->query->getDistinct() : 'uid';
-                $statementParts['fields'] = array('COUNT(DISTINCT ' . reset($statementParts['tables']) . '.' . $distinctField . ')');
+                $statementParts['fields'] = array('COUNT(DISTINCT '.reset($statementParts['tables']).'.'.$distinctField.')');
             }
 
             $statement = $this->buildQuery($statementParts);
@@ -258,14 +258,14 @@ 
             // tx_domain_model_foo0 (the alias) <--> tx_domain_model_foo (the origin table name)
             $values = [];
             foreach ($statementParts['fields'] as $key => $value) {
-                $values[$key] = str_replace($tableName, $tableName . '0', $value);
+                $values[$key] = str_replace($tableName, $tableName.'0', $value);
             }
             $statementParts['fields'] = $values;
 
             // Same comment as above.
             $values = [];
             foreach ($statementParts['where'] as $key => $value) {
-                $values[$key] = str_replace($tableName . '0', $tableName, $value);
+                $values[$key] = str_replace($tableName.'0', $tableName, $value);
             }
             $statementParts['where'] = $values;
 
@@ -304,25 +304,25 @@ 
         if (!empty($statementParts['unions'])) {
             foreach ($statementParts['unions'] as $tableName => $unionPart) {
                 if (!empty($statementParts['additionalWhereClause'][$tableName])) {
-                    $statementParts['unions'][$tableName] .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
+                    $statementParts['unions'][$tableName] .= ' AND '.implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
                 }
             }
         }
 
-        $statement = 'SELECT ' . implode(' ', $statementParts['keywords']) . ' ' . implode(',', $statementParts['fields']) . ' FROM ' . implode(' ', $statementParts['tables']) . ' ' . implode(' ', $statementParts['unions']);
+        $statement = 'SELECT '.implode(' ', $statementParts['keywords']).' '.implode(',', $statementParts['fields']).' FROM '.implode(' ', $statementParts['tables']).' '.implode(' ', $statementParts['unions']);
         if (!empty($statementParts['where'])) {
-            $statement .= ' WHERE ' . implode('', $statementParts['where']);
+            $statement .= ' WHERE '.implode('', $statementParts['where']);
             if (!empty($statementParts['additionalWhereClause'][$this->query->getType()])) {
-                $statement .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+                $statement .= ' AND '.implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
             }
         } elseif (!empty($statementParts['additionalWhereClause'])) {
-            $statement .= ' WHERE ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+            $statement .= ' WHERE '.implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
         }
         if (!empty($statementParts['orderings'])) {
-            $statement .= ' ORDER BY ' . implode(', ', $statementParts['orderings']);
+            $statement .= ' ORDER BY '.implode(', ', $statementParts['orderings']);
         }
         if (!empty($statementParts['limit'])) {
-            $statement .= ' LIMIT ' . $statementParts['limit'];
+            $statement .= ' LIMIT '.$statementParts['limit'];
         }
 
         return $statement;
@@ -339,10 +339,10 @@ 
     {
         if ($source instanceof SelectorInterface) {
             $tableName = $source->getNodeTypeName();
-            $sql['fields'][$tableName] = $tableName . '.*';
+            $sql['fields'][$tableName] = $tableName.'.*';
             $sql['tables'][$tableName] = $tableName;
             if ($this->query->getDistinct()) {
-                $sql['fields'][$tableName] = $tableName . '.' . $this->query->getDistinct();
+                $sql['fields'][$tableName] = $tableName.'.'.$this->query->getDistinct();
                 $sql['keywords']['distinct'] = 'DISTINCT';
             }
         } elseif ($source instanceof JoinInterface) {
@@ -367,15 +367,15 @@ 
             $rightTableName = $rightSource->getLeft()->getSelectorName();
         } else {
             $rightTableName = $rightSource->getSelectorName();
-            $sql['fields'][$leftTableName] = $rightTableName . '.*';
+            $sql['fields'][$leftTableName] = $rightTableName.'.*';
         }
         $sql['tables'][$leftTableName] = $leftTableName;
-        $sql['unions'][$rightTableName] = 'LEFT JOIN ' . $rightTableName;
+        $sql['unions'][$rightTableName] = 'LEFT JOIN '.$rightTableName;
         $joinCondition = $join->getJoinCondition();
         if ($joinCondition instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\EquiJoinCondition) {
             $column1Name = $joinCondition->getProperty1Name();
             $column2Name = $joinCondition->getProperty2Name();
-            $sql['unions'][$rightTableName] .= ' ON ' . $joinCondition->getSelector1Name() . '.' . $column1Name . ' = ' . $joinCondition->getSelector2Name() . '.' . $column2Name;
+            $sql['unions'][$rightTableName] .= ' ON '.$joinCondition->getSelector1Name().'.'.$column1Name.' = '.$joinCondition->getSelector2Name().'.'.$column2Name;
         }
         if ($rightSource instanceof JoinInterface) {
             $this->parseJoin($rightSource, $sql);
@@ -513,7 +513,7 @@ 
             if ($realInput instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
                 return $realInput->getUid();
             } else {
-                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "' . get_class($realInput) . '" could not be converted to a plain value.', 1274799934);
+                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "'.get_class($realInput).'" could not be converted to a plain value.', 1274799934);
             }
         } elseif (is_bool($input)) {
             return $input === true ? 1 : 0;
@@ -558,9 +558,9 @@ 
             $operator = $this->resolveOperator($operator);
             $constraintSQL = '';
             if ($valueFunction === null) {
-                $constraintSQL .= (!empty($tableName) ? $tableName . '.' : '') . $columnName . ' ' . $operator . ' ?';
+                $constraintSQL .= (!empty($tableName) ? $tableName.'.' : '').$columnName.' '.$operator.' ?';
             } else {
-                $constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName . ') ' . $operator . ' ?';
+                $constraintSQL .= $valueFunction.'('.(!empty($tableName) ? $tableName.'.' : '').$columnName.') '.$operator.' ?';
             }
 
             if (isset($tableName) && !empty($this->currentChildTableNameAlias)) {
@@ -590,7 +590,7 @@ 
         // to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
         if ($table->field($fieldName)->isGroup()) {
             $parts = explode('.', $propertyPath, 3);
-            $explodedPropertyPath[0] = $parts[0] . '.' . $parts[1];
+            $explodedPropertyPath[0] = $parts[0].'.'.$parts[1];
             $explodedPropertyPath[1] = $parts[2];
             $fieldName = $explodedPropertyPath[0];
         }
@@ -599,16 +599,16 @@ 
         $childTableName = $table->field($fieldName)->getForeignTable();
 
         if ($childTableName === null) {
-            throw new Exception\InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
+            throw new Exception\InvalidRelationConfigurationException('The relation information for property "'.$fieldName.'" of class "'.$tableName.'" is missing.', 1353170925);
         }
 
         if ($table->field($fieldName)->hasOne()) { // includes relation "one-to-one" and "many-to-one"
             // sometimes the opposite relation is not defined. We don't want to force this config for backward compatibility reasons.
             // $parentKeyFieldName === null does the trick somehow. Before condition was if (isset($parentKeyFieldName))
             if ($table->field($fieldName)->hasRelationManyToOne() || $parentKeyFieldName === null) {
-                $sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.' . $fieldName . '=' . $childTableName . '.uid';
+                $sql['unions'][$childTableName] = 'LEFT JOIN '.$childTableName.' ON '.$tableName.'.'.$fieldName.'='.$childTableName.'.uid';
             } else {
-                $sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.uid=' . $childTableName . '.' . $parentKeyFieldName;
+                $sql['unions'][$childTableName] = 'LEFT JOIN '.$childTableName.' ON '.$tableName.'.uid='.$childTableName.'.'.$parentKeyFieldName;
             }
         } elseif ($table->field($fieldName)->hasRelationManyToMany()) {
             $relationTableName = $table->field($fieldName)->getManyToManyTable();
@@ -773,11 +773,11 @@ 
                     foreach ($parameter as $item) {
                         $items[] = $this->databaseHandle->fullQuoteStr($item, $tableName);
                     }
-                    $parameter = '(' . implode(',', $items) . ')';
+                    $parameter = '('.implode(',', $items).')';
                 } else {
                     $parameter = $this->databaseHandle->fullQuoteStr($parameter, $tableName);
                 }
-                $sqlString = substr($sqlString, 0, $markPosition) . $parameter . substr($sqlString, ($markPosition + 1));
+                $sqlString = substr($sqlString, 0, $markPosition).$parameter.substr($sqlString, ($markPosition + 1));
             }
             $offset = $markPosition + strlen($parameter);
         }
@@ -878,18 +878,18 @@ 
         // If the table is found to have "workspace" support, add the corresponding fields in the statement.
         if (Tca::table($tableName)->hasWorkspaceSupport()) {
             if ($this->getBackendUser()->workspace === 0) {
-                $statement .= ' AND ' . $tableName . '.t3ver_state<=' . new VersionState(VersionState::DEFAULT_STATE);
+                $statement .= ' AND '.$tableName.'.t3ver_state<='.new VersionState(VersionState::DEFAULT_STATE);
             } else {
                 // Show only records of live and of the current workspace
                 // In case we are in a Versioning preview
-                $statement .= ' AND (' .
-                    $tableName . '.t3ver_wsid=0 OR ' .
-                    $tableName . '.t3ver_wsid=' . (int)$this->getBackendUser()->workspace .
+                $statement .= ' AND ('.
+                    $tableName.'.t3ver_wsid=0 OR '.
+                    $tableName.'.t3ver_wsid='.(int)$this->getBackendUser()->workspace.
                     ')';
             }
 
             // Check if this segment make sense here or whether it should be in the "if" part when we have workspace = 0
-            $statement .= ' AND ' . $tableName . '.pid<>-1';
+            $statement .= ' AND '.$tableName.'.pid<>-1';
         }
 
         if (!$includeDeleted) {
@@ -915,25 +915,25 @@ 
         if (is_array($GLOBALS['TCA'][$tableName]['ctrl'])) {
             if (!empty($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])) {
                 // Select all entries for the current language
-                $additionalWhereClause = $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' IN (' . intval($querySettings->getLanguageUid()) . ',-1)';
+                $additionalWhereClause = $tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].' IN ('.intval($querySettings->getLanguageUid()).',-1)';
                 // If any language is set -> get those entries which are not translated yet
                 // They will be removed by t3lib_page::getRecordOverlay if not matching overlay mode
                 if (isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
                     && $querySettings->getLanguageUid() > 0
                 ) {
-                    $additionalWhereClause .= ' OR (' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0' .
-                        ' AND ' . $tableNameOrAlias . '.uid NOT IN (SELECT ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] .
-                        ' FROM ' . $tableName .
-                        ' WHERE ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] . '>0' .
-                        ' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '>0';
+                    $additionalWhereClause .= ' OR ('.$tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'=0'.
+                        ' AND '.$tableNameOrAlias.'.uid NOT IN (SELECT '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'].
+                        ' FROM '.$tableName.
+                        ' WHERE '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'].'>0'.
+                        ' AND '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'>0';
 
                     // Add delete clause to ensure all entries are loaded
                     if (isset($GLOBALS['TCA'][$tableName]['ctrl']['delete'])) {
-                        $additionalWhereClause .= ' AND ' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['delete'] . '=0';
+                        $additionalWhereClause .= ' AND '.$tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['delete'].'=0';
                     }
                     $additionalWhereClause .= '))';
                 }
-                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = '(' . $additionalWhereClause . ')';
+                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = '('.$additionalWhereClause.')';
             }
         }
     }
@@ -978,7 +978,7 @@ 
     protected function parseLimitAndOffset($limit, $offset, array &$sql)
     {
         if ($limit !== null && $offset !== null) {
-            $sql['limit'] = intval($offset) . ', ' . intval($limit);
+            $sql['limit'] = intval($offset).', '.intval($limit);
         } elseif ($limit !== null) {
             $sql['limit'] = intval($limit);
         }
@@ -1045,10 +1045,10 @@ 
                 && $row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] > 0
             ) {
                 $row = $this->databaseHandle->exec_SELECTgetSingleRow(
-                    $tableName . '.*',
+                    $tableName.'.*',
                     $tableName,
-                    $tableName . '.uid=' . (int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] .
-                    ' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0'
+                    $tableName.'.uid='.(int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']].
+                    ' AND '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'=0'
                 );
             }
         }
@@ -1103,7 +1103,7 @@ 
         }
 
         $numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
-        $tableNameAlias = $tableName . $numberOfAliases;
+        $tableNameAlias = $tableName.$numberOfAliases;
 
         $this->tableNameAliases['aliasIncrement'][$tableName]++;
         $this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;
@@ -1182,7 +1182,7 @@ 
     {
         $error = $this->databaseHandle->sql_error();
         if ($error !== '') {
-            $error .= $sql ? ': ' . $sql : '';
+            $error .= $sql ? ': '.$sql : '';
             throw new \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\SqlErrorException($error, 1247602160);
         }
     }

Indentation +1158 added lines, -1158 removed lines

@@ -32,1162 +32,1162 @@
 class VidiDbBackend
 {
 
-    const OPERATOR_EQUAL_TO_NULL = 'operatorEqualToNull';
-    const OPERATOR_NOT_EQUAL_TO_NULL = 'operatorNotEqualToNull';
-
-    /**
-     * The TYPO3 database object
-     *
-     * @var \TYPO3\CMS\Core\Database\DatabaseConnection
-     */
-    protected $databaseHandle;
-
-    /**
-     * The TYPO3 page repository. Used for language and workspace overlay
-     *
-     * @var PageRepository
-     */
-    protected $pageRepository;
-
-    /**
-     * A first-level TypoScript configuration cache
-     *
-     * @var array
-     */
-    protected $pageTSConfigCache = [];
-
-    /**
-     * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
-     * @inject
-     */
-    protected $configurationManager;
-
-    /**
-     * @var \TYPO3\CMS\Extbase\Service\CacheService
-     * @inject
-     */
-    protected $cacheService;
-
-    /**
-     * @var \TYPO3\CMS\Core\Cache\CacheManager
-     * @inject
-     */
-    protected $cacheManager;
-
-    /**
-     * @var \TYPO3\CMS\Extbase\Service\EnvironmentService
-     * @inject
-     */
-    protected $environmentService;
-
-    /**
-     * @var \Fab\Vidi\Persistence\Query
-     */
-    protected $query;
-
-    /**
-     * Store some info related to table name and its aliases.
-     *
-     * @var array
-     */
-    protected $tableNameAliases = array(
-        'aliases' => [],
-        'aliasIncrement' => [],
-    );
-
-    /**
-     * Use to store the current foreign table name alias.
-     *
-     * @var string
-     */
-    protected $currentChildTableNameAlias = '';
-
-    /**
-     * The default object type being returned.
-     *
-     * @var string
-     */
-    protected $objectType = 'Fab\Vidi\Domain\Model\Content';
-
-    /**
-     * Constructor. takes the database handle from $GLOBALS['TYPO3_DB']
-     */
-    public function __construct(QueryInterface $query)
-    {
-        $this->query = $query;
-        $this->databaseHandle = $GLOBALS['TYPO3_DB'];
-    }
-
-    /**
-     * @param array $identifier
-     * @return string
-     */
-    protected function parseIdentifier(array $identifier)
-    {
-        $fieldNames = array_keys($identifier);
-        $suffixedFieldNames = [];
-        foreach ($fieldNames as $fieldName) {
-            $suffixedFieldNames[] = $fieldName . '=?';
-        }
-        return implode(' AND ', $suffixedFieldNames);
-    }
-
-    /**
-     * Returns the result of the query
-     */
-    public function fetchResult()
-    {
-
-        $parameters = [];
-        $statementParts = $this->parseQuery($this->query, $parameters);
-        $statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts); // Mmm... check if that is the right way of doing that.
-
-        $sql = $this->buildQuery($statementParts);
-        $tableName = '';
-        if (is_array($statementParts) && !empty(reset($statementParts['tables']))) {
-            $tableName = reset($statementParts['tables']);
-        }
-        $this->replacePlaceholders($sql, $parameters, $tableName);
-        #print $sql; exit(); // @debug
-
-        $result = $this->databaseHandle->sql_query($sql);
-        $this->checkSqlErrors($sql);
-        $rows = $this->getRowsFromResult($result);
-        $this->databaseHandle->sql_free_result($result);
-
-        return $rows;
-    }
-
-    /**
-     * Returns the number of tuples matching the query.
-     *
-     * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\BadConstraintException
-     * @return int The number of matching tuples
-     */
-    public function countResult()
-    {
-
-        $parameters = [];
-        $statementParts = $this->parseQuery($this->query, $parameters);
-        $statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts); // Mmm... check if that is the right way of doing that.
-        // Reset $statementParts for valid table return
-        reset($statementParts);
-
-        // if limit is set, we need to count the rows "manually" as COUNT(*) ignores LIMIT constraints
-        if (!empty($statementParts['limit'])) {
-            $statement = $this->buildQuery($statementParts);
-            $this->replacePlaceholders($statement, $parameters, current($statementParts['tables']));
-            #print $statement; exit(); // @debug
-            $result = $this->databaseHandle->sql_query($statement);
-            $this->checkSqlErrors($statement);
-            $count = $this->databaseHandle->sql_num_rows($result);
-        } else {
-            $statementParts['fields'] = array('COUNT(*)');
-            // having orderings without grouping is not compatible with non-MySQL DBMS
-            $statementParts['orderings'] = [];
-            if (isset($statementParts['keywords']['distinct'])) {
-                unset($statementParts['keywords']['distinct']);
-                $distinctField = $this->query->getDistinct() ? $this->query->getDistinct() : 'uid';
-                $statementParts['fields'] = array('COUNT(DISTINCT ' . reset($statementParts['tables']) . '.' . $distinctField . ')');
-            }
-
-            $statement = $this->buildQuery($statementParts);
-            $this->replacePlaceholders($statement, $parameters, current($statementParts['tables']));
-
-            #print $statement; exit(); // @debug
-            $result = $this->databaseHandle->sql_query($statement);
-            $this->checkSqlErrors($statement);
-            $count = 0;
-            if ($result) {
-                $row = $this->databaseHandle->sql_fetch_assoc($result);
-                $count = current($row);
-            }
-        }
-        $this->databaseHandle->sql_free_result($result);
-        return (int)$count;
-    }
-
-    /**
-     * Parses the query and returns the SQL statement parts.
-     *
-     * @param QueryInterface $query The query
-     * @param array &$parameters
-     * @return array The SQL statement parts
-     */
-    public function parseQuery(QueryInterface $query, array &$parameters)
-    {
-        $statementParts = [];
-        $statementParts['keywords'] = [];
-        $statementParts['tables'] = [];
-        $statementParts['unions'] = [];
-        $statementParts['fields'] = [];
-        $statementParts['where'] = [];
-        $statementParts['additionalWhereClause'] = [];
-        $statementParts['orderings'] = [];
-        $statementParts['limit'] = [];
-        $source = $query->getSource();
-        $this->parseSource($source, $statementParts);
-        $this->parseConstraint($query->getConstraint(), $source, $statementParts, $parameters);
-        $this->parseOrderings($query->getOrderings(), $source, $statementParts);
-        $this->parseLimitAndOffset($query->getLimit(), $query->getOffset(), $statementParts);
-        $tableNames = array_unique(array_keys($statementParts['tables'] + $statementParts['unions']));
-        foreach ($tableNames as $tableNameOrAlias) {
-            if (is_string($tableNameOrAlias) && strlen($tableNameOrAlias) > 0) {
-                $this->addAdditionalWhereClause($query->getQuerySettings(), $tableNameOrAlias, $statementParts);
-            }
-        }
-
-        return $statementParts;
-    }
-
-    /**
-     * Fiddle with the statement structure to handle recursive MM relations.
-     * For the recursive MM query to work, we must invert some values.
-     * Let see if that is the best way of doing that...
-     *
-     * @param array $statementParts
-     * @return array
-     */
-    public function processStatementStructureForRecursiveMMRelation(array $statementParts)
-    {
-
-        if ($this->hasRecursiveMMRelation()) {
-            $tableName = $this->query->getType();
-
-            // In order the MM query to work for a recursive MM query, we must invert some values.
-            // tx_domain_model_foo0 (the alias) <--> tx_domain_model_foo (the origin table name)
-            $values = [];
-            foreach ($statementParts['fields'] as $key => $value) {
-                $values[$key] = str_replace($tableName, $tableName . '0', $value);
-            }
-            $statementParts['fields'] = $values;
-
-            // Same comment as above.
-            $values = [];
-            foreach ($statementParts['where'] as $key => $value) {
-                $values[$key] = str_replace($tableName . '0', $tableName, $value);
-            }
-            $statementParts['where'] = $values;
-
-            // We must be more restrictive by transforming the "left" union by "inner"
-            $values = [];
-            foreach ($statementParts['unions'] as $key => $value) {
-                $values[$key] = str_replace('LEFT JOIN', 'INNER JOIN', $value);
-            }
-            $statementParts['unions'] = $values;
-        }
-
-        return $statementParts;
-    }
-
-    /**
-     * Tell whether there is a recursive MM relation.
-     *
-     * @return bool
-     */
-    public function hasRecursiveMMRelation()
-    {
-        return isset($this->tableNameAliases['aliasIncrement'][$this->query->getType()]);
-
-    }
-
-    /**
-     * Returns the statement, ready to be executed.
-     *
-     * @param array $statementParts The SQL statement parts
-     * @return string The SQL statement
-     */
-    public function buildQuery(array $statementParts)
-    {
-
-        // Add more statement to the UNION part.
-        if (!empty($statementParts['unions'])) {
-            foreach ($statementParts['unions'] as $tableName => $unionPart) {
-                if (!empty($statementParts['additionalWhereClause'][$tableName])) {
-                    $statementParts['unions'][$tableName] .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
-                }
-            }
-        }
-
-        $statement = 'SELECT ' . implode(' ', $statementParts['keywords']) . ' ' . implode(',', $statementParts['fields']) . ' FROM ' . implode(' ', $statementParts['tables']) . ' ' . implode(' ', $statementParts['unions']);
-        if (!empty($statementParts['where'])) {
-            $statement .= ' WHERE ' . implode('', $statementParts['where']);
-            if (!empty($statementParts['additionalWhereClause'][$this->query->getType()])) {
-                $statement .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
-            }
-        } elseif (!empty($statementParts['additionalWhereClause'])) {
-            $statement .= ' WHERE ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
-        }
-        if (!empty($statementParts['orderings'])) {
-            $statement .= ' ORDER BY ' . implode(', ', $statementParts['orderings']);
-        }
-        if (!empty($statementParts['limit'])) {
-            $statement .= ' LIMIT ' . $statementParts['limit'];
-        }
-
-        return $statement;
-    }
-
-    /**
-     * Transforms a Query Source into SQL and parameter arrays
-     *
-     * @param SourceInterface $source The source
-     * @param array &$sql
-     * @return void
-     */
-    protected function parseSource(SourceInterface $source, array &$sql)
-    {
-        if ($source instanceof SelectorInterface) {
-            $tableName = $source->getNodeTypeName();
-            $sql['fields'][$tableName] = $tableName . '.*';
-            $sql['tables'][$tableName] = $tableName;
-            if ($this->query->getDistinct()) {
-                $sql['fields'][$tableName] = $tableName . '.' . $this->query->getDistinct();
-                $sql['keywords']['distinct'] = 'DISTINCT';
-            }
-        } elseif ($source instanceof JoinInterface) {
-            $this->parseJoin($source, $sql);
-        }
-    }
-
-    /**
-     * Transforms a Join into SQL and parameter arrays
-     *
-     * @param JoinInterface $join The join
-     * @param array &$sql The query parts
-     * @return void
-     */
-    protected function parseJoin(JoinInterface $join, array &$sql)
-    {
-        $leftSource = $join->getLeft();
-        $leftTableName = $leftSource->getSelectorName();
-        // $sql['fields'][$leftTableName] = $leftTableName . '.*';
-        $rightSource = $join->getRight();
-        if ($rightSource instanceof JoinInterface) {
-            $rightTableName = $rightSource->getLeft()->getSelectorName();
-        } else {
-            $rightTableName = $rightSource->getSelectorName();
-            $sql['fields'][$leftTableName] = $rightTableName . '.*';
-        }
-        $sql['tables'][$leftTableName] = $leftTableName;
-        $sql['unions'][$rightTableName] = 'LEFT JOIN ' . $rightTableName;
-        $joinCondition = $join->getJoinCondition();
-        if ($joinCondition instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\EquiJoinCondition) {
-            $column1Name = $joinCondition->getProperty1Name();
-            $column2Name = $joinCondition->getProperty2Name();
-            $sql['unions'][$rightTableName] .= ' ON ' . $joinCondition->getSelector1Name() . '.' . $column1Name . ' = ' . $joinCondition->getSelector2Name() . '.' . $column2Name;
-        }
-        if ($rightSource instanceof JoinInterface) {
-            $this->parseJoin($rightSource, $sql);
-        }
-    }
-
-    /**
-     * Transforms a constraint into SQL and parameter arrays
-     *
-     * @param \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint The constraint
-     * @param SourceInterface $source The source
-     * @param array &$sql The query parts
-     * @param array &$parameters The parameters that will replace the markers
-     * @return void
-     */
-    protected function parseConstraint(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint = null, SourceInterface $source, array &$sql, array &$parameters)
-    {
-        if ($constraint instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\AndInterface) {
-            $sql['where'][] = '(';
-            $this->parseConstraint($constraint->getConstraint1(), $source, $sql, $parameters);
-            $sql['where'][] = ' AND ';
-            $this->parseConstraint($constraint->getConstraint2(), $source, $sql, $parameters);
-            $sql['where'][] = ')';
-        } elseif ($constraint instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\OrInterface) {
-            $sql['where'][] = '(';
-            $this->parseConstraint($constraint->getConstraint1(), $source, $sql, $parameters);
-            $sql['where'][] = ' OR ';
-            $this->parseConstraint($constraint->getConstraint2(), $source, $sql, $parameters);
-            $sql['where'][] = ')';
-        } elseif ($constraint instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\NotInterface) {
-            $sql['where'][] = 'NOT (';
-            $this->parseConstraint($constraint->getConstraint(), $source, $sql, $parameters);
-            $sql['where'][] = ')';
-        } elseif ($constraint instanceof ComparisonInterface) {
-            $this->parseComparison($constraint, $source, $sql, $parameters);
-        }
-    }
-
-    /**
-     * Parse a Comparison into SQL and parameter arrays.
-     *
-     * @param ComparisonInterface $comparison The comparison to parse
-     * @param SourceInterface $source The source
-     * @param array &$sql SQL query parts to add to
-     * @param array &$parameters Parameters to bind to the SQL
-     * @throws Exception\RepositoryException
-     * @return void
-     */
-    protected function parseComparison(ComparisonInterface $comparison, SourceInterface $source, array &$sql, array &$parameters)
-    {
-        $operand1 = $comparison->getOperand1();
-        $operator = $comparison->getOperator();
-        $operand2 = $comparison->getOperand2();
-        if ($operator === QueryInterface::OPERATOR_IN) {
-            $items = [];
-            $hasValue = false;
-            foreach ($operand2 as $value) {
-                $value = $this->getPlainValue($value);
-                if ($value !== null) {
-                    $items[] = $value;
-                    $hasValue = true;
-                }
-            }
-            if ($hasValue === false) {
-                $sql['where'][] = '1<>1';
-            } else {
-                $this->parseDynamicOperand($operand1, $operator, $source, $sql, $parameters, null);
-                $parameters[] = $items;
-            }
-        } elseif ($operator === QueryInterface::OPERATOR_CONTAINS) {
-            if ($operand2 === null) {
-                $sql['where'][] = '1<>1';
-            } else {
-                throw new \Exception('Not implemented! Contact extension author.', 1412931227);
-                # @todo re-implement me if necessary.
-                #$tableName = $this->query->getType();
-                #$propertyName = $operand1->getPropertyName();
-                #while (strpos($propertyName, '.') !== false) {
-                #	$this->addUnionStatement($tableName, $propertyName, $sql);
-                #}
-                #$columnName = $propertyName;
-                #$columnMap = $propertyName;
-                #$typeOfRelation = $columnMap instanceof ColumnMap ? $columnMap->getTypeOfRelation() : null;
-                #if ($typeOfRelation === ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY) {
-                #	$relationTableName = $columnMap->getRelationTableName();
-                #	$sql['where'][] = $tableName . '.uid IN (SELECT ' . $columnMap->getParentKeyFieldName() . ' FROM ' . $relationTableName . ' WHERE ' . $columnMap->getChildKeyFieldName() . '=?)';
-                #	$parameters[] = intval($this->getPlainValue($operand2));
-                #} elseif ($typeOfRelation === ColumnMap::RELATION_HAS_MANY) {
-                #	$parentKeyFieldName = $columnMap->getParentKeyFieldName();
-                #	if (isset($parentKeyFieldName)) {
-                #		$childTableName = $columnMap->getChildTableName();
-                #		$sql['where'][] = $tableName . '.uid=(SELECT ' . $childTableName . '.' . $parentKeyFieldName . ' FROM ' . $childTableName . ' WHERE ' . $childTableName . '.uid=?)';
-                #		$parameters[] = intval($this->getPlainValue($operand2));
-                #	} else {
-                #		$sql['where'][] = 'FIND_IN_SET(?,' . $tableName . '.' . $columnName . ')';
-                #		$parameters[] = intval($this->getPlainValue($operand2));
-                #	}
-                #} else {
-                #	throw new Exception\RepositoryException('Unsupported or non-existing property name "' . $propertyName . '" used in relation matching.', 1327065745);
-                #}
-            }
-        } else {
-            if ($operand2 === null) {
-                if ($operator === QueryInterface::OPERATOR_EQUAL_TO) {
-                    $operator = self::OPERATOR_EQUAL_TO_NULL;
-                } elseif ($operator === QueryInterface::OPERATOR_NOT_EQUAL_TO) {
-                    $operator = self::OPERATOR_NOT_EQUAL_TO_NULL;
-                }
-            }
-            $this->parseDynamicOperand($operand1, $operator, $source, $sql, $parameters);
-            $parameters[] = $this->getPlainValue($operand2);
-        }
-    }
-
-    /**
-     * Returns a plain value, i.e. objects are flattened out if possible.
-     *
-     * @param mixed $input
-     * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException
-     * @return mixed
-     */
-    protected function getPlainValue($input)
-    {
-        if (is_array($input)) {
-            throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An array could not be converted to a plain value.', 1274799932);
-        }
-        if ($input instanceof \DateTime) {
-            return $input->format('U');
-        } elseif (is_object($input)) {
-            if ($input instanceof \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy) {
-                $realInput = $input->_loadRealInstance();
-            } else {
-                $realInput = $input;
-            }
-            if ($realInput instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
-                return $realInput->getUid();
-            } else {
-                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "' . get_class($realInput) . '" could not be converted to a plain value.', 1274799934);
-            }
-        } elseif (is_bool($input)) {
-            return $input === true ? 1 : 0;
-        } else {
-            return $input;
-        }
-    }
-
-    /**
-     * Parse a DynamicOperand into SQL and parameter arrays.
-     *
-     * @param DynamicOperandInterface $operand
-     * @param string $operator One of the JCR_OPERATOR_* constants
-     * @param SourceInterface $source The source
-     * @param array &$sql The query parts
-     * @param array &$parameters The parameters that will replace the markers
-     * @param string $valueFunction an optional SQL function to apply to the operand value
-     * @return void
-     */
-    protected function parseDynamicOperand(DynamicOperandInterface $operand, $operator, SourceInterface $source, array &$sql, array &$parameters, $valueFunction = null)
-    {
-        if ($operand instanceof LowerCaseInterface) {
-            $this->parseDynamicOperand($operand->getOperand(), $operator, $source, $sql, $parameters, 'LOWER');
-        } elseif ($operand instanceof UpperCaseInterface) {
-            $this->parseDynamicOperand($operand->getOperand(), $operator, $source, $sql, $parameters, 'UPPER');
-        } elseif ($operand instanceof PropertyValueInterface) {
-            $propertyName = $operand->getPropertyName();
-
-            // Reset value.
-            $this->currentChildTableNameAlias = '';
-
-            if ($source instanceof SelectorInterface) {
-                $tableName = $this->query->getType();
-                while (strpos($propertyName, '.') !== false) {
-                    $this->addUnionStatement($tableName, $propertyName, $sql);
-                }
-            } elseif ($source instanceof JoinInterface) {
-                $tableName = $source->getJoinCondition()->getSelector1Name();
-            }
-
-            $columnName = $propertyName;
-            $operator = $this->resolveOperator($operator);
-            $constraintSQL = '';
-            if ($valueFunction === null) {
-                $constraintSQL .= (!empty($tableName) ? $tableName . '.' : '') . $columnName . ' ' . $operator . ' ?';
-            } else {
-                $constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName . ') ' . $operator . ' ?';
-            }
-
-            if (isset($tableName) && !empty($this->currentChildTableNameAlias)) {
-                $constraintSQL = $this->replaceTableNameByAlias($tableName, $this->currentChildTableNameAlias, $constraintSQL);
-            }
-            $sql['where'][] = $constraintSQL;
-        }
-    }
-
-    /**
-     * @param string &$tableName
-     * @param array &$propertyPath
-     * @param array &$sql
-     * @throws Exception
-     * @throws Exception\InvalidRelationConfigurationException
-     * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\MissingColumnMapException
-     */
-    protected function addUnionStatement(&$tableName, &$propertyPath, array &$sql)
-    {
-
-        $table = Tca::table($tableName);
-
-        $explodedPropertyPath = explode('.', $propertyPath, 2);
-        $fieldName = $explodedPropertyPath[0];
-
-        // Field of type "group" are special 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"
-        if ($table->field($fieldName)->isGroup()) {
-            $parts = explode('.', $propertyPath, 3);
-            $explodedPropertyPath[0] = $parts[0] . '.' . $parts[1];
-            $explodedPropertyPath[1] = $parts[2];
-            $fieldName = $explodedPropertyPath[0];
-        }
-
-        $parentKeyFieldName = $table->field($fieldName)->getForeignField();
-        $childTableName = $table->field($fieldName)->getForeignTable();
-
-        if ($childTableName === null) {
-            throw new Exception\InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
-        }
-
-        if ($table->field($fieldName)->hasOne()) { // includes relation "one-to-one" and "many-to-one"
-            // sometimes the opposite relation is not defined. We don't want to force this config for backward compatibility reasons.
-            // $parentKeyFieldName === null does the trick somehow. Before condition was if (isset($parentKeyFieldName))
-            if ($table->field($fieldName)->hasRelationManyToOne() || $parentKeyFieldName === null) {
-                $sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.' . $fieldName . '=' . $childTableName . '.uid';
-            } else {
-                $sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.uid=' . $childTableName . '.' . $parentKeyFieldName;
-            }
-        } elseif ($table->field($fieldName)->hasRelationManyToMany()) {
-            $relationTableName = $table->field($fieldName)->getManyToManyTable();
-
-            $parentKeyFieldName = $table->field($fieldName)->isOppositeRelation() ? 'uid_foreign' : 'uid_local';
-            $childKeyFieldName = !$table->field($fieldName)->isOppositeRelation() ? 'uid_foreign' : 'uid_local';
-
-            // MM table e.g sys_category_record_mm
-            $relationTableNameAlias = $this->generateAlias($relationTableName);
-            $join = sprintf(
-                'LEFT JOIN %s AS %s ON %s.uid=%s.%s', $relationTableName,
-                $relationTableNameAlias,
-                $tableName,
-                $relationTableNameAlias,
-                $parentKeyFieldName
-            );
-            $sql['unions'][$relationTableNameAlias] = $join;
-
-            // Foreign table e.g sys_category
-            $childTableNameAlias = $this->generateAlias($childTableName);
-            $this->currentChildTableNameAlias = $childTableNameAlias;
-            $join = sprintf(
-                'LEFT JOIN %s AS %s ON %s.%s=%s.uid',
-                $childTableName,
-                $childTableNameAlias,
-                $relationTableNameAlias,
-                $childKeyFieldName,
-                $childTableNameAlias
-            );
-            $sql['unions'][$childTableNameAlias] = $join;
-
-            // Find a possible table name for a MM condition.
-            $tableNameCondition = $table->field($fieldName)->getAdditionalTableNameCondition();
-            if ($tableNameCondition) {
-
-                // If we can find a source file name,  we can then retrieve more MM conditions from the TCA such as a field name.
-                $sourceFileName = $this->query->getSourceFieldName();
-                if (empty($sourceFileName)) {
-                    $additionalMMConditions = array(
-                        'tablenames' => $tableNameCondition,
-                    );
-                } else {
-                    $additionalMMConditions = Tca::table($tableNameCondition)->field($sourceFileName)->getAdditionalMMCondition();
-                }
-
-                foreach ($additionalMMConditions as $additionalFieldName => $additionalMMCondition) {
-                    $additionalJoin = sprintf(' AND %s.%s = "%s"', $relationTableNameAlias, $additionalFieldName, $additionalMMCondition);
-                    $sql['unions'][$relationTableNameAlias] .= $additionalJoin;
-
-                    $additionalJoin = sprintf(' AND %s.%s = "%s"', $relationTableNameAlias, $additionalFieldName, $additionalMMCondition);
-                    $sql['unions'][$childTableNameAlias] .= $additionalJoin;
-                }
-
-            }
-
-
-        } elseif ($table->field($fieldName)->hasMany()) { // includes relations "many-to-one" and "csv" relations
-            $childTableNameAlias = $this->generateAlias($childTableName);
-            $this->currentChildTableNameAlias = $childTableNameAlias;
-
-            if (isset($parentKeyFieldName)) {
-                $join = sprintf(
-                    'LEFT JOIN %s AS %s ON %s.uid=%s.%s',
-                    $childTableName,
-                    $childTableNameAlias,
-                    $tableName,
-                    $childTableNameAlias,
-                    $parentKeyFieldName
-                );
-                $sql['unions'][$childTableNameAlias] = $join;
-            } else {
-                $join = sprintf(
-                    'LEFT JOIN %s AS %s ON (FIND_IN_SET(%s.uid, %s.%s))',
-                    $childTableName,
-                    $childTableNameAlias,
-                    $childTableNameAlias,
-                    $tableName,
-                    $fieldName
-                );
-                $sql['unions'][$childTableNameAlias] = $join;
-            }
-        } else {
-            throw new Exception('Could not determine type of relation.', 1252502725);
-        }
-
-        // TODO check if there is another solution for this
-        $sql['keywords']['distinct'] = 'DISTINCT';
-        $propertyPath = $explodedPropertyPath[1];
-        $tableName = $childTableName;
-    }
-
-    /**
-     * Returns the SQL operator for the given JCR operator type.
-     *
-     * @param string $operator One of the JCR_OPERATOR_* constants
-     * @throws Exception
-     * @return string an SQL operator
-     */
-    protected function resolveOperator($operator)
-    {
-        switch ($operator) {
-            case self::OPERATOR_EQUAL_TO_NULL:
-                $operator = 'IS';
-                break;
-            case self::OPERATOR_NOT_EQUAL_TO_NULL:
-                $operator = 'IS NOT';
-                break;
-            case QueryInterface::OPERATOR_IN:
-                $operator = 'IN';
-                break;
-            case QueryInterface::OPERATOR_EQUAL_TO:
-                $operator = '=';
-                break;
-            case QueryInterface::OPERATOR_NOT_EQUAL_TO:
-                $operator = '!=';
-                break;
-            case QueryInterface::OPERATOR_LESS_THAN:
-                $operator = '<';
-                break;
-            case QueryInterface::OPERATOR_LESS_THAN_OR_EQUAL_TO:
-                $operator = '<=';
-                break;
-            case QueryInterface::OPERATOR_GREATER_THAN:
-                $operator = '>';
-                break;
-            case QueryInterface::OPERATOR_GREATER_THAN_OR_EQUAL_TO:
-                $operator = '>=';
-                break;
-            case QueryInterface::OPERATOR_LIKE:
-                $operator = 'LIKE';
-                break;
-            default:
-                throw new Exception('Unsupported operator encountered.', 1242816073);
-        }
-        return $operator;
-    }
-
-    /**
-     * Replace query placeholders in a query part by the given
-     * parameters.
-     *
-     * @param string &$sqlString The query part with placeholders
-     * @param array $parameters The parameters
-     * @param string $tableName
-     *
-     * @throws Exception
-     */
-    protected function replacePlaceholders(&$sqlString, array $parameters, $tableName = 'foo')
-    {
-        // TODO profile this method again
-        if (substr_count($sqlString, '?') !== count($parameters)) {
-            throw new Exception('The number of question marks to replace must be equal to the number of parameters.', 1242816074);
-        }
-        $offset = 0;
-        foreach ($parameters as $parameter) {
-            $markPosition = strpos($sqlString, '?', $offset);
-            if ($markPosition !== false) {
-                if ($parameter === null) {
-                    $parameter = 'null';
-                } elseif (is_array($parameter) || $parameter instanceof \ArrayAccess || $parameter instanceof \Traversable) {
-                    $items = [];
-                    foreach ($parameter as $item) {
-                        $items[] = $this->databaseHandle->fullQuoteStr($item, $tableName);
-                    }
-                    $parameter = '(' . implode(',', $items) . ')';
-                } else {
-                    $parameter = $this->databaseHandle->fullQuoteStr($parameter, $tableName);
-                }
-                $sqlString = substr($sqlString, 0, $markPosition) . $parameter . substr($sqlString, ($markPosition + 1));
-            }
-            $offset = $markPosition + strlen($parameter);
-        }
-    }
-
-    /**
-     * Adds additional WHERE statements according to the query settings.
-     *
-     * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
-     * @param string $tableNameOrAlias The table name to add the additional where clause for
-     * @param array &$statementParts
-     * @return void
-     */
-    protected function addAdditionalWhereClause(QuerySettingsInterface $querySettings, $tableNameOrAlias, &$statementParts)
-    {
-        $this->addVisibilityConstraintStatement($querySettings, $tableNameOrAlias, $statementParts);
-        if ($querySettings->getRespectSysLanguage()) {
-            $this->addSysLanguageStatement($tableNameOrAlias, $statementParts, $querySettings);
-        }
-    }
-
-    /**
-     * Adds enableFields and deletedClause to the query if necessary
-     *
-     * @param QuerySettingsInterface $querySettings
-     * @param string $tableNameOrAlias The database table name
-     * @param array &$statementParts The query parts
-     * @return void
-     */
-    protected function addVisibilityConstraintStatement(QuerySettingsInterface $querySettings, $tableNameOrAlias, array &$statementParts)
-    {
-        $statement = '';
-        $tableName = $this->resolveTableNameAlias($tableNameOrAlias);
-        if (is_array($GLOBALS['TCA'][$tableName]['ctrl'])) {
-            $ignoreEnableFields = $querySettings->getIgnoreEnableFields();
-            $enableFieldsToBeIgnored = $querySettings->getEnableFieldsToBeIgnored();
-            $includeDeleted = $querySettings->getIncludeDeleted();
-            if ($this->environmentService->isEnvironmentInFrontendMode()) {
-                $statement .= $this->getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted);
-            } else {
-                // TYPO3_MODE === 'BE'
-                $statement .= $this->getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted);
-            }
-
-            // Remove the prefixing "AND" if any.
-            if (!empty($statement)) {
-                $statement = strtolower(substr($statement, 1, 3)) === 'and' ? substr($statement, 5) : $statement;
-                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = $statement;
-            }
-        }
-    }
-
-    /**
-     * Returns constraint statement for frontend context
-     *
-     * @param string $tableNameOrAlias
-     * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
-     * @param array $enableFieldsToBeIgnored If $ignoreEnableFields is true, this array specifies enable fields to be ignored. If it is null or an empty array (default) all enable fields are ignored.
-     * @param boolean $includeDeleted A flag indicating whether deleted records should be included
-     * @return string
-     * @throws Exception\InconsistentQuerySettingsException
-     */
-    protected function getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored = [], $includeDeleted)
-    {
-        $statement = '';
-        $tableName = $this->resolveTableNameAlias($tableNameOrAlias);
-        if ($ignoreEnableFields && !$includeDeleted) {
-            if (count($enableFieldsToBeIgnored)) {
-                // array_combine() is necessary because of the way \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() is implemented
-                $statement .= $this->getPageRepository()->enableFields($tableName, -1, array_combine($enableFieldsToBeIgnored, $enableFieldsToBeIgnored));
-            } else {
-                $statement .= $this->getPageRepository()->deleteClause($tableName);
-            }
-        } elseif (!$ignoreEnableFields && !$includeDeleted) {
-            $statement .= $this->getPageRepository()->enableFields($tableName);
-        } elseif (!$ignoreEnableFields && $includeDeleted) {
-            throw new Exception\InconsistentQuerySettingsException('Query setting "ignoreEnableFields=false" can not be used together with "includeDeleted=true" in frontend context.', 1327678173);
-        }
-        return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
-    }
-
-    /**
-     * Returns constraint statement for backend context
-     *
-     * @param string $tableNameOrAlias
-     * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
-     * @param boolean $includeDeleted A flag indicating whether deleted records should be included
-     * @return string
-     */
-    protected function getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted)
-    {
-        $tableName = $this->resolveTableNameAlias($tableNameOrAlias);
-        $statement = '';
-        if (!$ignoreEnableFields) {
-            $statement .= BackendUtility::BEenableFields($tableName);
-        }
-
-        // If the table is found to have "workspace" support, add the corresponding fields in the statement.
-        if (Tca::table($tableName)->hasWorkspaceSupport()) {
-            if ($this->getBackendUser()->workspace === 0) {
-                $statement .= ' AND ' . $tableName . '.t3ver_state<=' . new VersionState(VersionState::DEFAULT_STATE);
-            } else {
-                // Show only records of live and of the current workspace
-                // In case we are in a Versioning preview
-                $statement .= ' AND (' .
-                    $tableName . '.t3ver_wsid=0 OR ' .
-                    $tableName . '.t3ver_wsid=' . (int)$this->getBackendUser()->workspace .
-                    ')';
-            }
-
-            // Check if this segment make sense here or whether it should be in the "if" part when we have workspace = 0
-            $statement .= ' AND ' . $tableName . '.pid<>-1';
-        }
-
-        if (!$includeDeleted) {
-            $statement .= BackendUtility::deleteClause($tableName);
-        }
-
-        return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
-    }
-
-    /**
-     * Builds the language field statement
-     *
-     * @param string $tableNameOrAlias The database table name
-     * @param array &$statementParts The query parts
-     * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
-     * @throws Exception
-     * @return void
-     */
-    protected function addSysLanguageStatement($tableNameOrAlias, array &$statementParts, $querySettings)
-    {
-
-        $tableName = $this->resolveTableNameAlias($tableNameOrAlias);
-        if (is_array($GLOBALS['TCA'][$tableName]['ctrl'])) {
-            if (!empty($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])) {
-                // Select all entries for the current language
-                $additionalWhereClause = $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' IN (' . intval($querySettings->getLanguageUid()) . ',-1)';
-                // If any language is set -> get those entries which are not translated yet
-                // They will be removed by t3lib_page::getRecordOverlay if not matching overlay mode
-                if (isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
-                    && $querySettings->getLanguageUid() > 0
-                ) {
-                    $additionalWhereClause .= ' OR (' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0' .
-                        ' AND ' . $tableNameOrAlias . '.uid NOT IN (SELECT ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] .
-                        ' FROM ' . $tableName .
-                        ' WHERE ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] . '>0' .
-                        ' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '>0';
-
-                    // Add delete clause to ensure all entries are loaded
-                    if (isset($GLOBALS['TCA'][$tableName]['ctrl']['delete'])) {
-                        $additionalWhereClause .= ' AND ' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['delete'] . '=0';
-                    }
-                    $additionalWhereClause .= '))';
-                }
-                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = '(' . $additionalWhereClause . ')';
-            }
-        }
-    }
-
-    /**
-     * Transforms orderings into SQL.
-     *
-     * @param array $orderings An array of orderings (Tx_Extbase_Persistence_QOM_Ordering)
-     * @param SourceInterface $source The source
-     * @param array &$sql The query parts
-     * @throws Exception\UnsupportedOrderException
-     * @return void
-     */
-    protected function parseOrderings(array $orderings, SourceInterface $source, array &$sql)
-    {
-        foreach ($orderings as $fieldNameAndPath => $order) {
-            switch ($order) {
-                case QueryInterface::ORDER_ASCENDING:
-                    $order = 'ASC';
-                    break;
-                case QueryInterface::ORDER_DESCENDING:
-                    $order = 'DESC';
-                    break;
-                default:
-                    throw new Exception\UnsupportedOrderException('Unsupported order encountered.', 1456845126);
-            }
-
-            $tableName = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->query->getType());
-            $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $tableName);
-            $sql['orderings'][] = sprintf('%s.%s %s', $tableName, $fieldName, $order);
-        }
-    }
-
-    /**
-     * Transforms limit and offset into SQL
-     *
-     * @param int $limit
-     * @param int $offset
-     * @param array &$sql
-     * @return void
-     */
-    protected function parseLimitAndOffset($limit, $offset, array &$sql)
-    {
-        if ($limit !== null && $offset !== null) {
-            $sql['limit'] = intval($offset) . ', ' . intval($limit);
-        } elseif ($limit !== null) {
-            $sql['limit'] = intval($limit);
-        }
-    }
-
-    /**
-     * Transforms a Resource from a database query to an array of rows.
-     *
-     * @param resource $result The result
-     * @return array The result as an array of rows (tuples)
-     */
-    protected function getRowsFromResult($result)
-    {
-        $rows = [];
-        while ($row = $this->databaseHandle->sql_fetch_assoc($result)) {
-            if (is_array($row)) {
-
-                // Get language uid from querySettings.
-                // Ensure the backend handling is not broken (fallback to Get parameter 'L' if needed)
-                $overlaidRow = $this->doLanguageAndWorkspaceOverlay($this->query->getSource(), $row, $this->query->getQuerySettings());
-                $contentObject = GeneralUtility::makeInstance($this->objectType, $this->query->getType(), $overlaidRow);
-                $rows[] = $contentObject;
-            }
-        }
-
-        return $rows;
-    }
-
-    /**
-     * Performs workspace and language overlay on the given row array. The language and workspace id is automatically
-     * detected (depending on FE or BE context). You can also explicitly set the language/workspace id.
-     *
-     * @param SourceInterface $source The source (selector od join)
-     * @param array $row
-     * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
-     * @return array
-     */
-    protected function doLanguageAndWorkspaceOverlay(SourceInterface $source, array $row, $querySettings)
-    {
-
-        /** @var SelectorInterface $source */
-        $tableName = $source->getSelectorName();
-
-        $pageRepository = $this->getPageRepository();
-        if (is_object($GLOBALS['TSFE'])) {
-            $languageMode = $GLOBALS['TSFE']->sys_language_mode;
-            if ($this->isBackendUserLogged() && $this->getBackendUser()->workspace !== 0) {
-                $pageRepository->versioningWorkspaceId = $this->getBackendUser()->workspace;
-            }
-        } else {
-            $languageMode = '';
-            $workspaceUid = $this->getBackendUser()->workspace;
-            $pageRepository->versioningWorkspaceId = $workspaceUid;
-            if ($this->getBackendUser()->workspace !== 0) {
-                $pageRepository->versioningPreview = 1;
-            }
-        }
-
-        // If current row is a translation select its parent
-        if (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
-            && isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
-        ) {
-            if (isset($row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']])
-                && $row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] > 0
-            ) {
-                $row = $this->databaseHandle->exec_SELECTgetSingleRow(
-                    $tableName . '.*',
-                    $tableName,
-                    $tableName . '.uid=' . (int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] .
-                    ' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0'
-                );
-            }
-        }
-
-        // Retrieve the original uid; Used for Workspaces!
-        if (TYPO3_MODE !== 'BE') {
-            $pageRepository->versionOL($tableName, $row, true, true);
-        } else {
-            BackendUtility::workspaceOL($tableName, $row);
-        }
-        if ($pageRepository->versioningPreview && isset($row['_ORIG_uid'])) {
-            $row['uid'] = $row['_ORIG_uid'];
-        }
-
-        // Special case for table "pages"
-        if ($tableName == 'pages') {
-            $row = $pageRepository->getPageOverlay($row, $querySettings->getLanguageUid());
-        } elseif (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
-            && $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] !== ''
-        ) {
-            if (in_array($row[$GLOBALS['TCA'][$tableName]['ctrl']['languageField']], array(-1, 0))) {
-                $overlayMode = $languageMode === 'strict' ? 'hideNonTranslated' : '';
-                $row = $pageRepository->getRecordOverlay($tableName, $row, $querySettings->getLanguageUid(), $overlayMode);
-            }
-        }
-
-        return $row;
-    }
-
-    /**
-     * Return a resolved table name given a possible table name alias.
-     *
-     * @param string $tableNameOrAlias
-     * @return string
-     */
-    protected function resolveTableNameAlias($tableNameOrAlias)
-    {
-        $resolvedTableName = $tableNameOrAlias;
-        if (!empty($this->tableNameAliases['aliases'][$tableNameOrAlias])) {
-            $resolvedTableName = $this->tableNameAliases['aliases'][$tableNameOrAlias];
-        }
-        return $resolvedTableName;
-    }
-
-    /**
-     * Generate a unique table name alias for the given table name.
-     *
-     * @param string $tableName
-     * @return string
-     */
-    protected function generateAlias($tableName)
-    {
-
-        if (!isset($this->tableNameAliases['aliasIncrement'][$tableName])) {
-            $this->tableNameAliases['aliasIncrement'][$tableName] = 0;
-        }
-
-        $numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
-        $tableNameAlias = $tableName . $numberOfAliases;
-
-        $this->tableNameAliases['aliasIncrement'][$tableName]++;
-        $this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;
-
-        return $tableNameAlias;
-    }
-
-    /**
-     * Replace the table names by its table name alias within the given statement.
-     *
-     * @param string $tableName
-     * @param string $tableNameAlias
-     * @param string $statement
-     * @return string
-     */
-    protected function replaceTableNameByAlias($tableName, $tableNameAlias, $statement)
-    {
-        if ($statement && $tableName !== $tableNameAlias) {
-            $statement = str_replace($tableName, $tableNameAlias, $statement);
-        }
-        return $statement;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Tell whether a Backend User is logged in.
-     *
-     * @return bool
-     */
-    protected function isBackendUserLogged()
-    {
-        return is_object($GLOBALS['BE_USER']);
-    }
-
-    /**
-     * @return PageRepository
-     */
-    protected function getPageRepository()
-    {
-        if (!$this->pageRepository instanceof PageRepository) {
-            if ($this->environmentService->isEnvironmentInFrontendMode() && is_object($GLOBALS['TSFE'])) {
-                $this->pageRepository = $GLOBALS['TSFE']->sys_page;
-            } else {
-                $this->pageRepository = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
-            }
-        }
-
-        return $this->pageRepository;
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\FieldPathResolver
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Resolver\FieldPathResolver');
-    }
-
-    /**
-     * Checks if there are SQL errors in the last query, and if yes, throw an exception.
-     *
-     * @return void
-     * @param string $sql The SQL statement
-     * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\SqlErrorException
-     */
-    protected function checkSqlErrors($sql = '')
-    {
-        $error = $this->databaseHandle->sql_error();
-        if ($error !== '') {
-            $error .= $sql ? ': ' . $sql : '';
-            throw new \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\SqlErrorException($error, 1247602160);
-        }
-    }
+	const OPERATOR_EQUAL_TO_NULL = 'operatorEqualToNull';
+	const OPERATOR_NOT_EQUAL_TO_NULL = 'operatorNotEqualToNull';
+
+	/**
+	 * The TYPO3 database object
+	 *
+	 * @var \TYPO3\CMS\Core\Database\DatabaseConnection
+	 */
+	protected $databaseHandle;
+
+	/**
+	 * The TYPO3 page repository. Used for language and workspace overlay
+	 *
+	 * @var PageRepository
+	 */
+	protected $pageRepository;
+
+	/**
+	 * A first-level TypoScript configuration cache
+	 *
+	 * @var array
+	 */
+	protected $pageTSConfigCache = [];
+
+	/**
+	 * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
+	 * @inject
+	 */
+	protected $configurationManager;
+
+	/**
+	 * @var \TYPO3\CMS\Extbase\Service\CacheService
+	 * @inject
+	 */
+	protected $cacheService;
+
+	/**
+	 * @var \TYPO3\CMS\Core\Cache\CacheManager
+	 * @inject
+	 */
+	protected $cacheManager;
+
+	/**
+	 * @var \TYPO3\CMS\Extbase\Service\EnvironmentService
+	 * @inject
+	 */
+	protected $environmentService;
+
+	/**
+	 * @var \Fab\Vidi\Persistence\Query
+	 */
+	protected $query;
+
+	/**
+	 * Store some info related to table name and its aliases.
+	 *
+	 * @var array
+	 */
+	protected $tableNameAliases = array(
+		'aliases' => [],
+		'aliasIncrement' => [],
+	);
+
+	/**
+	 * Use to store the current foreign table name alias.
+	 *
+	 * @var string
+	 */
+	protected $currentChildTableNameAlias = '';
+
+	/**
+	 * The default object type being returned.
+	 *
+	 * @var string
+	 */
+	protected $objectType = 'Fab\Vidi\Domain\Model\Content';
+
+	/**
+	 * Constructor. takes the database handle from $GLOBALS['TYPO3_DB']
+	 */
+	public function __construct(QueryInterface $query)
+	{
+		$this->query = $query;
+		$this->databaseHandle = $GLOBALS['TYPO3_DB'];
+	}
+
+	/**
+	 * @param array $identifier
+	 * @return string
+	 */
+	protected function parseIdentifier(array $identifier)
+	{
+		$fieldNames = array_keys($identifier);
+		$suffixedFieldNames = [];
+		foreach ($fieldNames as $fieldName) {
+			$suffixedFieldNames[] = $fieldName . '=?';
+		}
+		return implode(' AND ', $suffixedFieldNames);
+	}
+
+	/**
+	 * Returns the result of the query
+	 */
+	public function fetchResult()
+	{
+
+		$parameters = [];
+		$statementParts = $this->parseQuery($this->query, $parameters);
+		$statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts); // Mmm... check if that is the right way of doing that.
+
+		$sql = $this->buildQuery($statementParts);
+		$tableName = '';
+		if (is_array($statementParts) && !empty(reset($statementParts['tables']))) {
+			$tableName = reset($statementParts['tables']);
+		}
+		$this->replacePlaceholders($sql, $parameters, $tableName);
+		#print $sql; exit(); // @debug
+
+		$result = $this->databaseHandle->sql_query($sql);
+		$this->checkSqlErrors($sql);
+		$rows = $this->getRowsFromResult($result);
+		$this->databaseHandle->sql_free_result($result);
+
+		return $rows;
+	}
+
+	/**
+	 * Returns the number of tuples matching the query.
+	 *
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\BadConstraintException
+	 * @return int The number of matching tuples
+	 */
+	public function countResult()
+	{
+
+		$parameters = [];
+		$statementParts = $this->parseQuery($this->query, $parameters);
+		$statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts); // Mmm... check if that is the right way of doing that.
+		// Reset $statementParts for valid table return
+		reset($statementParts);
+
+		// if limit is set, we need to count the rows "manually" as COUNT(*) ignores LIMIT constraints
+		if (!empty($statementParts['limit'])) {
+			$statement = $this->buildQuery($statementParts);
+			$this->replacePlaceholders($statement, $parameters, current($statementParts['tables']));
+			#print $statement; exit(); // @debug
+			$result = $this->databaseHandle->sql_query($statement);
+			$this->checkSqlErrors($statement);
+			$count = $this->databaseHandle->sql_num_rows($result);
+		} else {
+			$statementParts['fields'] = array('COUNT(*)');
+			// having orderings without grouping is not compatible with non-MySQL DBMS
+			$statementParts['orderings'] = [];
+			if (isset($statementParts['keywords']['distinct'])) {
+				unset($statementParts['keywords']['distinct']);
+				$distinctField = $this->query->getDistinct() ? $this->query->getDistinct() : 'uid';
+				$statementParts['fields'] = array('COUNT(DISTINCT ' . reset($statementParts['tables']) . '.' . $distinctField . ')');
+			}
+
+			$statement = $this->buildQuery($statementParts);
+			$this->replacePlaceholders($statement, $parameters, current($statementParts['tables']));
+
+			#print $statement; exit(); // @debug
+			$result = $this->databaseHandle->sql_query($statement);
+			$this->checkSqlErrors($statement);
+			$count = 0;
+			if ($result) {
+				$row = $this->databaseHandle->sql_fetch_assoc($result);
+				$count = current($row);
+			}
+		}
+		$this->databaseHandle->sql_free_result($result);
+		return (int)$count;
+	}
+
+	/**
+	 * Parses the query and returns the SQL statement parts.
+	 *
+	 * @param QueryInterface $query The query
+	 * @param array &$parameters
+	 * @return array The SQL statement parts
+	 */
+	public function parseQuery(QueryInterface $query, array &$parameters)
+	{
+		$statementParts = [];
+		$statementParts['keywords'] = [];
+		$statementParts['tables'] = [];
+		$statementParts['unions'] = [];
+		$statementParts['fields'] = [];
+		$statementParts['where'] = [];
+		$statementParts['additionalWhereClause'] = [];
+		$statementParts['orderings'] = [];
+		$statementParts['limit'] = [];
+		$source = $query->getSource();
+		$this->parseSource($source, $statementParts);
+		$this->parseConstraint($query->getConstraint(), $source, $statementParts, $parameters);
+		$this->parseOrderings($query->getOrderings(), $source, $statementParts);
+		$this->parseLimitAndOffset($query->getLimit(), $query->getOffset(), $statementParts);
+		$tableNames = array_unique(array_keys($statementParts['tables'] + $statementParts['unions']));
+		foreach ($tableNames as $tableNameOrAlias) {
+			if (is_string($tableNameOrAlias) && strlen($tableNameOrAlias) > 0) {
+				$this->addAdditionalWhereClause($query->getQuerySettings(), $tableNameOrAlias, $statementParts);
+			}
+		}
+
+		return $statementParts;
+	}
+
+	/**
+	 * Fiddle with the statement structure to handle recursive MM relations.
+	 * For the recursive MM query to work, we must invert some values.
+	 * Let see if that is the best way of doing that...
+	 *
+	 * @param array $statementParts
+	 * @return array
+	 */
+	public function processStatementStructureForRecursiveMMRelation(array $statementParts)
+	{
+
+		if ($this->hasRecursiveMMRelation()) {
+			$tableName = $this->query->getType();
+
+			// In order the MM query to work for a recursive MM query, we must invert some values.
+			// tx_domain_model_foo0 (the alias) <--> tx_domain_model_foo (the origin table name)
+			$values = [];
+			foreach ($statementParts['fields'] as $key => $value) {
+				$values[$key] = str_replace($tableName, $tableName . '0', $value);
+			}
+			$statementParts['fields'] = $values;
+
+			// Same comment as above.
+			$values = [];
+			foreach ($statementParts['where'] as $key => $value) {
+				$values[$key] = str_replace($tableName . '0', $tableName, $value);
+			}
+			$statementParts['where'] = $values;
+
+			// We must be more restrictive by transforming the "left" union by "inner"
+			$values = [];
+			foreach ($statementParts['unions'] as $key => $value) {
+				$values[$key] = str_replace('LEFT JOIN', 'INNER JOIN', $value);
+			}
+			$statementParts['unions'] = $values;
+		}
+
+		return $statementParts;
+	}
+
+	/**
+	 * Tell whether there is a recursive MM relation.
+	 *
+	 * @return bool
+	 */
+	public function hasRecursiveMMRelation()
+	{
+		return isset($this->tableNameAliases['aliasIncrement'][$this->query->getType()]);
+
+	}
+
+	/**
+	 * Returns the statement, ready to be executed.
+	 *
+	 * @param array $statementParts The SQL statement parts
+	 * @return string The SQL statement
+	 */
+	public function buildQuery(array $statementParts)
+	{
+
+		// Add more statement to the UNION part.
+		if (!empty($statementParts['unions'])) {
+			foreach ($statementParts['unions'] as $tableName => $unionPart) {
+				if (!empty($statementParts['additionalWhereClause'][$tableName])) {
+					$statementParts['unions'][$tableName] .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
+				}
+			}
+		}
+
+		$statement = 'SELECT ' . implode(' ', $statementParts['keywords']) . ' ' . implode(',', $statementParts['fields']) . ' FROM ' . implode(' ', $statementParts['tables']) . ' ' . implode(' ', $statementParts['unions']);
+		if (!empty($statementParts['where'])) {
+			$statement .= ' WHERE ' . implode('', $statementParts['where']);
+			if (!empty($statementParts['additionalWhereClause'][$this->query->getType()])) {
+				$statement .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+			}
+		} elseif (!empty($statementParts['additionalWhereClause'])) {
+			$statement .= ' WHERE ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+		}
+		if (!empty($statementParts['orderings'])) {
+			$statement .= ' ORDER BY ' . implode(', ', $statementParts['orderings']);
+		}
+		if (!empty($statementParts['limit'])) {
+			$statement .= ' LIMIT ' . $statementParts['limit'];
+		}
+
+		return $statement;
+	}
+
+	/**
+	 * Transforms a Query Source into SQL and parameter arrays
+	 *
+	 * @param SourceInterface $source The source
+	 * @param array &$sql
+	 * @return void
+	 */
+	protected function parseSource(SourceInterface $source, array &$sql)
+	{
+		if ($source instanceof SelectorInterface) {
+			$tableName = $source->getNodeTypeName();
+			$sql['fields'][$tableName] = $tableName . '.*';
+			$sql['tables'][$tableName] = $tableName;
+			if ($this->query->getDistinct()) {
+				$sql['fields'][$tableName] = $tableName . '.' . $this->query->getDistinct();
+				$sql['keywords']['distinct'] = 'DISTINCT';
+			}
+		} elseif ($source instanceof JoinInterface) {
+			$this->parseJoin($source, $sql);
+		}
+	}
+
+	/**
+	 * Transforms a Join into SQL and parameter arrays
+	 *
+	 * @param JoinInterface $join The join
+	 * @param array &$sql The query parts
+	 * @return void
+	 */
+	protected function parseJoin(JoinInterface $join, array &$sql)
+	{
+		$leftSource = $join->getLeft();
+		$leftTableName = $leftSource->getSelectorName();
+		// $sql['fields'][$leftTableName] = $leftTableName . '.*';
+		$rightSource = $join->getRight();
+		if ($rightSource instanceof JoinInterface) {
+			$rightTableName = $rightSource->getLeft()->getSelectorName();
+		} else {
+			$rightTableName = $rightSource->getSelectorName();
+			$sql['fields'][$leftTableName] = $rightTableName . '.*';
+		}
+		$sql['tables'][$leftTableName] = $leftTableName;
+		$sql['unions'][$rightTableName] = 'LEFT JOIN ' . $rightTableName;
+		$joinCondition = $join->getJoinCondition();
+		if ($joinCondition instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\EquiJoinCondition) {
+			$column1Name = $joinCondition->getProperty1Name();
+			$column2Name = $joinCondition->getProperty2Name();
+			$sql['unions'][$rightTableName] .= ' ON ' . $joinCondition->getSelector1Name() . '.' . $column1Name . ' = ' . $joinCondition->getSelector2Name() . '.' . $column2Name;
+		}
+		if ($rightSource instanceof JoinInterface) {
+			$this->parseJoin($rightSource, $sql);
+		}
+	}
+
+	/**
+	 * Transforms a constraint into SQL and parameter arrays
+	 *
+	 * @param \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint The constraint
+	 * @param SourceInterface $source The source
+	 * @param array &$sql The query parts
+	 * @param array &$parameters The parameters that will replace the markers
+	 * @return void
+	 */
+	protected function parseConstraint(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface $constraint = null, SourceInterface $source, array &$sql, array &$parameters)
+	{
+		if ($constraint instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\AndInterface) {
+			$sql['where'][] = '(';
+			$this->parseConstraint($constraint->getConstraint1(), $source, $sql, $parameters);
+			$sql['where'][] = ' AND ';
+			$this->parseConstraint($constraint->getConstraint2(), $source, $sql, $parameters);
+			$sql['where'][] = ')';
+		} elseif ($constraint instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\OrInterface) {
+			$sql['where'][] = '(';
+			$this->parseConstraint($constraint->getConstraint1(), $source, $sql, $parameters);
+			$sql['where'][] = ' OR ';
+			$this->parseConstraint($constraint->getConstraint2(), $source, $sql, $parameters);
+			$sql['where'][] = ')';
+		} elseif ($constraint instanceof \TYPO3\CMS\Extbase\Persistence\Generic\Qom\NotInterface) {
+			$sql['where'][] = 'NOT (';
+			$this->parseConstraint($constraint->getConstraint(), $source, $sql, $parameters);
+			$sql['where'][] = ')';
+		} elseif ($constraint instanceof ComparisonInterface) {
+			$this->parseComparison($constraint, $source, $sql, $parameters);
+		}
+	}
+
+	/**
+	 * Parse a Comparison into SQL and parameter arrays.
+	 *
+	 * @param ComparisonInterface $comparison The comparison to parse
+	 * @param SourceInterface $source The source
+	 * @param array &$sql SQL query parts to add to
+	 * @param array &$parameters Parameters to bind to the SQL
+	 * @throws Exception\RepositoryException
+	 * @return void
+	 */
+	protected function parseComparison(ComparisonInterface $comparison, SourceInterface $source, array &$sql, array &$parameters)
+	{
+		$operand1 = $comparison->getOperand1();
+		$operator = $comparison->getOperator();
+		$operand2 = $comparison->getOperand2();
+		if ($operator === QueryInterface::OPERATOR_IN) {
+			$items = [];
+			$hasValue = false;
+			foreach ($operand2 as $value) {
+				$value = $this->getPlainValue($value);
+				if ($value !== null) {
+					$items[] = $value;
+					$hasValue = true;
+				}
+			}
+			if ($hasValue === false) {
+				$sql['where'][] = '1<>1';
+			} else {
+				$this->parseDynamicOperand($operand1, $operator, $source, $sql, $parameters, null);
+				$parameters[] = $items;
+			}
+		} elseif ($operator === QueryInterface::OPERATOR_CONTAINS) {
+			if ($operand2 === null) {
+				$sql['where'][] = '1<>1';
+			} else {
+				throw new \Exception('Not implemented! Contact extension author.', 1412931227);
+				# @todo re-implement me if necessary.
+				#$tableName = $this->query->getType();
+				#$propertyName = $operand1->getPropertyName();
+				#while (strpos($propertyName, '.') !== false) {
+				#	$this->addUnionStatement($tableName, $propertyName, $sql);
+				#}
+				#$columnName = $propertyName;
+				#$columnMap = $propertyName;
+				#$typeOfRelation = $columnMap instanceof ColumnMap ? $columnMap->getTypeOfRelation() : null;
+				#if ($typeOfRelation === ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY) {
+				#	$relationTableName = $columnMap->getRelationTableName();
+				#	$sql['where'][] = $tableName . '.uid IN (SELECT ' . $columnMap->getParentKeyFieldName() . ' FROM ' . $relationTableName . ' WHERE ' . $columnMap->getChildKeyFieldName() . '=?)';
+				#	$parameters[] = intval($this->getPlainValue($operand2));
+				#} elseif ($typeOfRelation === ColumnMap::RELATION_HAS_MANY) {
+				#	$parentKeyFieldName = $columnMap->getParentKeyFieldName();
+				#	if (isset($parentKeyFieldName)) {
+				#		$childTableName = $columnMap->getChildTableName();
+				#		$sql['where'][] = $tableName . '.uid=(SELECT ' . $childTableName . '.' . $parentKeyFieldName . ' FROM ' . $childTableName . ' WHERE ' . $childTableName . '.uid=?)';
+				#		$parameters[] = intval($this->getPlainValue($operand2));
+				#	} else {
+				#		$sql['where'][] = 'FIND_IN_SET(?,' . $tableName . '.' . $columnName . ')';
+				#		$parameters[] = intval($this->getPlainValue($operand2));
+				#	}
+				#} else {
+				#	throw new Exception\RepositoryException('Unsupported or non-existing property name "' . $propertyName . '" used in relation matching.', 1327065745);
+				#}
+			}
+		} else {
+			if ($operand2 === null) {
+				if ($operator === QueryInterface::OPERATOR_EQUAL_TO) {
+					$operator = self::OPERATOR_EQUAL_TO_NULL;
+				} elseif ($operator === QueryInterface::OPERATOR_NOT_EQUAL_TO) {
+					$operator = self::OPERATOR_NOT_EQUAL_TO_NULL;
+				}
+			}
+			$this->parseDynamicOperand($operand1, $operator, $source, $sql, $parameters);
+			$parameters[] = $this->getPlainValue($operand2);
+		}
+	}
+
+	/**
+	 * Returns a plain value, i.e. objects are flattened out if possible.
+	 *
+	 * @param mixed $input
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException
+	 * @return mixed
+	 */
+	protected function getPlainValue($input)
+	{
+		if (is_array($input)) {
+			throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An array could not be converted to a plain value.', 1274799932);
+		}
+		if ($input instanceof \DateTime) {
+			return $input->format('U');
+		} elseif (is_object($input)) {
+			if ($input instanceof \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy) {
+				$realInput = $input->_loadRealInstance();
+			} else {
+				$realInput = $input;
+			}
+			if ($realInput instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
+				return $realInput->getUid();
+			} else {
+				throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "' . get_class($realInput) . '" could not be converted to a plain value.', 1274799934);
+			}
+		} elseif (is_bool($input)) {
+			return $input === true ? 1 : 0;
+		} else {
+			return $input;
+		}
+	}
+
+	/**
+	 * Parse a DynamicOperand into SQL and parameter arrays.
+	 *
+	 * @param DynamicOperandInterface $operand
+	 * @param string $operator One of the JCR_OPERATOR_* constants
+	 * @param SourceInterface $source The source
+	 * @param array &$sql The query parts
+	 * @param array &$parameters The parameters that will replace the markers
+	 * @param string $valueFunction an optional SQL function to apply to the operand value
+	 * @return void
+	 */
+	protected function parseDynamicOperand(DynamicOperandInterface $operand, $operator, SourceInterface $source, array &$sql, array &$parameters, $valueFunction = null)
+	{
+		if ($operand instanceof LowerCaseInterface) {
+			$this->parseDynamicOperand($operand->getOperand(), $operator, $source, $sql, $parameters, 'LOWER');
+		} elseif ($operand instanceof UpperCaseInterface) {
+			$this->parseDynamicOperand($operand->getOperand(), $operator, $source, $sql, $parameters, 'UPPER');
+		} elseif ($operand instanceof PropertyValueInterface) {
+			$propertyName = $operand->getPropertyName();
+
+			// Reset value.
+			$this->currentChildTableNameAlias = '';
+
+			if ($source instanceof SelectorInterface) {
+				$tableName = $this->query->getType();
+				while (strpos($propertyName, '.') !== false) {
+					$this->addUnionStatement($tableName, $propertyName, $sql);
+				}
+			} elseif ($source instanceof JoinInterface) {
+				$tableName = $source->getJoinCondition()->getSelector1Name();
+			}
+
+			$columnName = $propertyName;
+			$operator = $this->resolveOperator($operator);
+			$constraintSQL = '';
+			if ($valueFunction === null) {
+				$constraintSQL .= (!empty($tableName) ? $tableName . '.' : '') . $columnName . ' ' . $operator . ' ?';
+			} else {
+				$constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName . ') ' . $operator . ' ?';
+			}
+
+			if (isset($tableName) && !empty($this->currentChildTableNameAlias)) {
+				$constraintSQL = $this->replaceTableNameByAlias($tableName, $this->currentChildTableNameAlias, $constraintSQL);
+			}
+			$sql['where'][] = $constraintSQL;
+		}
+	}
+
+	/**
+	 * @param string &$tableName
+	 * @param array &$propertyPath
+	 * @param array &$sql
+	 * @throws Exception
+	 * @throws Exception\InvalidRelationConfigurationException
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\MissingColumnMapException
+	 */
+	protected function addUnionStatement(&$tableName, &$propertyPath, array &$sql)
+	{
+
+		$table = Tca::table($tableName);
+
+		$explodedPropertyPath = explode('.', $propertyPath, 2);
+		$fieldName = $explodedPropertyPath[0];
+
+		// Field of type "group" are special 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"
+		if ($table->field($fieldName)->isGroup()) {
+			$parts = explode('.', $propertyPath, 3);
+			$explodedPropertyPath[0] = $parts[0] . '.' . $parts[1];
+			$explodedPropertyPath[1] = $parts[2];
+			$fieldName = $explodedPropertyPath[0];
+		}
+
+		$parentKeyFieldName = $table->field($fieldName)->getForeignField();
+		$childTableName = $table->field($fieldName)->getForeignTable();
+
+		if ($childTableName === null) {
+			throw new Exception\InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
+		}
+
+		if ($table->field($fieldName)->hasOne()) { // includes relation "one-to-one" and "many-to-one"
+			// sometimes the opposite relation is not defined. We don't want to force this config for backward compatibility reasons.
+			// $parentKeyFieldName === null does the trick somehow. Before condition was if (isset($parentKeyFieldName))
+			if ($table->field($fieldName)->hasRelationManyToOne() || $parentKeyFieldName === null) {
+				$sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.' . $fieldName . '=' . $childTableName . '.uid';
+			} else {
+				$sql['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.uid=' . $childTableName . '.' . $parentKeyFieldName;
+			}
+		} elseif ($table->field($fieldName)->hasRelationManyToMany()) {
+			$relationTableName = $table->field($fieldName)->getManyToManyTable();
+
+			$parentKeyFieldName = $table->field($fieldName)->isOppositeRelation() ? 'uid_foreign' : 'uid_local';
+			$childKeyFieldName = !$table->field($fieldName)->isOppositeRelation() ? 'uid_foreign' : 'uid_local';
+
+			// MM table e.g sys_category_record_mm
+			$relationTableNameAlias = $this->generateAlias($relationTableName);
+			$join = sprintf(
+				'LEFT JOIN %s AS %s ON %s.uid=%s.%s', $relationTableName,
+				$relationTableNameAlias,
+				$tableName,
+				$relationTableNameAlias,
+				$parentKeyFieldName
+			);
+			$sql['unions'][$relationTableNameAlias] = $join;
+
+			// Foreign table e.g sys_category
+			$childTableNameAlias = $this->generateAlias($childTableName);
+			$this->currentChildTableNameAlias = $childTableNameAlias;
+			$join = sprintf(
+				'LEFT JOIN %s AS %s ON %s.%s=%s.uid',
+				$childTableName,
+				$childTableNameAlias,
+				$relationTableNameAlias,
+				$childKeyFieldName,
+				$childTableNameAlias
+			);
+			$sql['unions'][$childTableNameAlias] = $join;
+
+			// Find a possible table name for a MM condition.
+			$tableNameCondition = $table->field($fieldName)->getAdditionalTableNameCondition();
+			if ($tableNameCondition) {
+
+				// If we can find a source file name,  we can then retrieve more MM conditions from the TCA such as a field name.
+				$sourceFileName = $this->query->getSourceFieldName();
+				if (empty($sourceFileName)) {
+					$additionalMMConditions = array(
+						'tablenames' => $tableNameCondition,
+					);
+				} else {
+					$additionalMMConditions = Tca::table($tableNameCondition)->field($sourceFileName)->getAdditionalMMCondition();
+				}
+
+				foreach ($additionalMMConditions as $additionalFieldName => $additionalMMCondition) {
+					$additionalJoin = sprintf(' AND %s.%s = "%s"', $relationTableNameAlias, $additionalFieldName, $additionalMMCondition);
+					$sql['unions'][$relationTableNameAlias] .= $additionalJoin;
+
+					$additionalJoin = sprintf(' AND %s.%s = "%s"', $relationTableNameAlias, $additionalFieldName, $additionalMMCondition);
+					$sql['unions'][$childTableNameAlias] .= $additionalJoin;
+				}
+
+			}
+
+
+		} elseif ($table->field($fieldName)->hasMany()) { // includes relations "many-to-one" and "csv" relations
+			$childTableNameAlias = $this->generateAlias($childTableName);
+			$this->currentChildTableNameAlias = $childTableNameAlias;
+
+			if (isset($parentKeyFieldName)) {
+				$join = sprintf(
+					'LEFT JOIN %s AS %s ON %s.uid=%s.%s',
+					$childTableName,
+					$childTableNameAlias,
+					$tableName,
+					$childTableNameAlias,
+					$parentKeyFieldName
+				);
+				$sql['unions'][$childTableNameAlias] = $join;
+			} else {
+				$join = sprintf(
+					'LEFT JOIN %s AS %s ON (FIND_IN_SET(%s.uid, %s.%s))',
+					$childTableName,
+					$childTableNameAlias,
+					$childTableNameAlias,
+					$tableName,
+					$fieldName
+				);
+				$sql['unions'][$childTableNameAlias] = $join;
+			}
+		} else {
+			throw new Exception('Could not determine type of relation.', 1252502725);
+		}
+
+		// TODO check if there is another solution for this
+		$sql['keywords']['distinct'] = 'DISTINCT';
+		$propertyPath = $explodedPropertyPath[1];
+		$tableName = $childTableName;
+	}
+
+	/**
+	 * Returns the SQL operator for the given JCR operator type.
+	 *
+	 * @param string $operator One of the JCR_OPERATOR_* constants
+	 * @throws Exception
+	 * @return string an SQL operator
+	 */
+	protected function resolveOperator($operator)
+	{
+		switch ($operator) {
+			case self::OPERATOR_EQUAL_TO_NULL:
+				$operator = 'IS';
+				break;
+			case self::OPERATOR_NOT_EQUAL_TO_NULL:
+				$operator = 'IS NOT';
+				break;
+			case QueryInterface::OPERATOR_IN:
+				$operator = 'IN';
+				break;
+			case QueryInterface::OPERATOR_EQUAL_TO:
+				$operator = '=';
+				break;
+			case QueryInterface::OPERATOR_NOT_EQUAL_TO:
+				$operator = '!=';
+				break;
+			case QueryInterface::OPERATOR_LESS_THAN:
+				$operator = '<';
+				break;
+			case QueryInterface::OPERATOR_LESS_THAN_OR_EQUAL_TO:
+				$operator = '<=';
+				break;
+			case QueryInterface::OPERATOR_GREATER_THAN:
+				$operator = '>';
+				break;
+			case QueryInterface::OPERATOR_GREATER_THAN_OR_EQUAL_TO:
+				$operator = '>=';
+				break;
+			case QueryInterface::OPERATOR_LIKE:
+				$operator = 'LIKE';
+				break;
+			default:
+				throw new Exception('Unsupported operator encountered.', 1242816073);
+		}
+		return $operator;
+	}
+
+	/**
+	 * Replace query placeholders in a query part by the given
+	 * parameters.
+	 *
+	 * @param string &$sqlString The query part with placeholders
+	 * @param array $parameters The parameters
+	 * @param string $tableName
+	 *
+	 * @throws Exception
+	 */
+	protected function replacePlaceholders(&$sqlString, array $parameters, $tableName = 'foo')
+	{
+		// TODO profile this method again
+		if (substr_count($sqlString, '?') !== count($parameters)) {
+			throw new Exception('The number of question marks to replace must be equal to the number of parameters.', 1242816074);
+		}
+		$offset = 0;
+		foreach ($parameters as $parameter) {
+			$markPosition = strpos($sqlString, '?', $offset);
+			if ($markPosition !== false) {
+				if ($parameter === null) {
+					$parameter = 'null';
+				} elseif (is_array($parameter) || $parameter instanceof \ArrayAccess || $parameter instanceof \Traversable) {
+					$items = [];
+					foreach ($parameter as $item) {
+						$items[] = $this->databaseHandle->fullQuoteStr($item, $tableName);
+					}
+					$parameter = '(' . implode(',', $items) . ')';
+				} else {
+					$parameter = $this->databaseHandle->fullQuoteStr($parameter, $tableName);
+				}
+				$sqlString = substr($sqlString, 0, $markPosition) . $parameter . substr($sqlString, ($markPosition + 1));
+			}
+			$offset = $markPosition + strlen($parameter);
+		}
+	}
+
+	/**
+	 * Adds additional WHERE statements according to the query settings.
+	 *
+	 * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
+	 * @param string $tableNameOrAlias The table name to add the additional where clause for
+	 * @param array &$statementParts
+	 * @return void
+	 */
+	protected function addAdditionalWhereClause(QuerySettingsInterface $querySettings, $tableNameOrAlias, &$statementParts)
+	{
+		$this->addVisibilityConstraintStatement($querySettings, $tableNameOrAlias, $statementParts);
+		if ($querySettings->getRespectSysLanguage()) {
+			$this->addSysLanguageStatement($tableNameOrAlias, $statementParts, $querySettings);
+		}
+	}
+
+	/**
+	 * Adds enableFields and deletedClause to the query if necessary
+	 *
+	 * @param QuerySettingsInterface $querySettings
+	 * @param string $tableNameOrAlias The database table name
+	 * @param array &$statementParts The query parts
+	 * @return void
+	 */
+	protected function addVisibilityConstraintStatement(QuerySettingsInterface $querySettings, $tableNameOrAlias, array &$statementParts)
+	{
+		$statement = '';
+		$tableName = $this->resolveTableNameAlias($tableNameOrAlias);
+		if (is_array($GLOBALS['TCA'][$tableName]['ctrl'])) {
+			$ignoreEnableFields = $querySettings->getIgnoreEnableFields();
+			$enableFieldsToBeIgnored = $querySettings->getEnableFieldsToBeIgnored();
+			$includeDeleted = $querySettings->getIncludeDeleted();
+			if ($this->environmentService->isEnvironmentInFrontendMode()) {
+				$statement .= $this->getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted);
+			} else {
+				// TYPO3_MODE === 'BE'
+				$statement .= $this->getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted);
+			}
+
+			// Remove the prefixing "AND" if any.
+			if (!empty($statement)) {
+				$statement = strtolower(substr($statement, 1, 3)) === 'and' ? substr($statement, 5) : $statement;
+				$statementParts['additionalWhereClause'][$tableNameOrAlias][] = $statement;
+			}
+		}
+	}
+
+	/**
+	 * Returns constraint statement for frontend context
+	 *
+	 * @param string $tableNameOrAlias
+	 * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
+	 * @param array $enableFieldsToBeIgnored If $ignoreEnableFields is true, this array specifies enable fields to be ignored. If it is null or an empty array (default) all enable fields are ignored.
+	 * @param boolean $includeDeleted A flag indicating whether deleted records should be included
+	 * @return string
+	 * @throws Exception\InconsistentQuerySettingsException
+	 */
+	protected function getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored = [], $includeDeleted)
+	{
+		$statement = '';
+		$tableName = $this->resolveTableNameAlias($tableNameOrAlias);
+		if ($ignoreEnableFields && !$includeDeleted) {
+			if (count($enableFieldsToBeIgnored)) {
+				// array_combine() is necessary because of the way \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() is implemented
+				$statement .= $this->getPageRepository()->enableFields($tableName, -1, array_combine($enableFieldsToBeIgnored, $enableFieldsToBeIgnored));
+			} else {
+				$statement .= $this->getPageRepository()->deleteClause($tableName);
+			}
+		} elseif (!$ignoreEnableFields && !$includeDeleted) {
+			$statement .= $this->getPageRepository()->enableFields($tableName);
+		} elseif (!$ignoreEnableFields && $includeDeleted) {
+			throw new Exception\InconsistentQuerySettingsException('Query setting "ignoreEnableFields=false" can not be used together with "includeDeleted=true" in frontend context.', 1327678173);
+		}
+		return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
+	}
+
+	/**
+	 * Returns constraint statement for backend context
+	 *
+	 * @param string $tableNameOrAlias
+	 * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
+	 * @param boolean $includeDeleted A flag indicating whether deleted records should be included
+	 * @return string
+	 */
+	protected function getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted)
+	{
+		$tableName = $this->resolveTableNameAlias($tableNameOrAlias);
+		$statement = '';
+		if (!$ignoreEnableFields) {
+			$statement .= BackendUtility::BEenableFields($tableName);
+		}
+
+		// If the table is found to have "workspace" support, add the corresponding fields in the statement.
+		if (Tca::table($tableName)->hasWorkspaceSupport()) {
+			if ($this->getBackendUser()->workspace === 0) {
+				$statement .= ' AND ' . $tableName . '.t3ver_state<=' . new VersionState(VersionState::DEFAULT_STATE);
+			} else {
+				// Show only records of live and of the current workspace
+				// In case we are in a Versioning preview
+				$statement .= ' AND (' .
+					$tableName . '.t3ver_wsid=0 OR ' .
+					$tableName . '.t3ver_wsid=' . (int)$this->getBackendUser()->workspace .
+					')';
+			}
+
+			// Check if this segment make sense here or whether it should be in the "if" part when we have workspace = 0
+			$statement .= ' AND ' . $tableName . '.pid<>-1';
+		}
+
+		if (!$includeDeleted) {
+			$statement .= BackendUtility::deleteClause($tableName);
+		}
+
+		return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
+	}
+
+	/**
+	 * Builds the language field statement
+	 *
+	 * @param string $tableNameOrAlias The database table name
+	 * @param array &$statementParts The query parts
+	 * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
+	 * @throws Exception
+	 * @return void
+	 */
+	protected function addSysLanguageStatement($tableNameOrAlias, array &$statementParts, $querySettings)
+	{
+
+		$tableName = $this->resolveTableNameAlias($tableNameOrAlias);
+		if (is_array($GLOBALS['TCA'][$tableName]['ctrl'])) {
+			if (!empty($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])) {
+				// Select all entries for the current language
+				$additionalWhereClause = $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' IN (' . intval($querySettings->getLanguageUid()) . ',-1)';
+				// If any language is set -> get those entries which are not translated yet
+				// They will be removed by t3lib_page::getRecordOverlay if not matching overlay mode
+				if (isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
+					&& $querySettings->getLanguageUid() > 0
+				) {
+					$additionalWhereClause .= ' OR (' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0' .
+						' AND ' . $tableNameOrAlias . '.uid NOT IN (SELECT ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] .
+						' FROM ' . $tableName .
+						' WHERE ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] . '>0' .
+						' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '>0';
+
+					// Add delete clause to ensure all entries are loaded
+					if (isset($GLOBALS['TCA'][$tableName]['ctrl']['delete'])) {
+						$additionalWhereClause .= ' AND ' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['delete'] . '=0';
+					}
+					$additionalWhereClause .= '))';
+				}
+				$statementParts['additionalWhereClause'][$tableNameOrAlias][] = '(' . $additionalWhereClause . ')';
+			}
+		}
+	}
+
+	/**
+	 * Transforms orderings into SQL.
+	 *
+	 * @param array $orderings An array of orderings (Tx_Extbase_Persistence_QOM_Ordering)
+	 * @param SourceInterface $source The source
+	 * @param array &$sql The query parts
+	 * @throws Exception\UnsupportedOrderException
+	 * @return void
+	 */
+	protected function parseOrderings(array $orderings, SourceInterface $source, array &$sql)
+	{
+		foreach ($orderings as $fieldNameAndPath => $order) {
+			switch ($order) {
+				case QueryInterface::ORDER_ASCENDING:
+					$order = 'ASC';
+					break;
+				case QueryInterface::ORDER_DESCENDING:
+					$order = 'DESC';
+					break;
+				default:
+					throw new Exception\UnsupportedOrderException('Unsupported order encountered.', 1456845126);
+			}
+
+			$tableName = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->query->getType());
+			$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $tableName);
+			$sql['orderings'][] = sprintf('%s.%s %s', $tableName, $fieldName, $order);
+		}
+	}
+
+	/**
+	 * Transforms limit and offset into SQL
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @param array &$sql
+	 * @return void
+	 */
+	protected function parseLimitAndOffset($limit, $offset, array &$sql)
+	{
+		if ($limit !== null && $offset !== null) {
+			$sql['limit'] = intval($offset) . ', ' . intval($limit);
+		} elseif ($limit !== null) {
+			$sql['limit'] = intval($limit);
+		}
+	}
+
+	/**
+	 * Transforms a Resource from a database query to an array of rows.
+	 *
+	 * @param resource $result The result
+	 * @return array The result as an array of rows (tuples)
+	 */
+	protected function getRowsFromResult($result)
+	{
+		$rows = [];
+		while ($row = $this->databaseHandle->sql_fetch_assoc($result)) {
+			if (is_array($row)) {
+
+				// Get language uid from querySettings.
+				// Ensure the backend handling is not broken (fallback to Get parameter 'L' if needed)
+				$overlaidRow = $this->doLanguageAndWorkspaceOverlay($this->query->getSource(), $row, $this->query->getQuerySettings());
+				$contentObject = GeneralUtility::makeInstance($this->objectType, $this->query->getType(), $overlaidRow);
+				$rows[] = $contentObject;
+			}
+		}
+
+		return $rows;
+	}
+
+	/**
+	 * Performs workspace and language overlay on the given row array. The language and workspace id is automatically
+	 * detected (depending on FE or BE context). You can also explicitly set the language/workspace id.
+	 *
+	 * @param SourceInterface $source The source (selector od join)
+	 * @param array $row
+	 * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
+	 * @return array
+	 */
+	protected function doLanguageAndWorkspaceOverlay(SourceInterface $source, array $row, $querySettings)
+	{
+
+		/** @var SelectorInterface $source */
+		$tableName = $source->getSelectorName();
+
+		$pageRepository = $this->getPageRepository();
+		if (is_object($GLOBALS['TSFE'])) {
+			$languageMode = $GLOBALS['TSFE']->sys_language_mode;
+			if ($this->isBackendUserLogged() && $this->getBackendUser()->workspace !== 0) {
+				$pageRepository->versioningWorkspaceId = $this->getBackendUser()->workspace;
+			}
+		} else {
+			$languageMode = '';
+			$workspaceUid = $this->getBackendUser()->workspace;
+			$pageRepository->versioningWorkspaceId = $workspaceUid;
+			if ($this->getBackendUser()->workspace !== 0) {
+				$pageRepository->versioningPreview = 1;
+			}
+		}
+
+		// If current row is a translation select its parent
+		if (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
+			&& isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
+		) {
+			if (isset($row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']])
+				&& $row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] > 0
+			) {
+				$row = $this->databaseHandle->exec_SELECTgetSingleRow(
+					$tableName . '.*',
+					$tableName,
+					$tableName . '.uid=' . (int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] .
+					' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0'
+				);
+			}
+		}
+
+		// Retrieve the original uid; Used for Workspaces!
+		if (TYPO3_MODE !== 'BE') {
+			$pageRepository->versionOL($tableName, $row, true, true);
+		} else {
+			BackendUtility::workspaceOL($tableName, $row);
+		}
+		if ($pageRepository->versioningPreview && isset($row['_ORIG_uid'])) {
+			$row['uid'] = $row['_ORIG_uid'];
+		}
+
+		// Special case for table "pages"
+		if ($tableName == 'pages') {
+			$row = $pageRepository->getPageOverlay($row, $querySettings->getLanguageUid());
+		} elseif (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
+			&& $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] !== ''
+		) {
+			if (in_array($row[$GLOBALS['TCA'][$tableName]['ctrl']['languageField']], array(-1, 0))) {
+				$overlayMode = $languageMode === 'strict' ? 'hideNonTranslated' : '';
+				$row = $pageRepository->getRecordOverlay($tableName, $row, $querySettings->getLanguageUid(), $overlayMode);
+			}
+		}
+
+		return $row;
+	}
+
+	/**
+	 * Return a resolved table name given a possible table name alias.
+	 *
+	 * @param string $tableNameOrAlias
+	 * @return string
+	 */
+	protected function resolveTableNameAlias($tableNameOrAlias)
+	{
+		$resolvedTableName = $tableNameOrAlias;
+		if (!empty($this->tableNameAliases['aliases'][$tableNameOrAlias])) {
+			$resolvedTableName = $this->tableNameAliases['aliases'][$tableNameOrAlias];
+		}
+		return $resolvedTableName;
+	}
+
+	/**
+	 * Generate a unique table name alias for the given table name.
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	protected function generateAlias($tableName)
+	{
+
+		if (!isset($this->tableNameAliases['aliasIncrement'][$tableName])) {
+			$this->tableNameAliases['aliasIncrement'][$tableName] = 0;
+		}
+
+		$numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
+		$tableNameAlias = $tableName . $numberOfAliases;
+
+		$this->tableNameAliases['aliasIncrement'][$tableName]++;
+		$this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;
+
+		return $tableNameAlias;
+	}
+
+	/**
+	 * Replace the table names by its table name alias within the given statement.
+	 *
+	 * @param string $tableName
+	 * @param string $tableNameAlias
+	 * @param string $statement
+	 * @return string
+	 */
+	protected function replaceTableNameByAlias($tableName, $tableNameAlias, $statement)
+	{
+		if ($statement && $tableName !== $tableNameAlias) {
+			$statement = str_replace($tableName, $tableNameAlias, $statement);
+		}
+		return $statement;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Tell whether a Backend User is logged in.
+	 *
+	 * @return bool
+	 */
+	protected function isBackendUserLogged()
+	{
+		return is_object($GLOBALS['BE_USER']);
+	}
+
+	/**
+	 * @return PageRepository
+	 */
+	protected function getPageRepository()
+	{
+		if (!$this->pageRepository instanceof PageRepository) {
+			if ($this->environmentService->isEnvironmentInFrontendMode() && is_object($GLOBALS['TSFE'])) {
+				$this->pageRepository = $GLOBALS['TSFE']->sys_page;
+			} else {
+				$this->pageRepository = GeneralUtility::makeInstance('TYPO3\\CMS\\Frontend\\Page\\PageRepository');
+			}
+		}
+
+		return $this->pageRepository;
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\FieldPathResolver
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Resolver\FieldPathResolver');
+	}
+
+	/**
+	 * Checks if there are SQL errors in the last query, and if yes, throw an exception.
+	 *
+	 * @return void
+	 * @param string $sql The SQL statement
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\SqlErrorException
+	 */
+	protected function checkSqlErrors($sql = '')
+	{
+		$error = $this->databaseHandle->sql_error();
+		if ($error !== '') {
+			$error .= $sql ? ': ' . $sql : '';
+			throw new \TYPO3\CMS\Extbase\Persistence\Generic\Storage\Exception\SqlErrorException($error, 1247602160);
+		}
+	}
 }

Classes/Processor/ContentObjectProcessor.php

Doc Comments +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 
     /**
      * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
+     * @return ProcessContentDataSignalArguments[]
      */
     public function processRelations(ProcessContentDataSignalArguments $signalArguments)
     {
@@ -50,7 +50,7 @@ 
 
     /**
      * @param \Fab\Vidi\Domain\Model\Content $object
-     * @param $fieldNameAndPath
+     * @param string $fieldNameAndPath
      * @param array $contentData
      * @param string $savingBehavior
      * @return array

Spacing +1 added lines, -1 removed lines

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

Indentation +117 added lines, -117 removed lines

@@ -22,121 +22,121 @@
 class ContentObjectProcessor implements SingletonInterface
 {
 
-    /**
-     * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
-     */
-    public function processRelations(ProcessContentDataSignalArguments $signalArguments)
-    {
-
-        $contentObject = $signalArguments->getContentObject();
-        $fieldNameAndPath = $signalArguments->getFieldNameAndPath();
-        $contentData = $signalArguments->getContentData();
-        $savingBehavior = $signalArguments->getSavingBehavior();
-
-        if ($savingBehavior !== SavingBehavior::REPLACE) {
-            $contentData = $this->appendOrRemoveRelations($contentObject, $fieldNameAndPath, $contentData, $savingBehavior);
-            $signalArguments->setContentData($contentData);
-        }
-
-        return array($signalArguments);
-    }
-
-    /**
-     * @param \Fab\Vidi\Domain\Model\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 \Fab\Vidi\Domain\Model\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 \Fab\Vidi\Resolver\ContentObjectResolver
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Resolver\ContentObjectResolver');
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\FieldPathResolver
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Resolver\FieldPathResolver');
-    }
+	/**
+	 * @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 \Fab\Vidi\Domain\Model\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 \Fab\Vidi\Domain\Model\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 \Fab\Vidi\Resolver\ContentObjectResolver
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Resolver\ContentObjectResolver');
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\FieldPathResolver
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Resolver\FieldPathResolver');
+	}
 }

Classes/Processor/MarkerProcessor.php

Doc Comments +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
     /**
      * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
+     * @return ProcessContentDataSignalArguments[]
      */
     public function processMarkers(ProcessContentDataSignalArguments $signalArguments)
     {
@@ -72,7 +72,7 @@ 
      * @param string $updateValue
      * @param string $currentValue
      * @param int $counter
-     * @param $creationTime
+     * @param integer $creationTime
      * @return string
      */
     protected function replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime)

Spacing +1 added lines, -1 removed lines

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

Indentation +109 added lines, -109 removed lines

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