fabarea / vidi

Classes/Language/LanguageService.php

Doc Comments +2 added lines, -2 removed lines

@@ -97,7 +97,7 @@ 
      *
      * @param Content $object
      * @param int $language
-     * @return string
+     * @return boolean
      */
     public function hasLocalization(Content $object, $language)
     {
@@ -178,7 +178,7 @@ 
     }
 
     /**
-     * @return object|DataService
+     * @return DataService
      */
     protected function getDataService(): DataService
     {

Indentation +163 added lines, -163 removed lines

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

Classes/Module/ModuleService.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
     }
 
     /**
-     * @return DataService
+     * @return string
      */
     protected function getDataService(): string
     {

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
  */
 
 use Fab\Vidi\Service\DataService;
-use Fab\Vidi\Utility\BackendUtility;
 use TYPO3\CMS\Core\SingletonInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use Fab\Vidi\Tca\Tca;

Indentation +93 added lines, -93 removed lines

@@ -21,106 +21,106 @@
 class ModuleService implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $storage = [];
+	/**
+	 * @var array
+	 */
+	protected $storage = [];
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Vidi\Module\ModuleService|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleService::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Vidi\Module\ModuleService|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleService::class);
+	}
 
-    /**
-     * Fetch all modules to be displayed on the current pid.
-     *
-     * @return array
-     */
-    public function getModulesForCurrentPid(): array
-    {
-        $pid = $this->getModuleLoader()->getCurrentPid();
-        return $this->getModulesForPid($pid);
-    }
+	/**
+	 * Fetch all modules to be displayed on the current pid.
+	 *
+	 * @return array
+	 */
+	public function getModulesForCurrentPid(): array
+	{
+		$pid = $this->getModuleLoader()->getCurrentPid();
+		return $this->getModulesForPid($pid);
+	}
 
-    /**
-     * Fetch all modules displayed given a pid.
-     *
-     * @param int $pid
-     * @return array
-     */
-    public function getModulesForPid($pid = null): array
-    {
-        if (!isset($this->storage[$pid])) {
+	/**
+	 * Fetch all modules displayed given a pid.
+	 *
+	 * @param int $pid
+	 * @return array
+	 */
+	public function getModulesForPid($pid = null): array
+	{
+		if (!isset($this->storage[$pid])) {
 
-            $modules = [];
-            foreach ($GLOBALS['TCA'] as $dataType => $configuration) {
-                if (Tca::table($dataType)->isNotHidden()) {
-                    $record = $this->getDataService()->getRecord(
-                        $dataType,
-                        [
-                            'pid' => $pid
-                        ]
-                    );
-                    if (!empty($record)) {
-                        $moduleName = 'Vidi' . GeneralUtility::underscoredToUpperCamelCase($dataType) . 'M1';
-                        $title = Tca::table($dataType)->getTitle();
-                        $modules[$moduleName] = $title;
-                    }
-                }
-            }
-            $this->storage[$pid] = $modules;
-        }
-        return $this->storage[$pid];
-    }
+			$modules = [];
+			foreach ($GLOBALS['TCA'] as $dataType => $configuration) {
+				if (Tca::table($dataType)->isNotHidden()) {
+					$record = $this->getDataService()->getRecord(
+						$dataType,
+						[
+							'pid' => $pid
+						]
+					);
+					if (!empty($record)) {
+						$moduleName = 'Vidi' . GeneralUtility::underscoredToUpperCamelCase($dataType) . 'M1';
+						$title = Tca::table($dataType)->getTitle();
+						$modules[$moduleName] = $title;
+					}
+				}
+			}
+			$this->storage[$pid] = $modules;
+		}
+		return $this->storage[$pid];
+	}
 
-    /**
-     * Fetch the first module for the current pid.
-     *
-     * @return string
-     */
-    public function getFirstModuleForCurrentPid(): string
-    {
-        $pid = $this->getModuleLoader()->getCurrentPid();
-        return $this->getFirstModuleForPid($pid);
-    }
+	/**
+	 * Fetch the first module for the current pid.
+	 *
+	 * @return string
+	 */
+	public function getFirstModuleForCurrentPid(): string
+	{
+		$pid = $this->getModuleLoader()->getCurrentPid();
+		return $this->getFirstModuleForPid($pid);
+	}
 
-    /**
-     * Fetch the module given a pid.
-     *
-     * @param int $pid
-     * @return string
-     */
-    public function getFirstModuleForPid($pid): string
-    {
-        $firstModule = '';
-        $modules = $this->getModulesForPid($pid);
-        if (!empty($modules)) {
-            $firstModule = key($modules);
-        }
+	/**
+	 * Fetch the module given a pid.
+	 *
+	 * @param int $pid
+	 * @return string
+	 */
+	public function getFirstModuleForPid($pid): string
+	{
+		$firstModule = '';
+		$modules = $this->getModulesForPid($pid);
+		if (!empty($modules)) {
+			$firstModule = key($modules);
+		}
 
-        return $firstModule;
-    }
+		return $firstModule;
+	}
 
-    /**
-     * @return DataService
-     */
-    protected function getDataService(): string
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * @return DataService
+	 */
+	protected function getDataService(): string
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
                         ]
                     );
                     if (!empty($record)) {
-                        $moduleName = 'Vidi' . GeneralUtility::underscoredToUpperCamelCase($dataType) . 'M1';
+                        $moduleName = 'Vidi'.GeneralUtility::underscoredToUpperCamelCase($dataType).'M1';
                         $title = Tca::table($dataType)->getTitle();
                         $modules[$moduleName] = $title;
                     }

Classes/Persistence/Query.php

Doc Comments +2 added lines, -2 removed lines

@@ -379,7 +379,7 @@ 
     /**
      * Gets the constraint for this query.
      *
-     * @return \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ConstraintInterface the constraint, or null if none
+     * @return null|ConstraintInterface the constraint, or null if none
      * @api
      */
     public function getConstraint()
@@ -476,7 +476,7 @@ 
      * Returns a like criterion used for matching objects against a query
      *
      * @param string $propertyName The name of the property to compare against
-     * @param mixed $operand The value to compare with
+     * @param string $operand The value to compare with
      * @param boolean $caseSensitive Whether the matching should be done case-sensitive
      * @return \TYPO3\CMS\Extbase\Persistence\Generic\Qom\ComparisonInterface
      * @api

Indentation +643 added lines, -643 removed lines

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

Classes/Persistence/Storage/VidiDbBackend.php

Doc Comments +2 added lines, -2 removed lines

@@ -645,7 +645,7 @@ 
     /**
      * Adds additional WHERE statements according to the query settings.
      *
-     * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
+     * @param \Fab\Vidi\Persistence\QuerySettings $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
@@ -873,7 +873,7 @@ 
      * 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
+     * @param \Fab\Vidi\Persistence\QuerySettings $querySettings The TYPO3 CMS specific query settings
      * @return array
      */
     protected function doLanguageAndWorkspaceOverlay(array $row, $querySettings)

Indentation +1027 added lines, -1027 removed lines

