fabarea / vidi

Classes/Persistence/Storage/VidiDbBackend.php

Spacing +37 added lines, -37 removed lines

@@ -169,7 +169,7 @@ 
             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 . ')');
+                $statementParts['fields'] = array('COUNT(DISTINCT '.$statementParts['mainTable'].'.'.$distinctField.')');
             }
 
             $sql = $this->buildQuery($statementParts);
@@ -232,14 +232,14 @@ 
             // tx_domain_model_foo0 (the alias) <--> tx_domain_model_foo (the origin table name)
             $values = [];
             foreach ($statementParts['fields'] as $key => $value) {
-                $values[$key] = str_replace($tableName, $tableName . '0', $value);
+                $values[$key] = str_replace($tableName, $tableName.'0', $value);
             }
             $statementParts['fields'] = $values;
 
             // Same comment as above.
             $values = [];
             foreach ($statementParts['where'] as $key => $value) {
-                $values[$key] = str_replace($tableName . '0', $tableName, $value);
+                $values[$key] = str_replace($tableName.'0', $tableName, $value);
             }
             $statementParts['where'] = $values;
 
@@ -278,25 +278,25 @@ 
         if (!empty($statementParts['unions'])) {
             foreach ($statementParts['unions'] as $tableName => $unionPart) {
                 if (!empty($statementParts['additionalWhereClause'][$tableName])) {
-                    $statementParts['unions'][$tableName] .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
+                    $statementParts['unions'][$tableName] .= ' AND '.implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
                 }
             }
         }
 
-        $statement = 'SELECT ' . implode(' ', $statementParts['keywords']) . ' ' . implode(',', $statementParts['fields']) . ' FROM ' . implode(' ', $statementParts['tables']) . ' ' . implode(' ', $statementParts['unions']);
+        $statement = 'SELECT '.implode(' ', $statementParts['keywords']).' '.implode(',', $statementParts['fields']).' FROM '.implode(' ', $statementParts['tables']).' '.implode(' ', $statementParts['unions']);
         if (!empty($statementParts['where'])) {
-            $statement .= ' WHERE ' . implode('', $statementParts['where']);
+            $statement .= ' WHERE '.implode('', $statementParts['where']);
             if (!empty($statementParts['additionalWhereClause'][$this->query->getType()])) {
-                $statement .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+                $statement .= ' AND '.implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
             }
         } elseif (!empty($statementParts['additionalWhereClause'])) {
-            $statement .= ' WHERE ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+            $statement .= ' WHERE '.implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
         }
         if (!empty($statementParts['orderings'])) {
-            $statement .= ' ORDER BY ' . implode(', ', $statementParts['orderings']);
+            $statement .= ' ORDER BY '.implode(', ', $statementParts['orderings']);
         }
         if (!empty($statementParts['limit'])) {
-            $statement .= ' LIMIT ' . $statementParts['limit'];
+            $statement .= ' LIMIT '.$statementParts['limit'];
         }
 
         return $statement;
@@ -312,9 +312,9 @@ 
     protected function parseSource(SourceInterface $source, array &$sql)
     {
         $tableName = $this->getTableName();
-        $sql['fields'][$tableName] = $tableName . '.*';
+        $sql['fields'][$tableName] = $tableName.'.*';
         if ($this->query->getDistinct()) {
-            $sql['fields'][$tableName] = $tableName . '.' . $this->query->getDistinct();
+            $sql['fields'][$tableName] = $tableName.'.'.$this->query->getDistinct();
             $sql['keywords']['distinct'] = 'DISTINCT';
         }
         $sql['tables'][$tableName] = $tableName;
@@ -452,7 +452,7 @@ 
             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);
+                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;
@@ -502,9 +502,9 @@ 
                 : '?';
 
             if ($valueFunction === null) {
-                $constraintSQL .= (!empty($tableName) ? $tableName . '.' : '') . $columnName . ' ' . $resolvedOperator . ' ' . $marker;
+                $constraintSQL .= (!empty($tableName) ? $tableName.'.' : '').$columnName.' '.$resolvedOperator.' '.$marker;
             } else {
-                $constraintSQL .= $valueFunction . '(' . (!empty($tableName) ? $tableName . '.' : '') . $columnName . ') ' . $resolvedOperator . ' ' . $marker;
+                $constraintSQL .= $valueFunction.'('.(!empty($tableName) ? $tableName.'.' : '').$columnName.') '.$resolvedOperator.' '.$marker;
             }
 
             if (isset($tableName) && !empty($this->currentChildTableNameAlias)) {
@@ -531,7 +531,7 @@ 
         // 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[0] = $parts[0].'.'.$parts[1];
             $explodedPropertyPath[1] = $parts[2];
             $fieldName = $explodedPropertyPath[0];
         }
@@ -540,16 +540,16 @@ 
         $childTableName = $table->field($fieldName)->getForeignTable();
 
         if ($childTableName === null) {
-            throw new InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
+            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';
+                $statementParts['unions'][$childTableName] = 'LEFT JOIN '.$childTableName.' ON '.$tableName.'.'.$fieldName.'='.$childTableName.'.uid';
             } else {
-                $statementParts['unions'][$childTableName] = 'LEFT JOIN ' . $childTableName . ' ON ' . $tableName . '.uid=' . $childTableName . '.' . $parentKeyFieldName;
+                $statementParts['unions'][$childTableName] = 'LEFT JOIN '.$childTableName.' ON '.$tableName.'.uid='.$childTableName.'.'.$parentKeyFieldName;
             }
         } elseif ($table->field($fieldName)->hasRelationManyToMany()) {
             $relationTableName = $table->field($fieldName)->getManyToManyTable();
@@ -779,18 +779,18 @@ 
         // If the table is found to have "workspace" support, add the corresponding fields in the statement.
         if (Tca::table($tableName)->hasWorkspaceSupport()) {
             if ($this->getBackendUser()->workspace === 0) {
-                $statement .= ' AND ' . $tableName . '.t3ver_state<=' . new VersionState(VersionState::DEFAULT_STATE);
+                $statement .= ' AND '.$tableName.'.t3ver_state<='.new VersionState(VersionState::DEFAULT_STATE);
             } else {
                 // Show only records of live and of the current workspace
                 // In case we are in a Versioning preview
-                $statement .= ' AND (' .
-                    $tableName . '.t3ver_wsid=0 OR ' .
-                    $tableName . '.t3ver_wsid=' . (int)$this->getBackendUser()->workspace .
+                $statement .= ' AND ('.
+                    $tableName.'.t3ver_wsid=0 OR '.
+                    $tableName.'.t3ver_wsid='.(int)$this->getBackendUser()->workspace.
                     ')';
             }
 
             // Check if this segment make sense here or whether it should be in the "if" part when we have workspace = 0
-            $statement .= ' AND ' . $tableName . '.pid<>-1';
+            $statement .= ' AND '.$tableName.'.pid<>-1';
         }
 
         if (!$includeDeleted) {
@@ -815,25 +815,25 @@ 
         if (is_array($GLOBALS['TCA'][$tableName]['ctrl'])) {
             if (!empty($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])) {
                 // Select all entries for the current language
-                $additionalWhereClause = $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' IN (' . intval($querySettings->getLanguageUid()) . ',-1)';
+                $additionalWhereClause = $tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].' IN ('.intval($querySettings->getLanguageUid()).',-1)';
                 // If any language is set -> get those entries which are not translated yet
                 // They will be removed by t3lib_page::getRecordOverlay if not matching overlay mode
                 if (isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
                     && $querySettings->getLanguageUid() > 0
                 ) {
-                    $additionalWhereClause .= ' OR (' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '=0' .
-                        ' AND ' . $tableNameOrAlias . '.uid NOT IN (SELECT ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] .
-                        ' FROM ' . $tableName .
-                        ' WHERE ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'] . '>0' .
-                        ' AND ' . $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . '>0';
+                    $additionalWhereClause .= ' OR ('.$tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'=0'.
+                        ' AND '.$tableNameOrAlias.'.uid NOT IN (SELECT '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'].
+                        ' FROM '.$tableName.
+                        ' WHERE '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'].'>0'.
+                        ' AND '.$tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].'>0';
 
                     // Add delete clause to ensure all entries are loaded
                     if (isset($GLOBALS['TCA'][$tableName]['ctrl']['delete'])) {
-                        $additionalWhereClause .= ' AND ' . $tableNameOrAlias . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['delete'] . '=0';
+                        $additionalWhereClause .= ' AND '.$tableNameOrAlias.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['delete'].'=0';
                     }
                     $additionalWhereClause .= '))';
                 }
-                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = '(' . $additionalWhereClause . ')';
+                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = '('.$additionalWhereClause.')';
             }
         }
     }
@@ -878,7 +878,7 @@ 
     protected function parseLimitAndOffset($limit, $offset, array &$statementParts)
     {
         if ($limit !== null && $offset !== null) {
-            $statementParts['limit'] = intval($offset) . ', ' . intval($limit);
+            $statementParts['limit'] = intval($offset).', '.intval($limit);
         } elseif ($limit !== null) {
             $statementParts['limit'] = intval($limit);
         }
@@ -946,11 +946,11 @@ 
             ) {
                 $queryBuilder = $this->getQueryBuilder();
                 $row = $queryBuilder
-                    ->select($tableName . '.*')
+                    ->select($tableName.'.*')
                     ->from($tableName)
                     ->andWhere(
-                        $tableName . '.uid=' . (int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']],
-                        $tableName . '.' . $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] . ' = 0'
+                        $tableName.'.uid='.(int)$row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']],
+                        $tableName.'.'.$GLOBALS['TCA'][$tableName]['ctrl']['languageField'].' = 0'
                     )
                     ->execute()
                     ->fetch();
@@ -1011,7 +1011,7 @@ 
         }
 
         $numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
-        $tableNameAlias = $tableName . $numberOfAliases;
+        $tableNameAlias = $tableName.$numberOfAliases;
 
         $this->tableNameAliases['aliasIncrement'][$tableName]++;
         $this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;

Indentation +1040 added lines, -1040 removed lines

