fabarea / vidi

Classes/Persistence/OrderObjectFactory.php

Indentation +38 added lines, -38 removed lines

@@ -18,42 +18,42 @@
  */
 class OrderObjectFactory implements SingletonInterface
 {
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return \Fab\Vidi\Persistence\OrderObjectFactory|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\OrderObjectFactory::class);
-    }
-
-    /**
-     * Returns an order object.
-     *
-     * @param string $dataType
-     * @return Order|object
-     */
-    public function getOrder($dataType = '')
-    {
-        // Default ordering
-        $order = Tca::table($dataType)->getDefaultOrderings();
-
-        // 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 ($columnPosition > 0) {
-                $field = Tca::grid()->getFieldNameByPosition($columnPosition);
-
-                $order = array(
-                    $field => strtoupper($direction)
-                );
-            }
-        }
-        return GeneralUtility::makeInstance(Order::class, $order);
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return \Fab\Vidi\Persistence\OrderObjectFactory|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\OrderObjectFactory::class);
+	}
+
+	/**
+	 * Returns an order object.
+	 *
+	 * @param string $dataType
+	 * @return Order|object
+	 */
+	public function getOrder($dataType = '')
+	{
+		// Default ordering
+		$order = Tca::table($dataType)->getDefaultOrderings();
+
+		// 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 ($columnPosition > 0) {
+				$field = Tca::grid()->getFieldNameByPosition($columnPosition);
+
+				$order = array(
+					$field => strtoupper($direction)
+				);
+			}
+		}
+		return GeneralUtility::makeInstance(Order::class, $order);
+	}
 }

Classes/Persistence/Matcher.php

Indentation +495 added lines, -495 removed lines