@@ -37,1032 +37,1032 @@
 class VidiDbBackend
 {
 
-    const OPERATOR_EQUAL_TO_NULL = 'operatorEqualToNull';
-    const OPERATOR_NOT_EQUAL_TO_NULL = 'operatorNotEqualToNull';
-
-    /**
-     * The TYPO3 page repository. Used for language and workspace overlay
-     *
-     * @var PageRepository
-     */
-    protected $pageRepository;
-
-    /**
-     * @var \TYPO3\CMS\Extbase\Service\EnvironmentService
-     * @inject
-     */
-    protected $environmentService;
-
-    /**
-     * @var \Fab\Vidi\Persistence\Query
-     */
-    protected $query;
-
-    /**
-     * Store some info related to table name and its aliases.
-     *
-     * @var array
-     */
-    protected $tableNameAliases = array(
-        'aliases' => [],
-        'aliasIncrement' => [],
-    );
-
-    /**
-     * Use to store the current foreign table name alias.
-     *
-     * @var string
-     */
-    protected $currentChildTableNameAlias = '';
-
-    /**
-     * @param Query $query
-     */
-    public function __construct(Query $query)
-    {
-        $this->query = $query;
-    }
-
-    /**
-     * 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)
-            ->fetchAll();
-
-        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);
-
-        // 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)
-                ->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)
-                ->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->getQuerySettings(), $tableNameOrAlias, $statementParts);
-            }
-        }
-
-        return $statementParts;
-    }
-
-    /**
-     * Fiddle with the statement structure to handle recursive MM relations.
-     * For the recursive MM query to work, we must invert some values.
-     * Let see if that is the best way of doing that...
-     *
-     * @param array $statementParts
-     * @return array
-     */
-    public function processStatementStructureForRecursiveMMRelation(array $statementParts)
-    {
-
-        if ($this->hasRecursiveMMRelation()) {
-            $tableName = $this->query->getType();
-
-            // In order the MM query to work for a recursive MM query, we must invert some values.
-            // tx_domain_model_foo0 (the alias) <--> tx_domain_model_foo (the origin table name)
-            $values = [];
-            foreach ($statementParts['fields'] as $key => $value) {
-                $values[$key] = str_replace($tableName, $tableName . '0', $value);
-            }
-            $statementParts['fields'] = $values;
-
-            // Same comment as above.
-            $values = [];
-            foreach ($statementParts['where'] as $key => $value) {
-                $values[$key] = str_replace($tableName . '0', $tableName, $value);
-            }
-            $statementParts['where'] = $values;
-
-            // We must be more restrictive by transforming the "left" union by "inner"
-            $values = [];
-            foreach ($statementParts['unions'] as $key => $value) {
-                $values[$key] = str_replace('LEFT JOIN', 'INNER JOIN', $value);
-            }
-            $statementParts['unions'] = $values;
-        }
-
-        return $statementParts;
-    }
-
-    /**
-     * Tell whether there is a recursive MM relation.
-     *
-     * @return bool
-     */
-    public function hasRecursiveMMRelation()
-    {
-        return isset($this->tableNameAliases['aliasIncrement'][$this->query->getType()]);
-
-    }
-
-    /**
-     * Returns the statement, ready to be executed.
-     *
-     * @param array $statementParts The SQL statement parts
-     * @return string The SQL statement
-     */
-    public function buildQuery(array $statementParts)
-    {
-
-        // Add more statement to the UNION part.
-        if (!empty($statementParts['unions'])) {
-            foreach ($statementParts['unions'] as $tableName => $unionPart) {
-                if (!empty($statementParts['additionalWhereClause'][$tableName])) {
-                    $statementParts['unions'][$tableName] .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
-                }
-            }
-        }
-
-        $statement = 'SELECT ' . implode(' ', $statementParts['keywords']) . ' ' . implode(',', $statementParts['fields']) . ' FROM ' . implode(' ', $statementParts['tables']) . ' ' . implode(' ', $statementParts['unions']);
-        if (!empty($statementParts['where'])) {
-            $statement .= ' WHERE ' . implode('', $statementParts['where']);
-            if (!empty($statementParts['additionalWhereClause'][$this->query->getType()])) {
-                $statement .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
-            }
-        } elseif (!empty($statementParts['additionalWhereClause'])) {
-            $statement .= ' WHERE ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
-        }
-        if (!empty($statementParts['orderings'])) {
-            $statement .= ' ORDER BY ' . implode(', ', $statementParts['orderings']);
-        }
-        if (!empty($statementParts['limit'])) {
-            $statement .= ' LIMIT ' . $statementParts['limit'];
-        }
-
-        return $statement;
-    }
-
-    /**
-     * Transforms a Query Source into SQL and parameter arrays
-     *
-     * @param SourceInterface $source The source
-     * @param array &$sql
-     * @return void
-     */
-    protected function parseSource(SourceInterface $source, array &$sql)
-    {
-        $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 \TYPO3\CMS\Extbase\Persistence\Generic\Qom\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 \TYPO3\CMS\Extbase\Persistence\Generic\Qom\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 \TYPO3\CMS\Extbase\Persistence\Generic\Qom\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 \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException
-     */
-    protected function getPlainValue($input)
-    {
-        if (is_array($input)) {
-            throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An array could not be converted to a plain value.', 1274799932);
-        }
-        if ($input instanceof \DateTime) {
-            return $input->format('U');
-        } elseif (is_object($input)) {
-            if ($input instanceof \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy) {
-                $realInput = $input->_loadRealInstance();
-            } else {
-                $realInput = $input;
-            }
-            if ($realInput instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
-                return $realInput->getUid();
-            } else {
-                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "' . get_class($realInput) . '" could not be converted to a plain value.', 1274799934);
-            }
-        } elseif (is_bool($input)) {
-            return $input === true ? 1 : 0;
-        } else {
-            return $input;
-        }
-    }
-
-    /**
-     * Parse a DynamicOperand into SQL and parameter arrays.
-     *
-     * @param DynamicOperandInterface $operand
-     * @param string $operator One of the JCR_OPERATOR_* constants
-     * @param SourceInterface $source The source
-     * @param array &$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 Exception\InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
-        }
-
-        if ($table->field($fieldName)->hasOne()) { // includes relation "one-to-one" and "many-to-one"
-            // sometimes the opposite relation is not defined. We don't want to force this config for backward compatibility reasons.
-            // $parentKeyFieldName === null does the trick somehow. Before condition was if (isset($parentKeyFieldName))
-            if ($table->field($fieldName)->hasRelationManyToOne() || $parentKeyFieldName === null) {
-                $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 ($this->environmentService->isEnvironmentInFrontendMode()) {
-                $statement .= $this->getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted);
-            } else {
-                // TYPO3_MODE === 'BE'
-                $statement .= $this->getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted);
-            }
-
-            // Remove the prefixing "AND" if any.
-            if (!empty($statement)) {
-                $statement = strtolower(substr($statement, 1, 3)) === 'and' ? substr($statement, 5) : $statement;
-                $statementParts['additionalWhereClause'][$tableNameOrAlias][] = $statement;
-            }
-        }
-    }
-
-    /**
-     * Returns constraint statement for frontend context
-     *
-     * @param string $tableNameOrAlias
-     * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
-     * @param array $enableFieldsToBeIgnored If $ignoreEnableFields is true, this array specifies enable fields to be ignored. If it is null or an empty array (default) all enable fields are ignored.
-     * @param boolean $includeDeleted A flag indicating whether deleted records should be included
-     * @return string
-     * @throws Exception\InconsistentQuerySettingsException
-     */
-    protected function getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted)
-    {
-        $statement = '';
-        $tableName = $this->resolveTableNameAlias($tableNameOrAlias);
-        if ($ignoreEnableFields && !$includeDeleted) {
-            if (count($enableFieldsToBeIgnored)) {
-                // array_combine() is necessary because of the way \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() is implemented
-                $statement .= $this->getPageRepository()->enableFields($tableName, -1, array_combine($enableFieldsToBeIgnored, $enableFieldsToBeIgnored));
-            } else {
-                $statement .= $this->getPageRepository()->deleteClause($tableName);
-            }
-        } elseif (!$ignoreEnableFields && !$includeDeleted) {
-            $statement .= $this->getPageRepository()->enableFields($tableName);
-        } elseif (!$ignoreEnableFields && $includeDeleted) {
-            throw new Exception\InconsistentQuerySettingsException('Query setting "ignoreEnableFields=false" can not be used together with "includeDeleted=true" in frontend context.', 1327678173);
-        }
-        return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
-    }
-
-    /**
-     * Returns constraint statement for backend context
-     *
-     * @param string $tableNameOrAlias
-     * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
-     * @param boolean $includeDeleted A flag indicating whether deleted records should be included
-     * @return string
-     */
-    protected function getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted)
-    {
-        $tableName = $this->resolveTableNameAlias($tableNameOrAlias);
-        $statement = '';
-        if (!$ignoreEnableFields) {
-            $statement .= BackendUtility::BEenableFields($tableName);
-        }
-
-        // If the table is found to have "workspace" support, add the corresponding fields in the statement.
-        if (Tca::table($tableName)->hasWorkspaceSupport()) {
-            if ($this->getBackendUser()->workspace === 0) {
-                $statement .= ' AND ' . $tableName . '.t3ver_state<=' . new VersionState(VersionState::DEFAULT_STATE);
-            } else {
-                // Show only records of live and of the current workspace
-                // In case we are in a Versioning preview
-                $statement .= ' AND (' .
-                    $tableName . '.t3ver_wsid=0 OR ' .
-                    $tableName . '.t3ver_wsid=' . (int)$this->getBackendUser()->workspace .
-                    ')';
-            }
-
-            // Check if this segment make sense here or whether it should be in the "if" part when we have workspace = 0
-            $statement .= ' AND ' . $tableName . '.pid<>-1';
-        }
-
-        if (!$includeDeleted) {
-            $statement .= BackendUtility::deleteClause($tableName);
-        }
-
-        return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
-    }
-
-    /**
-     * Builds the language field statement
-     *
-     * @param string $tableNameOrAlias The database table name
-     * @param array &$statementParts The query parts
-     * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
-     * @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 Exception\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->getQuerySettings()
-            );
-
-            $contentObjects[] = GeneralUtility::makeInstance(
-                \Fab\Vidi\Domain\Model\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 = $GLOBALS['TSFE']->sys_language_mode;
-            if ($this->isBackendUserLogged() && $this->getBackendUser()->workspace !== 0) {
-                $pageRepository->versioningWorkspaceId = $this->getBackendUser()->workspace;
-            }
-        } else {
-            $languageMode = '';
-            $workspaceUid = $this->getBackendUser()->workspace;
-            $pageRepository->versioningWorkspaceId = $workspaceUid;
-            if ($this->getBackendUser()->workspace !== 0) {
-                $pageRepository->versioningPreview = 1;
-            }
-        }
-
-        // If current row is a translation select its parent
-        if (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
-            && isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
-        ) {
-            if (isset($row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']])
-                && $row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] > 0
-            ) {
-                $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 (TYPO3_MODE !== 'BE') {
-            $pageRepository->versionOL($tableName, $row, true, true);
-        } else {
-            \TYPO3\CMS\Backend\Utility\BackendUtility::workspaceOL($tableName, $row);
-        }
-        if ($pageRepository->versioningPreview && isset($row['_ORIG_uid'])) {
-            $row['uid'] = $row['_ORIG_uid'];
-        }
-
-        // Special case for table "pages"
-        if ($tableName == 'pages') {
-            $row = $pageRepository->getPageOverlay($row, $querySettings->getLanguageUid());
-        } elseif (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
-            && $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] !== ''
-        ) {
-            if (in_array($row[$GLOBALS['TCA'][$tableName]['ctrl']['languageField']], array(-1, 0))) {
-                $overlayMode = $languageMode === 'strict' ? 'hideNonTranslated' : '';
-                $row = $pageRepository->getRecordOverlay($tableName, $row, $querySettings->getLanguageUid(), $overlayMode);
-            }
-        }
-
-        return $row;
-    }
-
-    /**
-     * Return a resolved table name given a possible table name alias.
-     *
-     * @param string $tableNameOrAlias
-     * @return string
-     */
-    protected function resolveTableNameAlias($tableNameOrAlias)
-    {
-        $resolvedTableName = $tableNameOrAlias;
-        if (!empty($this->tableNameAliases['aliases'][$tableNameOrAlias])) {
-            $resolvedTableName = $this->tableNameAliases['aliases'][$tableNameOrAlias];
-        }
-        return $resolvedTableName;
-    }
-
-    /**
-     * Generate a unique table name alias for the given table name.
-     *
-     * @param string $tableName
-     * @return string
-     */
-    protected function generateAlias($tableName)
-    {
-
-        if (!isset($this->tableNameAliases['aliasIncrement'][$tableName])) {
-            $this->tableNameAliases['aliasIncrement'][$tableName] = 0;
-        }
-
-        $numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
-        $tableNameAlias = $tableName . $numberOfAliases;
-
-        $this->tableNameAliases['aliasIncrement'][$tableName]++;
-        $this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;
-
-        return $tableNameAlias;
-    }
-
-    /**
-     * Replace the table names by its table name alias within the given statement.
-     *
-     * @param string $tableName
-     * @param string $tableNameAlias
-     * @param string $statement
-     * @return string
-     */
-    protected function replaceTableNameByAlias($tableName, $tableNameAlias, $statement)
-    {
-        if ($statement && $tableName !== $tableNameAlias) {
-            $statement = str_replace($tableName, $tableNameAlias, $statement);
-        }
-        return $statement;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Tell whether a Backend User is logged in.
-     *
-     * @return bool
-     */
-    protected function isBackendUserLogged()
-    {
-        return is_object($GLOBALS['BE_USER']);
-    }
-
-    /**
-     * @return PageRepository|object
-     */
-    protected function getPageRepository()
-    {
-        if (!$this->pageRepository instanceof PageRepository) {
-            if ($this->environmentService->isEnvironmentInFrontendMode() && is_object($GLOBALS['TSFE'])) {
-                $this->pageRepository = $GLOBALS['TSFE']->sys_page;
-            } else {
-                $this->pageRepository = GeneralUtility::makeInstance(PageRepository::class);
-            }
-        }
-
-        return $this->pageRepository;
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\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()
-    }
+	const OPERATOR_EQUAL_TO_NULL = 'operatorEqualToNull';
+	const OPERATOR_NOT_EQUAL_TO_NULL = 'operatorNotEqualToNull';
+
+	/**
+	 * The TYPO3 page repository. Used for language and workspace overlay
+	 *
+	 * @var PageRepository
+	 */
+	protected $pageRepository;
+
+	/**
+	 * @var \TYPO3\CMS\Extbase\Service\EnvironmentService
+	 * @inject
+	 */
+	protected $environmentService;
+
+	/**
+	 * @var \Fab\Vidi\Persistence\Query
+	 */
+	protected $query;
+
+	/**
+	 * Store some info related to table name and its aliases.
+	 *
+	 * @var array
+	 */
+	protected $tableNameAliases = array(
+		'aliases' => [],
+		'aliasIncrement' => [],
+	);
+
+	/**
+	 * Use to store the current foreign table name alias.
+	 *
+	 * @var string
+	 */
+	protected $currentChildTableNameAlias = '';
+
+	/**
+	 * @param Query $query
+	 */
+	public function __construct(Query $query)
+	{
+		$this->query = $query;
+	}
+
+	/**
+	 * 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)
+			->fetchAll();
+
+		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);
+
+		// 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)
+				->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)
+				->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->getQuerySettings(), $tableNameOrAlias, $statementParts);
+			}
+		}
+
+		return $statementParts;
+	}
+
+	/**
+	 * Fiddle with the statement structure to handle recursive MM relations.
+	 * For the recursive MM query to work, we must invert some values.
+	 * Let see if that is the best way of doing that...
+	 *
+	 * @param array $statementParts
+	 * @return array
+	 */
+	public function processStatementStructureForRecursiveMMRelation(array $statementParts)
+	{
+
+		if ($this->hasRecursiveMMRelation()) {
+			$tableName = $this->query->getType();
+
+			// In order the MM query to work for a recursive MM query, we must invert some values.
+			// tx_domain_model_foo0 (the alias) <--> tx_domain_model_foo (the origin table name)
+			$values = [];
+			foreach ($statementParts['fields'] as $key => $value) {
+				$values[$key] = str_replace($tableName, $tableName . '0', $value);
+			}
+			$statementParts['fields'] = $values;
+
+			// Same comment as above.
+			$values = [];
+			foreach ($statementParts['where'] as $key => $value) {
+				$values[$key] = str_replace($tableName . '0', $tableName, $value);
+			}
+			$statementParts['where'] = $values;
+
+			// We must be more restrictive by transforming the "left" union by "inner"
+			$values = [];
+			foreach ($statementParts['unions'] as $key => $value) {
+				$values[$key] = str_replace('LEFT JOIN', 'INNER JOIN', $value);
+			}
+			$statementParts['unions'] = $values;
+		}
+
+		return $statementParts;
+	}
+
+	/**
+	 * Tell whether there is a recursive MM relation.
+	 *
+	 * @return bool
+	 */
+	public function hasRecursiveMMRelation()
+	{
+		return isset($this->tableNameAliases['aliasIncrement'][$this->query->getType()]);
+
+	}
+
+	/**
+	 * Returns the statement, ready to be executed.
+	 *
+	 * @param array $statementParts The SQL statement parts
+	 * @return string The SQL statement
+	 */
+	public function buildQuery(array $statementParts)
+	{
+
+		// Add more statement to the UNION part.
+		if (!empty($statementParts['unions'])) {
+			foreach ($statementParts['unions'] as $tableName => $unionPart) {
+				if (!empty($statementParts['additionalWhereClause'][$tableName])) {
+					$statementParts['unions'][$tableName] .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$tableName]);
+				}
+			}
+		}
+
+		$statement = 'SELECT ' . implode(' ', $statementParts['keywords']) . ' ' . implode(',', $statementParts['fields']) . ' FROM ' . implode(' ', $statementParts['tables']) . ' ' . implode(' ', $statementParts['unions']);
+		if (!empty($statementParts['where'])) {
+			$statement .= ' WHERE ' . implode('', $statementParts['where']);
+			if (!empty($statementParts['additionalWhereClause'][$this->query->getType()])) {
+				$statement .= ' AND ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+			}
+		} elseif (!empty($statementParts['additionalWhereClause'])) {
+			$statement .= ' WHERE ' . implode(' AND ', $statementParts['additionalWhereClause'][$this->query->getType()]);
+		}
+		if (!empty($statementParts['orderings'])) {
+			$statement .= ' ORDER BY ' . implode(', ', $statementParts['orderings']);
+		}
+		if (!empty($statementParts['limit'])) {
+			$statement .= ' LIMIT ' . $statementParts['limit'];
+		}
+
+		return $statement;
+	}
+
+	/**
+	 * Transforms a Query Source into SQL and parameter arrays
+	 *
+	 * @param SourceInterface $source The source
+	 * @param array &$sql
+	 * @return void
+	 */
+	protected function parseSource(SourceInterface $source, array &$sql)
+	{
+		$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 \TYPO3\CMS\Extbase\Persistence\Generic\Qom\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 \TYPO3\CMS\Extbase\Persistence\Generic\Qom\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 \TYPO3\CMS\Extbase\Persistence\Generic\Qom\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 \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException
+	 */
+	protected function getPlainValue($input)
+	{
+		if (is_array($input)) {
+			throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An array could not be converted to a plain value.', 1274799932);
+		}
+		if ($input instanceof \DateTime) {
+			return $input->format('U');
+		} elseif (is_object($input)) {
+			if ($input instanceof \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy) {
+				$realInput = $input->_loadRealInstance();
+			} else {
+				$realInput = $input;
+			}
+			if ($realInput instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
+				return $realInput->getUid();
+			} else {
+				throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "' . get_class($realInput) . '" could not be converted to a plain value.', 1274799934);
+			}
+		} elseif (is_bool($input)) {
+			return $input === true ? 1 : 0;
+		} else {
+			return $input;
+		}
+	}
+
+	/**
+	 * Parse a DynamicOperand into SQL and parameter arrays.
+	 *
+	 * @param DynamicOperandInterface $operand
+	 * @param string $operator One of the JCR_OPERATOR_* constants
+	 * @param SourceInterface $source The source
+	 * @param array &$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 Exception\InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
+		}
+
+		if ($table->field($fieldName)->hasOne()) { // includes relation "one-to-one" and "many-to-one"
+			// sometimes the opposite relation is not defined. We don't want to force this config for backward compatibility reasons.
+			// $parentKeyFieldName === null does the trick somehow. Before condition was if (isset($parentKeyFieldName))
+			if ($table->field($fieldName)->hasRelationManyToOne() || $parentKeyFieldName === null) {
+				$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 ($this->environmentService->isEnvironmentInFrontendMode()) {
+				$statement .= $this->getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted);
+			} else {
+				// TYPO3_MODE === 'BE'
+				$statement .= $this->getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted);
+			}
+
+			// Remove the prefixing "AND" if any.
+			if (!empty($statement)) {
+				$statement = strtolower(substr($statement, 1, 3)) === 'and' ? substr($statement, 5) : $statement;
+				$statementParts['additionalWhereClause'][$tableNameOrAlias][] = $statement;
+			}
+		}
+	}
+
+	/**
+	 * Returns constraint statement for frontend context
+	 *
+	 * @param string $tableNameOrAlias
+	 * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
+	 * @param array $enableFieldsToBeIgnored If $ignoreEnableFields is true, this array specifies enable fields to be ignored. If it is null or an empty array (default) all enable fields are ignored.
+	 * @param boolean $includeDeleted A flag indicating whether deleted records should be included
+	 * @return string
+	 * @throws Exception\InconsistentQuerySettingsException
+	 */
+	protected function getFrontendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $enableFieldsToBeIgnored, $includeDeleted)
+	{
+		$statement = '';
+		$tableName = $this->resolveTableNameAlias($tableNameOrAlias);
+		if ($ignoreEnableFields && !$includeDeleted) {
+			if (count($enableFieldsToBeIgnored)) {
+				// array_combine() is necessary because of the way \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() is implemented
+				$statement .= $this->getPageRepository()->enableFields($tableName, -1, array_combine($enableFieldsToBeIgnored, $enableFieldsToBeIgnored));
+			} else {
+				$statement .= $this->getPageRepository()->deleteClause($tableName);
+			}
+		} elseif (!$ignoreEnableFields && !$includeDeleted) {
+			$statement .= $this->getPageRepository()->enableFields($tableName);
+		} elseif (!$ignoreEnableFields && $includeDeleted) {
+			throw new Exception\InconsistentQuerySettingsException('Query setting "ignoreEnableFields=false" can not be used together with "includeDeleted=true" in frontend context.', 1327678173);
+		}
+		return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
+	}
+
+	/**
+	 * Returns constraint statement for backend context
+	 *
+	 * @param string $tableNameOrAlias
+	 * @param boolean $ignoreEnableFields A flag indicating whether the enable fields should be ignored
+	 * @param boolean $includeDeleted A flag indicating whether deleted records should be included
+	 * @return string
+	 */
+	protected function getBackendConstraintStatement($tableNameOrAlias, $ignoreEnableFields, $includeDeleted)
+	{
+		$tableName = $this->resolveTableNameAlias($tableNameOrAlias);
+		$statement = '';
+		if (!$ignoreEnableFields) {
+			$statement .= BackendUtility::BEenableFields($tableName);
+		}
+
+		// If the table is found to have "workspace" support, add the corresponding fields in the statement.
+		if (Tca::table($tableName)->hasWorkspaceSupport()) {
+			if ($this->getBackendUser()->workspace === 0) {
+				$statement .= ' AND ' . $tableName . '.t3ver_state<=' . new VersionState(VersionState::DEFAULT_STATE);
+			} else {
+				// Show only records of live and of the current workspace
+				// In case we are in a Versioning preview
+				$statement .= ' AND (' .
+					$tableName . '.t3ver_wsid=0 OR ' .
+					$tableName . '.t3ver_wsid=' . (int)$this->getBackendUser()->workspace .
+					')';
+			}
+
+			// Check if this segment make sense here or whether it should be in the "if" part when we have workspace = 0
+			$statement .= ' AND ' . $tableName . '.pid<>-1';
+		}
+
+		if (!$includeDeleted) {
+			$statement .= BackendUtility::deleteClause($tableName);
+		}
+
+		return $this->replaceTableNameByAlias($tableName, $tableNameOrAlias, $statement);
+	}
+
+	/**
+	 * Builds the language field statement
+	 *
+	 * @param string $tableNameOrAlias The database table name
+	 * @param array &$statementParts The query parts
+	 * @param QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
+	 * @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 Exception\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->getQuerySettings()
+			);
+
+			$contentObjects[] = GeneralUtility::makeInstance(
+				\Fab\Vidi\Domain\Model\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 = $GLOBALS['TSFE']->sys_language_mode;
+			if ($this->isBackendUserLogged() && $this->getBackendUser()->workspace !== 0) {
+				$pageRepository->versioningWorkspaceId = $this->getBackendUser()->workspace;
+			}
+		} else {
+			$languageMode = '';
+			$workspaceUid = $this->getBackendUser()->workspace;
+			$pageRepository->versioningWorkspaceId = $workspaceUid;
+			if ($this->getBackendUser()->workspace !== 0) {
+				$pageRepository->versioningPreview = 1;
+			}
+		}
+
+		// If current row is a translation select its parent
+		if (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
+			&& isset($GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField'])
+		) {
+			if (isset($row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']])
+				&& $row[$GLOBALS['TCA'][$tableName]['ctrl']['transOrigPointerField']] > 0
+			) {
+				$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 (TYPO3_MODE !== 'BE') {
+			$pageRepository->versionOL($tableName, $row, true, true);
+		} else {
+			\TYPO3\CMS\Backend\Utility\BackendUtility::workspaceOL($tableName, $row);
+		}
+		if ($pageRepository->versioningPreview && isset($row['_ORIG_uid'])) {
+			$row['uid'] = $row['_ORIG_uid'];
+		}
+
+		// Special case for table "pages"
+		if ($tableName == 'pages') {
+			$row = $pageRepository->getPageOverlay($row, $querySettings->getLanguageUid());
+		} elseif (isset($GLOBALS['TCA'][$tableName]['ctrl']['languageField'])
+			&& $GLOBALS['TCA'][$tableName]['ctrl']['languageField'] !== ''
+		) {
+			if (in_array($row[$GLOBALS['TCA'][$tableName]['ctrl']['languageField']], array(-1, 0))) {
+				$overlayMode = $languageMode === 'strict' ? 'hideNonTranslated' : '';
+				$row = $pageRepository->getRecordOverlay($tableName, $row, $querySettings->getLanguageUid(), $overlayMode);
+			}
+		}
+
+		return $row;
+	}
+
+	/**
+	 * Return a resolved table name given a possible table name alias.
+	 *
+	 * @param string $tableNameOrAlias
+	 * @return string
+	 */
+	protected function resolveTableNameAlias($tableNameOrAlias)
+	{
+		$resolvedTableName = $tableNameOrAlias;
+		if (!empty($this->tableNameAliases['aliases'][$tableNameOrAlias])) {
+			$resolvedTableName = $this->tableNameAliases['aliases'][$tableNameOrAlias];
+		}
+		return $resolvedTableName;
+	}
+
+	/**
+	 * Generate a unique table name alias for the given table name.
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	protected function generateAlias($tableName)
+	{
+
+		if (!isset($this->tableNameAliases['aliasIncrement'][$tableName])) {
+			$this->tableNameAliases['aliasIncrement'][$tableName] = 0;
+		}
+
+		$numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
+		$tableNameAlias = $tableName . $numberOfAliases;
+
+		$this->tableNameAliases['aliasIncrement'][$tableName]++;
+		$this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;
+
+		return $tableNameAlias;
+	}
+
+	/**
+	 * Replace the table names by its table name alias within the given statement.
+	 *
+	 * @param string $tableName
+	 * @param string $tableNameAlias
+	 * @param string $statement
+	 * @return string
+	 */
+	protected function replaceTableNameByAlias($tableName, $tableNameAlias, $statement)
+	{
+		if ($statement && $tableName !== $tableNameAlias) {
+			$statement = str_replace($tableName, $tableNameAlias, $statement);
+		}
+		return $statement;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Tell whether a Backend User is logged in.
+	 *
+	 * @return bool
+	 */
+	protected function isBackendUserLogged()
+	{
+		return is_object($GLOBALS['BE_USER']);
+	}
+
+	/**
+	 * @return PageRepository|object
+	 */
+	protected function getPageRepository()
+	{
+		if (!$this->pageRepository instanceof PageRepository) {
+			if ($this->environmentService->isEnvironmentInFrontendMode() && is_object($GLOBALS['TSFE'])) {
+				$this->pageRepository = $GLOBALS['TSFE']->sys_page;
+			} else {
+				$this->pageRepository = GeneralUtility::makeInstance(PageRepository::class);
+			}
+		}
+
+		return $this->pageRepository;
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\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()
+	}
 
 }