@@ -53,1044 +53,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 (Typo3Mode::isFrontendMode()) {
-                $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 (Typo3Mode::isBackendMode()) {
-            $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 (Typo3Mode::isFrontendMode() && 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 (Typo3Mode::isFrontendMode()) {
+				$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 (Typo3Mode::isBackendMode()) {
+			$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 (Typo3Mode::isFrontendMode() && 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/Query.php

Spacing +2 added lines, -2 removed lines

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

Indentation +617 added lines, -617 removed lines

@@ -42,621 +42,621 @@
  */
 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;
-    }
-
-    protected function isBackendMode(): bool
-    {
-        return Typo3Mode::isBackendMode();
-    }
-
-    /**
-     * @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;
+	}
+
+	protected function isBackendMode(): bool
+	{
+		return Typo3Mode::isBackendMode();
+	}
+
+	/**
+	 * @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/ViewHelpers/Render/ComponentsViewHelper.php

Indentation +45 added lines, -45 removed lines

@@ -18,57 +18,57 @@
  */
 class ComponentsViewHelper extends AbstractViewHelper
 {
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('part', 'string', 'Template part', true);
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('part', 'string', 'Template part', true);
+	}
 
-    /**
-     * Escapes special characters with their escaped counterparts as needed using PHPs strip_tags() function.
-     *
-     * @return mixed
-     */
-    public function render()
-    {
-        return static::renderStatic(
-            $this->arguments,
-            $this->buildRenderChildrenClosure(),
-            $this->renderingContext
-        );
-    }
+	/**
+	 * Escapes special characters with their escaped counterparts as needed using PHPs strip_tags() function.
+	 *
+	 * @return mixed
+	 */
+	public function render()
+	{
+		return static::renderStatic(
+			$this->arguments,
+			$this->buildRenderChildrenClosure(),
+			$this->renderingContext
+		);
+	}
 
-    /**
-     * Applies strip_tags() on the specified value.
-     *
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     * @return string
-     */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
-    {
-        /** @var ModuleLoader $moduleLoader */
-        $moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
+	/**
+	 * Applies strip_tags() on the specified value.
+	 *
+	 * @param array $arguments
+	 * @param \Closure $renderChildrenClosure
+	 * @param RenderingContextInterface $renderingContext
+	 * @return string
+	 */
+	public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+	{
+		/** @var ModuleLoader $moduleLoader */
+		$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
 
-        $part = $arguments['part'];
+		$part = $arguments['part'];
 
-        $getComponents = 'get' . ucfirst($part) . 'Components';
-        $components = $moduleLoader->$getComponents();
+		$getComponents = 'get' . ucfirst($part) . 'Components';
+		$components = $moduleLoader->$getComponents();
 
-        $result = '';
-        foreach ($components as $component) {
-            $viewHelper = GeneralUtility::makeInstance($component);
+		$result = '';
+		foreach ($components as $component) {
+			$viewHelper = GeneralUtility::makeInstance($component);
 
-            // Get possible arguments but remove first one.
-            $arguments = func_get_args();
-            array_shift($arguments);
-            $result .= call_user_func_array(array($viewHelper, 'render'), $arguments);
-        }
+			// Get possible arguments but remove first one.
+			$arguments = func_get_args();
+			array_shift($arguments);
+			$result .= call_user_func_array(array($viewHelper, 'render'), $arguments);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
         $part = $arguments['part'];
 
-        $getComponents = 'get' . ucfirst($part) . 'Components';
+        $getComponents = 'get'.ucfirst($part).'Components';
         $components = $moduleLoader->$getComponents();
 
         $result = '';

ext_emconf.php

Indentation +5 added lines, -5 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 $EM_CONF[$_EXTKEY] = [
-    'title' => 'Versatile and Interactive Display - List Component',
-    'description' => 'Generic listing of records with versatile ways of interacting with the data, e.g. advanced filter, inline editing, mass editing, ... Veni, vidi, vici!',
-    'author' => 'Fabien Udriot',
-    'author_email' => 'fabien@ecodev.ch',
-    'state' => 'stable',
+	'title' => 'Versatile and Interactive Display - List Component',
+	'description' => 'Generic listing of records with versatile ways of interacting with the data, e.g. advanced filter, inline editing, mass editing, ... Veni, vidi, vici!',
+	'author' => 'Fabien Udriot',
+	'author_email' => 'fabien@ecodev.ch',
+	'state' => 'stable',
 ];

Classes/Module/ModuleLoader.php

Spacing +5 added lines, -5 removed lines

@@ -193,7 +193,7 @@ 
      */
     protected function getExistingMainConfiguration(): array
     {
-        $moduleSignature = $this->computeMainModule() . '_' . $this->getInternalModuleSignature();
+        $moduleSignature = $this->computeMainModule().'_'.$this->getInternalModuleSignature();
         return $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature] ?? [];
     }
 
@@ -315,7 +315,7 @@ 
             ExtensionUtility::registerModule(
                 'Vidi',
                 $this->computeMainModule(),
-                $this->dataType . '_' . $this->moduleKey,
+                $this->dataType.'_'.$this->moduleKey,
                 $this->position,
                 [
                     ContentController::class => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
@@ -378,7 +378,7 @@ 
      */
     public function getParameterPrefix(): string
     {
-        return 'tx_vidi_' . strtolower($this->getSignature());
+        return 'tx_vidi_'.strtolower($this->getSignature());
     }
 
     /**
@@ -1031,10 +1031,10 @@ 
         if ($dataType === null) {
             $dataType = $this->dataType;
         }
-        $subModuleName = $dataType . '_' . $this->moduleKey;
+        $subModuleName = $dataType.'_'.$this->moduleKey;
 
         $mainModule = $this->mainModule ?: self::DEFAULT_MAIN_MODULE;
-        return $mainModule . '_Vidi' . GeneralUtility::underscoredToUpperCamelCase($subModuleName);
+        return $mainModule.'_Vidi'.GeneralUtility::underscoredToUpperCamelCase($subModuleName);
     }
 
 }

Indentation +992 added lines, -992 removed lines

@@ -35,996 +35,996 @@
  */
 class ModuleLoader
 {
-    /**
-     * Define the default main module
-     */
-    public const DEFAULT_MAIN_MODULE = 'content';
-
-    /**
-     * Define the default pid
-     */
-    public const DEFAULT_PID = 0;
-
-    /**
-     * The type of data being listed (which corresponds to a table name in TCA)
-     *
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var string
-     */
-    protected $defaultPid;
-
-    /**
-     * @var bool
-     */
-    protected $isPidIgnored = false;
-
-    /**
-     * @var bool
-     */
-    protected $showPageTree = false;
-
-    /**
-     * @var bool
-     */
-    protected $isShown = true;
-
-    /**
-     * @var string
-     */
-    protected $access;
-
-    /**
-     * @var string
-     */
-    protected $mainModule;
-
-    /**
-     * @var string
-     */
-    protected $position = '';
-
-    /**
-     * @var string
-     */
-    protected $icon;
-
-    /**
-     * @var string
-     */
-    protected $moduleLanguageFile;
-
-    /**
-     * The module key such as m1, m2.
-     *
-     * @var string
-     */
-    protected $moduleKey = 'm1';
-
-    /**
-     * @var string[]
-     */
-    protected $additionalJavaScriptFiles = [];
-
-    /**
-     * @var string[]
-     */
-    protected $additionalStyleSheetFiles = [];
-
-    /**
-     * @var array
-     */
-    protected $components = [];
-
-    /**
-     * @param string $dataType
-     */
-    public function __construct($dataType = null)
-    {
-        $this->dataType = $dataType;
-
-        // Initialize components
-        $this->components = [
-            ModulePosition::DOC_HEADER => [
-                ModulePosition::TOP => [
-                    ModulePosition::LEFT => [],
-                    ModulePosition::RIGHT => [
-                        ToolButton::class,
-                    ],
-                ],
-                ModulePosition::BOTTOM => [
-                    ModulePosition::LEFT => [
-                        NewButton::class,
-                        BackViewHelper::class,
-                    ],
-                    ModulePosition::RIGHT => [],
-                ],
-            ],
-            ModulePosition::GRID => [
-                ModulePosition::TOP => [
-                    RelationsCheck::class,
-                    #\Fab\Vidi\View\Tab\DataTypeTab::class,
-                ],
-                ModulePosition::BUTTONS => [
-                    EditButton::class,
-                    DeleteButton::class,
-                ],
-                ModulePosition::BOTTOM => [],
-            ],
-            ModulePosition::MENU_MASS_ACTION => [
-                ExportXlsMenuItem::class,
-                ExportXmlMenuItem::class,
-                ExportCsvMenuItem::class,
-                DividerMenuItem::class,
-                MassDeleteMenuItem::class,
-                #\Fab\Vidi\View\MenuItem\MassEditMenuItem::class,
-            ],
-        ];
-    }
-
-    /**
-     * Tell whether a module is already registered.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    public function isRegistered($dataType): bool
-    {
-        $internalModuleSignature = $this->getInternalModuleSignature($dataType);
-        return !empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getExistingInternalConfiguration(): array
-    {
-        $internalModuleSignature = $this->getInternalModuleSignature();
-        return $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature] ?? [];
-    }
-
-    /**
-     * @return array
-     */
-    protected function getExistingMainConfiguration(): array
-    {
-        $moduleSignature = $this->computeMainModule() . '_' . $this->getInternalModuleSignature();
-        return $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature] ?? [];
-    }
-
-    /**
-     * @return string
-     */
-    protected function computeMainModule(): string
-    {
-        $existingConfiguration = $this->getExistingInternalConfiguration();
-
-        if ($this->mainModule !== null) {
-            $mainModule = $this->mainModule;
-        } elseif (!empty($existingConfiguration['mainModule'])) { // existing configuration may override.
-            $mainModule = $existingConfiguration['mainModule'];
-        } else {
-            $mainModule = self::DEFAULT_MAIN_MODULE; //default value.
-        }
-        return $mainModule;
-    }
-
-    /**
-     * @return string
-     */
-    protected function computeDefaultPid(): string
-    {
-        $existingConfiguration = $this->getExistingInternalConfiguration();
-
-        if ($this->defaultPid !== null) {
-            $defaultPid = $this->defaultPid;
-        } elseif (!empty($existingConfiguration['defaultPid'])) { // existing configuration may override.
-            $defaultPid = $existingConfiguration['defaultPid'];
-        } else {
-            $defaultPid = self::DEFAULT_PID; //default value.
-        }
-        return $defaultPid;
-    }
-
-    /**
-     * @return array
-     */
-    protected function computeAdditionalJavaScriptFiles(): array
-    {
-        $additionalJavaScriptFiles = $this->additionalJavaScriptFiles;
-
-        // Possible merge of existing javascript files.
-        $existingConfiguration = $this->getExistingInternalConfiguration();
-        if (!empty($existingConfiguration['additionalJavaScriptFiles'])) {
-            $additionalJavaScriptFiles = array_merge($additionalJavaScriptFiles, $existingConfiguration['additionalJavaScriptFiles']);
-        }
-
-        return $additionalJavaScriptFiles;
-    }
-
-    /**
-     * @return array
-     */
-    protected function computeAdditionalStyleSheetFiles(): array
-    {
-        $additionalStyleSheetFiles = $this->additionalStyleSheetFiles;
-
-        // Possible merge of existing style sheets.
-        $existingConfiguration = $this->getExistingInternalConfiguration();
-        if (!empty($existingConfiguration['additionalStyleSheetFiles'])) {
-            $additionalStyleSheetFiles = array_merge($additionalStyleSheetFiles, $existingConfiguration['additionalStyleSheetFiles']);
-        }
-
-        return $additionalStyleSheetFiles;
-    }
-
-    /**
-     * @return array
-     */
-    protected function computeComponents(): array
-    {
-        // We override the config in any case. See if we need more than that.
-        return $this->components;
-    }
-
-    /**
-     * Register the module in two places: core + vidi internal.
-     *
-     * @return $this
-     */
-    public function register(): self
-    {
-        // Internal Vidi module registration.
-        $configuration = [];
-        $configuration['dataType'] = $this->dataType;
-        $configuration['mainModule'] = $this->computeMainModule();
-        $configuration['defaultPid'] = $this->computeDefaultPid();
-        $configuration['additionalJavaScriptFiles'] = $this->computeAdditionalJavaScriptFiles();
-        $configuration['additionalStyleSheetFiles'] = $this->computeAdditionalStyleSheetFiles();
-        $configuration['components'] = $this->computeComponents();
-        $configuration['isPidIgnored'] = $this->isPidIgnored;
-
-        $internalModuleSignature = $this->getInternalModuleSignature();
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature] = $configuration;
-
-        // Core module registration.
-        // Register and displays module in the BE only if told, default is "true".
-        if ($this->isShown) {
-            $moduleConfiguration = [];
-            #$moduleConfiguration['routeTarget'] = \Fab\Vidi\Controller\ContentController::class . '::mainAction', // what to do here?
-            $moduleConfiguration['access'] = $this->getAccess();
-            $moduleConfiguration['labels'] = $this->getModuleLanguageFile();
-            $icon = $this->getIcon();
-            if ($icon) {
-                $moduleConfiguration['icon'] = $icon;
-            }
-
-            if ($this->showPageTree) {
-                $moduleConfiguration['navigationComponentId'] = 'TYPO3/CMS/Backend/PageTree/PageTreeElement';
-                $moduleConfiguration['inheritNavigationComponentFromMainModule'] = true;
-            } else {
-                $moduleConfiguration['inheritNavigationComponentFromMainModule'] = true;
-            }
-
-            ExtensionUtility::registerModule(
-                'Vidi',
-                $this->computeMainModule(),
-                $this->dataType . '_' . $this->moduleKey,
-                $this->position,
-                [
-                    ContentController::class => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
-                    ToolController::class => 'welcome, work',
-                    FacetController::class => 'autoSuggest, autoSuggests',
-                    SelectionController::class => 'edit, update, create, delete, list, show',
-                    UserPreferencesController::class => 'save',
-                    ClipboardController::class => 'save, flush, show',
-                ],
-                $moduleConfiguration
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Return the module code for a BE module.
-     *
-     * @return string
-     */
-    public function getSignature(): string
-    {
-        $signature = GeneralUtility::_GP(Parameter::MODULE);
-        $trimmedSignature = trim($signature, '/');
-        return str_replace(['/', 'module_'], ['_', ''], $trimmedSignature);
-    }
-
-    /**
-     * Returns the current pid.
-     *
-     * @return int
-     */
-    public function getCurrentPid(): int
-    {
-        return GeneralUtility::_GET(Parameter::PID) > 0 ? (int)GeneralUtility::_GET(Parameter::PID) : 0;
-    }
-
-    /**
-     * Return the module URL.
-     *
-     * @param array $additionalParameters
-     * @return string
-     */
-    public function getModuleUrl(array $additionalParameters = []): string
-    {
-        $moduleCode = $this->getSignature();
-
-        // And don't forget the pid!
-        if (GeneralUtility::_GET(Parameter::PID)) {
-            $additionalParameters[Parameter::PID] = GeneralUtility::_GET(Parameter::PID);
-        }
-
-        return BackendUtility::getModuleUrl($moduleCode, $additionalParameters);
-    }
-
-    /**
-     * Return the parameter prefix for a BE module.
-     *
-     * @return string
-     */
-    public function getParameterPrefix(): string
-    {
-        return 'tx_vidi_' . strtolower($this->getSignature());
-    }
-
-    /**
-     * Return a configuration key or the entire module configuration array if not key is given.
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function getModuleConfiguration($key = '')
-    {
-        $vidiModuleCode = $this->getSignature();
-
-        // Module code must exist
-        if (empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode])) {
-            $message = sprintf('Invalid or not existing module code "%s"', $vidiModuleCode);
-            throw new InvalidKeyInArrayException($message, 1375092053);
-        }
-
-        $result = $GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode];
-
-        if (!empty($key)) {
-            if (isset($result[$key])) {
-                $result = $result[$key];
-            } else {
-                // key must exist
-                $message = sprintf('Invalid key configuration "%s"', $key);
-                throw new InvalidKeyInArrayException($message, 1375092054);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @param string $icon
-     * @return $this
-     */
-    public function setIcon($icon): self
-    {
-        $this->icon = $icon;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getIcon(): string
-    {
-        $moduleConfiguration = $this->getExistingMainConfiguration();
-
-        if ($this->icon) {
-            $icon = $this->icon;
-        } else {
-            $icon = $moduleConfiguration['icon'] ?? '';
-        }
-
-        return $icon;
-    }
-
-    /**
-     * @param string $mainModule
-     * @return $this
-     */
-    public function setMainModule($mainModule): self
-    {
-        $this->mainModule = $mainModule;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMainModule(): string
-    {
-        if ($this->mainModule === null) {
-            $this->mainModule = $this->getModuleConfiguration('mainModule');
-        }
-        return $this->mainModule;
-    }
-
-    /**
-     * @param string $moduleLanguageFile
-     * @return $this
-     */
-    public function setModuleLanguageFile($moduleLanguageFile): self
-    {
-        $this->moduleLanguageFile = $moduleLanguageFile;
-        return $this;
-    }
-
-    /**
-     * @param string $component
-     * @return $this
-     */
-    public function removeComponentFromDocHeader(string $component): self
-    {
-        foreach ($this->components[ModulePosition::DOC_HEADER] as $verticalPosition => $docHeaders) {
-            foreach ($docHeaders as $horizontalPosition => $docHeader) {
-                $index = array_search($component, $docHeader, true);
-                if ($index !== false) {
-                    // $verticalPosition: top or bottom
-                    // $horizontalPosition: left or right
-                    unset($this->components[ModulePosition::DOC_HEADER][$verticalPosition][$horizontalPosition][$index]);
-                }
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * @param bool $isPidIgnored
-     * @return $this
-     */
-    public function ignorePid(bool $isPidIgnored): self
-    {
-        $this->isPidIgnored = $isPidIgnored;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isPidIgnored(): bool
-    {
-        return $this->getModuleConfiguration('isPidIgnored');
-    }
-
-    /**
-     * @param string $component
-     * @return bool
-     */
-    public function hasComponentInDocHeader(string $component): bool
-    {
-        foreach ($this->getModuleConfiguration('components')[ModulePosition::DOC_HEADER] as $verticalPosition => $docHeaders) {
-            foreach ($docHeaders as $horizontalPosition => $docHeader) {
-                $index = array_search($component, $docHeader, true);
-                if ($index !== false) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getModuleLanguageFile(): string
-    {
-        $moduleConfiguration = $this->getExistingMainConfiguration();
-
-        if ($this->moduleLanguageFile) {
-            $moduleLanguageFile = $this->moduleLanguageFile;
-        } elseif ($moduleConfiguration['labels']) { // existing configuration may override.
-            $moduleLanguageFile = $moduleConfiguration['labels'];
-        } else {
-            $moduleLanguageFile = ''; //default value.
-        }
-
-        return $moduleLanguageFile;
-    }
-
-    /**
-     * @param string $position
-     * @return $this
-     */
-    public function setPosition($position): self
-    {
-        $this->position = $position;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPosition(): string
-    {
-        return $this->position;
-    }
-
-    /**
-     * @param array $files
-     * @return $this
-     */
-    public function addJavaScriptFiles(array $files): self
-    {
-        foreach ($files as $file) {
-            $this->additionalJavaScriptFiles[] = $file;
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $fileNameAndPath
-     * @return $this
-     */
-    public function addJavaScriptFile($fileNameAndPath): self
-    {
-        $this->additionalJavaScriptFiles[] = $fileNameAndPath;
-        return $this;
-    }
-
-    /**
-     * @param array $files
-     * @return $this
-     */
-    public function addStyleSheetFiles(array $files): self
-    {
-        foreach ($files as $file) {
-            $this->additionalStyleSheetFiles[] = $file;
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $fileNameAndPath
-     * @return $this
-     */
-    public function addStyleSheetFile($fileNameAndPath): self
-    {
-        $this->additionalStyleSheetFiles[] = $fileNameAndPath;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType(): string
-    {
-        if ($this->dataType === null) {
-            $this->dataType = $this->getModuleConfiguration('dataType');
-        }
-        return $this->dataType;
-    }
-
-    /**
-     * @return array
-     */
-    public function getDataTypes(): array
-    {
-        $dataTypes = [];
-        foreach ($GLOBALS['TBE_MODULES_EXT']['vidi'] as $module) {
-            $dataTypes[] = $module['dataType'];
-        }
-        return $dataTypes;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType): self
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
-
-    /**
-     * @return int
-     */
-    public function getDefaultPid(): int
-    {
-        if (empty($this->defaultPid)) {
-            $this->defaultPid = $this->getModuleConfiguration('defaultPid');
-        }
-        return (int)$this->defaultPid;
-    }
-
-    /**
-     * @param string $defaultPid
-     * @return $this
-     */
-    public function setDefaultPid($defaultPid): self
-    {
-        $this->defaultPid = $defaultPid;
-        return $this;
-    }
-
-    /**
-     * @param bool $isPageTreeShown
-     * @return $this
-     */
-    public function showPageTree($isPageTreeShown): self
-    {
-        $this->showPageTree = $isPageTreeShown;
-        return $this;
-    }
-
-    /**
-     * @param string $isShown
-     * @return $this
-     */
-    public function isShown($isShown): self
-    {
-        $this->isShown = $isShown;
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderTopLeftComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderTopLeftComponents(array $components): self
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderTopLeftComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderTopRightComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderTopRightComponents(array $components): self
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderTopRightComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderBottomLeftComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderBottomLeftComponents(array $components): self
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderBottomLeftComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderBottomRightComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderBottomRightComponents(array $components): self
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderBottomRightComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getGridTopComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::GRID][ModulePosition::TOP];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setGridTopComponents(array $components): self
-    {
-        $this->components[ModulePosition::GRID][ModulePosition::TOP] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addGridTopComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::GRID][ModulePosition::TOP];
-        $this->components[ModulePosition::GRID][ModulePosition::TOP] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return mixed $array
-     */
-    public function getGridBottomComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::GRID][ModulePosition::BOTTOM];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setGridBottomComponents(array $components): self
-    {
-        $this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addGridBottomComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BOTTOM];
-        $this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getGridButtonsComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::GRID][ModulePosition::BUTTONS];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setGridButtonsComponents(array $components): self
-    {
-        $this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addGridButtonsComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BUTTONS];
-        $this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = array_merge($components, $currentComponents);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getMenuMassActionComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::MENU_MASS_ACTION];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setMenuMassActionComponents(array $components): self
-    {
-        $this->components[ModulePosition::MENU_MASS_ACTION] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addMenuMassActionComponents($components): self
-    {
-        if (is_string($components)) {
-            $components = [$components];
-        }
-        $currentComponents = $this->components[ModulePosition::MENU_MASS_ACTION];
-        $this->components[ModulePosition::MENU_MASS_ACTION] = array_merge($components, $currentComponents);
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getAccess(): string
-    {
-        $moduleConfiguration = $this->getExistingMainConfiguration();
-
-        if ($this->access !== null) {
-            $access = $this->access;
-        } elseif (!empty($moduleConfiguration['access'])) { // existing configuration may override.
-            $access = $moduleConfiguration['access'];
-        } else {
-            $access = Access::USER; //default value.
-        }
-        return $access;
-    }
-
-    /**
-     * @param string $access
-     * @return $this
-     */
-    public function setAccess($access): self
-    {
-        $this->access = $access;
-        return $this;
-    }
-
-    /**
-     * @return \string[]
-     */
-    public function getAdditionalJavaScriptFiles(): array
-    {
-        if (empty($this->additionalJavaScriptFiles)) {
-            $this->additionalJavaScriptFiles = $this->getModuleConfiguration('additionalJavaScriptFiles');
-        }
-        return $this->additionalJavaScriptFiles;
-    }
-
-    /**
-     * @return \string[]
-     */
-    public function getAdditionalStyleSheetFiles(): array
-    {
-        if (empty($this->additionalStyleSheetFiles)) {
-            $this->additionalStyleSheetFiles = $this->getModuleConfiguration('additionalStyleSheetFiles');
-        }
-        return $this->additionalStyleSheetFiles;
-    }
-
-    /**
-     * @return array
-     */
-    public function getComponents(): array
-    {
-        return $this->components;
-    }
-
-    /**
-     * @param string $pluginName
-     * @return bool
-     */
-    public function hasPlugin($pluginName = ''): bool
-    {
-        $parameterPrefix = $this->getParameterPrefix();
-        $parameters = GeneralUtility::_GET($parameterPrefix);
-
-        $hasPlugin = !empty($parameters['plugins']) && is_array($parameters['plugins']);
-        if ($hasPlugin && $pluginName) {
-            $hasPlugin = in_array($pluginName, $parameters['plugins']);
-        }
-        return $hasPlugin;
-    }
-
-    /**
-     * Compute the internal module code
-     *
-     * @param null|string $dataType
-     * @return string
-     */
-    protected function getInternalModuleSignature($dataType = null): string
-    {
-        // Else we forge the module signature
-        if ($dataType === null) {
-            $dataType = $this->dataType;
-        }
-        $subModuleName = $dataType . '_' . $this->moduleKey;
-
-        $mainModule = $this->mainModule ?: self::DEFAULT_MAIN_MODULE;
-        return $mainModule . '_Vidi' . GeneralUtility::underscoredToUpperCamelCase($subModuleName);
-    }
+	/**
+	 * Define the default main module
+	 */
+	public const DEFAULT_MAIN_MODULE = 'content';
+
+	/**
+	 * Define the default pid
+	 */
+	public const DEFAULT_PID = 0;
+
+	/**
+	 * The type of data being listed (which corresponds to a table name in TCA)
+	 *
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var string
+	 */
+	protected $defaultPid;
+
+	/**
+	 * @var bool
+	 */
+	protected $isPidIgnored = false;
+
+	/**
+	 * @var bool
+	 */
+	protected $showPageTree = false;
+
+	/**
+	 * @var bool
+	 */
+	protected $isShown = true;
+
+	/**
+	 * @var string
+	 */
+	protected $access;
+
+	/**
+	 * @var string
+	 */
+	protected $mainModule;
+
+	/**
+	 * @var string
+	 */
+	protected $position = '';
+
+	/**
+	 * @var string
+	 */
+	protected $icon;
+
+	/**
+	 * @var string
+	 */
+	protected $moduleLanguageFile;
+
+	/**
+	 * The module key such as m1, m2.
+	 *
+	 * @var string
+	 */
+	protected $moduleKey = 'm1';
+
+	/**
+	 * @var string[]
+	 */
+	protected $additionalJavaScriptFiles = [];
+
+	/**
+	 * @var string[]
+	 */
+	protected $additionalStyleSheetFiles = [];
+
+	/**
+	 * @var array
+	 */
+	protected $components = [];
+
+	/**
+	 * @param string $dataType
+	 */
+	public function __construct($dataType = null)
+	{
+		$this->dataType = $dataType;
+
+		// Initialize components
+		$this->components = [
+			ModulePosition::DOC_HEADER => [
+				ModulePosition::TOP => [
+					ModulePosition::LEFT => [],
+					ModulePosition::RIGHT => [
+						ToolButton::class,
+					],
+				],
+				ModulePosition::BOTTOM => [
+					ModulePosition::LEFT => [
+						NewButton::class,
+						BackViewHelper::class,
+					],
+					ModulePosition::RIGHT => [],
+				],
+			],
+			ModulePosition::GRID => [
+				ModulePosition::TOP => [
+					RelationsCheck::class,
+					#\Fab\Vidi\View\Tab\DataTypeTab::class,
+				],
+				ModulePosition::BUTTONS => [
+					EditButton::class,
+					DeleteButton::class,
+				],
+				ModulePosition::BOTTOM => [],
+			],
+			ModulePosition::MENU_MASS_ACTION => [
+				ExportXlsMenuItem::class,
+				ExportXmlMenuItem::class,
+				ExportCsvMenuItem::class,
+				DividerMenuItem::class,
+				MassDeleteMenuItem::class,
+				#\Fab\Vidi\View\MenuItem\MassEditMenuItem::class,
+			],
+		];
+	}
+
+	/**
+	 * Tell whether a module is already registered.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	public function isRegistered($dataType): bool
+	{
+		$internalModuleSignature = $this->getInternalModuleSignature($dataType);
+		return !empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getExistingInternalConfiguration(): array
+	{
+		$internalModuleSignature = $this->getInternalModuleSignature();
+		return $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature] ?? [];
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getExistingMainConfiguration(): array
+	{
+		$moduleSignature = $this->computeMainModule() . '_' . $this->getInternalModuleSignature();
+		return $GLOBALS['TBE_MODULES']['_configuration'][$moduleSignature] ?? [];
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function computeMainModule(): string
+	{
+		$existingConfiguration = $this->getExistingInternalConfiguration();
+
+		if ($this->mainModule !== null) {
+			$mainModule = $this->mainModule;
+		} elseif (!empty($existingConfiguration['mainModule'])) { // existing configuration may override.
+			$mainModule = $existingConfiguration['mainModule'];
+		} else {
+			$mainModule = self::DEFAULT_MAIN_MODULE; //default value.
+		}
+		return $mainModule;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function computeDefaultPid(): string
+	{
+		$existingConfiguration = $this->getExistingInternalConfiguration();
+
+		if ($this->defaultPid !== null) {
+			$defaultPid = $this->defaultPid;
+		} elseif (!empty($existingConfiguration['defaultPid'])) { // existing configuration may override.
+			$defaultPid = $existingConfiguration['defaultPid'];
+		} else {
+			$defaultPid = self::DEFAULT_PID; //default value.
+		}
+		return $defaultPid;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function computeAdditionalJavaScriptFiles(): array
+	{
+		$additionalJavaScriptFiles = $this->additionalJavaScriptFiles;
+
+		// Possible merge of existing javascript files.
+		$existingConfiguration = $this->getExistingInternalConfiguration();
+		if (!empty($existingConfiguration['additionalJavaScriptFiles'])) {
+			$additionalJavaScriptFiles = array_merge($additionalJavaScriptFiles, $existingConfiguration['additionalJavaScriptFiles']);
+		}
+
+		return $additionalJavaScriptFiles;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function computeAdditionalStyleSheetFiles(): array
+	{
+		$additionalStyleSheetFiles = $this->additionalStyleSheetFiles;
+
+		// Possible merge of existing style sheets.
+		$existingConfiguration = $this->getExistingInternalConfiguration();
+		if (!empty($existingConfiguration['additionalStyleSheetFiles'])) {
+			$additionalStyleSheetFiles = array_merge($additionalStyleSheetFiles, $existingConfiguration['additionalStyleSheetFiles']);
+		}
+
+		return $additionalStyleSheetFiles;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function computeComponents(): array
+	{
+		// We override the config in any case. See if we need more than that.
+		return $this->components;
+	}
+
+	/**
+	 * Register the module in two places: core + vidi internal.
+	 *
+	 * @return $this
+	 */
+	public function register(): self
+	{
+		// Internal Vidi module registration.
+		$configuration = [];
+		$configuration['dataType'] = $this->dataType;
+		$configuration['mainModule'] = $this->computeMainModule();
+		$configuration['defaultPid'] = $this->computeDefaultPid();
+		$configuration['additionalJavaScriptFiles'] = $this->computeAdditionalJavaScriptFiles();
+		$configuration['additionalStyleSheetFiles'] = $this->computeAdditionalStyleSheetFiles();
+		$configuration['components'] = $this->computeComponents();
+		$configuration['isPidIgnored'] = $this->isPidIgnored;
+
+		$internalModuleSignature = $this->getInternalModuleSignature();
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature] = $configuration;
+
+		// Core module registration.
+		// Register and displays module in the BE only if told, default is "true".
+		if ($this->isShown) {
+			$moduleConfiguration = [];
+			#$moduleConfiguration['routeTarget'] = \Fab\Vidi\Controller\ContentController::class . '::mainAction', // what to do here?
+			$moduleConfiguration['access'] = $this->getAccess();
+			$moduleConfiguration['labels'] = $this->getModuleLanguageFile();
+			$icon = $this->getIcon();
+			if ($icon) {
+				$moduleConfiguration['icon'] = $icon;
+			}
+
+			if ($this->showPageTree) {
+				$moduleConfiguration['navigationComponentId'] = 'TYPO3/CMS/Backend/PageTree/PageTreeElement';
+				$moduleConfiguration['inheritNavigationComponentFromMainModule'] = true;
+			} else {
+				$moduleConfiguration['inheritNavigationComponentFromMainModule'] = true;
+			}
+
+			ExtensionUtility::registerModule(
+				'Vidi',
+				$this->computeMainModule(),
+				$this->dataType . '_' . $this->moduleKey,
+				$this->position,
+				[
+					ContentController::class => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
+					ToolController::class => 'welcome, work',
+					FacetController::class => 'autoSuggest, autoSuggests',
+					SelectionController::class => 'edit, update, create, delete, list, show',
+					UserPreferencesController::class => 'save',
+					ClipboardController::class => 'save, flush, show',
+				],
+				$moduleConfiguration
+			);
+		}
+		return $this;
+	}
+
+	/**
+	 * Return the module code for a BE module.
+	 *
+	 * @return string
+	 */
+	public function getSignature(): string
+	{
+		$signature = GeneralUtility::_GP(Parameter::MODULE);
+		$trimmedSignature = trim($signature, '/');
+		return str_replace(['/', 'module_'], ['_', ''], $trimmedSignature);
+	}
+
+	/**
+	 * Returns the current pid.
+	 *
+	 * @return int
+	 */
+	public function getCurrentPid(): int
+	{
+		return GeneralUtility::_GET(Parameter::PID) > 0 ? (int)GeneralUtility::_GET(Parameter::PID) : 0;
+	}
+
+	/**
+	 * Return the module URL.
+	 *
+	 * @param array $additionalParameters
+	 * @return string
+	 */
+	public function getModuleUrl(array $additionalParameters = []): string
+	{
+		$moduleCode = $this->getSignature();
+
+		// And don't forget the pid!
+		if (GeneralUtility::_GET(Parameter::PID)) {
+			$additionalParameters[Parameter::PID] = GeneralUtility::_GET(Parameter::PID);
+		}
+
+		return BackendUtility::getModuleUrl($moduleCode, $additionalParameters);
+	}
+
+	/**
+	 * Return the parameter prefix for a BE module.
+	 *
+	 * @return string
+	 */
+	public function getParameterPrefix(): string
+	{
+		return 'tx_vidi_' . strtolower($this->getSignature());
+	}
+
+	/**
+	 * Return a configuration key or the entire module configuration array if not key is given.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function getModuleConfiguration($key = '')
+	{
+		$vidiModuleCode = $this->getSignature();
+
+		// Module code must exist
+		if (empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode])) {
+			$message = sprintf('Invalid or not existing module code "%s"', $vidiModuleCode);
+			throw new InvalidKeyInArrayException($message, 1375092053);
+		}
+
+		$result = $GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode];
+
+		if (!empty($key)) {
+			if (isset($result[$key])) {
+				$result = $result[$key];
+			} else {
+				// key must exist
+				$message = sprintf('Invalid key configuration "%s"', $key);
+				throw new InvalidKeyInArrayException($message, 1375092054);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 */
+	public function setIcon($icon): self
+	{
+		$this->icon = $icon;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getIcon(): string
+	{
+		$moduleConfiguration = $this->getExistingMainConfiguration();
+
+		if ($this->icon) {
+			$icon = $this->icon;
+		} else {
+			$icon = $moduleConfiguration['icon'] ?? '';
+		}
+
+		return $icon;
+	}
+
+	/**
+	 * @param string $mainModule
+	 * @return $this
+	 */
+	public function setMainModule($mainModule): self
+	{
+		$this->mainModule = $mainModule;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMainModule(): string
+	{
+		if ($this->mainModule === null) {
+			$this->mainModule = $this->getModuleConfiguration('mainModule');
+		}
+		return $this->mainModule;
+	}
+
+	/**
+	 * @param string $moduleLanguageFile
+	 * @return $this
+	 */
+	public function setModuleLanguageFile($moduleLanguageFile): self
+	{
+		$this->moduleLanguageFile = $moduleLanguageFile;
+		return $this;
+	}
+
+	/**
+	 * @param string $component
+	 * @return $this
+	 */
+	public function removeComponentFromDocHeader(string $component): self
+	{
+		foreach ($this->components[ModulePosition::DOC_HEADER] as $verticalPosition => $docHeaders) {
+			foreach ($docHeaders as $horizontalPosition => $docHeader) {
+				$index = array_search($component, $docHeader, true);
+				if ($index !== false) {
+					// $verticalPosition: top or bottom
+					// $horizontalPosition: left or right
+					unset($this->components[ModulePosition::DOC_HEADER][$verticalPosition][$horizontalPosition][$index]);
+				}
+			}
+		}
+		return $this;
+	}
+
+	/**
+	 * @param bool $isPidIgnored
+	 * @return $this
+	 */
+	public function ignorePid(bool $isPidIgnored): self
+	{
+		$this->isPidIgnored = $isPidIgnored;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isPidIgnored(): bool
+	{
+		return $this->getModuleConfiguration('isPidIgnored');
+	}
+
+	/**
+	 * @param string $component
+	 * @return bool
+	 */
+	public function hasComponentInDocHeader(string $component): bool
+	{
+		foreach ($this->getModuleConfiguration('components')[ModulePosition::DOC_HEADER] as $verticalPosition => $docHeaders) {
+			foreach ($docHeaders as $horizontalPosition => $docHeader) {
+				$index = array_search($component, $docHeader, true);
+				if ($index !== false) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getModuleLanguageFile(): string
+	{
+		$moduleConfiguration = $this->getExistingMainConfiguration();
+
+		if ($this->moduleLanguageFile) {
+			$moduleLanguageFile = $this->moduleLanguageFile;
+		} elseif ($moduleConfiguration['labels']) { // existing configuration may override.
+			$moduleLanguageFile = $moduleConfiguration['labels'];
+		} else {
+			$moduleLanguageFile = ''; //default value.
+		}
+
+		return $moduleLanguageFile;
+	}
+
+	/**
+	 * @param string $position
+	 * @return $this
+	 */
+	public function setPosition($position): self
+	{
+		$this->position = $position;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPosition(): string
+	{
+		return $this->position;
+	}
+
+	/**
+	 * @param array $files
+	 * @return $this
+	 */
+	public function addJavaScriptFiles(array $files): self
+	{
+		foreach ($files as $file) {
+			$this->additionalJavaScriptFiles[] = $file;
+		}
+		return $this;
+	}
+
+	/**
+	 * @param string $fileNameAndPath
+	 * @return $this
+	 */
+	public function addJavaScriptFile($fileNameAndPath): self
+	{
+		$this->additionalJavaScriptFiles[] = $fileNameAndPath;
+		return $this;
+	}
+
+	/**
+	 * @param array $files
+	 * @return $this
+	 */
+	public function addStyleSheetFiles(array $files): self
+	{
+		foreach ($files as $file) {
+			$this->additionalStyleSheetFiles[] = $file;
+		}
+		return $this;
+	}
+
+	/**
+	 * @param string $fileNameAndPath
+	 * @return $this
+	 */
+	public function addStyleSheetFile($fileNameAndPath): self
+	{
+		$this->additionalStyleSheetFiles[] = $fileNameAndPath;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType(): string
+	{
+		if ($this->dataType === null) {
+			$this->dataType = $this->getModuleConfiguration('dataType');
+		}
+		return $this->dataType;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getDataTypes(): array
+	{
+		$dataTypes = [];
+		foreach ($GLOBALS['TBE_MODULES_EXT']['vidi'] as $module) {
+			$dataTypes[] = $module['dataType'];
+		}
+		return $dataTypes;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType): self
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getDefaultPid(): int
+	{
+		if (empty($this->defaultPid)) {
+			$this->defaultPid = $this->getModuleConfiguration('defaultPid');
+		}
+		return (int)$this->defaultPid;
+	}
+
+	/**
+	 * @param string $defaultPid
+	 * @return $this
+	 */
+	public function setDefaultPid($defaultPid): self
+	{
+		$this->defaultPid = $defaultPid;
+		return $this;
+	}
+
+	/**
+	 * @param bool $isPageTreeShown
+	 * @return $this
+	 */
+	public function showPageTree($isPageTreeShown): self
+	{
+		$this->showPageTree = $isPageTreeShown;
+		return $this;
+	}
+
+	/**
+	 * @param string $isShown
+	 * @return $this
+	 */
+	public function isShown($isShown): self
+	{
+		$this->isShown = $isShown;
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderTopLeftComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderTopLeftComponents(array $components): self
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderTopLeftComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderTopRightComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderTopRightComponents(array $components): self
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderTopRightComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderBottomLeftComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderBottomLeftComponents(array $components): self
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderBottomLeftComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderBottomRightComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderBottomRightComponents(array $components): self
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderBottomRightComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getGridTopComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::GRID][ModulePosition::TOP];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setGridTopComponents(array $components): self
+	{
+		$this->components[ModulePosition::GRID][ModulePosition::TOP] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addGridTopComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::GRID][ModulePosition::TOP];
+		$this->components[ModulePosition::GRID][ModulePosition::TOP] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return mixed $array
+	 */
+	public function getGridBottomComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::GRID][ModulePosition::BOTTOM];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setGridBottomComponents(array $components): self
+	{
+		$this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addGridBottomComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BOTTOM];
+		$this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getGridButtonsComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::GRID][ModulePosition::BUTTONS];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setGridButtonsComponents(array $components): self
+	{
+		$this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addGridButtonsComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BUTTONS];
+		$this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = array_merge($components, $currentComponents);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getMenuMassActionComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::MENU_MASS_ACTION];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setMenuMassActionComponents(array $components): self
+	{
+		$this->components[ModulePosition::MENU_MASS_ACTION] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addMenuMassActionComponents($components): self
+	{
+		if (is_string($components)) {
+			$components = [$components];
+		}
+		$currentComponents = $this->components[ModulePosition::MENU_MASS_ACTION];
+		$this->components[ModulePosition::MENU_MASS_ACTION] = array_merge($components, $currentComponents);
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getAccess(): string
+	{
+		$moduleConfiguration = $this->getExistingMainConfiguration();
+
+		if ($this->access !== null) {
+			$access = $this->access;
+		} elseif (!empty($moduleConfiguration['access'])) { // existing configuration may override.
+			$access = $moduleConfiguration['access'];
+		} else {
+			$access = Access::USER; //default value.
+		}
+		return $access;
+	}
+
+	/**
+	 * @param string $access
+	 * @return $this
+	 */
+	public function setAccess($access): self
+	{
+		$this->access = $access;
+		return $this;
+	}
+
+	/**
+	 * @return \string[]
+	 */
+	public function getAdditionalJavaScriptFiles(): array
+	{
+		if (empty($this->additionalJavaScriptFiles)) {
+			$this->additionalJavaScriptFiles = $this->getModuleConfiguration('additionalJavaScriptFiles');
+		}
+		return $this->additionalJavaScriptFiles;
+	}
+
+	/**
+	 * @return \string[]
+	 */
+	public function getAdditionalStyleSheetFiles(): array
+	{
+		if (empty($this->additionalStyleSheetFiles)) {
+			$this->additionalStyleSheetFiles = $this->getModuleConfiguration('additionalStyleSheetFiles');
+		}
+		return $this->additionalStyleSheetFiles;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getComponents(): array
+	{
+		return $this->components;
+	}
+
+	/**
+	 * @param string $pluginName
+	 * @return bool
+	 */
+	public function hasPlugin($pluginName = ''): bool
+	{
+		$parameterPrefix = $this->getParameterPrefix();
+		$parameters = GeneralUtility::_GET($parameterPrefix);
+
+		$hasPlugin = !empty($parameters['plugins']) && is_array($parameters['plugins']);
+		if ($hasPlugin && $pluginName) {
+			$hasPlugin = in_array($pluginName, $parameters['plugins']);
+		}
+		return $hasPlugin;
+	}
+
+	/**
+	 * Compute the internal module code
+	 *
+	 * @param null|string $dataType
+	 * @return string
+	 */
+	protected function getInternalModuleSignature($dataType = null): string
+	{
+		// Else we forge the module signature
+		if ($dataType === null) {
+			$dataType = $this->dataType;
+		}
+		$subModuleName = $dataType . '_' . $this->moduleKey;
+
+		$mainModule = $this->mainModule ?: self::DEFAULT_MAIN_MODULE;
+		return $mainModule . '_Vidi' . GeneralUtility::underscoredToUpperCamelCase($subModuleName);
+	}
 }

Classes/Grid/VisibilityRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 ->setDataAttributes([
                     'toggle' => 'tooltip',
                 ])
-                ->setTitle($this->getLabelService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:' . $label))
+                ->setTitle($this->getLabelService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:'.$label))
                 ->setIcon($this->getIconFactory()->getIcon($spriteName, Icon::SIZE_SMALL))
                 ->render();
         }

Indentation +66 added lines, -66 removed lines

@@ -21,80 +21,80 @@
  */
 class VisibilityRenderer extends ColumnRendererAbstract
 {
-    /**
-     * Render visibility for the Grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $output = '';
-        $hiddenField = Tca::table()->getHiddenField();
+	/**
+	 * Render visibility for the Grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$output = '';
+		$hiddenField = Tca::table()->getHiddenField();
 
-        if ($hiddenField) {
-            $spriteName = $this->object[$hiddenField] ? 'actions-edit-unhide' : 'actions-edit-hide';
+		if ($hiddenField) {
+			$spriteName = $this->object[$hiddenField] ? 'actions-edit-unhide' : 'actions-edit-hide';
 
-            $label = $this->object[$hiddenField] ? 'unHide' : 'hide';
+			$label = $this->object[$hiddenField] ? 'unHide' : 'hide';
 
-            $output = $this->makeLinkButton()
-                ->setHref($this->getEditUri($this->object))
-                ->setClasses('btn-visibility-toggle')
-                ->setDataAttributes([
-                    'toggle' => 'tooltip',
-                ])
-                ->setTitle($this->getLabelService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:' . $label))
-                ->setIcon($this->getIconFactory()->getIcon($spriteName, Icon::SIZE_SMALL))
-                ->render();
-        }
-        return $output;
-    }
+			$output = $this->makeLinkButton()
+				->setHref($this->getEditUri($this->object))
+				->setClasses('btn-visibility-toggle')
+				->setDataAttributes([
+					'toggle' => 'tooltip',
+				])
+				->setTitle($this->getLabelService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf:' . $label))
+				->setIcon($this->getIconFactory()->getIcon($spriteName, Icon::SIZE_SMALL))
+				->render();
+		}
+		return $output;
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     */
-    protected function getEditUri(Content $object)
-    {
-        $hiddenField = Tca::table()->getHiddenField();
+	/**
+	 * @param Content $object
+	 * @return string
+	 */
+	protected function getEditUri(Content $object)
+	{
+		$hiddenField = Tca::table()->getHiddenField();
 
-        $additionalParameters = array(
-            $this->getModuleLoader()->getParameterPrefix() => [
-                'controller' => 'Content',
-                'action' => 'update',
-                'format' => 'json',
-                'fieldNameAndPath' => Tca::table()->getHiddenField(),
-                'matches' => [
-                    'uid' => $object->getUid(),
-                ],
-                'content' => [$hiddenField => (int)!$this->object[$hiddenField]],
-            ],
-        );
+		$additionalParameters = array(
+			$this->getModuleLoader()->getParameterPrefix() => [
+				'controller' => 'Content',
+				'action' => 'update',
+				'format' => 'json',
+				'fieldNameAndPath' => Tca::table()->getHiddenField(),
+				'matches' => [
+					'uid' => $object->getUid(),
+				],
+				'content' => [$hiddenField => (int)!$this->object[$hiddenField]],
+			],
+		);
 
-        return $this->getModuleLoader()->getModuleUrl($additionalParameters);
-    }
+		return $this->getModuleLoader()->getModuleUrl($additionalParameters);
+	}
 
-    /**
-     * @return LinkButton
-     */
-    protected function makeLinkButton()
-    {
-        return GeneralUtility::makeInstance(LinkButton::class);
-    }
+	/**
+	 * @return LinkButton
+	 */
+	protected function makeLinkButton()
+	{
+		return GeneralUtility::makeInstance(LinkButton::class);
+	}
 
 
-    /**
-     * @return IconFactory
-     */
-    protected function getIconFactory()
-    {
-        return GeneralUtility::makeInstance(IconFactory::class);
-    }
+	/**
+	 * @return IconFactory
+	 */
+	protected function getIconFactory()
+	{
+		return GeneralUtility::makeInstance(IconFactory::class);
+	}
 
-    /**
-     * @return LanguageService
-     */
-    protected function getLabelService()
-    {
-        return $GLOBALS['LANG'];
-    }
+	/**
+	 * @return LanguageService
+	 */
+	protected function getLabelService()
+	{
+		return $GLOBALS['LANG'];
+	}
 }

Classes/Tca/GridService.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
         $this->tableName = $tableName;
 
         if (empty($GLOBALS['TCA'][$this->tableName])) {
-            throw new InvalidKeyInArrayException('No TCA existence for table name: ' . $this->tableName, 1356945108);
+            throw new InvalidKeyInArrayException('No TCA existence for table name: '.$this->tableName, 1356945108);
         }
 
         $this->tca = $GLOBALS['TCA'][$this->tableName]['grid'] ?? [];
@@ -171,7 +171,7 @@ 
     {
         $fields = array_keys($this->getFields());
         if (empty($fields[$position])) {
-            throw new InvalidKeyInArrayException('No field exist for position: ' . $position, 1356945119);
+            throw new InvalidKeyInArrayException('No field exist for position: '.$position, 1356945119);
         }
 
         return (string)$fields[$position];
@@ -687,7 +687,7 @@ 
         $facet = GeneralUtility::makeInstance(StandardFacet::class, $facetName, $label);
 
         if (!$facet instanceof StandardFacet) {
-            throw new \RuntimeException('I could not instantiate a facet for facet name "' . $facetName . '""', 1445856345);
+            throw new \RuntimeException('I could not instantiate a facet for facet name "'.$facetName.'""', 1445856345);
         }
         return $facet;
     }

Indentation +691 added lines, -691 removed lines

@@ -23,695 +23,695 @@
  */
 class GridService extends AbstractTca
 {
-    /**
-     * @var array
-     */
-    protected $tca;
-
-    /**
-     * @var string
-     */
-    protected $tableName;
-
-    /**
-     * All fields available in the Grid.
-     *
-     * @var array
-     */
-    protected $fields;
-
-    /**
-     * All fields regardless whether they have been excluded or not.
-     *
-     * @var array
-     */
-    protected $allFields;
-
-    /**
-     * @var array
-     */
-    protected $instances;
-
-    /**
-     * @var array
-     */
-    protected $facets;
-
-    /**
-     * __construct
-     *
-     * @param string $tableName
-     */
-    public function __construct($tableName)
-    {
-        $this->tableName = $tableName;
-
-        if (empty($GLOBALS['TCA'][$this->tableName])) {
-            throw new InvalidKeyInArrayException('No TCA existence for table name: ' . $this->tableName, 1356945108);
-        }
-
-        $this->tca = $GLOBALS['TCA'][$this->tableName]['grid'] ?? [];
-    }
-
-    /**
-     * Returns an array containing column names.
-     *
-     * @return array
-     */
-    public function getFieldNames(): array
-    {
-        $fields = $this->getFields();
-        return array_keys($fields) ?: [];
-    }
-
-    /**
-     * Returns an array containing column names.
-     *
-     * @return array
-     */
-    public function getAllFieldNames(): array
-    {
-        $allFields = $this->getAllFields();
-        return array_keys($allFields);
-    }
-
-    /**
-     * Get the label key.
-     *
-     * @param string $fieldNameAndPath
-     * @return string
-     */
-    public function getLabelKey($fieldNameAndPath): string
-    {
-        $field = $this->getField($fieldNameAndPath);
-
-        // First option is to get the label from the Grid TCA.
-        $rawLabel = '';
-        if (isset($field['label'])) {
-            $rawLabel = $field['label'];
-        }
-
-        // Second option is to fetch the label from the Column Renderer object.
-        if (!$rawLabel && $this->hasRenderers($fieldNameAndPath)) {
-            $renderers = $this->getRenderers($fieldNameAndPath);
-            /** @var $renderer ColumnRendererInterface */
-            foreach ($renderers as $renderer) {
-                if (isset($renderer['label'])) {
-                    $rawLabel = $renderer['label'];
-                    break;
-                }
-            }
-        }
-        return $rawLabel;
-    }
-
-    /**
-     * Get the translation of a label given a column name.
-     *
-     * @param string $fieldNameAndPath
-     * @return string
-     */
-    public function getLabel($fieldNameAndPath)
-    {
-        $label = '';
-        if ($this->hasLabel($fieldNameAndPath)) {
-            $labelKey = $this->getLabelKey($fieldNameAndPath);
-            try {
-                $label = $this->getLanguageService()->sL($labelKey);
-            } catch (\InvalidArgumentException $e) {
-            }
-            if (empty($label)) {
-                $label = $labelKey;
-            }
-        } else {
-            // Important to notice the label can contains a path, e.g. metadata.categories and must be resolved.
-            $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->tableName);
-            $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->tableName);
-            $table = Tca::table($dataType);
-
-            if ($table->hasField($fieldName) && $table->field($fieldName)->hasLabel()) {
-                $label = $table->field($fieldName)->getLabel();
-            }
-        }
-
-        return $label;
-    }
-
-    /**
-     * Returns the field name given its position.
-     *
-     * @param string $position the position of the field in the grid
-     * @return string
-     */
-    public function getFieldNameByPosition($position): string
-    {
-        $fields = array_keys($this->getFields());
-        if (empty($fields[$position])) {
-            throw new InvalidKeyInArrayException('No field exist for position: ' . $position, 1356945119);
-        }
-
-        return (string)$fields[$position];
-    }
-
-    /**
-     * Returns a field name.
-     *
-     * @param string $fieldName
-     * @return array
-     */
-    public function getField($fieldName): array
-    {
-        $fields = $this->getFields();
-        return $fields[$fieldName] ?: [];
-    }
-
-    /**
-     * Returns an array containing column names for the Grid.
-     *
-     * @return array
-     */
-    public function getFields(): array
-    {
-        // Cache this operation since it can take some time.
-        if ($this->fields === null) {
-            // Fetch all available fields first.
-            $fields = $this->getAllFields();
-
-            if ($this->isBackendMode()) {
-                // Then remove the not allowed.
-                $fields = $this->filterByIncludedFields($fields);
-                $fields = $this->filterByBackendUser($fields);
-                $fields = $this->filterByExcludedFields($fields);
-            }
-
-            $this->fields = $fields;
-        }
-
-        return $this->fields;
-    }
-
-    /**
-     * Remove fields according to Grid configuration.
-     *
-     * @param $fields
-     * @return array
-     */
-    protected function filterByIncludedFields($fields): array
-    {
-        $filteredFields = $fields;
-        $includedFields = $this->getIncludedFields();
-        if (count($includedFields) > 0) {
-            $filteredFields = [];
-            foreach ($fields as $fieldNameAndPath => $configuration) {
-                if (in_array($fieldNameAndPath, $includedFields, true) || !Tca::table($this->tableName)->hasField($fieldNameAndPath)) {
-                    $filteredFields[$fieldNameAndPath] = $configuration;
-                }
-            }
-        }
-        return $filteredFields;
-    }
-
-    /**
-     * Remove fields according to BE User permission.
-     *
-     * @param $fields
-     * @return array
-     */
-    protected function filterByBackendUser($fields): array
-    {
-        if (!$this->getBackendUser()->isAdmin()) {
-            foreach ($fields as $fieldName => $field) {
-                if (Tca::table($this->tableName)->hasField($fieldName) && !Tca::table($this->tableName)->field($fieldName)->hasAccess()) {
-                    unset($fields[$fieldName]);
-                }
-            }
-        }
-        return $fields;
-    }
-
-    /**
-     * Remove fields according to Grid configuration.
-     *
-     * @param $fields
-     * @return array
-     */
-    protected function filterByExcludedFields($fields): array
-    {
-        // Unset excluded fields.
-        foreach ($this->getExcludedFields() as $excludedField) {
-            if (isset($fields[$excludedField])) {
-                unset($fields[$excludedField]);
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Returns an array containing column names for the Grid.
-     *
-     * @return array
-     */
-    public function getAllFields(): array
-    {
-        // Cache this operation since it can take some time.
-        if ($this->allFields === null) {
-            $fields = isset($this->tca['columns']) && is_array($this->tca['columns']) ? $this->tca['columns'] : [];
-            $gridFieldNames = array_keys($fields);
-
-            // Fetch all fields of the TCA and merge it back to the fields configured for Grid.
-            $tableFieldNames = Tca::table($this->tableName)->getFields();
-
-            // Just remove system fields from the Grid.
-            foreach ($tableFieldNames as $key => $fieldName) {
-                if (in_array($fieldName, Tca::getSystemFields())) {
-                    unset($tableFieldNames[$key]);
-                }
-            }
-
-            $additionalFields = array_diff($tableFieldNames, $gridFieldNames);
-
-            if (!empty($additionalFields)) {
-                // Pop out last element of the key
-                // Idea is to place new un-configured columns in between. By default, they will be hidden.
-                end($fields);
-                $lastColumnKey = key($fields);
-                $lastColumn = array_pop($fields);
-
-                // Feed up the grid fields with un configured elements
-                foreach ($additionalFields as $additionalField) {
-                    $fields[$additionalField] = array(
-                        'visible' => false
-                    );
-
-                    // Try to guess the format of the field.
-                    $fieldType = Tca::table($this->tableName)->field($additionalField)->getType();
-                    if ($fieldType === FieldType::DATE) {
-                        $fields[$additionalField]['format'] = 'Fab\Vidi\Formatter\Date';
-                    } elseif ($fieldType === FieldType::DATETIME) {
-                        $fields[$additionalField]['format'] = 'Fab\Vidi\Formatter\Datetime';
-                    }
-                }
-                $fields[$lastColumnKey] = $lastColumn;
-            }
-
-            $this->allFields = $fields;
-        }
-
-        return $this->allFields;
-    }
-
-    /**
-     * Tell whether the field exists in the grid or not.
-     *
-     * @param string $fieldName
-     * @return bool
-     */
-    public function hasField($fieldName): bool
-    {
-        $fields = $this->getFields();
-        return isset($fields[$fieldName]);
-    }
-
-    /**
-     * Tell whether the facet exists in the grid or not.
-     *
-     * @param string $facetName
-     * @return bool
-     */
-    public function hasFacet($facetName): bool
-    {
-        $facets = $this->getFacets();
-        return isset($facets[$facetName]);
-    }
-
-    /**
-     * Returns an array containing facets fields.
-     *
-     * @return FacetInterface[]
-     */
-    public function getFacets(): array
-    {
-        if ($this->facets === null) {
-            $this->facets = [];
-
-            if (is_array($this->tca['facets'])) {
-                foreach ($this->tca['facets'] as $key => $facetNameOrArray) {
-                    if (is_array($facetNameOrArray)) {
-                        $name = $facetNameOrArray['name'] ?? '';
-
-                        $label = isset($facetNameOrArray['label'])
-                            ? $this->getLanguageService()->sL($facetNameOrArray['label'])
-                            : '';
-
-                        $suggestions = $facetNameOrArray['suggestions'] ?? [];
-                        $configuration = $facetNameOrArray['configuration'] ?? [];
-
-                        /** @var FacetInterface $facetObject */
-                        $facetObject = GeneralUtility::makeInstance($key, $name, $label, $suggestions, $configuration);
-                        $this->facets[$facetObject->getName()] = $facetObject;
-                    } else {
-                        $this->facets[$facetNameOrArray] = $this->instantiateStandardFacet($facetNameOrArray);
-                    }
-                }
-            }
-        }
-        return $this->facets;
-    }
-
-    /**
-     * Returns the "sortable" value of the column.
-     *
-     * @param string $fieldName
-     * @return int|string
-     */
-    public function isSortable($fieldName)
-    {
-        $defaultValue = true;
-        $hasSortableField = Tca::table($this->tableName)->hasSortableField();
-        if ($hasSortableField) {
-            $isSortable = false;
-        } else {
-            $isSortable = $this->get($fieldName, 'sortable', $defaultValue);
-        }
-        return $isSortable;
-    }
-
-    /**
-     * Returns the "canBeHidden" value of the column.
-     *
-     * @param string $fieldName
-     * @return bool
-     */
-    public function canBeHidden($fieldName): bool
-    {
-        $defaultValue = true;
-        return $this->get($fieldName, 'canBeHidden', $defaultValue);
-    }
-
-    /**
-     * Returns the "width" value of the column.
-     *
-     * @param string $fieldName
-     * @return int|string
-     */
-    public function getWidth($fieldName)
-    {
-        $defaultValue = 'auto';
-        return $this->get($fieldName, 'width', $defaultValue);
-    }
-
-    /**
-     * Returns the "visible" value of the column.
-     *
-     * @param string $fieldName
-     * @return bool
-     */
-    public function isVisible($fieldName): bool
-    {
-        $defaultValue = true;
-        return $this->get($fieldName, 'visible', $defaultValue);
-    }
-
-    /**
-     * Returns the "editable" value of the column.
-     *
-     * @param string $columnName
-     * @return bool
-     */
-    public function isEditable($columnName): bool
-    {
-        $defaultValue = false;
-        return $this->get($columnName, 'editable', $defaultValue);
-    }
-
-    /**
-     * Returns the "localized" value of the column.
-     *
-     * @param string $columnName
-     * @return bool
-     */
-    public function isLocalized($columnName): bool
-    {
-        $defaultValue = true;
-        return $this->get($columnName, 'localized', $defaultValue);
-    }
-
-    /**
-     *
-     * Returns the "html" value of the column.
-     *
-     * @param string $fieldName
-     * @return string
-     */
-    public function getHeader($fieldName): string
-    {
-        $defaultValue = '';
-        return $this->get($fieldName, 'html', $defaultValue);
-    }
-
-    /**
-     * Fetch a possible from a Grid Renderer. If no value is found, returns null
-     *
-     * @param string $fieldName
-     * @param string $key
-     * @param mixed $defaultValue
-     * @return null|mixed
-     */
-    public function get($fieldName, $key, $defaultValue = null)
-    {
-        $value = $defaultValue;
-
-        $field = $this->getField($fieldName);
-        if (isset($field[$key])) {
-            $value = $field[$key];
-        } elseif ($this->hasRenderers($fieldName)) {
-            $renderers = $this->getRenderers($fieldName);
-            foreach ($renderers as $rendererConfiguration) {
-                if (isset($rendererConfiguration[$key])) {
-                    $value = $rendererConfiguration[$key];
-                }
-            }
-        }
-        return $value;
-    }
-
-    /**
-     * Returns whether the column has a renderer.
-     *
-     * @param string $fieldName
-     * @return bool
-     */
-    public function hasRenderers($fieldName): bool
-    {
-        $field = $this->getField($fieldName);
-        return empty($field['renderer']) && empty($field['renderers']) ? false : true;
-    }
-
-    /**
-     * Returns a renderer.
-     *
-     * @param string $fieldName
-     * @return array
-     */
-    public function getRenderers($fieldName): array
-    {
-        $field = $this->getField($fieldName);
-        $renderers = [];
-        if (!empty($field['renderer'])) {
-            $renderers = $this->convertRendererToArray($field['renderer'], $field);
-        } elseif (!empty($field['renderers']) && is_array($field['renderers'])) {
-            foreach ($field['renderers'] as $renderer) {
-                $rendererNameAndConfiguration = $this->convertRendererToArray($renderer, $field);
-                $renderers = array_merge($renderers, $rendererNameAndConfiguration);
-            }
-        }
-
-        return $renderers;
-    }
-
-    /**
-     * @param string $renderer
-     * @return array
-     */
-    protected function convertRendererToArray($renderer, array $field): array
-    {
-        $result = [];
-        if (is_string($renderer)) {
-            $configuration = empty($field['rendererConfiguration'])
-                ? []
-                : $field['rendererConfiguration'];
-
-            /** @var ColumnRendererInterface $rendererObject */
-            $rendererObject = GeneralUtility::makeInstance($renderer);
-
-            $result[$renderer] = array_merge($rendererObject->getConfiguration(), $configuration);
-        // TODO: throw alert message because this is not compatible anymore as of TYPO3 8.7.7
-        } elseif ($renderer instanceof ColumnRendererInterface) {
-            /** @var ColumnRendererInterface $renderer */
-            $result[get_class($renderer)] = $renderer->getConfiguration();
-        }
-        return $result;
-    }
-
-    /**
-     * Returns the class names applied to a cell
-     *
-     * @param string $fieldName
-     * @return bool
-     */
-    public function getClass($fieldName): bool
-    {
-        $field = $this->getField($fieldName);
-        return isset($field['class']) ? $field['class'] : '';
-    }
-
-    /**
-     * Returns whether the column has a label.
-     *
-     * @param string $fieldNameAndPath
-     * @return bool
-     */
-    public function hasLabel($fieldNameAndPath): bool
-    {
-        $field = $this->getField($fieldNameAndPath);
-
-        $hasLabel = empty($field['label']) ? false : true;
-
-        if (!$hasLabel && $this->hasRenderers($fieldNameAndPath)) {
-            $renderers = $this->getRenderers($fieldNameAndPath);
-            /** @var $renderer ColumnRendererInterface */
-            foreach ($renderers as $renderer) {
-                if (isset($renderer['label'])) {
-                    $hasLabel = true;
-                    break;
-                }
-            }
-        }
-        return $hasLabel;
-    }
-
-    /**
-     * @return array
-     */
-    public function getTca(): array
-    {
-        return $this->tca;
-    }
-
-    /**
-     * @return array
-     */
-    public function getIncludedFields(): array
-    {
-        return empty($this->tca['included_fields']) ? [] : GeneralUtility::trimExplode(',', $this->tca['included_fields'], true);
-    }
-
-    /**
-     * Return excluded fields from configuration + preferences.
-     *
-     * @return array
-     */
-    public function getExcludedFields(): array
-    {
-        $configurationFields = $this->getExcludedFieldsFromConfiguration();
-        $preferencesFields = $this->getExcludedFieldsFromPreferences();
-
-        return array_merge($configurationFields, $preferencesFields);
-    }
-
-    /**
-     * Fetch excluded fields from configuration.
-     *
-     * @return array
-     */
-    protected function getExcludedFieldsFromConfiguration(): array
-    {
-        $excludedFields = [];
-        if (!empty($this->tca['excluded_fields'])) {
-            $excludedFields = GeneralUtility::trimExplode(',', $this->tca['excluded_fields'], true);
-        } elseif (!empty($this->tca['export']['excluded_fields'])) { // only for export for legacy reason.
-            $excludedFields = GeneralUtility::trimExplode(',', $this->tca['export']['excluded_fields'], true);
-        }
-        return $excludedFields;
-    }
-
-    /**
-     * Fetch excluded fields from preferences.
-     *
-     * @return array
-     */
-    protected function getExcludedFieldsFromPreferences(): array
-    {
-        $excludedFields = $this->getModulePreferences()->get(ConfigurablePart::EXCLUDED_FIELDS, $this->tableName);
-        return is_array($excludedFields) ? $excludedFields : [];
-    }
-
-    /**
-     * @return bool
-     */
-    public function areFilesIncludedInExport(): bool
-    {
-        $isIncluded = true;
-
-        if (isset($this->tca['export']['include_files'])) {
-            $isIncluded = (bool)$this->tca['export']['include_files'];
-        }
-        return $isIncluded;
-    }
-
-    /**
-     * Returns a "facet" service instance.
-     *
-     * @param string|FacetInterface $facetName
-     * @return StandardFacet
-     */
-    protected function instantiateStandardFacet($facetName): StandardFacet
-    {
-        $label = $this->getLabel($facetName);
-
-        /** @var StandardFacet $facetName */
-        $facet = GeneralUtility::makeInstance(StandardFacet::class, $facetName, $label);
-
-        if (!$facet instanceof StandardFacet) {
-            throw new \RuntimeException('I could not instantiate a facet for facet name "' . $facetName . '""', 1445856345);
-        }
-        return $facet;
-    }
-
-    /**
-     * Returns a "facet" service instance.
-     *
-     * @param string|FacetInterface $facetName
-     * @return FacetInterface
-     */
-    public function facet($facetName = ''): FacetInterface
-    {
-        $facets = $this->getFacets();
-        return $facets[$facetName];
-    }
-
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * @return ModulePreferences|object
-     */
-    protected function getModulePreferences()
-    {
-        return GeneralUtility::makeInstance(ModulePreferences::class);
-    }
-
-    /**
-     * @return LanguageService|object
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(LanguageService::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $tca;
+
+	/**
+	 * @var string
+	 */
+	protected $tableName;
+
+	/**
+	 * All fields available in the Grid.
+	 *
+	 * @var array
+	 */
+	protected $fields;
+
+	/**
+	 * All fields regardless whether they have been excluded or not.
+	 *
+	 * @var array
+	 */
+	protected $allFields;
+
+	/**
+	 * @var array
+	 */
+	protected $instances;
+
+	/**
+	 * @var array
+	 */
+	protected $facets;
+
+	/**
+	 * __construct
+	 *
+	 * @param string $tableName
+	 */
+	public function __construct($tableName)
+	{
+		$this->tableName = $tableName;
+
+		if (empty($GLOBALS['TCA'][$this->tableName])) {
+			throw new InvalidKeyInArrayException('No TCA existence for table name: ' . $this->tableName, 1356945108);
+		}
+
+		$this->tca = $GLOBALS['TCA'][$this->tableName]['grid'] ?? [];
+	}
+
+	/**
+	 * Returns an array containing column names.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array
+	{
+		$fields = $this->getFields();
+		return array_keys($fields) ?: [];
+	}
+
+	/**
+	 * Returns an array containing column names.
+	 *
+	 * @return array
+	 */
+	public function getAllFieldNames(): array
+	{
+		$allFields = $this->getAllFields();
+		return array_keys($allFields);
+	}
+
+	/**
+	 * Get the label key.
+	 *
+	 * @param string $fieldNameAndPath
+	 * @return string
+	 */
+	public function getLabelKey($fieldNameAndPath): string
+	{
+		$field = $this->getField($fieldNameAndPath);
+
+		// First option is to get the label from the Grid TCA.
+		$rawLabel = '';
+		if (isset($field['label'])) {
+			$rawLabel = $field['label'];
+		}
+
+		// Second option is to fetch the label from the Column Renderer object.
+		if (!$rawLabel && $this->hasRenderers($fieldNameAndPath)) {
+			$renderers = $this->getRenderers($fieldNameAndPath);
+			/** @var $renderer ColumnRendererInterface */
+			foreach ($renderers as $renderer) {
+				if (isset($renderer['label'])) {
+					$rawLabel = $renderer['label'];
+					break;
+				}
+			}
+		}
+		return $rawLabel;
+	}
+
+	/**
+	 * Get the translation of a label given a column name.
+	 *
+	 * @param string $fieldNameAndPath
+	 * @return string
+	 */
+	public function getLabel($fieldNameAndPath)
+	{
+		$label = '';
+		if ($this->hasLabel($fieldNameAndPath)) {
+			$labelKey = $this->getLabelKey($fieldNameAndPath);
+			try {
+				$label = $this->getLanguageService()->sL($labelKey);
+			} catch (\InvalidArgumentException $e) {
+			}
+			if (empty($label)) {
+				$label = $labelKey;
+			}
+		} else {
+			// Important to notice the label can contains a path, e.g. metadata.categories and must be resolved.
+			$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $this->tableName);
+			$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $this->tableName);
+			$table = Tca::table($dataType);
+
+			if ($table->hasField($fieldName) && $table->field($fieldName)->hasLabel()) {
+				$label = $table->field($fieldName)->getLabel();
+			}
+		}
+
+		return $label;
+	}
+
+	/**
+	 * Returns the field name given its position.
+	 *
+	 * @param string $position the position of the field in the grid
+	 * @return string
+	 */
+	public function getFieldNameByPosition($position): string
+	{
+		$fields = array_keys($this->getFields());
+		if (empty($fields[$position])) {
+			throw new InvalidKeyInArrayException('No field exist for position: ' . $position, 1356945119);
+		}
+
+		return (string)$fields[$position];
+	}
+
+	/**
+	 * Returns a field name.
+	 *
+	 * @param string $fieldName
+	 * @return array
+	 */
+	public function getField($fieldName): array
+	{
+		$fields = $this->getFields();
+		return $fields[$fieldName] ?: [];
+	}
+
+	/**
+	 * Returns an array containing column names for the Grid.
+	 *
+	 * @return array
+	 */
+	public function getFields(): array
+	{
+		// Cache this operation since it can take some time.
+		if ($this->fields === null) {
+			// Fetch all available fields first.
+			$fields = $this->getAllFields();
+
+			if ($this->isBackendMode()) {
+				// Then remove the not allowed.
+				$fields = $this->filterByIncludedFields($fields);
+				$fields = $this->filterByBackendUser($fields);
+				$fields = $this->filterByExcludedFields($fields);
+			}
+
+			$this->fields = $fields;
+		}
+
+		return $this->fields;
+	}
+
+	/**
+	 * Remove fields according to Grid configuration.
+	 *
+	 * @param $fields
+	 * @return array
+	 */
+	protected function filterByIncludedFields($fields): array
+	{
+		$filteredFields = $fields;
+		$includedFields = $this->getIncludedFields();
+		if (count($includedFields) > 0) {
+			$filteredFields = [];
+			foreach ($fields as $fieldNameAndPath => $configuration) {
+				if (in_array($fieldNameAndPath, $includedFields, true) || !Tca::table($this->tableName)->hasField($fieldNameAndPath)) {
+					$filteredFields[$fieldNameAndPath] = $configuration;
+				}
+			}
+		}
+		return $filteredFields;
+	}
+
+	/**
+	 * Remove fields according to BE User permission.
+	 *
+	 * @param $fields
+	 * @return array
+	 */
+	protected function filterByBackendUser($fields): array
+	{
+		if (!$this->getBackendUser()->isAdmin()) {
+			foreach ($fields as $fieldName => $field) {
+				if (Tca::table($this->tableName)->hasField($fieldName) && !Tca::table($this->tableName)->field($fieldName)->hasAccess()) {
+					unset($fields[$fieldName]);
+				}
+			}
+		}
+		return $fields;
+	}
+
+	/**
+	 * Remove fields according to Grid configuration.
+	 *
+	 * @param $fields
+	 * @return array
+	 */
+	protected function filterByExcludedFields($fields): array
+	{
+		// Unset excluded fields.
+		foreach ($this->getExcludedFields() as $excludedField) {
+			if (isset($fields[$excludedField])) {
+				unset($fields[$excludedField]);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Returns an array containing column names for the Grid.
+	 *
+	 * @return array
+	 */
+	public function getAllFields(): array
+	{
+		// Cache this operation since it can take some time.
+		if ($this->allFields === null) {
+			$fields = isset($this->tca['columns']) && is_array($this->tca['columns']) ? $this->tca['columns'] : [];
+			$gridFieldNames = array_keys($fields);
+
+			// Fetch all fields of the TCA and merge it back to the fields configured for Grid.
+			$tableFieldNames = Tca::table($this->tableName)->getFields();
+
+			// Just remove system fields from the Grid.
+			foreach ($tableFieldNames as $key => $fieldName) {
+				if (in_array($fieldName, Tca::getSystemFields())) {
+					unset($tableFieldNames[$key]);
+				}
+			}
+
+			$additionalFields = array_diff($tableFieldNames, $gridFieldNames);
+
+			if (!empty($additionalFields)) {
+				// Pop out last element of the key
+				// Idea is to place new un-configured columns in between. By default, they will be hidden.
+				end($fields);
+				$lastColumnKey = key($fields);
+				$lastColumn = array_pop($fields);
+
+				// Feed up the grid fields with un configured elements
+				foreach ($additionalFields as $additionalField) {
+					$fields[$additionalField] = array(
+						'visible' => false
+					);
+
+					// Try to guess the format of the field.
+					$fieldType = Tca::table($this->tableName)->field($additionalField)->getType();
+					if ($fieldType === FieldType::DATE) {
+						$fields[$additionalField]['format'] = 'Fab\Vidi\Formatter\Date';
+					} elseif ($fieldType === FieldType::DATETIME) {
+						$fields[$additionalField]['format'] = 'Fab\Vidi\Formatter\Datetime';
+					}
+				}
+				$fields[$lastColumnKey] = $lastColumn;
+			}
+
+			$this->allFields = $fields;
+		}
+
+		return $this->allFields;
+	}
+
+	/**
+	 * Tell whether the field exists in the grid or not.
+	 *
+	 * @param string $fieldName
+	 * @return bool
+	 */
+	public function hasField($fieldName): bool
+	{
+		$fields = $this->getFields();
+		return isset($fields[$fieldName]);
+	}
+
+	/**
+	 * Tell whether the facet exists in the grid or not.
+	 *
+	 * @param string $facetName
+	 * @return bool
+	 */
+	public function hasFacet($facetName): bool
+	{
+		$facets = $this->getFacets();
+		return isset($facets[$facetName]);
+	}
+
+	/**
+	 * Returns an array containing facets fields.
+	 *
+	 * @return FacetInterface[]
+	 */
+	public function getFacets(): array
+	{
+		if ($this->facets === null) {
+			$this->facets = [];
+
+			if (is_array($this->tca['facets'])) {
+				foreach ($this->tca['facets'] as $key => $facetNameOrArray) {
+					if (is_array($facetNameOrArray)) {
+						$name = $facetNameOrArray['name'] ?? '';
+
+						$label = isset($facetNameOrArray['label'])
+							? $this->getLanguageService()->sL($facetNameOrArray['label'])
+							: '';
+
+						$suggestions = $facetNameOrArray['suggestions'] ?? [];
+						$configuration = $facetNameOrArray['configuration'] ?? [];
+
+						/** @var FacetInterface $facetObject */
+						$facetObject = GeneralUtility::makeInstance($key, $name, $label, $suggestions, $configuration);
+						$this->facets[$facetObject->getName()] = $facetObject;
+					} else {
+						$this->facets[$facetNameOrArray] = $this->instantiateStandardFacet($facetNameOrArray);
+					}
+				}
+			}
+		}
+		return $this->facets;
+	}
+
+	/**
+	 * Returns the "sortable" value of the column.
+	 *
+	 * @param string $fieldName
+	 * @return int|string
+	 */
+	public function isSortable($fieldName)
+	{
+		$defaultValue = true;
+		$hasSortableField = Tca::table($this->tableName)->hasSortableField();
+		if ($hasSortableField) {
+			$isSortable = false;
+		} else {
+			$isSortable = $this->get($fieldName, 'sortable', $defaultValue);
+		}
+		return $isSortable;
+	}
+
+	/**
+	 * Returns the "canBeHidden" value of the column.
+	 *
+	 * @param string $fieldName
+	 * @return bool
+	 */
+	public function canBeHidden($fieldName): bool
+	{
+		$defaultValue = true;
+		return $this->get($fieldName, 'canBeHidden', $defaultValue);
+	}
+
+	/**
+	 * Returns the "width" value of the column.
+	 *
+	 * @param string $fieldName
+	 * @return int|string
+	 */
+	public function getWidth($fieldName)
+	{
+		$defaultValue = 'auto';
+		return $this->get($fieldName, 'width', $defaultValue);
+	}
+
+	/**
+	 * Returns the "visible" value of the column.
+	 *
+	 * @param string $fieldName
+	 * @return bool
+	 */
+	public function isVisible($fieldName): bool
+	{
+		$defaultValue = true;
+		return $this->get($fieldName, 'visible', $defaultValue);
+	}
+
+	/**
+	 * Returns the "editable" value of the column.
+	 *
+	 * @param string $columnName
+	 * @return bool
+	 */
+	public function isEditable($columnName): bool
+	{
+		$defaultValue = false;
+		return $this->get($columnName, 'editable', $defaultValue);
+	}
+
+	/**
+	 * Returns the "localized" value of the column.
+	 *
+	 * @param string $columnName
+	 * @return bool
+	 */
+	public function isLocalized($columnName): bool
+	{
+		$defaultValue = true;
+		return $this->get($columnName, 'localized', $defaultValue);
+	}
+
+	/**
+	 *
+	 * Returns the "html" value of the column.
+	 *
+	 * @param string $fieldName
+	 * @return string
+	 */
+	public function getHeader($fieldName): string
+	{
+		$defaultValue = '';
+		return $this->get($fieldName, 'html', $defaultValue);
+	}
+
+	/**
+	 * Fetch a possible from a Grid Renderer. If no value is found, returns null
+	 *
+	 * @param string $fieldName
+	 * @param string $key
+	 * @param mixed $defaultValue
+	 * @return null|mixed
+	 */
+	public function get($fieldName, $key, $defaultValue = null)
+	{
+		$value = $defaultValue;
+
+		$field = $this->getField($fieldName);
+		if (isset($field[$key])) {
+			$value = $field[$key];
+		} elseif ($this->hasRenderers($fieldName)) {
+			$renderers = $this->getRenderers($fieldName);
+			foreach ($renderers as $rendererConfiguration) {
+				if (isset($rendererConfiguration[$key])) {
+					$value = $rendererConfiguration[$key];
+				}
+			}
+		}
+		return $value;
+	}
+
+	/**
+	 * Returns whether the column has a renderer.
+	 *
+	 * @param string $fieldName
+	 * @return bool
+	 */
+	public function hasRenderers($fieldName): bool
+	{
+		$field = $this->getField($fieldName);
+		return empty($field['renderer']) && empty($field['renderers']) ? false : true;
+	}
+
+	/**
+	 * Returns a renderer.
+	 *
+	 * @param string $fieldName
+	 * @return array
+	 */
+	public function getRenderers($fieldName): array
+	{
+		$field = $this->getField($fieldName);
+		$renderers = [];
+		if (!empty($field['renderer'])) {
+			$renderers = $this->convertRendererToArray($field['renderer'], $field);
+		} elseif (!empty($field['renderers']) && is_array($field['renderers'])) {
+			foreach ($field['renderers'] as $renderer) {
+				$rendererNameAndConfiguration = $this->convertRendererToArray($renderer, $field);
+				$renderers = array_merge($renderers, $rendererNameAndConfiguration);
+			}
+		}
+
+		return $renderers;
+	}
+
+	/**
+	 * @param string $renderer
+	 * @return array
+	 */
+	protected function convertRendererToArray($renderer, array $field): array
+	{
+		$result = [];
+		if (is_string($renderer)) {
+			$configuration = empty($field['rendererConfiguration'])
+				? []
+				: $field['rendererConfiguration'];
+
+			/** @var ColumnRendererInterface $rendererObject */
+			$rendererObject = GeneralUtility::makeInstance($renderer);
+
+			$result[$renderer] = array_merge($rendererObject->getConfiguration(), $configuration);
+		// TODO: throw alert message because this is not compatible anymore as of TYPO3 8.7.7
+		} elseif ($renderer instanceof ColumnRendererInterface) {
+			/** @var ColumnRendererInterface $renderer */
+			$result[get_class($renderer)] = $renderer->getConfiguration();
+		}
+		return $result;
+	}
+
+	/**
+	 * Returns the class names applied to a cell
+	 *
+	 * @param string $fieldName
+	 * @return bool
+	 */
+	public function getClass($fieldName): bool
+	{
+		$field = $this->getField($fieldName);
+		return isset($field['class']) ? $field['class'] : '';
+	}
+
+	/**
+	 * Returns whether the column has a label.
+	 *
+	 * @param string $fieldNameAndPath
+	 * @return bool
+	 */
+	public function hasLabel($fieldNameAndPath): bool
+	{
+		$field = $this->getField($fieldNameAndPath);
+
+		$hasLabel = empty($field['label']) ? false : true;
+
+		if (!$hasLabel && $this->hasRenderers($fieldNameAndPath)) {
+			$renderers = $this->getRenderers($fieldNameAndPath);
+			/** @var $renderer ColumnRendererInterface */
+			foreach ($renderers as $renderer) {
+				if (isset($renderer['label'])) {
+					$hasLabel = true;
+					break;
+				}
+			}
+		}
+		return $hasLabel;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getTca(): array
+	{
+		return $this->tca;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getIncludedFields(): array
+	{
+		return empty($this->tca['included_fields']) ? [] : GeneralUtility::trimExplode(',', $this->tca['included_fields'], true);
+	}
+
+	/**
+	 * Return excluded fields from configuration + preferences.
+	 *
+	 * @return array
+	 */
+	public function getExcludedFields(): array
+	{
+		$configurationFields = $this->getExcludedFieldsFromConfiguration();
+		$preferencesFields = $this->getExcludedFieldsFromPreferences();
+
+		return array_merge($configurationFields, $preferencesFields);
+	}
+
+	/**
+	 * Fetch excluded fields from configuration.
+	 *
+	 * @return array
+	 */
+	protected function getExcludedFieldsFromConfiguration(): array
+	{
+		$excludedFields = [];
+		if (!empty($this->tca['excluded_fields'])) {
+			$excludedFields = GeneralUtility::trimExplode(',', $this->tca['excluded_fields'], true);
+		} elseif (!empty($this->tca['export']['excluded_fields'])) { // only for export for legacy reason.
+			$excludedFields = GeneralUtility::trimExplode(',', $this->tca['export']['excluded_fields'], true);
+		}
+		return $excludedFields;
+	}
+
+	/**
+	 * Fetch excluded fields from preferences.
+	 *
+	 * @return array
+	 */
+	protected function getExcludedFieldsFromPreferences(): array
+	{
+		$excludedFields = $this->getModulePreferences()->get(ConfigurablePart::EXCLUDED_FIELDS, $this->tableName);
+		return is_array($excludedFields) ? $excludedFields : [];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function areFilesIncludedInExport(): bool
+	{
+		$isIncluded = true;
+
+		if (isset($this->tca['export']['include_files'])) {
+			$isIncluded = (bool)$this->tca['export']['include_files'];
+		}
+		return $isIncluded;
+	}
+
+	/**
+	 * Returns a "facet" service instance.
+	 *
+	 * @param string|FacetInterface $facetName
+	 * @return StandardFacet
+	 */
+	protected function instantiateStandardFacet($facetName): StandardFacet
+	{
+		$label = $this->getLabel($facetName);
+
+		/** @var StandardFacet $facetName */
+		$facet = GeneralUtility::makeInstance(StandardFacet::class, $facetName, $label);
+
+		if (!$facet instanceof StandardFacet) {
+			throw new \RuntimeException('I could not instantiate a facet for facet name "' . $facetName . '""', 1445856345);
+		}
+		return $facet;
+	}
+
+	/**
+	 * Returns a "facet" service instance.
+	 *
+	 * @param string|FacetInterface $facetName
+	 * @return FacetInterface
+	 */
+	public function facet($facetName = ''): FacetInterface
+	{
+		$facets = $this->getFacets();
+		return $facets[$facetName];
+	}
+
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * @return ModulePreferences|object
+	 */
+	protected function getModulePreferences()
+	{
+		return GeneralUtility::makeInstance(ModulePreferences::class);
+	}
+
+	/**
+	 * @return LanguageService|object
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(LanguageService::class);
+	}
 }

Classes/Domain/Repository/SelectionRepository.php

Indentation +49 added lines, -49 removed lines

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

Classes/Domain/Repository/ContentRepository.php

Spacing +10 added lines, -10 removed lines

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

Indentation +823 added lines, -823 removed lines

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