fabarea / vidi

Classes/Persistence/PagerObjectFactory.php

Indentation +37 added lines, -37 removed lines

@@ -23,48 +23,48 @@
 class PagerObjectFactory implements SingletonInterface
 {
 
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return \Fab\Vidi\Persistence\PagerObjectFactory
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Persistence\PagerObjectFactory');
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return \Fab\Vidi\Persistence\PagerObjectFactory
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Persistence\PagerObjectFactory');
+	}
 
-    /**
-     * Returns a pager object.
-     *
-     * @return \Fab\Vidi\Persistence\Pager
-     */
-    public function getPager()
-    {
+	/**
+	 * Returns a pager object.
+	 *
+	 * @return \Fab\Vidi\Persistence\Pager
+	 */
+	public function getPager()
+	{
 
-        /** @var $pager \Fab\Vidi\Persistence\Pager */
-        $pager = GeneralUtility::makeInstance('Fab\Vidi\Persistence\Pager');
+		/** @var $pager \Fab\Vidi\Persistence\Pager */
+		$pager = GeneralUtility::makeInstance('Fab\Vidi\Persistence\Pager');
 
-        // Set items per page
-        if (GeneralUtility::_GET('length') !== NULL) {
-            $limit = (int)GeneralUtility::_GET('length');
-            $pager->setLimit($limit);
-        }
+		// Set items per page
+		if (GeneralUtility::_GET('length') !== NULL) {
+			$limit = (int)GeneralUtility::_GET('length');
+			$pager->setLimit($limit);
+		}
 
-        // Set offset
-        $offset = 0;
-        if (GeneralUtility::_GET('start') !== NULL) {
-            $offset = (int)GeneralUtility::_GET('start');
-        }
-        $pager->setOffset($offset);
+		// Set offset
+		$offset = 0;
+		if (GeneralUtility::_GET('start') !== NULL) {
+			$offset = (int)GeneralUtility::_GET('start');
+		}
+		$pager->setOffset($offset);
 
-        // set page
-        $page = 1;
-        if ($pager->getLimit() > 0) {
-            $page = round($pager->getOffset() / $pager->getLimit());
-        }
-        $pager->setPage($page);
+		// set page
+		$page = 1;
+		if ($pager->getLimit() > 0) {
+			$page = round($pager->getOffset() / $pager->getLimit());
+		}
+		$pager->setPage($page);
 
-        return $pager;
-    }
+		return $pager;
+	}
 
 }

Classes/Persistence/ResultSetStorage.php

Indentation +25 added lines, -25 removed lines

@@ -22,32 +22,32 @@
 class ResultSetStorage implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $resultSets = array();
+	/**
+	 * @var array
+	 */
+	protected $resultSets = array();
 
-    /**
-     * @param string $querySignature
-     * @return array
-     */
-    public function get($querySignature)
-    {
-        $resultSet = NULL;
-        if (isset($this->resultSets[$querySignature])) {
-            $resultSet = $this->resultSets[$querySignature];
-        }
-        return $resultSet;
-    }
+	/**
+	 * @param string $querySignature
+	 * @return array
+	 */
+	public function get($querySignature)
+	{
+		$resultSet = NULL;
+		if (isset($this->resultSets[$querySignature])) {
+			$resultSet = $this->resultSets[$querySignature];
+		}
+		return $resultSet;
+	}
 
-    /**
-     * @param $querySignature
-     * @param array $resultSet
-     * @internal param array $resultSets
-     */
-    public function set($querySignature, array $resultSet)
-    {
-        $this->resultSets[$querySignature] = $resultSet;
-    }
+	/**
+	 * @param $querySignature
+	 * @param array $resultSet
+	 * @internal param array $resultSets
+	 */
+	public function set($querySignature, array $resultSet)
+	{
+		$this->resultSets[$querySignature] = $resultSet;
+	}
 
 }

Classes/Persistence/Order.php

Indentation +38 added lines, -38 removed lines