Spacing +37 added lines, -37 removed lines

@@ -127,7 +127,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);
@@ -190,14 +190,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;
 
@@ -236,25 +236,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;
@@ -270,9 +270,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;
@@ -410,7 +410,7 @@ 
             if ($realInput instanceof \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface) {
                 return $realInput->getUid();
             } else {
-                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "' . get_class($realInput) . '" could not be converted to a plain value.', 1274799934);
+                throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnexpectedTypeException('An object of class "'.get_class($realInput).'" could not be converted to a plain value.', 1274799934);
             }
         } elseif (is_bool($input)) {
             return $input === true ? 1 : 0;
@@ -460,9 +460,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)) {
@@ -489,7 +489,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];
         }
@@ -498,16 +498,16 @@ 
         $childTableName = $table->field($fieldName)->getForeignTable();
 
         if ($childTableName === null) {
-            throw new Exception\InvalidRelationConfigurationException('The relation information for property "' . $fieldName . '" of class "' . $tableName . '" is missing.', 1353170925);
+            throw new Exception\InvalidRelationConfigurationException('The relation information for property "'.$fieldName.'" of class "'.$tableName.'" is missing.', 1353170925);
         }
 
         if ($table->field($fieldName)->hasOne()) { // includes relation "one-to-one" and "many-to-one"
             // sometimes the opposite relation is not defined. We don't want to force this config for backward compatibility reasons.
             // $parentKeyFieldName === null does the trick somehow. Before condition was if (isset($parentKeyFieldName))
             if ($table->field($fieldName)->hasRelationManyToOne() || $parentKeyFieldName === null) {
-                $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();
@@ -737,18 +737,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) {
@@ -773,25 +773,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.')';
             }
         }
     }