@@ -14,499 +14,499 @@
  */
 class Matcher
 {
-    /**
-     * The logical OR
-     */
-    public const LOGICAL_OR = 'logicalOr';
-
-    /**
-     * The logical AND
-     */
-    public const LOGICAL_AND = 'logicalAnd';
-
-    /**
-     * @var string
-     */
-    protected $dataType = '';
-
-    /**
-     * @var string
-     */
-    protected $searchTerm = '';
-
-    /**
-     * @var array
-     */
-    protected $supportedOperators = [
-        '=' => 'equals',
-        '!=' => 'notEquals',
-        'in' => 'in',
-        'like' => 'like',
-        '>' => 'greaterThan',
-        '>=' => 'greaterThanOrEqual',
-        '<' => 'lessThan',
-        '<=' => 'lessThanOrEqual',
-    ];
-
-    /**
-     * @var array
-     */
-    protected $equals = [];
-
-    /**
-     * @var array
-     */
-    protected $notEquals = [];
-
-    /**
-     * @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 array
-     */
-    protected $matches = [];
-
-    /**
-     * @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).
-     */
-    public function __construct($matches = [], $dataType = '')
-    {
-        $this->dataType = $dataType;
-        $this->matches = $matches;
-    }
-
-    /**
-     * @param string $searchTerm
-     * @return \Fab\Vidi\Persistence\Matcher
-     */
-    public function setSearchTerm($searchTerm): Matcher
-    {
-        $this->searchTerm = $searchTerm;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSearchTerm(): string
-    {
-        return $this->searchTerm;
-    }
-
-    /**
-     * @return array
-     */
-    public function getEquals(): array
-    {
-        return $this->equals;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function equals($fieldNameAndPath, $operand): self
-    {
-        $this->equals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getNotEquals(): array
-    {
-        return $this->notEquals;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function notEquals($fieldNameAndPath, $operand): self
-    {
-        $this->notEquals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getGreaterThan(): array
-    {
-        return $this->greaterThan;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function greaterThan($fieldNameAndPath, $operand): self
-    {
-        $this->greaterThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getGreaterThanOrEqual(): array
-    {
-        return $this->greaterThanOrEqual;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function greaterThanOrEqual($fieldNameAndPath, $operand): self
-    {
-        $this->greaterThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLessThan(): array
-    {
-        return $this->lessThan;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function lessThan($fieldNameAndPath, $operand): self
-    {
-        $this->lessThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLessThanOrEqual(): array
-    {
-        return $this->lessThanOrEqual;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function lessThanOrEqual($fieldNameAndPath, $operand): self
-    {
-        $this->lessThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLike(): array
-    {
-        return $this->like;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function in($fieldNameAndPath, $operand): self
-    {
-        $this->in[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getIn(): array
-    {
-        return $this->in;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @param bool $addWildCard
-     * @return $this
-     */
-    public function like($fieldNameAndPath, $operand, $addWildCard = true): self
-    {
-        $wildCardSymbol = $addWildCard ? '%' : '';
-        $this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultLogicalSeparator(): string
-    {
-        return $this->defaultLogicalSeparator;
-    }
-
-    /**
-     * @param string $defaultLogicalSeparator
-     * @return $this
-     */
-    public function setDefaultLogicalSeparator($defaultLogicalSeparator): self
-    {
-        $this->defaultLogicalSeparator = $defaultLogicalSeparator;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForEquals(): string
-    {
-        return $this->logicalSeparatorForEquals;
-    }
-
-    /**
-     * @param string $logicalSeparatorForEquals
-     * @return $this
-     */
-    public function setLogicalSeparatorForEquals($logicalSeparatorForEquals): self
-    {
-        $this->logicalSeparatorForEquals = $logicalSeparatorForEquals;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForGreaterThan(): string
-    {
-        return $this->logicalSeparatorForGreaterThan;
-    }
-
-    /**
-     * @param string $logicalSeparatorForGreaterThan
-     * @return $this
-     */
-    public function setLogicalSeparatorForGreaterThan($logicalSeparatorForGreaterThan): self
-    {
-        $this->logicalSeparatorForGreaterThan = $logicalSeparatorForGreaterThan;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForGreaterThanOrEqual(): string
-    {
-        return $this->logicalSeparatorForGreaterThanOrEqual;
-    }
-
-    /**
-     * @param string $logicalSeparatorForGreaterThanOrEqual
-     * @return $this
-     */
-    public function setLogicalSeparatorForGreaterThanOrEqual($logicalSeparatorForGreaterThanOrEqual): self
-    {
-        $this->logicalSeparatorForGreaterThanOrEqual = $logicalSeparatorForGreaterThanOrEqual;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLessThan(): string
-    {
-        return $this->logicalSeparatorForLessThan;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLessThan
-     * @return $this
-     */
-    public function setLogicalSeparatorForLessThan($logicalSeparatorForLessThan): self
-    {
-        $this->logicalSeparatorForLessThan = $logicalSeparatorForLessThan;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLessThanOrEqual(): string
-    {
-        return $this->logicalSeparatorForLessThanOrEqual;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLessThanOrEqual
-     * @return $this
-     */
-    public function setLogicalSeparatorForLessThanOrEqual($logicalSeparatorForLessThanOrEqual): self
-    {
-        $this->logicalSeparatorForLessThanOrEqual = $logicalSeparatorForLessThanOrEqual;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForIn(): string
-    {
-        return $this->logicalSeparatorForIn;
-    }
-
-    /**
-     * @param string $logicalSeparatorForIn
-     * @return $this
-     */
-    public function setLogicalSeparatorForIn($logicalSeparatorForIn): self
-    {
-        $this->logicalSeparatorForIn = $logicalSeparatorForIn;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLike(): string
-    {
-        return $this->logicalSeparatorForLike;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLike
-     * @return $this
-     */
-    public function setLogicalSeparatorForLike($logicalSeparatorForLike): self
-    {
-        $this->logicalSeparatorForLike = $logicalSeparatorForLike;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForSearchTerm(): string
-    {
-        return $this->logicalSeparatorForSearchTerm;
-    }
-
-    /**
-     * @param string $logicalSeparatorForSearchTerm
-     * @return $this
-     */
-    public function setLogicalSeparatorForSearchTerm($logicalSeparatorForSearchTerm): self
-    {
-        $this->logicalSeparatorForSearchTerm = $logicalSeparatorForSearchTerm;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSupportedOperators(): array
-    {
-        return $this->supportedOperators;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType(): string
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType): self
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
+	/**
+	 * The logical OR
+	 */
+	public const LOGICAL_OR = 'logicalOr';
+
+	/**
+	 * The logical AND
+	 */
+	public const LOGICAL_AND = 'logicalAnd';
+
+	/**
+	 * @var string
+	 */
+	protected $dataType = '';
+
+	/**
+	 * @var string
+	 */
+	protected $searchTerm = '';
+
+	/**
+	 * @var array
+	 */
+	protected $supportedOperators = [
+		'=' => 'equals',
+		'!=' => 'notEquals',
+		'in' => 'in',
+		'like' => 'like',
+		'>' => 'greaterThan',
+		'>=' => 'greaterThanOrEqual',
+		'<' => 'lessThan',
+		'<=' => 'lessThanOrEqual',
+	];
+
+	/**
+	 * @var array
+	 */
+	protected $equals = [];
+
+	/**
+	 * @var array
+	 */
+	protected $notEquals = [];
+
+	/**
+	 * @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 array
+	 */
+	protected $matches = [];
+
+	/**
+	 * @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).
+	 */
+	public function __construct($matches = [], $dataType = '')
+	{
+		$this->dataType = $dataType;
+		$this->matches = $matches;
+	}
+
+	/**
+	 * @param string $searchTerm
+	 * @return \Fab\Vidi\Persistence\Matcher
+	 */
+	public function setSearchTerm($searchTerm): Matcher
+	{
+		$this->searchTerm = $searchTerm;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSearchTerm(): string
+	{
+		return $this->searchTerm;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getEquals(): array
+	{
+		return $this->equals;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function equals($fieldNameAndPath, $operand): self
+	{
+		$this->equals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getNotEquals(): array
+	{
+		return $this->notEquals;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function notEquals($fieldNameAndPath, $operand): self
+	{
+		$this->notEquals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getGreaterThan(): array
+	{
+		return $this->greaterThan;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function greaterThan($fieldNameAndPath, $operand): self
+	{
+		$this->greaterThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getGreaterThanOrEqual(): array
+	{
+		return $this->greaterThanOrEqual;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function greaterThanOrEqual($fieldNameAndPath, $operand): self
+	{
+		$this->greaterThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLessThan(): array
+	{
+		return $this->lessThan;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function lessThan($fieldNameAndPath, $operand): self
+	{
+		$this->lessThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLessThanOrEqual(): array
+	{
+		return $this->lessThanOrEqual;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function lessThanOrEqual($fieldNameAndPath, $operand): self
+	{
+		$this->lessThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLike(): array
+	{
+		return $this->like;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function in($fieldNameAndPath, $operand): self
+	{
+		$this->in[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getIn(): array
+	{
+		return $this->in;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @param bool $addWildCard
+	 * @return $this
+	 */
+	public function like($fieldNameAndPath, $operand, $addWildCard = true): self
+	{
+		$wildCardSymbol = $addWildCard ? '%' : '';
+		$this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultLogicalSeparator(): string
+	{
+		return $this->defaultLogicalSeparator;
+	}
+
+	/**
+	 * @param string $defaultLogicalSeparator
+	 * @return $this
+	 */
+	public function setDefaultLogicalSeparator($defaultLogicalSeparator): self
+	{
+		$this->defaultLogicalSeparator = $defaultLogicalSeparator;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForEquals(): string
+	{
+		return $this->logicalSeparatorForEquals;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForEquals
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForEquals($logicalSeparatorForEquals): self
+	{
+		$this->logicalSeparatorForEquals = $logicalSeparatorForEquals;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForGreaterThan(): string
+	{
+		return $this->logicalSeparatorForGreaterThan;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForGreaterThan
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForGreaterThan($logicalSeparatorForGreaterThan): self
+	{
+		$this->logicalSeparatorForGreaterThan = $logicalSeparatorForGreaterThan;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForGreaterThanOrEqual(): string
+	{
+		return $this->logicalSeparatorForGreaterThanOrEqual;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForGreaterThanOrEqual
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForGreaterThanOrEqual($logicalSeparatorForGreaterThanOrEqual): self
+	{
+		$this->logicalSeparatorForGreaterThanOrEqual = $logicalSeparatorForGreaterThanOrEqual;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLessThan(): string
+	{
+		return $this->logicalSeparatorForLessThan;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLessThan
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLessThan($logicalSeparatorForLessThan): self
+	{
+		$this->logicalSeparatorForLessThan = $logicalSeparatorForLessThan;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLessThanOrEqual(): string
+	{
+		return $this->logicalSeparatorForLessThanOrEqual;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLessThanOrEqual
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLessThanOrEqual($logicalSeparatorForLessThanOrEqual): self
+	{
+		$this->logicalSeparatorForLessThanOrEqual = $logicalSeparatorForLessThanOrEqual;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForIn(): string
+	{
+		return $this->logicalSeparatorForIn;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForIn
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForIn($logicalSeparatorForIn): self
+	{
+		$this->logicalSeparatorForIn = $logicalSeparatorForIn;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLike(): string
+	{
+		return $this->logicalSeparatorForLike;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLike
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLike($logicalSeparatorForLike): self
+	{
+		$this->logicalSeparatorForLike = $logicalSeparatorForLike;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForSearchTerm(): string
+	{
+		return $this->logicalSeparatorForSearchTerm;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForSearchTerm
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForSearchTerm($logicalSeparatorForSearchTerm): self
+	{
+		$this->logicalSeparatorForSearchTerm = $logicalSeparatorForSearchTerm;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSupportedOperators(): array
+	{
+		return $this->supportedOperators;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType(): string
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType): self
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
 }

Classes/Persistence/MatcherObjectFactory.php

Indentation +255 added lines, -255 removed lines

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

Classes/Persistence/Pager.php

Indentation +164 added lines, -164 removed lines

@@ -16,168 +16,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/Order.php

Indentation +38 added lines, -38 removed lines

@@ -14,45 +14,45 @@
  */
 class Order
 {
-    /**
-     * The orderings
-     *
-     * @var array
-     */
-    protected $orderings = [];
+	/**
+	 * The orderings
+	 *
+	 * @var array
+	 */
+	protected $orderings = [];
 
-    /**
-     * 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/ResultSetStorage.php

Indentation +25 added lines, -25 removed lines

@@ -16,31 +16,31 @@
  */
 class ResultSetStorage implements SingletonInterface
 {
-    /**
-     * @var array
-     */
-    protected $resultSets = [];
+	/**
+	 * @var array
+	 */
+	protected $resultSets = [];
 
-    /**
-     * @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/Query.php

Indentation +622 added lines, -622 removed lines

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

Classes/Persistence/Storage/VidiDbBackend.php

Indentation +1040 added lines, -1040 removed lines

@@ -51,1044 +51,1044 @@
  */
 class VidiDbBackend
 {
-    public const OPERATOR_EQUAL_TO_NULL = 'operatorEqualToNull';
-    public const OPERATOR_NOT_EQUAL_TO_NULL = 'operatorNotEqualToNull';
-
-    /**
-     * The TYPO3 page repository. Used for language and workspace overlay
-     *
-     * @var PageRepository
-     */
-    protected $pageRepository;
-
-    /**
-     * @var 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 = '';
-
-    /**
-     * @param Query $query
-     */
-    public function __construct(Query $query)
-    {
-        $this->query = $query;
-    }
-
-    /**
-     * @param $parameters
-     * @return array
-     */
-    protected static function getTypes($parameters)
-    {
-        $types = [];
-        foreach ($parameters as $parameter) {
-            if (is_array($parameter)) {
-                if (MathUtility::canBeInterpretedAsInteger($parameter[0])) {
-                    $types[] = \Doctrine\DBAL\Connection::PARAM_INT_ARRAY;
-                } else {
-                    $types[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
-                }
-            } else {
-                if (MathUtility::canBeInterpretedAsInteger($parameter)) {
-                    $types[] = ParameterType::INTEGER;
-                } else {
-                    $types[] = ParameterType::STRING;
-                }
-            }
-        }
-        return $types;
-    }
-
-    /**
-     * Returns the result of the query
-     */
-    public function fetchResult()
-    {
-        $parameters = [];
-        $statementParts = $this->parseQuery($parameters);
-        $statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts);
-        $sql = $this->buildQuery($statementParts);
-        //print $sql; exit();
-
-        $rows = $this->getConnection()
-            ->executeQuery($sql, $parameters, self::getTypes($parameters))
-            ->fetchAllAssociative();
-
-        return $this->getContentObjects($rows);
-    }
-
-    /**
-     * Returns the number of tuples matching the query.
-     *
-     * @return int The number of matching tuples
-     */
-    public function countResult()
-    {
-        $parameters = [];
-        $statementParts = $this->parseQuery($parameters);
-        $statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts);
-        $types = self::getTypes($parameters);
-
-        // if limit is set, we need to count the rows "manually" as COUNT(*) ignores LIMIT constraints
-        if (!empty($statementParts['limit'])) {
-            $sql = $this->buildQuery($statementParts);
-
-            $count = $this
-                ->getConnection()
-                ->executeQuery($sql, $parameters, $types)
-                ->rowCount();
-        } 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 ' . $statementParts['mainTable'] . '.' . $distinctField . ')');
-            }
-
-            $sql = $this->buildQuery($statementParts);
-            $count = $this
-                ->getConnection()
-                ->executeQuery($sql, $parameters, $types)
-                ->fetchColumn(0);
-        }
-        return (int)$count;
-    }
-
-    /**
-     * Parses the query and returns the SQL statement parts.
-     *
-     * @param array &$parameters
-     * @return array
-     */
-    public function parseQuery(array &$parameters)
-    {
-        $statementParts = [];
-        $statementParts['keywords'] = [];
-        $statementParts['tables'] = [];
-        $statementParts['unions'] = [];
-        $statementParts['fields'] = [];
-        $statementParts['where'] = [];
-        $statementParts['additionalWhereClause'] = [];
-        $statementParts['orderings'] = [];
-        $statementParts['limit'] = [];
-        $query = $this->query;
-        $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->getTypo3QuerySettings(), $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)
-    {
-        $tableName = $this->getTableName();
-        $sql['fields'][$tableName] = $tableName . '.*';
-        if ($this->query->getDistinct()) {
-            $sql['fields'][$tableName] = $tableName . '.' . $this->query->getDistinct();
-            $sql['keywords']['distinct'] = 'DISTINCT';
-        }
-        $sql['tables'][$tableName] = $tableName;
-        $sql['mainTable'] = $tableName;
-    }
-
-    /**
-     * Transforms a constraint into SQL and parameter arrays
-     *
-     * @param ConstraintInterface $constraint The constraint
-     * @param SourceInterface $source The source
-     * @param array &$statementParts The query parts
-     * @param array &$parameters The parameters that will replace the markers
-     * @return void
-     */
-    protected function parseConstraint(ConstraintInterface $constraint = null, SourceInterface $source, array &$statementParts, array &$parameters)
-    {
-        if ($constraint instanceof AndInterface) {
-            $statementParts['where'][] = '(';
-            $this->parseConstraint($constraint->getConstraint1(), $source, $statementParts, $parameters);
-            $statementParts['where'][] = ' AND ';
-            $this->parseConstraint($constraint->getConstraint2(), $source, $statementParts, $parameters);
-            $statementParts['where'][] = ')';
-        } elseif ($constraint instanceof OrInterface) {
-            $statementParts['where'][] = '(';
-            $this->parseConstraint($constraint->getConstraint1(), $source, $statementParts, $parameters);
-            $statementParts['where'][] = ' OR ';
-            $this->parseConstraint($constraint->getConstraint2(), $source, $statementParts, $parameters);
-            $statementParts['where'][] = ')';
-        } elseif ($constraint instanceof NotInterface) {
-            $statementParts['where'][] = 'NOT (';
-            $this->parseConstraint($constraint->getConstraint(), $source, $statementParts, $parameters);
-            $statementParts['where'][] = ')';
-        } elseif ($constraint instanceof ComparisonInterface) {
-            $this->parseComparison($constraint, $source, $statementParts, $parameters);
-        }
-    }
-
-    /**
-     * Parse a Comparison into SQL and parameter arrays.
-     *
-     * @param ComparisonInterface $comparison The comparison to parse
-     * @param SourceInterface $source The source
-     * @param array &$statementParts SQL query parts to add to
-     * @param array &$parameters Parameters to bind to the SQL
-     * @return void
-     * @throws Exception\RepositoryException
-     */
-    protected function parseComparison(ComparisonInterface $comparison, SourceInterface $source, array &$statementParts, 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) {
-                $statementParts['where'][] = '1<>1';
-            } else {
-                $this->parseDynamicOperand($operand1, $operator, $source, $statementParts, $parameters, null);
-                $parameters[] = $items;
-            }
-        } elseif ($operator === QueryInterface::OPERATOR_CONTAINS) {
-            if ($operand2 === null) {
-                $statementParts['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, $statementParts);
-                #}
-                #$columnName = $propertyName;
-                #$columnMap = $propertyName;
-                #$typeOfRelation = $columnMap instanceof ColumnMap ? $columnMap->getTypeOfRelation() : null;
-                #if ($typeOfRelation === ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY) {
-                #	$relationTableName = $columnMap->getRelationTableName();
-                #	$statementParts['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();
-                #		$statementParts['where'][] = $tableName . '.uid=(SELECT ' . $childTableName . '.' . $parentKeyFieldName . ' FROM ' . $childTableName . ' WHERE ' . $childTableName . '.uid=?)';
-                #		$parameters[] = intval($this->getPlainValue($operand2));
-                #	} else {
-                #		$statementParts['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, $statementParts, $parameters);
-            $parameters[] = $this->getPlainValue($operand2);
-        }
-    }
-
-    /**
-     * Returns a plain value, i.e. objects are flattened if possible.
-     *
-     * @param mixed $input
-     * @return mixed
-     * @throws UnexpectedTypeException
-     */
-    protected function getPlainValue($input)
-    {
-        if (is_array($input)) {
-            throw new 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 LazyLoadingProxy) {
-                $realInput = $input->_loadRealInstance();
-            } else {
-                $realInput = $input;
-            }
-            if ($realInput instanceof DomainObjectInterface) {
-                return $realInput->getUid();
-            } else {
-                throw new 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 &$statementParts 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 &$statementParts, array &$parameters, $valueFunction = null)
-    {
-        if ($operand instanceof LowerCaseInterface) {
-            $this->parseDynamicOperand($operand->getOperand(), $operator, $source, $statementParts, $parameters, 'LOWER');
-        } elseif ($operand instanceof UpperCaseInterface) {
-            $this->parseDynamicOperand($operand->getOperand(), $operator, $source, $statementParts, $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, $statementParts);
-                }
-            } elseif ($source instanceof JoinInterface) {
-                $tableName = $source->getJoinCondition()->getSelector1Name();
-            }
-
-            $columnName = $propertyName;
-            $resolvedOperator = $this->resolveOperator($operator);
-            $constraintSQL = '';
-
-            $marker = $operator === QueryInterface::OPERATOR_IN
-                ? '(?)'
-                : '?';
-
-            if ($valueFunction === null) {
-                $constraintSQL .= (!empty($tableName) ? $tableName . '.' : '') . $columnName . ' ' . $resolvedOperator . ' ' . $marker;
-            } else {
-                $constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName . ') ' . $resolvedOperator . ' ' . $marker;
-            }
-
-            if (isset($tableName) && !empty($this->currentChildTableNameAlias)) {
-                $constraintSQL = $this->replaceTableNameByAlias($tableName, $this->currentChildTableNameAlias, $constraintSQL);
-            }
-            $statementParts['where'][] = $constraintSQL;
-        }
-    }
-
-    /**
-     * @param string &$tableName
-     * @param string &$propertyPath
-     * @param array &$statementParts
-     */
-    protected function addUnionStatement(&$tableName, &$propertyPath, array &$statementParts)
-    {
-        $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"
-        $parts = explode('.', $propertyPath, 3);
-        if ($table->field($fieldName)->isGroup() && count($parts) > 2) {
-            $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 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) {
-                $statementParts['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.' . $fieldName . '=' . $childTableName . '.uid';
-            } else {
-                $statementParts['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
-            );
-            $statementParts['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
-            );
-            $statementParts['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);
-                    $statementParts['unions'][$relationTableNameAlias] .= $additionalJoin;
-
-                    $additionalJoin = sprintf(' AND %s.%s = "%s"', $relationTableNameAlias, $additionalFieldName, $additionalMMCondition);
-                    $statementParts['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
-                );
-                $statementParts['unions'][$childTableNameAlias] = $join;
-            } else {
-                $join = sprintf(
-                    'LEFT JOIN %s AS %s ON (FIND_IN_SET(%s.uid, %s.%s))',
-                    $childTableName,
-                    $childTableNameAlias,
-                    $childTableNameAlias,
-                    $tableName,
-                    $fieldName
-                );
-                $statementParts['unions'][$childTableNameAlias] = $join;
-            }
-        } else {
-            throw new Exception('Could not determine type of relation.', 1252502725);
-        }
-
-        $statementParts['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
-     * @return string an SQL operator
-     * @throws Exception
-     */
-    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;
-    }
-
-    /**
-     * 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 (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
-                $statement .= $this->getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted);
-            } else {
-                // 'BE' case
-                $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 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
-     * @return void
-     * @throws Exception
-     */
-    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 &$statementParts The query parts
-     * @return void
-     * @throws Exception\UnsupportedOrderException
-     */
-    protected function parseOrderings(array $orderings, SourceInterface $source, array &$statementParts)
-    {
-        foreach ($orderings as $fieldNameAndPath => $order) {
-            switch ($order) {
-                case QueryInterface::ORDER_ASCENDING:
-                    $order = 'ASC';
-                    break;
-                case QueryInterface::ORDER_DESCENDING:
-                    $order = 'DESC';
-                    break;
-                default:
-                    throw new UnsupportedOrderException('Unsupported order encountered.', 1456845126);
-            }
-
-            $tableName = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->query->getType());
-            $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $tableName);
-            $statementParts['orderings'][] = sprintf('%s.%s %s', $tableName, $fieldName, $order);
-        }
-    }
-
-    /**
-     * Transforms limit and offset into SQL
-     *
-     * @param int $limit
-     * @param int $offset
-     * @param array &$statementParts
-     * @return void
-     */
-    protected function parseLimitAndOffset($limit, $offset, array &$statementParts)
-    {
-        if ($limit !== null && $offset !== null) {
-            $statementParts['limit'] = intval($offset) . ', ' . intval($limit);
-        } elseif ($limit !== null) {
-            $statementParts['limit'] = intval($limit);
-        }
-    }
-
-    /**
-     * @param array $rows
-     * @return array
-     */
-    protected function getContentObjects(array $rows): array
-    {
-        $contentObjects = [];
-        foreach ($rows as $row) {
-            // Get language uid from querySettings.
-            // Ensure the backend handling is not broken (fallback to Get parameter 'L' if needed)
-            $overlaidRow = $this->doLanguageAndWorkspaceOverlay(
-                $row,
-                $this->query->getTypo3QuerySettings()
-            );
-
-            $contentObjects[] = GeneralUtility::makeInstance(
-                Content::class,
-                $this->query->getType(),
-                $overlaidRow
-            );
-        }
-
-        return $contentObjects;
-    }
-
-    /**
-     * 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 array $row
-     * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
-     * @return array
-     */
-    protected function doLanguageAndWorkspaceOverlay(array $row, $querySettings)
-    {
-        $tableName = $this->getTableName();
-
-        $pageRepository = $this->getPageRepository();
-        if (is_object($GLOBALS['TSFE'])) {
-            $languageMode = GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('language', 'legacyLanguageMode');
-        #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
-            ) {
-                $queryBuilder = $this->getQueryBuilder();
-                $row = $queryBuilder
-                    ->select($tableName . '.*')
-                    ->from($tableName)
-                    ->andWhere(
-                        $tableName . '.uid=' . (int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']],
-                        $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' = 0'
-                    )
-                    ->execute()
-                    ->fetch();
-            }
-        }
-
-        // Retrieve the original uid; Used for Workspaces!
-        if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) {
-            $pageRepository->versionOL($tableName, $row, true, true);
-        } else {
-            \TYPO3\CMS\Backend\Utility\BackendUtility::workspaceOL($tableName, $row);
-        }
-        if (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 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|object
-     */
-    protected function getPageRepository()
-    {
-        if (!$this->pageRepository instanceof PageRepository) {
-            if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend() && is_object($GLOBALS['TSFE'])) {
-                $this->pageRepository = $GLOBALS['TSFE']->sys_page;
-            } else {
-                $this->pageRepository = GeneralUtility::makeInstance(PageRepository::class);
-            }
-        }
-
-        return $this->pageRepository;
-    }
-
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * @return object|Connection
-     */
-    protected function getConnection(): Connection
-    {
-        /** @var ConnectionPool $connectionPool */
-        return GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getConnectionForTable($this->getTableName());
-    }
-
-    /**
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder(): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($this->getTableName());
-    }
-
-    /**
-     * @return string
-     */
-    public function getTableName(): string
-    {
-        return $this->query->getSource()->getNodeTypeName(); // getSelectorName()
-    }
+	public const OPERATOR_EQUAL_TO_NULL = 'operatorEqualToNull';
+	public const OPERATOR_NOT_EQUAL_TO_NULL = 'operatorNotEqualToNull';
+
+	/**
+	 * The TYPO3 page repository. Used for language and workspace overlay
+	 *
+	 * @var PageRepository
+	 */
+	protected $pageRepository;
+
+	/**
+	 * @var 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 = '';
+
+	/**
+	 * @param Query $query
+	 */
+	public function __construct(Query $query)
+	{
+		$this->query = $query;
+	}
+
+	/**
+	 * @param $parameters
+	 * @return array
+	 */
+	protected static function getTypes($parameters)
+	{
+		$types = [];
+		foreach ($parameters as $parameter) {
+			if (is_array($parameter)) {
+				if (MathUtility::canBeInterpretedAsInteger($parameter[0])) {
+					$types[] = \Doctrine\DBAL\Connection::PARAM_INT_ARRAY;
+				} else {
+					$types[] = \Doctrine\DBAL\Connection::PARAM_STR_ARRAY;
+				}
+			} else {
+				if (MathUtility::canBeInterpretedAsInteger($parameter)) {
+					$types[] = ParameterType::INTEGER;
+				} else {
+					$types[] = ParameterType::STRING;
+				}
+			}
+		}
+		return $types;
+	}
+
+	/**
+	 * Returns the result of the query
+	 */
+	public function fetchResult()
+	{
+		$parameters = [];
+		$statementParts = $this->parseQuery($parameters);
+		$statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts);
+		$sql = $this->buildQuery($statementParts);
+		//print $sql; exit();
+
+		$rows = $this->getConnection()
+			->executeQuery($sql, $parameters, self::getTypes($parameters))
+			->fetchAllAssociative();
+
+		return $this->getContentObjects($rows);
+	}
+
+	/**
+	 * Returns the number of tuples matching the query.
+	 *
+	 * @return int The number of matching tuples
+	 */
+	public function countResult()
+	{
+		$parameters = [];
+		$statementParts = $this->parseQuery($parameters);
+		$statementParts = $this->processStatementStructureForRecursiveMMRelation($statementParts);
+		$types = self::getTypes($parameters);
+
+		// if limit is set, we need to count the rows "manually" as COUNT(*) ignores LIMIT constraints
+		if (!empty($statementParts['limit'])) {
+			$sql = $this->buildQuery($statementParts);
+
+			$count = $this
+				->getConnection()
+				->executeQuery($sql, $parameters, $types)
+				->rowCount();
+		} 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 ' . $statementParts['mainTable'] . '.' . $distinctField . ')');
+			}
+
+			$sql = $this->buildQuery($statementParts);
+			$count = $this
+				->getConnection()
+				->executeQuery($sql, $parameters, $types)
+				->fetchColumn(0);
+		}
+		return (int)$count;
+	}
+
+	/**
+	 * Parses the query and returns the SQL statement parts.
+	 *
+	 * @param array &$parameters
+	 * @return array
+	 */
+	public function parseQuery(array &$parameters)
+	{
+		$statementParts = [];
+		$statementParts['keywords'] = [];
+		$statementParts['tables'] = [];
+		$statementParts['unions'] = [];
+		$statementParts['fields'] = [];
+		$statementParts['where'] = [];
+		$statementParts['additionalWhereClause'] = [];
+		$statementParts['orderings'] = [];
+		$statementParts['limit'] = [];
+		$query = $this->query;
+		$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->getTypo3QuerySettings(), $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)
+	{
+		$tableName = $this->getTableName();
+		$sql['fields'][$tableName] = $tableName . '.*';
+		if ($this->query->getDistinct()) {
+			$sql['fields'][$tableName] = $tableName . '.' . $this->query->getDistinct();
+			$sql['keywords']['distinct'] = 'DISTINCT';
+		}
+		$sql['tables'][$tableName] = $tableName;
+		$sql['mainTable'] = $tableName;
+	}
+
+	/**
+	 * Transforms a constraint into SQL and parameter arrays
+	 *
+	 * @param ConstraintInterface $constraint The constraint
+	 * @param SourceInterface $source The source
+	 * @param array &$statementParts The query parts
+	 * @param array &$parameters The parameters that will replace the markers
+	 * @return void
+	 */
+	protected function parseConstraint(ConstraintInterface $constraint = null, SourceInterface $source, array &$statementParts, array &$parameters)
+	{
+		if ($constraint instanceof AndInterface) {
+			$statementParts['where'][] = '(';
+			$this->parseConstraint($constraint->getConstraint1(), $source, $statementParts, $parameters);
+			$statementParts['where'][] = ' AND ';
+			$this->parseConstraint($constraint->getConstraint2(), $source, $statementParts, $parameters);
+			$statementParts['where'][] = ')';
+		} elseif ($constraint instanceof OrInterface) {
+			$statementParts['where'][] = '(';
+			$this->parseConstraint($constraint->getConstraint1(), $source, $statementParts, $parameters);
+			$statementParts['where'][] = ' OR ';
+			$this->parseConstraint($constraint->getConstraint2(), $source, $statementParts, $parameters);
+			$statementParts['where'][] = ')';
+		} elseif ($constraint instanceof NotInterface) {
+			$statementParts['where'][] = 'NOT (';
+			$this->parseConstraint($constraint->getConstraint(), $source, $statementParts, $parameters);
+			$statementParts['where'][] = ')';
+		} elseif ($constraint instanceof ComparisonInterface) {
+			$this->parseComparison($constraint, $source, $statementParts, $parameters);
+		}
+	}
+
+	/**
+	 * Parse a Comparison into SQL and parameter arrays.
+	 *
+	 * @param ComparisonInterface $comparison The comparison to parse
+	 * @param SourceInterface $source The source
+	 * @param array &$statementParts SQL query parts to add to
+	 * @param array &$parameters Parameters to bind to the SQL
+	 * @return void
+	 * @throws Exception\RepositoryException
+	 */
+	protected function parseComparison(ComparisonInterface $comparison, SourceInterface $source, array &$statementParts, 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) {
+				$statementParts['where'][] = '1<>1';
+			} else {
+				$this->parseDynamicOperand($operand1, $operator, $source, $statementParts, $parameters, null);
+				$parameters[] = $items;
+			}
+		} elseif ($operator === QueryInterface::OPERATOR_CONTAINS) {
+			if ($operand2 === null) {
+				$statementParts['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, $statementParts);
+				#}
+				#$columnName = $propertyName;
+				#$columnMap = $propertyName;
+				#$typeOfRelation = $columnMap instanceof ColumnMap ? $columnMap->getTypeOfRelation() : null;
+				#if ($typeOfRelation === ColumnMap::RELATION_HAS_AND_BELONGS_TO_MANY) {
+				#	$relationTableName = $columnMap->getRelationTableName();
+				#	$statementParts['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();
+				#		$statementParts['where'][] = $tableName . '.uid=(SELECT ' . $childTableName . '.' . $parentKeyFieldName . ' FROM ' . $childTableName . ' WHERE ' . $childTableName . '.uid=?)';
+				#		$parameters[] = intval($this->getPlainValue($operand2));
+				#	} else {
+				#		$statementParts['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, $statementParts, $parameters);
+			$parameters[] = $this->getPlainValue($operand2);
+		}
+	}
+
+	/**
+	 * Returns a plain value, i.e. objects are flattened if possible.
+	 *
+	 * @param mixed $input
+	 * @return mixed
+	 * @throws UnexpectedTypeException
+	 */
+	protected function getPlainValue($input)
+	{
+		if (is_array($input)) {
+			throw new 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 LazyLoadingProxy) {
+				$realInput = $input->_loadRealInstance();
+			} else {
+				$realInput = $input;
+			}
+			if ($realInput instanceof DomainObjectInterface) {
+				return $realInput->getUid();
+			} else {
+				throw new 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 &$statementParts 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 &$statementParts, array &$parameters, $valueFunction = null)
+	{
+		if ($operand instanceof LowerCaseInterface) {
+			$this->parseDynamicOperand($operand->getOperand(), $operator, $source, $statementParts, $parameters, 'LOWER');
+		} elseif ($operand instanceof UpperCaseInterface) {
+			$this->parseDynamicOperand($operand->getOperand(), $operator, $source, $statementParts, $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, $statementParts);
+				}
+			} elseif ($source instanceof JoinInterface) {
+				$tableName = $source->getJoinCondition()->getSelector1Name();
+			}
+
+			$columnName = $propertyName;
+			$resolvedOperator = $this->resolveOperator($operator);
+			$constraintSQL = '';
+
+			$marker = $operator === QueryInterface::OPERATOR_IN
+				? '(?)'
+				: '?';
+
+			if ($valueFunction === null) {
+				$constraintSQL .= (!empty($tableName) ? $tableName . '.' : '') . $columnName . ' ' . $resolvedOperator . ' ' . $marker;
+			} else {
+				$constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName . ') ' . $resolvedOperator . ' ' . $marker;
+			}
+
+			if (isset($tableName) && !empty($this->currentChildTableNameAlias)) {
+				$constraintSQL = $this->replaceTableNameByAlias($tableName, $this->currentChildTableNameAlias, $constraintSQL);
+			}
+			$statementParts['where'][] = $constraintSQL;
+		}
+	}
+
+	/**
+	 * @param string &$tableName
+	 * @param string &$propertyPath
+	 * @param array &$statementParts
+	 */
+	protected function addUnionStatement(&$tableName, &$propertyPath, array &$statementParts)
+	{
+		$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"
+		$parts = explode('.', $propertyPath, 3);
+		if ($table->field($fieldName)->isGroup() && count($parts) > 2) {
+			$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 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) {
+				$statementParts['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.' . $fieldName . '=' . $childTableName . '.uid';
+			} else {
+				$statementParts['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
+			);
+			$statementParts['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
+			);
+			$statementParts['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);
+					$statementParts['unions'][$relationTableNameAlias] .= $additionalJoin;
+
+					$additionalJoin = sprintf(' AND %s.%s = "%s"', $relationTableNameAlias, $additionalFieldName, $additionalMMCondition);
+					$statementParts['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
+				);
+				$statementParts['unions'][$childTableNameAlias] = $join;
+			} else {
+				$join = sprintf(
+					'LEFT JOIN %s AS %s ON (FIND_IN_SET(%s.uid, %s.%s))',
+					$childTableName,
+					$childTableNameAlias,
+					$childTableNameAlias,
+					$tableName,
+					$fieldName
+				);
+				$statementParts['unions'][$childTableNameAlias] = $join;
+			}
+		} else {
+			throw new Exception('Could not determine type of relation.', 1252502725);
+		}
+
+		$statementParts['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
+	 * @return string an SQL operator
+	 * @throws Exception
+	 */
+	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;
+	}
+
+	/**
+	 * 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 (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()) {
+				$statement .= $this->getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted);
+			} else {
+				// 'BE' case
+				$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 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
+	 * @return void
+	 * @throws Exception
+	 */
+	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 &$statementParts The query parts
+	 * @return void
+	 * @throws Exception\UnsupportedOrderException
+	 */
+	protected function parseOrderings(array $orderings, SourceInterface $source, array &$statementParts)
+	{
+		foreach ($orderings as $fieldNameAndPath => $order) {
+			switch ($order) {
+				case QueryInterface::ORDER_ASCENDING:
+					$order = 'ASC';
+					break;
+				case QueryInterface::ORDER_DESCENDING:
+					$order = 'DESC';
+					break;
+				default:
+					throw new UnsupportedOrderException('Unsupported order encountered.', 1456845126);
+			}
+
+			$tableName = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->query->getType());
+			$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $tableName);
+			$statementParts['orderings'][] = sprintf('%s.%s %s', $tableName, $fieldName, $order);
+		}
+	}
+
+	/**
+	 * Transforms limit and offset into SQL
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @param array &$statementParts
+	 * @return void
+	 */
+	protected function parseLimitAndOffset($limit, $offset, array &$statementParts)
+	{
+		if ($limit !== null && $offset !== null) {
+			$statementParts['limit'] = intval($offset) . ', ' . intval($limit);
+		} elseif ($limit !== null) {
+			$statementParts['limit'] = intval($limit);
+		}
+	}
+
+	/**
+	 * @param array $rows
+	 * @return array
+	 */
+	protected function getContentObjects(array $rows): array
+	{
+		$contentObjects = [];
+		foreach ($rows as $row) {
+			// Get language uid from querySettings.
+			// Ensure the backend handling is not broken (fallback to Get parameter 'L' if needed)
+			$overlaidRow = $this->doLanguageAndWorkspaceOverlay(
+				$row,
+				$this->query->getTypo3QuerySettings()
+			);
+
+			$contentObjects[] = GeneralUtility::makeInstance(
+				Content::class,
+				$this->query->getType(),
+				$overlaidRow
+			);
+		}
+
+		return $contentObjects;
+	}
+
+	/**
+	 * 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 array $row
+	 * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
+	 * @return array
+	 */
+	protected function doLanguageAndWorkspaceOverlay(array $row, $querySettings)
+	{
+		$tableName = $this->getTableName();
+
+		$pageRepository = $this->getPageRepository();
+		if (is_object($GLOBALS['TSFE'])) {
+			$languageMode = GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('language', 'legacyLanguageMode');
+		#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
+			) {
+				$queryBuilder = $this->getQueryBuilder();
+				$row = $queryBuilder
+					->select($tableName . '.*')
+					->from($tableName)
+					->andWhere(
+						$tableName . '.uid=' . (int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']],
+						$tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' = 0'
+					)
+					->execute()
+					->fetch();
+			}
+		}
+
+		// Retrieve the original uid; Used for Workspaces!
+		if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isBackend()) {
+			$pageRepository->versionOL($tableName, $row, true, true);
+		} else {
+			\TYPO3\CMS\Backend\Utility\BackendUtility::workspaceOL($tableName, $row);
+		}
+		if (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 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|object
+	 */
+	protected function getPageRepository()
+	{
+		if (!$this->pageRepository instanceof PageRepository) {
+			if (ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend() && is_object($GLOBALS['TSFE'])) {
+				$this->pageRepository = $GLOBALS['TSFE']->sys_page;
+			} else {
+				$this->pageRepository = GeneralUtility::makeInstance(PageRepository::class);
+			}
+		}
+
+		return $this->pageRepository;
+	}
+
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * @return object|Connection
+	 */
+	protected function getConnection(): Connection
+	{
+		/** @var ConnectionPool $connectionPool */
+		return GeneralUtility::makeInstance(ConnectionPool::class)
+			->getConnectionForTable($this->getTableName());
+	}
+
+	/**
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder(): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($this->getTableName());
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTableName(): string
+	{
+		return $this->query->getSource()->getNodeTypeName(); // getSelectorName()
+	}
 }

Classes/Persistence/PagerObjectFactory.php

Indentation +42 added lines, -42 removed lines

@@ -17,46 +17,46 @@
  */
 class PagerObjectFactory implements SingletonInterface
 {
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return \Fab\Vidi\Persistence\PagerObjectFactory|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\PagerObjectFactory::class);
-    }
-
-    /**
-     * Returns a pager object.
-     *
-     * @return Pager
-     */
-    public function getPager()
-    {
-        /** @var $pager \Fab\Vidi\Persistence\Pager */
-        $pager = GeneralUtility::makeInstance(Pager::class);
-
-        // 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 page
-        $page = 1;
-        if ($pager->getLimit() > 0) {
-            $page = round($pager->getOffset() / $pager->getLimit());
-        }
-        $pager->setPage($page);
-
-        return $pager;
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return \Fab\Vidi\Persistence\PagerObjectFactory|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\PagerObjectFactory::class);
+	}
+
+	/**
+	 * Returns a pager object.
+	 *
+	 * @return Pager
+	 */
+	public function getPager()
+	{
+		/** @var $pager \Fab\Vidi\Persistence\Pager */
+		$pager = GeneralUtility::makeInstance(Pager::class);
+
+		// 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 page
+		$page = 1;
+		if ($pager->getLimit() > 0) {
+			$page = round($pager->getOffset() / $pager->getLimit());
+		}
+		$pager->setPage($page);
+
+		return $pager;
+	}
 }