@@ -20,45 +20,45 @@
 class Order
 {
 
-    /**
-     * The orderings
-     *
-     * @var array
-     */
-    protected $orderings = array();
+	/**
+	 * The orderings
+	 *
+	 * @var array
+	 */
+	protected $orderings = array();
 
-    /**
-     * Constructs a new Order
-     *
-     * @para array $orders
-     * @param array $orders
-     */
-    public function __construct($orders = array())
-    {
-        foreach ($orders as $order => $direction) {
-            $this->addOrdering($order, $direction);
-        }
-    }
+	/**
+	 * Constructs a new Order
+	 *
+	 * @para array $orders
+	 * @param array $orders
+	 */
+	public function __construct($orders = array())
+	{
+		foreach ($orders as $order => $direction) {
+			$this->addOrdering($order, $direction);
+		}
+	}
 
-    /**
-     * Add ordering
-     *
-     * @param string $order The order
-     * @param string $direction ASC / DESC
-     * @return void
-     */
-    public function addOrdering($order, $direction)
-    {
-        $this->orderings[$order] = $direction;
-    }
+	/**
+	 * Add ordering
+	 *
+	 * @param string $order The order
+	 * @param string $direction ASC / DESC
+	 * @return void
+	 */
+	public function addOrdering($order, $direction)
+	{
+		$this->orderings[$order] = $direction;
+	}
 
-    /**
-     * Returns the order
-     *
-     * @return array The order
-     */
-    public function getOrderings()
-    {
-        return $this->orderings;
-    }
+	/**
+	 * Returns the order
+	 *
+	 * @return array The order
+	 */
+	public function getOrderings()
+	{
+		return $this->orderings;
+	}
 }

Classes/Persistence/QuerySettings.php

Indentation +14 added lines, -14 removed lines

@@ -24,19 +24,19 @@
 class QuerySettings extends Typo3QuerySettings
 {
 
-    /**
-     * Flag if the storage page should be respected for the query.
-     *
-     * @var boolean
-     */
-    protected $respectStoragePage = FALSE;
+	/**
+	 * Flag if the storage page should be respected for the query.
+	 *
+	 * @var boolean
+	 */
+	protected $respectStoragePage = FALSE;
 
-    /**
-     * As long as we use a feature flag ignoreAllEnableFieldsInBe to determine the default behavior, the
-     * initializeObject is responsible for handling that.
-     */
-    public function initializeObject()
-    {
-        parent::initializeObject();
-    }
+	/**
+	 * As long as we use a feature flag ignoreAllEnableFieldsInBe to determine the default behavior, the
+	 * initializeObject is responsible for handling that.
+	 */
+	public function initializeObject()
+	{
+		parent::initializeObject();
+	}
 }

Classes/Persistence/Matcher.php

Indentation +286 added lines, -286 removed lines

@@ -20,290 +20,290 @@
 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 = array('equals', 'in', 'like');