@@ -836,7 +836,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);
         }
@@ -904,11 +904,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();
@@ -969,7 +969,7 @@ 
         }
 
         $numberOfAliases = $this->tableNameAliases['aliasIncrement'][$tableName];
-        $tableNameAlias = $tableName . $numberOfAliases;
+        $tableNameAlias = $tableName.$numberOfAliases;
 
         $this->tableNameAliases['aliasIncrement'][$tableName]++;
         $this->tableNameAliases['aliases'][$tableNameAlias] = $tableName;

Classes/Service/FileReferenceService.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
     /**
      * Fetch the files given an object assuming
      *
-     * @param $propertyName
+     * @param string $propertyName
      * @param Content $object
      * @return File[]
      */
@@ -99,7 +99,7 @@ 
     }
 
     /**
-     * @return DataService
+     * @return string
      */
     protected function getDataService(): string
     {

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use Fab\Vidi\Utility\BackendUtility;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\SingletonInterface;

Indentation +82 added lines, -82 removed lines

@@ -23,87 +23,87 @@
 class FileReferenceService implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    static protected $instances = [];
-
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Vidi\Service\FileReferenceService|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Service\FileReferenceService::class);
-    }
-
-    /**
-     * @param Content $object
-     * @param string $propertyName
-     * @return File[]
-     */
-    public function findReferencedBy($propertyName, Content $object)
-    {
-
-        if (!isset(self::$instances[$object->getUid()][$propertyName])) {
-
-            // Initialize instances value
-            if (!isset(self::$instances[$object->getUid()])) {
-                self::$instances[$object->getUid()] = [];
-            }
-
-            $fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
-            $field = Tca::table($object->getDataType())->field($fieldName);
-            if ($field->getForeignTable() === 'sys_file_reference') {
-                $files = $this->findByFileReference($propertyName, $object);
-                self::$instances[$object->getUid()][$propertyName] = $files;
-            } else {
-                // @todo the standard way of handling file references is by "sys_file_reference". Let see if there is other use cases...
-            }
-        }
-
-        return self::$instances[$object->getUid()][$propertyName];
-    }
-
-    /**
-     * Fetch the files given an object assuming
-     *
-     * @param $propertyName
-     * @param Content $object
-     * @return File[]
-     */
-    protected function findByFileReference($propertyName, Content $object)
-    {
-
-        $fileField = 'uid_local';
-        $tableName = 'sys_file_reference';
-
-        $rows = $this->getDataService()->getRecords(
-            $tableName,
-            [
-                'tablenames' => $object->getDataType(),
-                'fieldname'=> GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName),
-                'uid_foreign'=> $object->getUid(),
-            ]
-        );
-
-
-        // Build array of Files
-        $files = [];
-        foreach ($rows as $row) {
-            $files[] = ResourceFactory::getInstance()->getFileObject($row[$fileField]);
-        }
-
-        return $files;
-    }
-
-    /**
-     * @return DataService
-     */
-    protected function getDataService(): string
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * @var array
+	 */
+	static protected $instances = [];
+
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Vidi\Service\FileReferenceService|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Service\FileReferenceService::class);
+	}
+
+	/**
+	 * @param Content $object
+	 * @param string $propertyName
+	 * @return File[]
+	 */
+	public function findReferencedBy($propertyName, Content $object)
+	{
+
+		if (!isset(self::$instances[$object->getUid()][$propertyName])) {
+
+			// Initialize instances value
+			if (!isset(self::$instances[$object->getUid()])) {
+				self::$instances[$object->getUid()] = [];
+			}
+
+			$fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
+			$field = Tca::table($object->getDataType())->field($fieldName);
+			if ($field->getForeignTable() === 'sys_file_reference') {
+				$files = $this->findByFileReference($propertyName, $object);
+				self::$instances[$object->getUid()][$propertyName] = $files;
+			} else {
+				// @todo the standard way of handling file references is by "sys_file_reference". Let see if there is other use cases...
+			}
+		}
+
+		return self::$instances[$object->getUid()][$propertyName];
+	}
+
+	/**
+	 * Fetch the files given an object assuming
+	 *
+	 * @param $propertyName
+	 * @param Content $object
+	 * @return File[]
+	 */
+	protected function findByFileReference($propertyName, Content $object)
+	{
+
+		$fileField = 'uid_local';
+		$tableName = 'sys_file_reference';
+
+		$rows = $this->getDataService()->getRecords(
+			$tableName,
+			[
+				'tablenames' => $object->getDataType(),
+				'fieldname'=> GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName),
+				'uid_foreign'=> $object->getUid(),
+			]
+		);
+
+
+		// Build array of Files
+		$files = [];
+		foreach ($rows as $row) {
+			$files[] = ResourceFactory::getInstance()->getFileObject($row[$fileField]);
+		}
+
+		return $files;
+	}
+
+	/**
+	 * @return DataService
+	 */
+	protected function getDataService(): string
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 
 }

ext_localconf.php

Indentation +29 added lines, -29 removed lines

@@ -3,33 +3,33 @@
 
 call_user_func(function () {
 
-    $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-        \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
-    )->get('vidi');
-
-    if (false === isset($configuration['autoload_typoscript']) || true === (bool)$configuration['autoload_typoscript']) {
-
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript(
-            'vidi',
-            'constants',
-            '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:vidi/Configuration/TypoScript/constants.txt">'
-        );
-
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript(
-            'vidi',
-            'setup',
-            '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:vidi/Configuration/TypoScript/setup.txt">'
-        );
-    }
-
-    // Initialize generic Vidi modules after the TCA is loaded.
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['extTablesInclusion-PostProcessing'][] = 'Fab\Vidi\Configuration\VidiModulesAspect';
-
-    // Initialize generic grid TCA for all data types
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['extTablesInclusion-PostProcessing'][] = 'Fab\Vidi\Configuration\TcaGridAspect';
-
-    // cache configuration, see https://docs.typo3.org/typo3cms/CoreApiReference/ApiOverview/CachingFramework/Configuration/Index.html#cache-configurations
-    $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['vidi']['frontend'] = \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class;
-    $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['vidi']['groups'] = array('all', 'vidi');
-    $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['vidi']['options']['defaultLifetime'] = 2592000;
+	$configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+		\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
+	)->get('vidi');
+
+	if (false === isset($configuration['autoload_typoscript']) || true === (bool)$configuration['autoload_typoscript']) {
+
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript(
+			'vidi',
+			'constants',
+			'<INCLUDE_TYPOSCRIPT: source="FILE:EXT:vidi/Configuration/TypoScript/constants.txt">'
+		);
+
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript(
+			'vidi',
+			'setup',
+			'<INCLUDE_TYPOSCRIPT: source="FILE:EXT:vidi/Configuration/TypoScript/setup.txt">'
+		);
+	}
+
+	// Initialize generic Vidi modules after the TCA is loaded.
+	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['extTablesInclusion-PostProcessing'][] = 'Fab\Vidi\Configuration\VidiModulesAspect';
+
+	// Initialize generic grid TCA for all data types
+	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['extTablesInclusion-PostProcessing'][] = 'Fab\Vidi\Configuration\TcaGridAspect';
+
+	// cache configuration, see https://docs.typo3.org/typo3cms/CoreApiReference/ApiOverview/CachingFramework/Configuration/Index.html#cache-configurations
+	$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['vidi']['frontend'] = \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class;
+	$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['vidi']['groups'] = array('all', 'vidi');
+	$GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['vidi']['options']['defaultLifetime'] = 2592000;
 });
\ No newline at end of file

Classes/Module/ModulePidService.php

Indentation +218 added lines, -218 removed lines