-
-    /**
-     * Associative values used for "equals" operator ($fieldName => $value)
-     *
-     * @var array
-     */
-    protected $equalsCriteria = array();
-
-    /**
-     * Associative values used for "in" operator ($fieldName => $value)
-     *
-     * @var array
-     */
-    protected $inCriteria = array();
-
-    /**
-     * Associative values used for "like" operator ($fieldName => $value)
-     *
-     * @var array
-     */
-    protected $likeCriteria = array();
-
-    /**
-     * Default logical operator for like.
-     *
-     * @var string
-     */
-    protected $defaultLogicalSeparator = self::LOGICAL_AND;
-
-    /**
-     * Default logical operator for equals.
-     *
-     * @var string
-     */
-    protected $logicalSeparatorForEquals = self::LOGICAL_AND;
-
-    /**
-     * Default logical operator for equals.
-     *
-     * @var string
-     */
-    protected $logicalSeparatorForIn = self::LOGICAL_AND;
-
-    /**
-     * Default logical operator for like.
-     *
-     * @var string
-     */
-    protected $logicalSeparatorForLike = self::LOGICAL_AND;
-
-    /**
-     * Default logical operator for the search term.
-     *
-     * @var string
-     */
-    protected $logicalSeparatorForSearchTerm = self::LOGICAL_OR;
-
-    /**
-     * Constructs a new Matcher
-     *
-     * @param array $matches associative array($field => $value)
-     * @param string $dataType which corresponds to an entry of the TCA (table name).
-     * @return \Fab\Vidi\Persistence\Matcher
-     */
-    public function __construct($matches = array(), $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 getEqualsCriteria()
-    {
-        return $this->equalsCriteria;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function equals($fieldNameAndPath, $operand)
-    {
-        $this->equalsCriteria[] = array('fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand);
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLikeCriteria()
-    {
-        return $this->likeCriteria;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function in($fieldNameAndPath, $operand)
-    {
-        $this->inCriteria[] = array('fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand);
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getInCriteria()
-    {
-        return $this->inCriteria;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @param bool $addWildCard
-     * @return $this
-     */
-    public function like($fieldNameAndPath, $operand, $addWildCard = TRUE)
-    {
-        $wildCardSymbol = $addWildCard ? '%' : '';
-        $this->likeCriteria[] = array('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 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 = array('equals', 'in', 'like');
+
+	/**
+	 * Associative values used for "equals" operator ($fieldName => $value)
+	 *
+	 * @var array
+	 */
+	protected $equalsCriteria = array();
+
+	/**
+	 * Associative values used for "in" operator ($fieldName => $value)
+	 *
+	 * @var array
+	 */
+	protected $inCriteria = array();
+
+	/**
+	 * Associative values used for "like" operator ($fieldName => $value)
+	 *
+	 * @var array
+	 */
+	protected $likeCriteria = array();
+
+	/**
+	 * Default logical operator for like.
+	 *
+	 * @var string
+	 */
+	protected $defaultLogicalSeparator = self::LOGICAL_AND;
+
+	/**
+	 * Default logical operator for equals.
+	 *
+	 * @var string
+	 */
+	protected $logicalSeparatorForEquals = self::LOGICAL_AND;
+
+	/**
+	 * Default logical operator for equals.
+	 *
+	 * @var string
+	 */
+	protected $logicalSeparatorForIn = self::LOGICAL_AND;
+
+	/**
+	 * Default logical operator for like.
+	 *
+	 * @var string
+	 */
+	protected $logicalSeparatorForLike = self::LOGICAL_AND;
+
+	/**
+	 * Default logical operator for the search term.
+	 *
+	 * @var string
+	 */
+	protected $logicalSeparatorForSearchTerm = self::LOGICAL_OR;
+
+	/**
+	 * Constructs a new Matcher
+	 *
+	 * @param array $matches associative array($field => $value)
+	 * @param string $dataType which corresponds to an entry of the TCA (table name).
+	 * @return \Fab\Vidi\Persistence\Matcher
+	 */
+	public function __construct($matches = array(), $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 getEqualsCriteria()
+	{
+		return $this->equalsCriteria;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function equals($fieldNameAndPath, $operand)
+	{
+		$this->equalsCriteria[] = array('fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand);
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLikeCriteria()
+	{
+		return $this->likeCriteria;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function in($fieldNameAndPath, $operand)
+	{
+		$this->inCriteria[] = array('fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand);
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getInCriteria()
+	{
+		return $this->inCriteria;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @param bool $addWildCard
+	 * @return $this
+	 */
+	public function like($fieldNameAndPath, $operand, $addWildCard = TRUE)
+	{
+		$wildCardSymbol = $addWildCard ? '%' : '';
+		$this->likeCriteria[] = array('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 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;
+	}
 }

Classes/Persistence/OrderObjectFactory.php

Indentation +33 added lines, -33 removed lines

@@ -24,43 +24,43 @@
 class OrderObjectFactory implements SingletonInterface
 {
 
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return \Fab\Vidi\Persistence\OrderObjectFactory
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Persistence\OrderObjectFactory');
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return \Fab\Vidi\Persistence\OrderObjectFactory
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Persistence\OrderObjectFactory');
+	}
 
-    /**
-     * Returns an order object.
-     *
-     * @param string $dataType
-     * @return \Fab\Vidi\Persistence\Order
-     */
-    public function getOrder($dataType = '')
-    {
+	/**
+	 * Returns an order object.
+	 *
+	 * @param string $dataType
+	 * @return \Fab\Vidi\Persistence\Order
+	 */
+	public function getOrder($dataType = '')
+	{
 
-        // Default ordering
-        $order = Tca::table($dataType)->getDefaultOrderings();
+		// Default ordering
+		$order = Tca::table($dataType)->getDefaultOrderings();
 
-        // Retrieve a possible id of the column from the request
-        $orderings = GeneralUtility::_GP('order');
+		// Retrieve a possible id of the column from the request
+		$orderings = GeneralUtility::_GP('order');
 
-        if (is_array($orderings) && isset($orderings[0])) {
-            $columnPosition = $orderings[0]['column'];
-            $direction = $orderings[0]['dir'];
+		if (is_array($orderings) && isset($orderings[0])) {
+			$columnPosition = $orderings[0]['column'];
+			$direction = $orderings[0]['dir'];
 
-            if ($columnPosition > 0) {
-                $field = Tca::grid()->getFieldNameByPosition($columnPosition);
+			if ($columnPosition > 0) {
+				$field = Tca::grid()->getFieldNameByPosition($columnPosition);
 
-                $order = array(
-                    $field => strtoupper($direction)
-                );
-            }
-        }
-        return GeneralUtility::makeInstance('Fab\Vidi\Persistence\Order', $order);
-    }
+				$order = array(
+					$field => strtoupper($direction)
+				);
+			}
+		}
+		return GeneralUtility::makeInstance('Fab\Vidi\Persistence\Order', $order);
+	}
 }

Classes/Persistence/Query.php

Indentation +644 added lines, -644 removed lines

@@ -29,649 +29,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 = array();
-
-    /**
-     * @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 = array();
+
+	/**
+	 * @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/Pager.php

Indentation +164 added lines, -164 removed lines

@@ -22,168 +22,168 @@
 class Pager
 {
 
-    /**
-     * Total amount of entries
-     *
-     * @var integer
-     */
-    protected $count;
-
-    /**
-     * Current offset
-     *
-     * @var integer
-     */
-    protected $offset;
-
-    /**
-     * Current page index
-     *
-     * @var integer
-     */
-    protected $page;
-
-    /**
-     * Number of items per page
-     *
-     * @var integer
-     */
-    protected $limit = 10;
-
-    /**
-     * Constructs a new Pager
-     */
-    public function __construct()
-    {
-        $this->page = 1;
-    }
-
-    /**
-     * Returns the total amount of entries
-     *
-     * @return int
-     */
-    public function getCount()
-    {
-        return $this->count;
-    }
-
-    /**
-     * Sets the total amount of entries
-     *
-     * @param int $count
-     */
-    public function setCount($count)
-    {
-        $this->count = $count;
-    }
-
-    /**
-     * Returns the current page index
-     *
-     * @return int
-     */
-    public function getPage()
-    {
-        return $this->page;
-    }
-
-    /**
-     * Sets the current page index
-     *
-     * @param int $page
-     */
-    public function setPage($page)
-    {
-        $this->page = $page;
-    }
-
-    /**
-     * Returns the current limit index
-     *
-     * @return int
-     */
-    public function getLimit()
-    {
-        return $this->limit;
-    }
-
-    /**
-     * Sets the current limit index
-     *
-     * @param int $limit
-     */
-    public function setLimit($limit)
-    {
-        $this->limit = $limit;
-    }
-
-    /**
-     * @return Array Items to display
-     */
-    public function getDisplayItems()
-    {
-        $last = $this->getLastPage();
-        if ($last == 1) {
-            return null;
-        }
-        $values = Array();
-        for ($i = 1; $i <= $last; $i++) {
-            $values[] = Array('key' => $i, 'value' => $i);
-        }
-        return $values;
-    }
-
-    /**
-     * @return int The last page index
-     */
-    public function getLastPage()
-    {
-        $last = intval($this->count / $this->limit);
-        if ($this->count % $this->limit > 0) {
-            $last++;
-        }
-        return $last;
-    }
-
-    /**
-     * @return int The previous page index. Minimum value is 1
-     */
-    public function getPreviousPage()
-    {
-        $prev = $this->page - 1;
-        if ($prev < 1) {
-            $prev = 1;
-        }
-        return $prev;
-    }
-
-    /**
-     * @return int The next page index. Maximum valus is the last page
-     */
-    public function getNextPage()
-    {
-        $next = $this->page + 1;
-        $last = $this->getLastPage();
-        if ($next > $last) {
-            $next = $last;
-        }
-        return $next;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOffset()
-    {
-        return $this->offset;
-    }
-
-    /**
-     * @param int $offset
-     */
-    public function setOffset($offset)
-    {
-        $this->offset = $offset;
-    }
+	/**
+	 * Total amount of entries
+	 *
+	 * @var integer
+	 */
+	protected $count;
+
+	/**
+	 * Current offset
+	 *
+	 * @var integer
+	 */
+	protected $offset;
+
+	/**
+	 * Current page index
+	 *
+	 * @var integer
+	 */
+	protected $page;
+
+	/**
+	 * Number of items per page
+	 *
+	 * @var integer
+	 */
+	protected $limit = 10;
+
+	/**
+	 * Constructs a new Pager
+	 */
+	public function __construct()
+	{
+		$this->page = 1;
+	}
+
+	/**
+	 * Returns the total amount of entries
+	 *
+	 * @return int
+	 */
+	public function getCount()
+	{
+		return $this->count;
+	}
+
+	/**
+	 * Sets the total amount of entries
+	 *
+	 * @param int $count
+	 */
+	public function setCount($count)
+	{
+		$this->count = $count;
+	}
+
+	/**
+	 * Returns the current page index
+	 *
+	 * @return int
+	 */
+	public function getPage()
+	{
+		return $this->page;
+	}
+
+	/**
+	 * Sets the current page index
+	 *
+	 * @param int $page
+	 */
+	public function setPage($page)
+	{
+		$this->page = $page;
+	}
+
+	/**
+	 * Returns the current limit index
+	 *
+	 * @return int
+	 */
+	public function getLimit()
+	{
+		return $this->limit;
+	}
+
+	/**
+	 * Sets the current limit index
+	 *
+	 * @param int $limit
+	 */
+	public function setLimit($limit)
+	{
+		$this->limit = $limit;
+	}
+
+	/**
+	 * @return Array Items to display
+	 */
+	public function getDisplayItems()
+	{
+		$last = $this->getLastPage();
+		if ($last == 1) {
+			return null;
+		}
+		$values = Array();
+		for ($i = 1; $i <= $last; $i++) {
+			$values[] = Array('key' => $i, 'value' => $i);
+		}
+		return $values;
+	}
+
+	/**
+	 * @return int The last page index
+	 */
+	public function getLastPage()
+	{
+		$last = intval($this->count / $this->limit);
+		if ($this->count % $this->limit > 0) {
+			$last++;
+		}
+		return $last;
+	}
+
+	/**
+	 * @return int The previous page index. Minimum value is 1
+	 */
+	public function getPreviousPage()
+	{
+		$prev = $this->page - 1;
+		if ($prev < 1) {
+			$prev = 1;
+		}
+		return $prev;
+	}
+
+	/**
+	 * @return int The next page index. Maximum valus is the last page
+	 */
+	public function getNextPage()
+	{
+		$next = $this->page + 1;
+		$last = $this->getLastPage();
+		if ($next > $last) {
+			$next = $last;
+		}
+		return $next;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getOffset()
+	{
+		return $this->offset;
+	}
+
+	/**
+	 * @param int $offset
+	 */
+	public function setOffset($offset)
+	{
+		$this->offset = $offset;
+	}
 }

Classes/Persistence/MatcherObjectFactory.php

Indentation +219 added lines, -219 removed lines

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