@@ -19,223 +19,223 @@
  */
 class ModulePidService
 {
-    /**
-     * The data type (table)
-     *
-     * @var string
-     */
-    protected $dataType = '';
-
-    /**
-     * The page record of the configured pid
-     *
-     * @var array
-     */
-    protected $page = [];
-
-    /**
-     * A collection of speaking error messages why the pid is invalid.
-     *
-     * @var array
-     */
-    protected $errors = [];
-
-    /**
-     * ModulePidService constructor.
-     */
-    public function __construct()
-    {
-        $this->dataType = $this->getModuleLoader()->getDataType();
-    }
-
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Vidi\Module\ModulePidService|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(self::class);
-    }
-
-    /**
-     * @return bool
-     */
-    public function isConfiguredPidValid(): bool
-    {
-        $errors = $this->validateConfiguredPid();
-        return empty($errors);
-    }
-
-    /**
-     * @return array
-     */
-    public function validateConfiguredPid(): array
-    {
-        $configuredPid = $this->getConfiguredNewRecordPid();
-        $this->validateRootLevel($configuredPid);
-        $this->validatePageExist($configuredPid);
-        $this->validateDoktype($configuredPid);
-        return $this->errors;
-    }
-
-    /**
-     * Return the default configured pid.
-     *
-     * @return int
-     */
-    public function getConfiguredNewRecordPid(): int
-    {
-        if (GeneralUtility::_GP(Parameter::PID)) {
-            $configuredPid = (int)GeneralUtility::_GP(Parameter::PID);
-        } else {
-
-            // Get pid from User TSConfig if any.
-            $tsConfigPath = sprintf('tx_vidi.dataType.%s.storagePid', $this->dataType);
-            $result = $this->getBackendUser()->getTSConfig($tsConfigPath);
-            $configuredPid = isset($result['value'])
-                ? $configuredPid = (int)$result['value']
-                : $this->getModuleLoader()->getDefaultPid();
-        }
-
-        return $configuredPid;
-    }
-
-    /**
-     * Check if pid is 0 and given table is allowed on root level.
-     *
-     * @param int $configuredPid
-     * @return void
-     */
-    protected function validateRootLevel(int $configuredPid): void
-    {
-        if ($configuredPid > 0) {
-            return;
-        }
-
-        $isRootLevel = (bool)Tca::table()->get('rootLevel');
-        if (!$isRootLevel) {
-            $this->errors[] = sprintf(
-                'You are not allowed to use page id "0" unless you set $GLOBALS[\'TCA\'][\'%1$s\'][\'ctrl\'][\'rootLevel\'] = 1;',
-                $this->dataType
-            );
-        }
-    }
-
-    /**
-     * Check if a page exists for the configured pid
-     *
-     * @param int $configuredPid
-     * @return void
-     */
-    protected function validatePageExist(int $configuredPid): void
-    {
-        if ($configuredPid === 0) {
-            return;
-        }
-
-        $page = $this->getPage($configuredPid);
-        if (empty($page)) {
-            $this->errors[] = sprintf(
-                'No page found for the configured page id "%s".',
-                $configuredPid
-            );
-        }
-    }
-
-    /**
-     * Check if configured page is a sysfolder and if it is allowed.
-     *
-     * @param int $configuredPid
-     * @return void
-     */
-    protected function validateDoktype(int $configuredPid): void
-    {
-        if ($configuredPid === 0) {
-            return;
-        }
-
-        $page = $this->getPage($configuredPid);
-        if (!empty($page)
-            && (int)$page['doktype'] !== PageRepository::DOKTYPE_SYSFOLDER
-            && !$this->isTableAllowedOnStandardPages()
-            && $this->getModuleLoader()->hasComponentInDocHeader(\Fab\Vidi\View\Button\NewButton::class)) {
-            $this->errors[] = sprintf(
-                'The page with the id "%s" either has to be of the type "folder" (doktype=254) or the table "%s" has to be allowed on standard pages.',
-                $configuredPid,
-                $this->dataType
-            );
-        }
-    }
-
-    /**
-     * Check if given table is allowed on standard pages
-     *
-     * @return bool
-     * @see \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages()
-     */
-    protected function isTableAllowedOnStandardPages(): bool
-    {
-        $allowedTables = explode(',', $GLOBALS['PAGES_TYPES']['default']['allowedTables']);
-        return in_array($this->dataType, $allowedTables, true);
-    }
-
-    /**
-     * Returns the page record of the configured pid
-     *
-     * @param int $configuredPid
-     * @return array
-     */
-    protected function getPage(int $configuredPid): ?array
-    {
-        if ($this->page !== null) {
-            return $this->page;
-        }
-
-        $query = $this->getQueryBuilder('pages');
-        $query->getRestrictions()->removeAll(); // we are in BE context.
-
-        $page = $query->select('doktype')
-            ->from('pages')
-            ->where('deleted = 0',
-                'uid = ' . $configuredPid)
-            ->execute()
-            ->fetch();
-
-        return is_array($page)
-            ? $page
-            : [];
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	/**
+	 * The data type (table)
+	 *
+	 * @var string
+	 */
+	protected $dataType = '';
+
+	/**
+	 * The page record of the configured pid
+	 *
+	 * @var array
+	 */
+	protected $page = [];
+
+	/**
+	 * A collection of speaking error messages why the pid is invalid.
+	 *
+	 * @var array
+	 */
+	protected $errors = [];
+
+	/**
+	 * ModulePidService constructor.
+	 */
+	public function __construct()
+	{
+		$this->dataType = $this->getModuleLoader()->getDataType();
+	}
+
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Vidi\Module\ModulePidService|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(self::class);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isConfiguredPidValid(): bool
+	{
+		$errors = $this->validateConfiguredPid();
+		return empty($errors);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function validateConfiguredPid(): array
+	{
+		$configuredPid = $this->getConfiguredNewRecordPid();
+		$this->validateRootLevel($configuredPid);
+		$this->validatePageExist($configuredPid);
+		$this->validateDoktype($configuredPid);
+		return $this->errors;
+	}
+
+	/**
+	 * Return the default configured pid.
+	 *
+	 * @return int
+	 */
+	public function getConfiguredNewRecordPid(): int
+	{
+		if (GeneralUtility::_GP(Parameter::PID)) {
+			$configuredPid = (int)GeneralUtility::_GP(Parameter::PID);
+		} else {
+
+			// Get pid from User TSConfig if any.
+			$tsConfigPath = sprintf('tx_vidi.dataType.%s.storagePid', $this->dataType);
+			$result = $this->getBackendUser()->getTSConfig($tsConfigPath);
+			$configuredPid = isset($result['value'])
+				? $configuredPid = (int)$result['value']
+				: $this->getModuleLoader()->getDefaultPid();
+		}
+
+		return $configuredPid;
+	}
+
+	/**
+	 * Check if pid is 0 and given table is allowed on root level.
+	 *
+	 * @param int $configuredPid
+	 * @return void
+	 */
+	protected function validateRootLevel(int $configuredPid): void
+	{
+		if ($configuredPid > 0) {
+			return;
+		}
+
+		$isRootLevel = (bool)Tca::table()->get('rootLevel');
+		if (!$isRootLevel) {
+			$this->errors[] = sprintf(
+				'You are not allowed to use page id "0" unless you set $GLOBALS[\'TCA\'][\'%1$s\'][\'ctrl\'][\'rootLevel\'] = 1;',
+				$this->dataType
+			);
+		}
+	}
+
+	/**
+	 * Check if a page exists for the configured pid
+	 *
+	 * @param int $configuredPid
+	 * @return void
+	 */
+	protected function validatePageExist(int $configuredPid): void
+	{
+		if ($configuredPid === 0) {
+			return;
+		}
+
+		$page = $this->getPage($configuredPid);
+		if (empty($page)) {
+			$this->errors[] = sprintf(
+				'No page found for the configured page id "%s".',
+				$configuredPid
+			);
+		}
+	}
+
+	/**
+	 * Check if configured page is a sysfolder and if it is allowed.
+	 *
+	 * @param int $configuredPid
+	 * @return void
+	 */
+	protected function validateDoktype(int $configuredPid): void
+	{
+		if ($configuredPid === 0) {
+			return;
+		}
+
+		$page = $this->getPage($configuredPid);
+		if (!empty($page)
+			&& (int)$page['doktype'] !== PageRepository::DOKTYPE_SYSFOLDER
+			&& !$this->isTableAllowedOnStandardPages()
+			&& $this->getModuleLoader()->hasComponentInDocHeader(\Fab\Vidi\View\Button\NewButton::class)) {
+			$this->errors[] = sprintf(
+				'The page with the id "%s" either has to be of the type "folder" (doktype=254) or the table "%s" has to be allowed on standard pages.',
+				$configuredPid,
+				$this->dataType
+			);
+		}
+	}
+
+	/**
+	 * Check if given table is allowed on standard pages
+	 *
+	 * @return bool
+	 * @see \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages()
+	 */
+	protected function isTableAllowedOnStandardPages(): bool
+	{
+		$allowedTables = explode(',', $GLOBALS['PAGES_TYPES']['default']['allowedTables']);
+		return in_array($this->dataType, $allowedTables, true);
+	}
+
+	/**
+	 * Returns the page record of the configured pid
+	 *
+	 * @param int $configuredPid
+	 * @return array
+	 */
+	protected function getPage(int $configuredPid): ?array
+	{
+		if ($this->page !== null) {
+			return $this->page;
+		}
+
+		$query = $this->getQueryBuilder('pages');
+		$query->getRestrictions()->removeAll(); // we are in BE context.
+
+		$page = $query->select('doktype')
+			->from('pages')
+			->where('deleted = 0',
+				'uid = ' . $configuredPid)
+			->execute()
+			->fetch();
+
+		return is_array($page)
+			? $page
+			: [];
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 
 }

Classes/Module/ModulePreferences.php

Indentation +216 added lines, -216 removed lines

@@ -18,221 +18,221 @@
 class ModulePreferences implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $preferences;
-
-    /**
-     * @var string
-     */
-    protected $tableName = 'tx_vidi_preference';
-
-    /**
-     * @param string $key
-     * @param string $dataType
-     * @return mixed
-     */
-    public function get($key, $dataType = '')
-    {
-
-        if (empty($dataType)) {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-
-        if (!$this->isLoaded($dataType)) {
-            $this->load($dataType);
-        }
-
-        $value = empty($this->preferences[$dataType][$key]) ? null : $this->preferences[$dataType][$key];
-        return $value;
-    }
-
-    /**
-     * Tell whether the module is loaded.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    public function isLoaded($dataType)
-    {
-        return !empty($this->preferences[$dataType]);
-    }
-
-    /**
-     * @param string $dataType
-     * @return array
-     */
-    public function getAll($dataType = '')
-    {
-
-        if (empty($dataType)) {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-        $this->load($dataType);
-        return $this->preferences[$dataType];
-    }
-
-    /**
-     * Get the md5 signature of the preferences.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    public function getSignature($dataType = '')
-    {
-        $preferences = $this->getAll($dataType);
-        return md5(serialize($preferences));
-    }
-
-    /**
-     * Load preferences.
-     *
-     * @param string $dataType
-     * @return void
-     */
-    public function load($dataType)
-    {
-
-        // Fetch preferences from different sources and overlay them
-        $databasePreferences = $this->fetchPreferencesFromDatabase($dataType);
-        $generalPreferences = $this->fetchGlobalPreferencesFromTypoScript();
-        $specificPreferences = $this->fetchExtraPreferencesFromTypoScript($dataType);
-
-        $preferences = array_merge($generalPreferences, $specificPreferences, $databasePreferences);
-        $this->preferences[$dataType] = $preferences;
-    }
-
-    /**
-     * Save preferences
-     *
-     * @param array $preferences
-     * @return void
-     */
-    public function save($preferences)
-    {
-        $configurableParts = ConfigurablePart::getParts();
-
-        $dataType = $this->getModuleLoader()->getDataType();
-        $this->getDataService()->delete(
-            $this->tableName,
-            [
-                'data_type' => $dataType
-            ]
-        );
-
-        $sanitizedPreferences = [];
-        foreach ($preferences as $key => $value) {
-            if (in_array($key, $configurableParts)) {
-                $sanitizedPreferences[$key] = $value;
-            }
-        }
-
-        $this->getDataService()->insert(
-            $this->tableName,
-            [
-                'data_type' => $dataType,
-                'preferences' => serialize($sanitizedPreferences),
-            ]
-        );
-    }
-
-    /**
-     * @param $dataType
-     * @return array
-     */
-    public function fetchPreferencesFromDatabase($dataType)
-    {
-        $preferences = [];
-        $record = $this->getDataService()->getRecord(
-            $this->tableName,
-            [
-                'data_type' => $dataType
-            ]
-        );
-
-        if (!empty($record)) {
-            $preferences = unserialize($record['preferences']);
-        }
-
-        return $preferences;
-    }
-
-    /**
-     * Returns the module settings.
-     *
-     * @return array
-     */
-    protected function fetchGlobalPreferencesFromTypoScript()
-    {
-        $settings = $this->getSettings();
-
-        $configurableParts = ConfigurablePart::getParts();
-        $preferences = [];
-        foreach ($settings as $key => $value) {
-            if (in_array($key, $configurableParts)) {
-                $preferences[$key] = $value;
-            }
-        }
-
-        return $preferences;
-    }
-
-    /**
-     * Returns the module settings.
-     *
-     * @param string $dataType
-     * @return array
-     */
-    protected function fetchExtraPreferencesFromTypoScript($dataType)
-    {
-        $generalSettings = $this->getSettings();
-
-        $preferences = [];
-        if (isset($generalSettings[$dataType . '.'])) {
-            $settings = $generalSettings[$dataType . '.'];
-
-            $configurableParts = ConfigurablePart::getParts();
-            foreach ($settings as $key => $value) {
-                if (in_array($key, $configurableParts)) {
-                    $preferences[$key] = $value;
-                }
-            }
-        }
-
-        return $preferences;
-    }
-
-    /**
-     * Returns the module settings.
-     *
-     * @return array
-     */
-    protected function getSettings()
-    {
-        /** @var \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager $backendConfigurationManager */
-        $objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-        $backendConfigurationManager = $objectManager->get(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class);
-        $configuration = $backendConfigurationManager->getTypoScriptSetup();
-        return $configuration['module.']['tx_vidi.']['settings.'];
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $preferences;
+
+	/**
+	 * @var string
+	 */
+	protected $tableName = 'tx_vidi_preference';
+
+	/**
+	 * @param string $key
+	 * @param string $dataType
+	 * @return mixed
+	 */
+	public function get($key, $dataType = '')
+	{
+
+		if (empty($dataType)) {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+
+		if (!$this->isLoaded($dataType)) {
+			$this->load($dataType);
+		}
+
+		$value = empty($this->preferences[$dataType][$key]) ? null : $this->preferences[$dataType][$key];
+		return $value;
+	}
+
+	/**
+	 * Tell whether the module is loaded.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	public function isLoaded($dataType)
+	{
+		return !empty($this->preferences[$dataType]);
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return array
+	 */
+	public function getAll($dataType = '')
+	{
+
+		if (empty($dataType)) {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+		$this->load($dataType);
+		return $this->preferences[$dataType];
+	}
+
+	/**
+	 * Get the md5 signature of the preferences.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	public function getSignature($dataType = '')
+	{
+		$preferences = $this->getAll($dataType);
+		return md5(serialize($preferences));
+	}
+
+	/**
+	 * Load preferences.
+	 *
+	 * @param string $dataType
+	 * @return void
+	 */
+	public function load($dataType)
+	{
+
+		// Fetch preferences from different sources and overlay them
+		$databasePreferences = $this->fetchPreferencesFromDatabase($dataType);
+		$generalPreferences = $this->fetchGlobalPreferencesFromTypoScript();
+		$specificPreferences = $this->fetchExtraPreferencesFromTypoScript($dataType);
+
+		$preferences = array_merge($generalPreferences, $specificPreferences, $databasePreferences);
+		$this->preferences[$dataType] = $preferences;
+	}
+
+	/**
+	 * Save preferences
+	 *
+	 * @param array $preferences
+	 * @return void
+	 */
+	public function save($preferences)
+	{
+		$configurableParts = ConfigurablePart::getParts();
+
+		$dataType = $this->getModuleLoader()->getDataType();
+		$this->getDataService()->delete(
+			$this->tableName,
+			[
+				'data_type' => $dataType
+			]
+		);
+
+		$sanitizedPreferences = [];
+		foreach ($preferences as $key => $value) {
+			if (in_array($key, $configurableParts)) {
+				$sanitizedPreferences[$key] = $value;
+			}
+		}
+
+		$this->getDataService()->insert(
+			$this->tableName,
+			[
+				'data_type' => $dataType,
+				'preferences' => serialize($sanitizedPreferences),
+			]
+		);
+	}
+
+	/**
+	 * @param $dataType
+	 * @return array
+	 */
+	public function fetchPreferencesFromDatabase($dataType)
+	{
+		$preferences = [];
+		$record = $this->getDataService()->getRecord(
+			$this->tableName,
+			[
+				'data_type' => $dataType
+			]
+		);
+
+		if (!empty($record)) {
+			$preferences = unserialize($record['preferences']);
+		}
+
+		return $preferences;
+	}
+
+	/**
+	 * Returns the module settings.
+	 *
+	 * @return array
+	 */
+	protected function fetchGlobalPreferencesFromTypoScript()
+	{
+		$settings = $this->getSettings();
+
+		$configurableParts = ConfigurablePart::getParts();
+		$preferences = [];
+		foreach ($settings as $key => $value) {
+			if (in_array($key, $configurableParts)) {
+				$preferences[$key] = $value;
+			}
+		}
+
+		return $preferences;
+	}
+
+	/**
+	 * Returns the module settings.
+	 *
+	 * @param string $dataType
+	 * @return array
+	 */
+	protected function fetchExtraPreferencesFromTypoScript($dataType)
+	{
+		$generalSettings = $this->getSettings();
+
+		$preferences = [];
+		if (isset($generalSettings[$dataType . '.'])) {
+			$settings = $generalSettings[$dataType . '.'];
+
+			$configurableParts = ConfigurablePart::getParts();
+			foreach ($settings as $key => $value) {
+				if (in_array($key, $configurableParts)) {
+					$preferences[$key] = $value;
+				}
+			}
+		}
+
+		return $preferences;
+	}
+
+	/**
+	 * Returns the module settings.
+	 *
+	 * @return array
+	 */
+	protected function getSettings()
+	{
+		/** @var \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager $backendConfigurationManager */
+		$objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+		$backendConfigurationManager = $objectManager->get(\TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager::class);
+		$configuration = $backendConfigurationManager->getTypoScriptSetup();
+		return $configuration['module.']['tx_vidi.']['settings.'];
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 
 }

Classes/ViewHelpers/Result/AbstractToFormatViewHelper.php

Indentation +158 added lines, -158 removed lines

@@ -23,163 +23,163 @@
 abstract class AbstractToFormatViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Store fields of type "file".
-     *
-     * @var array
-     */
-    protected $fileTypeProperties = [];
-
-    /**
-     * @var File[]
-     */
-    protected $collectedFiles = [];
-
-    /**
-     * @var string
-     */
-    protected $exportFileNameAndPath;
-
-    /**
-     * @var string
-     */
-    protected $zipFileNameAndPath;
-
-    /**
-     * @var string
-     */
-    protected $temporaryDirectory;
-
-
-    /**
-     * Write the zip file to a temporary location.
-     *
-     * @return void
-     * @throws \RuntimeException
-     */
-    protected function writeZipFile()
-    {
-
-        $zip = new \ZipArchive();
-        $zip->open($this->zipFileNameAndPath, \ZipArchive::CREATE);
-
-        // Add the CSV content into the zipball.
-        $zip->addFile($this->exportFileNameAndPath, basename($this->exportFileNameAndPath));
-
-        // Add the files into the zipball.
-        foreach ($this->collectedFiles as $file) {
-            $zip->addFile($file->getForLocalProcessing(false), $file->getIdentifier());
-        }
-
-        $zip->close();
-    }
-
-    /**
-     * Initialize some properties
-     *
-     * @param array $objects
-     * @return void
-     */
-    protected function initializeEnvironment(array $objects)
-    {
-
-        /** @var \Fab\Vidi\Domain\Model\Content $object */
-        $object = reset($objects);
-
-        $this->temporaryDirectory = PATH_site . 'typo3temp/' . uniqid() . '/';
-        GeneralUtility::mkdir($this->temporaryDirectory);
-
-        // Compute file name and path variable
-        $this->exportFileNameAndPath = $this->temporaryDirectory . $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']);
-
-        // Compute file name and path variable for zip
-        $zipFileName = $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']) . '.zip';
-        $this->zipFileNameAndPath = $this->temporaryDirectory . $zipFileName;
-    }
-
-    /**
-     * Fetch the files given an object.
-     *
-     * @param \Fab\Vidi\Domain\Model\Content $object
-     * @return void
-     */
-    protected function collectFiles(Content $object)
-    {
-        foreach ($this->fileTypeProperties as $property) {
-            $files = FileReferenceService::getInstance()->findReferencedBy($property, $object);
-            foreach ($files as $file) {
-                $this->collectedFiles[$file->getUid()] = $file;
-            }
-        }
-    }
-
-    /**
-     * Tells whether the object has fields containing files.
-     *
-     * @return boolean
-     */
-    protected function hasCollectedFiles()
-    {
-        return !empty($this->collectedFiles);
-    }
-
-    /**
-     * Tells whether the object has fields containing files.
-     *
-     * @return boolean
-     */
-    protected function hasFileFields()
-    {
-        return !empty($this->fileTypeProperties);
-    }
-
-    /**
-     * Check whether the given object is meant to include files in some fields.
-     *
-     * @param Content $object
-     * @return void
-     * @throws \Fab\Vidi\Exception\NotExistingClassException
-     */
-    protected function checkWhetherObjectMayIncludeFiles(Content $object)
-    {
-        if (Tca::grid($object->getDataType())->areFilesIncludedInExport()) {
-            foreach ($object->toFields() as $fieldName) {
-                $fieldType = Tca::table($object->getDataType())->field($fieldName)->getType();
-
-                if ($fieldType === FieldType::FILE) {
-                    $this->fileTypeProperties[] = GeneralUtility::camelCaseToLowerCaseUnderscored($fieldName);
-                }
-            }
-        }
-    }
-
-    /**
-     * @return void
-     * @throws \InvalidArgumentException
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    protected function sendZipHttpHeaders()
-    {
-        /** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->setHeader('Pragma', 'public');
-        $response->setHeader('Expires', '0');
-        $response->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
-        $response->setHeader('Content-Type', 'application/zip');
-        $response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->zipFileNameAndPath) . '"');
-        $response->setHeader('Content-Length', filesize($this->zipFileNameAndPath));
-        $response->setHeader('Content-Description', 'File Transfer');
-        $response->setHeader('Content-Transfer-Encoding', 'binary');
-
-        $response->sendHeaders();
-    }
-
-    /**
-     * @return Rows|object
-     */
-    protected function getRowsView()
-    {
-        return GeneralUtility::makeInstance(Rows::class);
-    }
+	/**
+	 * Store fields of type "file".
+	 *
+	 * @var array
+	 */
+	protected $fileTypeProperties = [];
+
+	/**
+	 * @var File[]
+	 */
+	protected $collectedFiles = [];
+
+	/**
+	 * @var string
+	 */
+	protected $exportFileNameAndPath;
+
+	/**
+	 * @var string
+	 */
+	protected $zipFileNameAndPath;
+
+	/**
+	 * @var string
+	 */
+	protected $temporaryDirectory;
+
+
+	/**
+	 * Write the zip file to a temporary location.
+	 *
+	 * @return void
+	 * @throws \RuntimeException
+	 */
+	protected function writeZipFile()
+	{
+
+		$zip = new \ZipArchive();
+		$zip->open($this->zipFileNameAndPath, \ZipArchive::CREATE);
+
+		// Add the CSV content into the zipball.
+		$zip->addFile($this->exportFileNameAndPath, basename($this->exportFileNameAndPath));
+
+		// Add the files into the zipball.
+		foreach ($this->collectedFiles as $file) {
+			$zip->addFile($file->getForLocalProcessing(false), $file->getIdentifier());
+		}
+
+		$zip->close();
+	}
+
+	/**
+	 * Initialize some properties
+	 *
+	 * @param array $objects
+	 * @return void
+	 */
+	protected function initializeEnvironment(array $objects)
+	{
+
+		/** @var \Fab\Vidi\Domain\Model\Content $object */
+		$object = reset($objects);
+
+		$this->temporaryDirectory = PATH_site . 'typo3temp/' . uniqid() . '/';
+		GeneralUtility::mkdir($this->temporaryDirectory);
+
+		// Compute file name and path variable
+		$this->exportFileNameAndPath = $this->temporaryDirectory . $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']);
+
+		// Compute file name and path variable for zip
+		$zipFileName = $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']) . '.zip';
+		$this->zipFileNameAndPath = $this->temporaryDirectory . $zipFileName;
+	}
+
+	/**
+	 * Fetch the files given an object.
+	 *
+	 * @param \Fab\Vidi\Domain\Model\Content $object
+	 * @return void
+	 */
+	protected function collectFiles(Content $object)
+	{
+		foreach ($this->fileTypeProperties as $property) {
+			$files = FileReferenceService::getInstance()->findReferencedBy($property, $object);
+			foreach ($files as $file) {
+				$this->collectedFiles[$file->getUid()] = $file;
+			}
+		}
+	}
+
+	/**
+	 * Tells whether the object has fields containing files.
+	 *
+	 * @return boolean
+	 */
+	protected function hasCollectedFiles()
+	{
+		return !empty($this->collectedFiles);
+	}
+
+	/**
+	 * Tells whether the object has fields containing files.
+	 *
+	 * @return boolean
+	 */
+	protected function hasFileFields()
+	{
+		return !empty($this->fileTypeProperties);
+	}
+
+	/**
+	 * Check whether the given object is meant to include files in some fields.
+	 *
+	 * @param Content $object
+	 * @return void
+	 * @throws \Fab\Vidi\Exception\NotExistingClassException
+	 */
+	protected function checkWhetherObjectMayIncludeFiles(Content $object)
+	{
+		if (Tca::grid($object->getDataType())->areFilesIncludedInExport()) {
+			foreach ($object->toFields() as $fieldName) {
+				$fieldType = Tca::table($object->getDataType())->field($fieldName)->getType();
+
+				if ($fieldType === FieldType::FILE) {
+					$this->fileTypeProperties[] = GeneralUtility::camelCaseToLowerCaseUnderscored($fieldName);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	protected function sendZipHttpHeaders()
+	{
+		/** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->setHeader('Pragma', 'public');
+		$response->setHeader('Expires', '0');
+		$response->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
+		$response->setHeader('Content-Type', 'application/zip');
+		$response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->zipFileNameAndPath) . '"');
+		$response->setHeader('Content-Length', filesize($this->zipFileNameAndPath));
+		$response->setHeader('Content-Description', 'File Transfer');
+		$response->setHeader('Content-Transfer-Encoding', 'binary');
+
+		$response->sendHeaders();
+	}
+
+	/**
+	 * @return Rows|object
+	 */
+	protected function getRowsView()
+	{
+		return GeneralUtility::makeInstance(Rows::class);
+	}
 
 }