fabarea / vidi

Classes/Controller/Backend/ContentController.php

Doc Comments +4 added lines, -4 removed lines

@@ -740,11 +740,11 @@
      * Signal that is called for post-processing content data send to the server for update.
      *
      * @param Content $contentObject
-     * @param $fieldNameAndPath
+     * @param string $fieldNameAndPath
      * @param $contentData
-     * @param $counter
-     * @param $savingBehavior
-     * @param $language
+     * @param integer $counter
+     * @param string $savingBehavior
+     * @param integer $language
      * @return ProcessContentDataSignalArguments
      * @signal
      */

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 
 use Fab\Vidi\Tca\FieldType;
 use Fab\Vidi\View\Grid\Row;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\HttpUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;

Indentation +764 added lines, -764 removed lines

@@ -37,769 +37,769 @@
 class ContentController extends ActionController
 {
 
-    /**
-     * @var \TYPO3\CMS\Core\Page\PageRenderer
-     * @inject
-     */
-    protected $pageRenderer;
-
-    /**
-     * @var \Fab\Vidi\Domain\Repository\SelectionRepository
-     * @inject
-     */
-    protected $selectionRepository;
-
-    /**
-     * Initialize every action.
-     */
-    public function initializeAction()
-    {
-        $this->pageRenderer->addInlineLanguageLabelFile('EXT:vidi/Resources/Private/Language/locallang.xlf');
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('columns')) {
-
-            /** @var \Fab\Vidi\TypeConverter\CsvToArrayConverter $typeConverter */
-            $typeConverter = $this->objectManager->get('Fab\Vidi\TypeConverter\CsvToArrayConverter');
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('columns')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * List action for this controller.
-     *
-     * @return void
-     */
-    public function indexAction()
-    {
-        $dataType = $this->getModuleLoader()->getDataType();
-        $selections = $this->selectionRepository->findByDataTypeForCurrentBackendUser($dataType);
-        $this->view->assign('selections', $selections);
-
-        $columns = Tca::grid()->getFields();
-        $this->view->assign('columns', $columns);
-        $this->view->assign('numberOfColumns', count($columns));
-    }
-
-    /**
-     * List Row action for this controller. Output a json list of contents
-     *
-     * @param array $columns corresponds to columns to be rendered.
-     * @param array $matches
-     * @validate $columns Fab\Vidi\Domain\Validator\ColumnsValidator
-     * @validate $matches Fab\Vidi\Domain\Validator\MatchesValidator
-     * @return void
-     */
-    public function listAction(array $columns = array(), $matches = array())
-    {
-        // Initialize some objects related to the query.
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
-        $order = OrderObjectFactory::getInstance()->getOrder();
-        $pager = PagerObjectFactory::getInstance()->getPager();
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher, $order, $pager->getLimit(), $pager->getOffset());
-        $pager->setCount($contentService->getNumberOfObjects());
-
-        // Assign values.
-        $this->view->assign('columns', $columns);
-        $this->view->assign('objects', $contentService->getObjects());
-        $this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
-        $this->view->assign('pager', $pager);
-        $this->view->assign('response', $this->response);
-    }
-
-    /**
-     * Retrieve Content objects first according to matching criteria and then "update" them.
-     * Important to notice the field name can contains a path, e.g. metadata.title and therefore must be analysed.
-     *
-     * Possible values for $matches:
-     * -----------------------------
-     *
-     * $matches = array(uid => 1), will be taken as $query->equals
-     * $matches = array(uid => 1,2,3), will be taken as $query->in
-     * $matches = array(field_name1 => bar, field_name2 => bax), will be separated by AND.
-     *
-     * Possible values for $content:
-     * -----------------------------
-     *
-     * $content = array(field_name => bar)
-     * $content = array(field_name => array(value1, value2)) <-- will be CSV converted by "value1,value2"
-     *
-     * @param string $fieldNameAndPath
-     * @param array $content
-     * @param array $matches
-     * @param string $savingBehavior
-     * @param int $language
-     * @param array $columns
-     * @return string
-     * @throws \Fab\Vidi\Exception\InvalidKeyInArrayException
-     */
-    public function updateAction($fieldNameAndPath, array $content, array $matches = array(), $savingBehavior = SavingBehavior::REPLACE, $language = 0, $columns = array())
-    {
-
-        // Instantiate the Matcher object according different rules.
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
-        $order = OrderObjectFactory::getInstance()->getOrder();
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher, $order);
-
-        // Get the real field that is going to be updated.
-        $updatedFieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
-
-        // Get result object for storing data along the processing.
-        $result = $this->getJsonResult();
-        $result->setNumberOfObjects($contentService->getNumberOfObjects());
-
-        foreach ($contentService->getObjects() as $index => $object) {
-
-            $identifier = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, 'uid', $language);
-
-            // It could be the identifier is not found because the translation
-            // of the record does not yet exist when mass-editing
-            if ((int)$identifier <= 0) {
-                continue;
-            }
-
-            $dataType = $this->getContentObjectResolver()->getDataType($object, $fieldNameAndPath);
-
-            $signalResult = $this->emitProcessContentDataSignal($object, $fieldNameAndPath, $content, $index + 1, $savingBehavior, $language);
-            $contentData = $signalResult->getContentData();
-
-            // Add identifier to content data, required by TCEMain.
-            $contentData['uid'] = $identifier;
-
-            /** @var Content $dataObject */
-            $dataObject = GeneralUtility::makeInstance('Fab\Vidi\Domain\Model\Content', $dataType, $contentData);
-
-            // Properly update object.
-            ContentRepositoryFactory::getInstance($dataType)->update($dataObject);
-
-            // Get the possible error messages and store them.
-            $errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
-            $result->addErrorMessages($errorMessages);
-
-            // We only want to see the detail result if there is one object updated.
-            // Required for inline editing + it will display some useful info on the GUI in the flash messages.
-            if ($contentService->getNumberOfObjects() === 1) {
-
-                // Fetch the updated object from repository.
-                $updatedObject = ContentRepositoryFactory::getInstance()->findByUid($object->getUid());
-
-                // Re-fetch the updated result.
-                $updatedResult = $this->getContentObjectResolver()->getValue($updatedObject, $fieldNameAndPath, $updatedFieldName, $language);
-                if (is_array($updatedResult)) {
-                    $_updatedResult = array(); // reset result set.
-
-                    /** @var Content $contentObject */
-                    foreach ($updatedResult as $contentObject) {
-                        $labelField = Tca::table($contentObject)->getLabelField();
-                        $values = array(
-                            'uid' => $contentObject->getUid(),
-                            'name' => $contentObject[$labelField],
-                        );
-                        $_updatedResult[] = $values;
-                    }
-
-                    $updatedResult = $_updatedResult;
-                }
-
-                $labelField = Tca::table($object)->getLabelField();
-
-                $processedObjectData = array(
-                    'uid' => $object->getUid(),
-                    'name' => $object[$labelField],
-                    'updatedField' => $fieldNameAndPath,
-                    'updatedValue' => $updatedResult,
-                );
-                $result->setProcessedObject($processedObjectData);
-
-                if (!empty($columns)) {
-                    /** @var Row $row */
-                    $row = GeneralUtility::makeInstance('Fab\Vidi\View\Grid\Row', $columns);
-                    $result->setRow($row->render($updatedObject));
-                }
-            }
-        }
-
-        // Set the result and render the JSON view.
-        $this->getJsonView()->setResult($result);
-        return $this->getJsonView()->render();
-    }
-
-    /**
-     * Set the sorting of a record giving the previous object.
-     *
-     * @param array $matches
-     * @param int $previousIdentifier
-     * @return string
-     */
-    public function sortAction(array $matches = array(), $previousIdentifier = NULL)
-    {
-
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        // Compute the label field name of the table.
-        $tableTitleField = Tca::table()->getLabelField();
-
-        // Get result object for storing data along the processing.
-        $result = $this->getJsonResult();
-        $result->setNumberOfObjects($contentService->getNumberOfObjects());
-
-        foreach ($contentService->getObjects() as $object) {
-
-            // Store the first object, so that the "action" message can be more explicit when deleting only one record.
-            if ($contentService->getNumberOfObjects() === 1) {
-                $tableTitleValue = $object[$tableTitleField];
-                $processedObjectData = array(
-                    'uid' => $object->getUid(),
-                    'name' => $tableTitleValue,
-                );
-                $result->setProcessedObject($processedObjectData);
-            }
-
-            // The $target corresponds to the pid to move the records to.
-            // It can also be a negative value in case of sorting. The negative value would be the uid of its predecessor.
-            $target = is_null($previousIdentifier) ? $object->getPid() : (-(int)$previousIdentifier);
-
-            // Work out the object.
-            ContentRepositoryFactory::getInstance()->move($object, $target);
-
-            // Get the possible error messages and store them.
-            $errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
-            $result->addErrorMessages($errorMessages);
-        }
-
-        // Set the result and render the JSON view.
-        $this->getJsonView()->setResult($result);
-        return $this->getJsonView()->render();
-    }
-
-    /**
-     * Returns an editing form for a given field name of a Content object.
-     * Argument $fieldNameAndPath corresponds to the field name to be edited.
-     * Important to notice it can contains a path, e.g. metadata.title and therefore must be analysed.
-     *
-     * Possible values for $matches, refer to method "updateAction".
-     *
-     * @param string $fieldNameAndPath
-     * @param array $matches
-     * @param bool $hasRecursiveSelection
-     * @throws \Exception
-     */
-    public function editAction($fieldNameAndPath, array $matches = array(), $hasRecursiveSelection = FALSE)
-    {
-
-        // Instantiate the Matcher object according different rules.
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
-        $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
-
-        $fieldType = Tca::table($dataType)->field($fieldName)->getType();
-        $this->view->assign('fieldType', ucfirst($fieldType));
-        $this->view->assign('dataType', $dataType);
-        $this->view->assign('fieldName', $fieldName);
-        $this->view->assign('matches', $matches);
-        $this->view->assign('fieldNameAndPath', $fieldNameAndPath);
-        $this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
-        $this->view->assign('hasRecursiveSelection', $hasRecursiveSelection);
-        $this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
-
-        // Fetch content and its relations.
-        if ($fieldType === FieldType::MULTISELECT) {
-
-            $object = ContentRepositoryFactory::getInstance()->findOneBy($matcher);
-            $identifier = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, 'uid');
-            $dataType = $this->getContentObjectResolver()->getDataType($object, $fieldNameAndPath);
-
-            $content = ContentRepositoryFactory::getInstance($dataType)->findByUid($identifier);
-
-            // Makes sure the object was retrieved. Security!
-            if (!$content) {
-                $message = sprintf('I could not retrieved content object of type "%s" with identifier %s.', $dataType, $identifier);
-                throw new \Exception($message, 1402350182);
-            }
-
-            $relatedDataType = Tca::table($dataType)->field($fieldName)->getForeignTable();
-
-            // Initialize the matcher object.
-            /** @var \Fab\Vidi\Persistence\Matcher $matcher */
-            $matcher = GeneralUtility::makeInstance('Fab\Vidi\Persistence\Matcher', array(), $relatedDataType);
-
-            // Default ordering for related data type.
-            $defaultOrderings = Tca::table($relatedDataType)->getDefaultOrderings();
-            /** @var \Fab\Vidi\Persistence\Order $order */
-            $defaultOrder = GeneralUtility::makeInstance('Fab\Vidi\Persistence\Order', $defaultOrderings);
-
-            // Fetch related contents
-            $relatedContents = ContentRepositoryFactory::getInstance($relatedDataType)->findBy($matcher, $defaultOrder);
-
-            if (Tca::table($dataType)->field($fieldName)->isRenderModeTree()) {
-
-                $fieldConfiguration = Tca::table($dataType)->field($fieldName)->getConfiguration();
-                $parentField = $fieldConfiguration['treeConfig']['parentField'];
-
-                $flatTree = array();
-                foreach ($relatedContents as $node) {
-                    $flatTree[$node->getUid()] = array(
-                        'item' => $node,
-                        'parent' => $node[$parentField] ? $node[$parentField]['uid'] : NULL,
-                    );
-                }
-
-                $tree = array();
-
-                // If leaves are selected without its parents selected, those are shown as parent
-                foreach ($flatTree as $id => &$flatNode) {
-                    if (!isset($flatTree[$flatNode['parent']])) {
-                        $flatNode['parent'] = NULL;
-                    }
-                }
-
-                foreach ($flatTree as $id => &$node) {
-                    if ($node['parent'] === NULL) {
-                        $tree[$id] = &$node;
-                    } else {
-                        $flatTree[$node['parent']]['children'][$id] = &$node;
-                    }
-                }
-
-                $relatedContents = $tree;
-            }
-
-            $this->view->assign('content', $content);
-            $this->view->assign('relatedContents', $relatedContents);
-            $this->view->assign('relatedDataType', $relatedDataType);
-            $this->view->assign('relatedContentTitle', Tca::table($relatedDataType)->getTitle());
-            $this->view->assign(
-                'renderMode',
-                Tca::table($dataType)->field($fieldName)->isRenderModeTree() ? FieldType::TREE : NULL
-            );
-        }
-    }
-
-    /**
-     * Retrieve Content objects first according to matching criteria and then "delete" them.
-     *
-     * Possible values for $matches, refer to method "updateAction".
-     *
-     * @param array $matches
-     * @return string
-     */
-    public function deleteAction(array $matches = array())
-    {
-
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        // Compute the label field name of the table.
-        $tableTitleField = Tca::table()->getLabelField();
-
-        // Get result object for storing data along the processing.
-        $result = $this->getJsonResult();
-        $result->setNumberOfObjects($contentService->getNumberOfObjects());
-
-        foreach ($contentService->getObjects() as $object) {
-
-            // Store the first object, so that the delete message can be more explicit when deleting only one record.
-            if ($contentService->getNumberOfObjects() === 1) {
-                $tableTitleValue = $object[$tableTitleField];
-                $processedObjectData = array(
-                    'uid' => $object->getUid(),
-                    'name' => $tableTitleValue,
-                );
-                $result->setProcessedObject($processedObjectData);
-            }
-
-            // Properly delete object.
-            ContentRepositoryFactory::getInstance()->remove($object);
-
-            // Get the possible error messages and store them.
-            $errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
-            $result->addErrorMessages($errorMessages);
-        }
-
-        // Set the result and render the JSON view.
-        $this->getJsonView()->setResult($result);
-        return $this->getJsonView()->render();
-    }
-
-    /**
-     * Retrieve Content objects first according to matching criteria and then "copy" them.
-     *
-     * Possible values for $matches, refer to method "updateAction".
-     *
-     * @param string $target
-     * @param array $matches
-     * @throws \Exception
-     * @return string
-     */
-    public function copyAction($target, array $matches = array())
-    {
-        // @todo
-        throw new \Exception('Not yet implemented', 1410192546);
-    }
-
-    /**
-     * Retrieve Content objects from the Clipboard then "copy" them according to the target.
-     *
-     * @param string $target
-     * @throws \Exception
-     * @return string
-     */
-    public function copyClipboardAction($target)
-    {
-
-        // Retrieve matcher object from clipboard.
-        $matcher = $this->getClipboardService()->getMatcher();
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        // Compute the label field name of the table.
-        $tableTitleField = Tca::table()->getLabelField();
-
-        // Get result object for storing data along the processing.
-        $result = $this->getJsonResult();
-        $result->setNumberOfObjects($contentService->getNumberOfObjects());
-
-        foreach ($contentService->getObjects() as $object) {
-
-            // Store the first object, so that the "action" message can be more explicit when deleting only one record.
-            if ($contentService->getNumberOfObjects() === 1) {
-                $tableTitleValue = $object[$tableTitleField];
-                $processedObjectData = array(
-                    'uid' => $object->getUid(),
-                    'name' => $tableTitleValue,
-                );
-                $result->setProcessedObject($processedObjectData);
-            }
-
-            // Work out the object.
-            ContentRepositoryFactory::getInstance()->copy($object, $target);
-
-            // Get the possible error messages and store them.
-            $errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
-            $result->addErrorMessages($errorMessages);
-        }
-
-        // Flush Clipboard if told so.
-        if (GeneralUtility::_GP('flushClipboard')) {
-            $this->getClipboardService()->flush();
-        }
-
-        // Set the result and render the JSON view.
-        $this->getJsonView()->setResult($result);
-        return $this->getJsonView()->render();
-    }
-
-    /**
-     * Retrieve Content objects first according to matching criteria and then "move" them.
-     *
-     * Possible values for $matches, refer to method "updateAction".
-     *
-     * @param string $target
-     * @param array $matches
-     * @return string
-     */
-    public function moveAction($target, array $matches = array())
-    {
-
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        // Compute the label field name of the table.
-        $tableTitleField = Tca::table()->getLabelField();
-
-        // Get result object for storing data along the processing.
-        $result = $this->getJsonResult();
-        $result->setNumberOfObjects($contentService->getNumberOfObjects());
-
-        foreach ($contentService->getObjects() as $object) {
-
-            // Store the first object, so that the "action" message can be more explicit when deleting only one record.
-            if ($contentService->getNumberOfObjects() === 1) {
-                $tableTitleValue = $object[$tableTitleField];
-                $processedObjectData = array(
-                    'uid' => $object->getUid(),
-                    'name' => $tableTitleValue,
-                );
-                $result->setProcessedObject($processedObjectData);
-            }
-
-            // Work out the object.
-            ContentRepositoryFactory::getInstance()->move($object, $target);
-
-            // Get the possible error messages and store them.
-            $errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
-            $result->addErrorMessages($errorMessages);
-        }
-
-        // Set the result and render the JSON view.
-        $this->getJsonView()->setResult($result);
-        return $this->getJsonView()->render();
-    }
-
-    /**
-     * Retrieve Content objects from the Clipboard then "move" them according to the target.
-     *
-     * @param string $target
-     * @return string
-     */
-    public function moveClipboardAction($target)
-    {
-
-        // Retrieve matcher object from clipboard.
-        $matcher = $this->getClipboardService()->getMatcher();
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        // Compute the label field name of the table.
-        $tableTitleField = Tca::table()->getLabelField();
-
-        // Get result object for storing data along the processing.
-        $result = $this->getJsonResult();
-        $result->setNumberOfObjects($contentService->getNumberOfObjects());
-
-        foreach ($contentService->getObjects() as $object) {
-
-            // Store the first object, so that the "action" message can be more explicit when deleting only one record.
-            if ($contentService->getNumberOfObjects() === 1) {
-                $tableTitleValue = $object[$tableTitleField];
-                $processedObjectData = array(
-                    'uid' => $object->getUid(),
-                    'name' => $tableTitleValue,
-                );
-                $result->setProcessedObject($processedObjectData);
-            }
-
-            // Work out the object.
-            ContentRepositoryFactory::getInstance()->move($object, $target);
-
-            // Get the possible error messages and store them.
-            $errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
-            $result->addErrorMessages($errorMessages);
-        }
-
-        // Flush Clipboard if told so.
-        if (GeneralUtility::_GP('flushClipboard')) {
-            $this->getClipboardService()->flush();
-        }
-
-        // Set the result and render the JSON view.
-        $this->getJsonView()->setResult($result);
-        return $this->getJsonView()->render();
-    }
-
-    /**
-     * Retrieve Content objects first according to matching criteria and then "localize" them.
-     *
-     * Possible values for $matches, refer to method "updateAction".
-     *
-     * @param string $fieldNameAndPath
-     * @param array $matches
-     * @param int $language
-     * @return string
-     * @throws \Exception
-     */
-    public function localizeAction($fieldNameAndPath, array $matches = array(), $language = 0)
-    {
-
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        // Get result object for storing data along the processing.
-        $result = $this->getJsonResult();
-        $result->setNumberOfObjects($contentService->getNumberOfObjects());
-
-        foreach ($contentService->getObjects() as $object) {
-
-            $identifier = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, 'uid');
-            $dataType = $this->getContentObjectResolver()->getDataType($object, $fieldNameAndPath);
-
-            // Fetch the source object to be localized.
-            /** @var Content $content */
-            $content = ContentRepositoryFactory::getInstance($dataType)->findByIdentifier($identifier);
-
-            // Makes sure the object was retrieved. Security!
-            if (!$content) {
-                $message = sprintf('Something went wrong when retrieving content "%s" with identifier "%s".', $dataType, $identifier);
-                throw new \Exception($message, 1412343097);
-            }
-
-            // Handover the localization to the Repository.
-            ContentRepositoryFactory::getInstance($dataType)->localize($content, $language);
-
-            // Get the possible error messages and store them.
-            $errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
-
-            // Redirect to TCEForm so that the BE User can do its job!
-            if ($contentService->getNumberOfObjects() === 1) {
-
-                if (!empty($errorMessages)) {
-                    $message = sprintf('Something went wrong when localizing content "%s" with identifier "%s". <br/>%s',
-                        $dataType,
-                        $identifier,
-                        implode('<br/>', $errorMessages)
-                    );
-                    throw new \Exception($message, 1412343098);
-                }
-
-                $localizedContent = $this->getLanguageService()->getLocalizedContent($content, $language);
-                if (empty($localizedContent)) {
-                    $message = sprintf('Oups! I could not retrieve localized content of type "%s" with identifier "%s"',
-                        $content->getDataType(),
-                        $content->getUid()
-                    );
-                    throw new \Exception($message, 1412343099);
-                }
-
-                /** @var \Fab\Vidi\View\Uri\EditUri $uri */
-                $uriRenderer = GeneralUtility::makeInstance('Fab\Vidi\View\Uri\EditUri');
-                $uri = $uriRenderer->render($localizedContent);
-                HttpUtility::redirect($uri);
-                break; // no need to further continue
-            }
-
-            $result->addErrorMessages($errorMessages);
-        }
-
-        // Set the result and render the JSON view.
-        $this->getJsonView()->setResult($result);
-        return $this->getJsonView()->render();
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Service\ContentService
-     */
-    protected function getContentService()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Service\ContentService');
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\ContentObjectResolver
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Resolver\ContentObjectResolver');
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\FieldPathResolver
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Resolver\FieldPathResolver');
-    }
-
-    /**
-     * Return a special view for handling JSON
-     * Goal is to have this view injected but require more configuration.
-     *
-     * @return JsonView
-     */
-    protected function getJsonView()
-    {
-        if (!$this->view instanceof JsonView) {
-            /** @var JsonView $view */
-            $this->view = $this->objectManager->get('Fab\Vidi\Mvc\JsonView');
-            $this->view->setResponse($this->response);
-        }
-        return $this->view;
-    }
-
-    /**
-     * @return JsonResult
-     */
-    protected function getJsonResult()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Mvc\JsonResult');
-    }
-
-    /**
-     * Signal that is called for post-processing content data send to the server for update.
-     *
-     * @param Content $contentObject
-     * @param $fieldNameAndPath
-     * @param $contentData
-     * @param $counter
-     * @param $savingBehavior
-     * @param $language
-     * @return ProcessContentDataSignalArguments
-     * @signal
-     */
-    protected function emitProcessContentDataSignal(Content $contentObject, $fieldNameAndPath, $contentData, $counter, $savingBehavior, $language)
-    {
-
-        /** @var \Fab\Vidi\Signal\ProcessContentDataSignalArguments $signalArguments */
-        $signalArguments = GeneralUtility::makeInstance('Fab\Vidi\Signal\ProcessContentDataSignalArguments');
-        $signalArguments->setContentObject($contentObject)
-            ->setFieldNameAndPath($fieldNameAndPath)
-            ->setContentData($contentData)
-            ->setCounter($counter)
-            ->setSavingBehavior($savingBehavior)
-            ->setLanguage($language);
-
-        $signalResult = $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\Controller\Backend\ContentController', 'processContentData', array($signalArguments));
-        return $signalResult[0];
-    }
-
-    /**
-     * Get the SignalSlot dispatcher.
-     *
-     * @return \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return $this->objectManager->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
-    }
-
-    /**
-     * Get the Clipboard service.
-     *
-     * @return \Fab\Vidi\Service\ClipboardService
-     */
-    protected function getClipboardService()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Service\ClipboardService');
-    }
-
-    /**
-     * @return \Fab\Vidi\Language\LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Language\LanguageService');
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance('Fab\Vidi\Module\ModuleLoader');
-    }
+	/**
+	 * @var \TYPO3\CMS\Core\Page\PageRenderer
+	 * @inject
+	 */
+	protected $pageRenderer;
+
+	/**
+	 * @var \Fab\Vidi\Domain\Repository\SelectionRepository
+	 * @inject
+	 */
+	protected $selectionRepository;
+
+	/**
+	 * Initialize every action.
+	 */
+	public function initializeAction()
+	{
+		$this->pageRenderer->addInlineLanguageLabelFile('EXT:vidi/Resources/Private/Language/locallang.xlf');
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('columns')) {
+
+			/** @var \Fab\Vidi\TypeConverter\CsvToArrayConverter $typeConverter */
+			$typeConverter = $this->objectManager->get('Fab\Vidi\TypeConverter\CsvToArrayConverter');
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('columns')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * List action for this controller.
+	 *
+	 * @return void
+	 */
+	public function indexAction()
+	{
+		$dataType = $this->getModuleLoader()->getDataType();
+		$selections = $this->selectionRepository->findByDataTypeForCurrentBackendUser($dataType);
+		$this->view->assign('selections', $selections);
+
+		$columns = Tca::grid()->getFields();
+		$this->view->assign('columns', $columns);
+		$this->view->assign('numberOfColumns', count($columns));
+	}
+
+	/**
+	 * List Row action for this controller. Output a json list of contents
+	 *
+	 * @param array $columns corresponds to columns to be rendered.
+	 * @param array $matches
+	 * @validate $columns Fab\Vidi\Domain\Validator\ColumnsValidator
+	 * @validate $matches Fab\Vidi\Domain\Validator\MatchesValidator
+	 * @return void
+	 */
+	public function listAction(array $columns = array(), $matches = array())
+	{
+		// Initialize some objects related to the query.
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
+		$order = OrderObjectFactory::getInstance()->getOrder();
+		$pager = PagerObjectFactory::getInstance()->getPager();
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher, $order, $pager->getLimit(), $pager->getOffset());
+		$pager->setCount($contentService->getNumberOfObjects());
+
+		// Assign values.
+		$this->view->assign('columns', $columns);
+		$this->view->assign('objects', $contentService->getObjects());
+		$this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
+		$this->view->assign('pager', $pager);
+		$this->view->assign('response', $this->response);
+	}
+
+	/**
+	 * Retrieve Content objects first according to matching criteria and then "update" them.
+	 * Important to notice the field name can contains a path, e.g. metadata.title and therefore must be analysed.
+	 *
+	 * Possible values for $matches:
+	 * -----------------------------
+	 *
+	 * $matches = array(uid => 1), will be taken as $query->equals
+	 * $matches = array(uid => 1,2,3), will be taken as $query->in
+	 * $matches = array(field_name1 => bar, field_name2 => bax), will be separated by AND.
+	 *
+	 * Possible values for $content:
+	 * -----------------------------
+	 *
+	 * $content = array(field_name => bar)
+	 * $content = array(field_name => array(value1, value2)) <-- will be CSV converted by "value1,value2"
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param array $content
+	 * @param array $matches
+	 * @param string $savingBehavior
+	 * @param int $language
+	 * @param array $columns
+	 * @return string
+	 * @throws \Fab\Vidi\Exception\InvalidKeyInArrayException
+	 */
+	public function updateAction($fieldNameAndPath, array $content, array $matches = array(), $savingBehavior = SavingBehavior::REPLACE, $language = 0, $columns = array())
+	{
+
+		// Instantiate the Matcher object according different rules.
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
+		$order = OrderObjectFactory::getInstance()->getOrder();
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher, $order);
+
+		// Get the real field that is going to be updated.
+		$updatedFieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+
+		// Get result object for storing data along the processing.
+		$result = $this->getJsonResult();
+		$result->setNumberOfObjects($contentService->getNumberOfObjects());
+
+		foreach ($contentService->getObjects() as $index => $object) {
+
+			$identifier = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, 'uid', $language);
+
+			// It could be the identifier is not found because the translation
+			// of the record does not yet exist when mass-editing
+			if ((int)$identifier <= 0) {
+				continue;
+			}
+
+			$dataType = $this->getContentObjectResolver()->getDataType($object, $fieldNameAndPath);
+
+			$signalResult = $this->emitProcessContentDataSignal($object, $fieldNameAndPath, $content, $index + 1, $savingBehavior, $language);
+			$contentData = $signalResult->getContentData();
+
+			// Add identifier to content data, required by TCEMain.
+			$contentData['uid'] = $identifier;
+
+			/** @var Content $dataObject */
+			$dataObject = GeneralUtility::makeInstance('Fab\Vidi\Domain\Model\Content', $dataType, $contentData);
+
+			// Properly update object.
+			ContentRepositoryFactory::getInstance($dataType)->update($dataObject);
+
+			// Get the possible error messages and store them.
+			$errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
+			$result->addErrorMessages($errorMessages);
+
+			// We only want to see the detail result if there is one object updated.
+			// Required for inline editing + it will display some useful info on the GUI in the flash messages.
+			if ($contentService->getNumberOfObjects() === 1) {
+
+				// Fetch the updated object from repository.
+				$updatedObject = ContentRepositoryFactory::getInstance()->findByUid($object->getUid());
+
+				// Re-fetch the updated result.
+				$updatedResult = $this->getContentObjectResolver()->getValue($updatedObject, $fieldNameAndPath, $updatedFieldName, $language);
+				if (is_array($updatedResult)) {
+					$_updatedResult = array(); // reset result set.
+
+					/** @var Content $contentObject */
+					foreach ($updatedResult as $contentObject) {
+						$labelField = Tca::table($contentObject)->getLabelField();
+						$values = array(
+							'uid' => $contentObject->getUid(),
+							'name' => $contentObject[$labelField],
+						);
+						$_updatedResult[] = $values;
+					}
+
+					$updatedResult = $_updatedResult;
+				}
+
+				$labelField = Tca::table($object)->getLabelField();
+
+				$processedObjectData = array(
+					'uid' => $object->getUid(),
+					'name' => $object[$labelField],
+					'updatedField' => $fieldNameAndPath,
+					'updatedValue' => $updatedResult,
+				);
+				$result->setProcessedObject($processedObjectData);
+
+				if (!empty($columns)) {
+					/** @var Row $row */
+					$row = GeneralUtility::makeInstance('Fab\Vidi\View\Grid\Row', $columns);
+					$result->setRow($row->render($updatedObject));
+				}
+			}
+		}
+
+		// Set the result and render the JSON view.
+		$this->getJsonView()->setResult($result);
+		return $this->getJsonView()->render();
+	}
+
+	/**
+	 * Set the sorting of a record giving the previous object.
+	 *
+	 * @param array $matches
+	 * @param int $previousIdentifier
+	 * @return string
+	 */
+	public function sortAction(array $matches = array(), $previousIdentifier = NULL)
+	{
+
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		// Compute the label field name of the table.
+		$tableTitleField = Tca::table()->getLabelField();
+
+		// Get result object for storing data along the processing.
+		$result = $this->getJsonResult();
+		$result->setNumberOfObjects($contentService->getNumberOfObjects());
+
+		foreach ($contentService->getObjects() as $object) {
+
+			// Store the first object, so that the "action" message can be more explicit when deleting only one record.
+			if ($contentService->getNumberOfObjects() === 1) {
+				$tableTitleValue = $object[$tableTitleField];
+				$processedObjectData = array(
+					'uid' => $object->getUid(),
+					'name' => $tableTitleValue,
+				);
+				$result->setProcessedObject($processedObjectData);
+			}
+
+			// The $target corresponds to the pid to move the records to.
+			// It can also be a negative value in case of sorting. The negative value would be the uid of its predecessor.
+			$target = is_null($previousIdentifier) ? $object->getPid() : (-(int)$previousIdentifier);
+
+			// Work out the object.
+			ContentRepositoryFactory::getInstance()->move($object, $target);
+
+			// Get the possible error messages and store them.
+			$errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
+			$result->addErrorMessages($errorMessages);
+		}
+
+		// Set the result and render the JSON view.
+		$this->getJsonView()->setResult($result);
+		return $this->getJsonView()->render();
+	}
+
+	/**
+	 * Returns an editing form for a given field name of a Content object.
+	 * Argument $fieldNameAndPath corresponds to the field name to be edited.
+	 * Important to notice it can contains a path, e.g. metadata.title and therefore must be analysed.
+	 *
+	 * Possible values for $matches, refer to method "updateAction".
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param array $matches
+	 * @param bool $hasRecursiveSelection
+	 * @throws \Exception
+	 */
+	public function editAction($fieldNameAndPath, array $matches = array(), $hasRecursiveSelection = FALSE)
+	{
+
+		// Instantiate the Matcher object according different rules.
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
+		$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+
+		$fieldType = Tca::table($dataType)->field($fieldName)->getType();
+		$this->view->assign('fieldType', ucfirst($fieldType));
+		$this->view->assign('dataType', $dataType);
+		$this->view->assign('fieldName', $fieldName);
+		$this->view->assign('matches', $matches);
+		$this->view->assign('fieldNameAndPath', $fieldNameAndPath);
+		$this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
+		$this->view->assign('hasRecursiveSelection', $hasRecursiveSelection);
+		$this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
+
+		// Fetch content and its relations.
+		if ($fieldType === FieldType::MULTISELECT) {
+
+			$object = ContentRepositoryFactory::getInstance()->findOneBy($matcher);
+			$identifier = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, 'uid');
+			$dataType = $this->getContentObjectResolver()->getDataType($object, $fieldNameAndPath);
+
+			$content = ContentRepositoryFactory::getInstance($dataType)->findByUid($identifier);
+
+			// Makes sure the object was retrieved. Security!
+			if (!$content) {
+				$message = sprintf('I could not retrieved content object of type "%s" with identifier %s.', $dataType, $identifier);
+				throw new \Exception($message, 1402350182);
+			}
+
+			$relatedDataType = Tca::table($dataType)->field($fieldName)->getForeignTable();
+
+			// Initialize the matcher object.
+			/** @var \Fab\Vidi\Persistence\Matcher $matcher */
+			$matcher = GeneralUtility::makeInstance('Fab\Vidi\Persistence\Matcher', array(), $relatedDataType);
+
+			// Default ordering for related data type.
+			$defaultOrderings = Tca::table($relatedDataType)->getDefaultOrderings();
+			/** @var \Fab\Vidi\Persistence\Order $order */
+			$defaultOrder = GeneralUtility::makeInstance('Fab\Vidi\Persistence\Order', $defaultOrderings);
+
+			// Fetch related contents
+			$relatedContents = ContentRepositoryFactory::getInstance($relatedDataType)->findBy($matcher, $defaultOrder);
+
+			if (Tca::table($dataType)->field($fieldName)->isRenderModeTree()) {
+
+				$fieldConfiguration = Tca::table($dataType)->field($fieldName)->getConfiguration();
+				$parentField = $fieldConfiguration['treeConfig']['parentField'];
+
+				$flatTree = array();
+				foreach ($relatedContents as $node) {
+					$flatTree[$node->getUid()] = array(
+						'item' => $node,
+						'parent' => $node[$parentField] ? $node[$parentField]['uid'] : NULL,
+					);
+				}
+
+				$tree = array();
+
+				// If leaves are selected without its parents selected, those are shown as parent
+				foreach ($flatTree as $id => &$flatNode) {
+					if (!isset($flatTree[$flatNode['parent']])) {
+						$flatNode['parent'] = NULL;
+					}
+				}
+
+				foreach ($flatTree as $id => &$node) {
+					if ($node['parent'] === NULL) {
+						$tree[$id] = &$node;
+					} else {
+						$flatTree[$node['parent']]['children'][$id] = &$node;
+					}
+				}
+
+				$relatedContents = $tree;
+			}
+
+			$this->view->assign('content', $content);
+			$this->view->assign('relatedContents', $relatedContents);
+			$this->view->assign('relatedDataType', $relatedDataType);
+			$this->view->assign('relatedContentTitle', Tca::table($relatedDataType)->getTitle());
+			$this->view->assign(
+				'renderMode',
+				Tca::table($dataType)->field($fieldName)->isRenderModeTree() ? FieldType::TREE : NULL
+			);
+		}
+	}
+
+	/**
+	 * Retrieve Content objects first according to matching criteria and then "delete" them.
+	 *
+	 * Possible values for $matches, refer to method "updateAction".
+	 *
+	 * @param array $matches
+	 * @return string
+	 */
+	public function deleteAction(array $matches = array())
+	{
+
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		// Compute the label field name of the table.
+		$tableTitleField = Tca::table()->getLabelField();
+
+		// Get result object for storing data along the processing.
+		$result = $this->getJsonResult();
+		$result->setNumberOfObjects($contentService->getNumberOfObjects());
+
+		foreach ($contentService->getObjects() as $object) {
+
+			// Store the first object, so that the delete message can be more explicit when deleting only one record.
+			if ($contentService->getNumberOfObjects() === 1) {
+				$tableTitleValue = $object[$tableTitleField];
+				$processedObjectData = array(
+					'uid' => $object->getUid(),
+					'name' => $tableTitleValue,
+				);
+				$result->setProcessedObject($processedObjectData);
+			}
+
+			// Properly delete object.
+			ContentRepositoryFactory::getInstance()->remove($object);
+
+			// Get the possible error messages and store them.
+			$errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
+			$result->addErrorMessages($errorMessages);
+		}
+
+		// Set the result and render the JSON view.
+		$this->getJsonView()->setResult($result);
+		return $this->getJsonView()->render();
+	}
+
+	/**
+	 * Retrieve Content objects first according to matching criteria and then "copy" them.
+	 *
+	 * Possible values for $matches, refer to method "updateAction".
+	 *
+	 * @param string $target
+	 * @param array $matches
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function copyAction($target, array $matches = array())
+	{
+		// @todo
+		throw new \Exception('Not yet implemented', 1410192546);
+	}
+
+	/**
+	 * Retrieve Content objects from the Clipboard then "copy" them according to the target.
+	 *
+	 * @param string $target
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function copyClipboardAction($target)
+	{
+
+		// Retrieve matcher object from clipboard.
+		$matcher = $this->getClipboardService()->getMatcher();
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		// Compute the label field name of the table.
+		$tableTitleField = Tca::table()->getLabelField();
+
+		// Get result object for storing data along the processing.
+		$result = $this->getJsonResult();
+		$result->setNumberOfObjects($contentService->getNumberOfObjects());
+
+		foreach ($contentService->getObjects() as $object) {
+
+			// Store the first object, so that the "action" message can be more explicit when deleting only one record.
+			if ($contentService->getNumberOfObjects() === 1) {
+				$tableTitleValue = $object[$tableTitleField];
+				$processedObjectData = array(
+					'uid' => $object->getUid(),
+					'name' => $tableTitleValue,
+				);
+				$result->setProcessedObject($processedObjectData);
+			}
+
+			// Work out the object.
+			ContentRepositoryFactory::getInstance()->copy($object, $target);
+
+			// Get the possible error messages and store them.
+			$errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
+			$result->addErrorMessages($errorMessages);
+		}
+
+		// Flush Clipboard if told so.
+		if (GeneralUtility::_GP('flushClipboard')) {
+			$this->getClipboardService()->flush();
+		}
+
+		// Set the result and render the JSON view.
+		$this->getJsonView()->setResult($result);
+		return $this->getJsonView()->render();
+	}
+
+	/**
+	 * Retrieve Content objects first according to matching criteria and then "move" them.
+	 *
+	 * Possible values for $matches, refer to method "updateAction".
+	 *
+	 * @param string $target
+	 * @param array $matches
+	 * @return string
+	 */
+	public function moveAction($target, array $matches = array())
+	{
+
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		// Compute the label field name of the table.
+		$tableTitleField = Tca::table()->getLabelField();
+
+		// Get result object for storing data along the processing.
+		$result = $this->getJsonResult();
+		$result->setNumberOfObjects($contentService->getNumberOfObjects());
+
+		foreach ($contentService->getObjects() as $object) {
+
+			// Store the first object, so that the "action" message can be more explicit when deleting only one record.
+			if ($contentService->getNumberOfObjects() === 1) {
+				$tableTitleValue = $object[$tableTitleField];
+				$processedObjectData = array(
+					'uid' => $object->getUid(),
+					'name' => $tableTitleValue,
+				);
+				$result->setProcessedObject($processedObjectData);
+			}
+
+			// Work out the object.
+			ContentRepositoryFactory::getInstance()->move($object, $target);
+
+			// Get the possible error messages and store them.
+			$errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
+			$result->addErrorMessages($errorMessages);
+		}
+
+		// Set the result and render the JSON view.
+		$this->getJsonView()->setResult($result);
+		return $this->getJsonView()->render();
+	}
+
+	/**
+	 * Retrieve Content objects from the Clipboard then "move" them according to the target.
+	 *
+	 * @param string $target
+	 * @return string
+	 */
+	public function moveClipboardAction($target)
+	{
+
+		// Retrieve matcher object from clipboard.
+		$matcher = $this->getClipboardService()->getMatcher();
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		// Compute the label field name of the table.
+		$tableTitleField = Tca::table()->getLabelField();
+
+		// Get result object for storing data along the processing.
+		$result = $this->getJsonResult();
+		$result->setNumberOfObjects($contentService->getNumberOfObjects());
+
+		foreach ($contentService->getObjects() as $object) {
+
+			// Store the first object, so that the "action" message can be more explicit when deleting only one record.
+			if ($contentService->getNumberOfObjects() === 1) {
+				$tableTitleValue = $object[$tableTitleField];
+				$processedObjectData = array(
+					'uid' => $object->getUid(),
+					'name' => $tableTitleValue,
+				);
+				$result->setProcessedObject($processedObjectData);
+			}
+
+			// Work out the object.
+			ContentRepositoryFactory::getInstance()->move($object, $target);
+
+			// Get the possible error messages and store them.
+			$errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
+			$result->addErrorMessages($errorMessages);
+		}
+
+		// Flush Clipboard if told so.
+		if (GeneralUtility::_GP('flushClipboard')) {
+			$this->getClipboardService()->flush();
+		}
+
+		// Set the result and render the JSON view.
+		$this->getJsonView()->setResult($result);
+		return $this->getJsonView()->render();
+	}
+
+	/**
+	 * Retrieve Content objects first according to matching criteria and then "localize" them.
+	 *
+	 * Possible values for $matches, refer to method "updateAction".
+	 *
+	 * @param string $fieldNameAndPath
+	 * @param array $matches
+	 * @param int $language
+	 * @return string
+	 * @throws \Exception
+	 */
+	public function localizeAction($fieldNameAndPath, array $matches = array(), $language = 0)
+	{
+
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		// Get result object for storing data along the processing.
+		$result = $this->getJsonResult();
+		$result->setNumberOfObjects($contentService->getNumberOfObjects());
+
+		foreach ($contentService->getObjects() as $object) {
+
+			$identifier = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, 'uid');
+			$dataType = $this->getContentObjectResolver()->getDataType($object, $fieldNameAndPath);
+
+			// Fetch the source object to be localized.
+			/** @var Content $content */
+			$content = ContentRepositoryFactory::getInstance($dataType)->findByIdentifier($identifier);
+
+			// Makes sure the object was retrieved. Security!
+			if (!$content) {
+				$message = sprintf('Something went wrong when retrieving content "%s" with identifier "%s".', $dataType, $identifier);
+				throw new \Exception($message, 1412343097);
+			}
+
+			// Handover the localization to the Repository.
+			ContentRepositoryFactory::getInstance($dataType)->localize($content, $language);
+
+			// Get the possible error messages and store them.
+			$errorMessages = ContentRepositoryFactory::getInstance()->getErrorMessages();
+
+			// Redirect to TCEForm so that the BE User can do its job!
+			if ($contentService->getNumberOfObjects() === 1) {
+
+				if (!empty($errorMessages)) {
+					$message = sprintf('Something went wrong when localizing content "%s" with identifier "%s". <br/>%s',
+						$dataType,
+						$identifier,
+						implode('<br/>', $errorMessages)
+					);
+					throw new \Exception($message, 1412343098);
+				}
+
+				$localizedContent = $this->getLanguageService()->getLocalizedContent($content, $language);
+				if (empty($localizedContent)) {
+					$message = sprintf('Oups! I could not retrieve localized content of type "%s" with identifier "%s"',
+						$content->getDataType(),
+						$content->getUid()
+					);
+					throw new \Exception($message, 1412343099);
+				}
+
+				/** @var \Fab\Vidi\View\Uri\EditUri $uri */
+				$uriRenderer = GeneralUtility::makeInstance('Fab\Vidi\View\Uri\EditUri');
+				$uri = $uriRenderer->render($localizedContent);
+				HttpUtility::redirect($uri);
+				break; // no need to further continue
+			}
+
+			$result->addErrorMessages($errorMessages);
+		}
+
+		// Set the result and render the JSON view.
+		$this->getJsonView()->setResult($result);
+		return $this->getJsonView()->render();
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Service\ContentService
+	 */
+	protected function getContentService()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Service\ContentService');
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\ContentObjectResolver
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Resolver\ContentObjectResolver');
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\FieldPathResolver
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Resolver\FieldPathResolver');
+	}
+
+	/**
+	 * Return a special view for handling JSON
+	 * Goal is to have this view injected but require more configuration.
+	 *
+	 * @return JsonView
+	 */
+	protected function getJsonView()
+	{
+		if (!$this->view instanceof JsonView) {
+			/** @var JsonView $view */
+			$this->view = $this->objectManager->get('Fab\Vidi\Mvc\JsonView');
+			$this->view->setResponse($this->response);
+		}
+		return $this->view;
+	}
+
+	/**
+	 * @return JsonResult
+	 */
+	protected function getJsonResult()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Mvc\JsonResult');
+	}
+
+	/**
+	 * Signal that is called for post-processing content data send to the server for update.
+	 *
+	 * @param Content $contentObject
+	 * @param $fieldNameAndPath
+	 * @param $contentData
+	 * @param $counter
+	 * @param $savingBehavior
+	 * @param $language
+	 * @return ProcessContentDataSignalArguments
+	 * @signal
+	 */
+	protected function emitProcessContentDataSignal(Content $contentObject, $fieldNameAndPath, $contentData, $counter, $savingBehavior, $language)
+	{
+
+		/** @var \Fab\Vidi\Signal\ProcessContentDataSignalArguments $signalArguments */
+		$signalArguments = GeneralUtility::makeInstance('Fab\Vidi\Signal\ProcessContentDataSignalArguments');
+		$signalArguments->setContentObject($contentObject)
+			->setFieldNameAndPath($fieldNameAndPath)
+			->setContentData($contentData)
+			->setCounter($counter)
+			->setSavingBehavior($savingBehavior)
+			->setLanguage($language);
+
+		$signalResult = $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\Controller\Backend\ContentController', 'processContentData', array($signalArguments));
+		return $signalResult[0];
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher.
+	 *
+	 * @return \TYPO3\CMS\Extbase\SignalSlot\Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return $this->objectManager->get('TYPO3\\CMS\\Extbase\\SignalSlot\\Dispatcher');
+	}
+
+	/**
+	 * Get the Clipboard service.
+	 *
+	 * @return \Fab\Vidi\Service\ClipboardService
+	 */
+	protected function getClipboardService()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Service\ClipboardService');
+	}
+
+	/**
+	 * @return \Fab\Vidi\Language\LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Language\LanguageService');
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance('Fab\Vidi\Module\ModuleLoader');
+	}
 
 }

Classes/DataHandler/CoreDataHandler.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +135 added lines, -135 removed lines

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

Classes/Domain/Model/Content.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +436 added lines, -436 removed lines

@@ -29,441 +29,441 @@
 class Content implements \ArrayAccess
 {
 
-    /**
-     * @var int
-     */
-    protected $uid;
-
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * Constructor for a Content object.
-     *
-     * @param string $dataType will basically correspond to a table name, e.g fe_users, tt_content, ...
-     * @param array $contentData
-     * @return \Fab\Vidi\Domain\Model\Content
-     */
-    public function __construct($dataType, array $contentData = array())
-    {
-
-        $this->dataType = $dataType;
-        $this->uid = empty($contentData['uid']) ? NULL : (int)$contentData['uid'];
-
-        /** @var \Fab\Vidi\Tca\TableService $table */
-        $table = Tca::table($dataType);
-
-        // Initialize the array containing the allowed fields to be filled-in.
-        $fields = array('pid');
-
-        // If a creation time stamp has been defined for this data type.
-        if ($table->getTimeCreationField()) {
-            $fields[] = $table->getTimeCreationField();
-        }
-
-        // If an update time stamp has been defined for this data type.
-        if ($table->getTimeModificationField()) {
-            $fields[] = $table->getTimeModificationField();
-        }
-
-        // Merge the other fields allowed for this data type.
-        $fields = array_merge($fields, $table->getFields());
-
-        // Fetch excluded fields from the grid.
-        if ($this->isBackendMode()) {
-            $fields = $this->filterForConfiguration($fields);
-            $fields = $this->filterForBackendUser($fields);
-        }
-
-        // Get column to be displayed
-        foreach ($fields as $fieldName) {
-            if (array_key_exists($fieldName, $contentData)) {
-                $propertyName = Field::name($fieldName)->of($dataType)->toPropertyName();
-                $this->$propertyName = $contentData[$fieldName];
-            }
-        }
-    }
-
-    /**
-     * Dispatches magic methods (findBy[Property]())
-     *
-     * @param string $methodName The name of the magic method
-     * @param string $arguments The arguments of the magic method
-     * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnsupportedMethodException
-     * @return mixed
-     * @api
-     */
-    public function __call($methodName, $arguments)
-    {
-        $value = NULL;
-        if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
-
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-            $field = Tca::table($this->dataType)->field($fieldName);
-
-            $value = $this->$propertyName;
-
-            // TRUE means it is a relation and it is not yet resolved.
-            if ($this->hasRelation($propertyName) && is_scalar($this->$propertyName)) {
-                $value = $this->resolveRelation($propertyName);
-            } elseif ($field->getType() === FieldType::RADIO || $field->getType() === FieldType::SELECT) {
-
-                // Attempt to convert the value into a label for radio and select fields.
-                $label = Tca::table($this->getDataType())->field($fieldName)->getLabelForItem($value);
-                if ($label) {
-                    $value = $label;
-                }
-            }
-
-        } elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
-            $this->$propertyName = $arguments[0];
-        }
-        return $value;
-    }
-
-    /**
-     * Tell whether the property has a relation.
-     *
-     * @param string $propertyName
-     * @return bool
-     */
-    protected function hasRelation($propertyName)
-    {
-        $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-        return Tca::table($this->dataType)->field($fieldName)->hasRelation();
-    }
-
-    /**
-     * Try to "resolve" the property whether it has a relation.
-     * If the property has not relation it simply returns the same value.
-     *
-     * @throws \RuntimeException
-     * @param string $propertyName
-     * @return mixed
-     */
-    protected function resolveRelation($propertyName)
-    {
-
-        // Convert property name to field name and get the foreign data type.
-        $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-        $foreignDataType = Tca::table($this->dataType)->field($fieldName)->relationDataType();
-
-        // Get the foreign repository instance form the factory
-        /** @var \Fab\Vidi\Domain\Repository\ContentRepository $foreignContentRepository */
-        $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType, $fieldName);
-
-        if (Tca::table($this->dataType)->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
-
-            // Fetch values from repository
-            $values = GeneralUtility::trimExplode(',', $this->$propertyName);
-            $this->$propertyName = $foreignContentRepository->findIn('uid', $values);
-        } elseif (Tca::table($this->dataType)->field($fieldName)->hasMany()) {
-            // Include relation many-to-many and one-to-many
-            // Tca::table($this->dataType)->field($fieldName)->hasRelationOneToMany()
-            // Tca::table($this->dataType)->field($fieldName)->hasRelationManyToMany()
-
-            $foreignFieldName = Tca::table($this->dataType)->field($fieldName)->getForeignField();
-            if (empty($foreignFieldName)) {
-                $message = sprintf('Missing "foreign_field" key for field "%s" in table "%s".',
-                    $fieldName,
-                    $this->dataType
-                );
-                throw new \RuntimeException($message, 1376149186);
-            }
-
-            // Fetch values from repository.
-            $foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
-            $findByProperty = 'findBy' . ucfirst($foreignPropertyName);
-
-            // Date picker (type == group) are special fields because property path must contain the table name
-            // to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
-            $propertyValue = $this->uid;
-            if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
-                $propertyValue = $this->dataType . '.' . $this->uid;
-            }
-
-            $this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
-
-        } elseif (Tca::table($this->dataType)->field($fieldName)->hasOne()) {
-
-            $fieldConfiguration = Tca::table($this->dataType)->field($fieldName)->getConfiguration();
-
-            // First case, we are on the "good side" of the relation, just query the repository
-            if (empty($fieldConfiguration['foreign_field'])) {
-                $this->$propertyName = $foreignContentRepository->findByUid($this->$propertyName);
-            } else {
-                // Second case, we are the "bad side" of the relation, query the foreign repository
-                // e.g. in case of one-to-one relation.
-
-                // We must query the opposite side to get the identifier of the foreign object.
-                $foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
-                $foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
-                $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
-                $find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
-
-                /** @var Content $foreignObject */
-                $this->$propertyName = $foreignContentRepository->$find($this->getUid());
-            }
-
-        }
-        return $this->$propertyName;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUid()
-    {
-        return $this->uid;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType()
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * Whether a offset exists
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     * @param mixed $offset
-     * @return boolean true on success or false on failure.
-     */
-    public function offsetExists($offset)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        return isset($this->$offset);
-    }
-
-    /**
-     * Offset to retrieve
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     * @param mixed $offset
-     * @return mixed Can return all value types.
-     */
-    public function offsetGet($offset)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        $getter = 'get' . ucfirst($offset);
-        return $this->$getter();
-    }
-
-    /**
-     * Offset to set
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     * @param mixed $offset
-     * @param mixed $value
-     * @return $this
-     */
-    public function offsetSet($offset, $value)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        $setter = 'set' . ucfirst($offset);
-        $this->$setter($value);
-        return $this;
-    }
-
-    /**
-     * Offset to unset
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     * @param mixed $offset
-     * @throws NotImplementedException
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        $message = 'Un-setting value for Array object is not supported';
-        throw new NotImplementedException($message, 1376132306);
-    }
-
-    /**
-     * Convert this to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $result['uid'] = $this->uid;
-        $propertiesAndValues = json_decode(json_encode($this), TRUE);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-            $result[$fieldName] = $value;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert this object to an array containing the resolved values.
-     *
-     * @param bool $resolveRelations
-     * @return array
-     * @throws \Exception
-     */
-    public function toValues($resolveRelations = TRUE)
-    {
-        $result['uid'] = $this->uid;
-        $propertiesAndValues = json_decode(json_encode($this), TRUE);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-
-            $result[$fieldName] = $value;
-            if ($resolveRelations) {
-                $field = Tca::table($this->dataType)->field($fieldName);
-
-                $resolvedValue = '';
-                if ($field->getType() === FieldType::FILE) {
-
-                    if ($field->hasMany()) {
-                        $files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
-
-                        $resolvedValue = array();
-                        foreach ($files as $file) {
-                            $resolvedValue[] = $file->getIdentifier();
-                        }
-                    } else {
-                        $files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
-                        if (!empty($files)) {
-                            $resolvedValue = current($files)->getIdentifier();
-                        }
-                    }
-
-                    // Reset value
-                    $result[$fieldName] = $resolvedValue;
-
-                } elseif (Tca::table($this->dataType)->field($fieldName)->hasRelation()) {
-                    $objects = $this[$fieldName];
-                    if (is_array($objects)) {
-                        $resolvedValue = array();
-                        foreach ($objects as $object) {
-                            /** @var $object Content */
-                            $labelField = Tca::table($object->getDataType())->getLabelField();
-                            $resolvedValue[] = $object[$labelField];
-                        }
-                    } elseif ($objects instanceof Content) {
-                        $labelField = Tca::table($objects->getDataType())->getLabelField();
-                        $resolvedValue = $objects[$labelField];
-                    }
-
-                    // Reset value
-                    $result[$fieldName] = $resolvedValue;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Return the properties of this object.
-     *
-     * @return array
-     */
-    public function toProperties()
-    {
-        $result[] = 'uid';
-        $propertiesAndValues = json_decode(json_encode($this), TRUE);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $result[] = $propertyName;
-        }
-        return $result;
-    }
-
-    /**
-     * Return the properties of this object.
-     *
-     * @return array
-     */
-    public function toFields()
-    {
-        $result[] = 'uid';
-        $propertiesAndValues = json_decode(json_encode($this), TRUE);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $result[] = Property::name($propertyName)->of($this)->toFieldName();
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $labelField = Tca::table($this->dataType)->getLabelField();
-        return $this[$labelField];
-    }
-
-    /**
-     * Remove fields according to BE User permission.
-     *
-     * @param $fields
-     * @return array
-     * @throws \Exception
-     */
-    protected function filterForBackendUser($fields)
-    {
-        if (!$this->getBackendUser()->isAdmin()) {
-            foreach ($fields as $key => $fieldName) {
-                if (Tca::table($this->dataType)->hasField($fieldName) && !Tca::table($this->dataType)->field($fieldName)->hasAccess()) {
-                    unset($fields[$key]);
-                }
-            }
-        }
-        return $fields;
-    }
-
-    /**
-     * Remove fields according to Grid configuration.
-     *
-     * @param $fields
-     * @return array
-     */
-    protected function filterForConfiguration($fields)
-    {
-
-        $excludedFields = Tca::grid($this->dataType)->getExcludedFields();
-        foreach ($fields as $key => $field) {
-            if (in_array($field, $excludedFields)) {
-                unset($fields[$key]);
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Returns whether the current mode is Backend
-     *
-     * @return bool
-     */
-    protected function isBackendMode()
-    {
-        return TYPO3_MODE == 'BE';
-    }
+	/**
+	 * @var int
+	 */
+	protected $uid;
+
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * Constructor for a Content object.
+	 *
+	 * @param string $dataType will basically correspond to a table name, e.g fe_users, tt_content, ...
+	 * @param array $contentData
+	 * @return \Fab\Vidi\Domain\Model\Content
+	 */
+	public function __construct($dataType, array $contentData = array())
+	{
+
+		$this->dataType = $dataType;
+		$this->uid = empty($contentData['uid']) ? NULL : (int)$contentData['uid'];
+
+		/** @var \Fab\Vidi\Tca\TableService $table */
+		$table = Tca::table($dataType);
+
+		// Initialize the array containing the allowed fields to be filled-in.
+		$fields = array('pid');
+
+		// If a creation time stamp has been defined for this data type.
+		if ($table->getTimeCreationField()) {
+			$fields[] = $table->getTimeCreationField();
+		}
+
+		// If an update time stamp has been defined for this data type.
+		if ($table->getTimeModificationField()) {
+			$fields[] = $table->getTimeModificationField();
+		}
+
+		// Merge the other fields allowed for this data type.
+		$fields = array_merge($fields, $table->getFields());
+
+		// Fetch excluded fields from the grid.
+		if ($this->isBackendMode()) {
+			$fields = $this->filterForConfiguration($fields);
+			$fields = $this->filterForBackendUser($fields);
+		}
+
+		// Get column to be displayed
+		foreach ($fields as $fieldName) {
+			if (array_key_exists($fieldName, $contentData)) {
+				$propertyName = Field::name($fieldName)->of($dataType)->toPropertyName();
+				$this->$propertyName = $contentData[$fieldName];
+			}
+		}
+	}
+
+	/**
+	 * Dispatches magic methods (findBy[Property]())
+	 *
+	 * @param string $methodName The name of the magic method
+	 * @param string $arguments The arguments of the magic method
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnsupportedMethodException
+	 * @return mixed
+	 * @api
+	 */
+	public function __call($methodName, $arguments)
+	{
+		$value = NULL;
+		if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
+			$propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+			$field = Tca::table($this->dataType)->field($fieldName);
+
+			$value = $this->$propertyName;
+
+			// TRUE means it is a relation and it is not yet resolved.
+			if ($this->hasRelation($propertyName) && is_scalar($this->$propertyName)) {
+				$value = $this->resolveRelation($propertyName);
+			} elseif ($field->getType() === FieldType::RADIO || $field->getType() === FieldType::SELECT) {
+
+				// Attempt to convert the value into a label for radio and select fields.
+				$label = Tca::table($this->getDataType())->field($fieldName)->getLabelForItem($value);
+				if ($label) {
+					$value = $label;
+				}
+			}
+
+		} elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
+			$propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+			$this->$propertyName = $arguments[0];
+		}
+		return $value;
+	}
+
+	/**
+	 * Tell whether the property has a relation.
+	 *
+	 * @param string $propertyName
+	 * @return bool
+	 */
+	protected function hasRelation($propertyName)
+	{
+		$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+		return Tca::table($this->dataType)->field($fieldName)->hasRelation();
+	}
+
+	/**
+	 * Try to "resolve" the property whether it has a relation.
+	 * If the property has not relation it simply returns the same value.
+	 *
+	 * @throws \RuntimeException
+	 * @param string $propertyName
+	 * @return mixed
+	 */
+	protected function resolveRelation($propertyName)
+	{
+
+		// Convert property name to field name and get the foreign data type.
+		$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+		$foreignDataType = Tca::table($this->dataType)->field($fieldName)->relationDataType();
+
+		// Get the foreign repository instance form the factory
+		/** @var \Fab\Vidi\Domain\Repository\ContentRepository $foreignContentRepository */
+		$foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType, $fieldName);
+
+		if (Tca::table($this->dataType)->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
+
+			// Fetch values from repository
+			$values = GeneralUtility::trimExplode(',', $this->$propertyName);
+			$this->$propertyName = $foreignContentRepository->findIn('uid', $values);
+		} elseif (Tca::table($this->dataType)->field($fieldName)->hasMany()) {
+			// Include relation many-to-many and one-to-many
+			// Tca::table($this->dataType)->field($fieldName)->hasRelationOneToMany()
+			// Tca::table($this->dataType)->field($fieldName)->hasRelationManyToMany()
+
+			$foreignFieldName = Tca::table($this->dataType)->field($fieldName)->getForeignField();
+			if (empty($foreignFieldName)) {
+				$message = sprintf('Missing "foreign_field" key for field "%s" in table "%s".',
+					$fieldName,
+					$this->dataType
+				);
+				throw new \RuntimeException($message, 1376149186);
+			}
+
+			// Fetch values from repository.
+			$foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
+			$findByProperty = 'findBy' . ucfirst($foreignPropertyName);
+
+			// Date picker (type == group) are special fields because property path must contain the table name
+			// to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
+			$propertyValue = $this->uid;
+			if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
+				$propertyValue = $this->dataType . '.' . $this->uid;
+			}
+
+			$this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
+
+		} elseif (Tca::table($this->dataType)->field($fieldName)->hasOne()) {
+
+			$fieldConfiguration = Tca::table($this->dataType)->field($fieldName)->getConfiguration();
+
+			// First case, we are on the "good side" of the relation, just query the repository
+			if (empty($fieldConfiguration['foreign_field'])) {
+				$this->$propertyName = $foreignContentRepository->findByUid($this->$propertyName);
+			} else {
+				// Second case, we are the "bad side" of the relation, query the foreign repository
+				// e.g. in case of one-to-one relation.
+
+				// We must query the opposite side to get the identifier of the foreign object.
+				$foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
+				$foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
+				$foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
+				$find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
+
+				/** @var Content $foreignObject */
+				$this->$propertyName = $foreignContentRepository->$find($this->getUid());
+			}
+
+		}
+		return $this->$propertyName;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUid()
+	{
+		return $this->uid;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType()
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * Whether a offset exists
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 * @param mixed $offset
+	 * @return boolean true on success or false on failure.
+	 */
+	public function offsetExists($offset)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		return isset($this->$offset);
+	}
+
+	/**
+	 * Offset to retrieve
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 * @param mixed $offset
+	 * @return mixed Can return all value types.
+	 */
+	public function offsetGet($offset)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		$getter = 'get' . ucfirst($offset);
+		return $this->$getter();
+	}
+
+	/**
+	 * Offset to set
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 * @param mixed $offset
+	 * @param mixed $value
+	 * @return $this
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		$setter = 'set' . ucfirst($offset);
+		$this->$setter($value);
+		return $this;
+	}
+
+	/**
+	 * Offset to unset
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 * @param mixed $offset
+	 * @throws NotImplementedException
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		$message = 'Un-setting value for Array object is not supported';
+		throw new NotImplementedException($message, 1376132306);
+	}
+
+	/**
+	 * Convert this to array
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$result['uid'] = $this->uid;
+		$propertiesAndValues = json_decode(json_encode($this), TRUE);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+			$result[$fieldName] = $value;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Convert this object to an array containing the resolved values.
+	 *
+	 * @param bool $resolveRelations
+	 * @return array
+	 * @throws \Exception
+	 */
+	public function toValues($resolveRelations = TRUE)
+	{
+		$result['uid'] = $this->uid;
+		$propertiesAndValues = json_decode(json_encode($this), TRUE);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+
+			$result[$fieldName] = $value;
+			if ($resolveRelations) {
+				$field = Tca::table($this->dataType)->field($fieldName);
+
+				$resolvedValue = '';
+				if ($field->getType() === FieldType::FILE) {
+
+					if ($field->hasMany()) {
+						$files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
+
+						$resolvedValue = array();
+						foreach ($files as $file) {
+							$resolvedValue[] = $file->getIdentifier();
+						}
+					} else {
+						$files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
+						if (!empty($files)) {
+							$resolvedValue = current($files)->getIdentifier();
+						}
+					}
+
+					// Reset value
+					$result[$fieldName] = $resolvedValue;
+
+				} elseif (Tca::table($this->dataType)->field($fieldName)->hasRelation()) {
+					$objects = $this[$fieldName];
+					if (is_array($objects)) {
+						$resolvedValue = array();
+						foreach ($objects as $object) {
+							/** @var $object Content */
+							$labelField = Tca::table($object->getDataType())->getLabelField();
+							$resolvedValue[] = $object[$labelField];
+						}
+					} elseif ($objects instanceof Content) {
+						$labelField = Tca::table($objects->getDataType())->getLabelField();
+						$resolvedValue = $objects[$labelField];
+					}
+
+					// Reset value
+					$result[$fieldName] = $resolvedValue;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Return the properties of this object.
+	 *
+	 * @return array
+	 */
+	public function toProperties()
+	{
+		$result[] = 'uid';
+		$propertiesAndValues = json_decode(json_encode($this), TRUE);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$result[] = $propertyName;
+		}
+		return $result;
+	}
+
+	/**
+	 * Return the properties of this object.
+	 *
+	 * @return array
+	 */
+	public function toFields()
+	{
+		$result[] = 'uid';
+		$propertiesAndValues = json_decode(json_encode($this), TRUE);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$result[] = Property::name($propertyName)->of($this)->toFieldName();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		$labelField = Tca::table($this->dataType)->getLabelField();
+		return $this[$labelField];
+	}
+
+	/**
+	 * Remove fields according to BE User permission.
+	 *
+	 * @param $fields
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function filterForBackendUser($fields)
+	{
+		if (!$this->getBackendUser()->isAdmin()) {
+			foreach ($fields as $key => $fieldName) {
+				if (Tca::table($this->dataType)->hasField($fieldName) && !Tca::table($this->dataType)->field($fieldName)->hasAccess()) {
+					unset($fields[$key]);
+				}
+			}
+		}
+		return $fields;
+	}
+
+	/**
+	 * Remove fields according to Grid configuration.
+	 *
+	 * @param $fields
+	 * @return array
+	 */
+	protected function filterForConfiguration($fields)
+	{
+
+		$excludedFields = Tca::grid($this->dataType)->getExcludedFields();
+		foreach ($fields as $key => $field) {
+			if (in_array($field, $excludedFields)) {
+				unset($fields[$key]);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Returns whether the current mode is Backend
+	 *
+	 * @return bool
+	 */
+	protected function isBackendMode()
+	{
+		return TYPO3_MODE == 'BE';
+	}
 
 }

Classes/Domain/Repository/ContentRepository.php

Doc Comments +3 added lines, -2 removed lines

@@ -271,7 +271,7 @@ 
      * Update a content with new information.
      *
      * @param Content $content
-     * @param $language
+     * @param integer $language
      * @return bool
      */
     public function localize($content, $language)
@@ -352,6 +352,7 @@ 
      * Copy a content within this repository.
      *
      * @param Content $content
+     * @param string $target
      * @return bool
      */
     public function copy($content, $target)
@@ -504,7 +505,7 @@ 
     /**
      * Sets the default query settings to be used in this repository
      *
-     * @param QuerySettingsInterface $defaultQuerySettings The query settings to be used by default
+     * @param \Fab\Vidi\Persistence\QuerySettings $defaultQuerySettings The query settings to be used by default
      * @throws \BadMethodCallException
      * @return void
      * @api

Indentation +819 added lines, -819 removed lines

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

Classes/Grid/GridAnalyserService.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +102 added lines, -102 removed lines

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

Classes/Language/LanguageService.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +173 added lines, -173 removed lines

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

Classes/Module/ModuleLoader.php

Doc Comments +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
     /**
      * Returns the current pid.
      *
-     * @return bool
+     * @return integer
      */
     public function getCurrentPid()
     {

Indentation +895 added lines, -895 removed lines

@@ -26,900 +26,900 @@
 class ModuleLoader
 {
 
-    /**
-     * Define the default main module
-     */
-    const DEFAULT_MAIN_MODULE = 'content';
-
-    /**
-     * Define the default pid
-     */
-    const DEFAULT_PID = 0;
-
-    /**
-     * The type of data being listed (which corresponds to a table name in TCA)
-     *
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var string
-     */
-    protected $defaultPid;
-
-    /**
-     * @var bool
-     */
-    protected $showPageTree;
-
-    /**
-     * @var bool
-     */
-    protected $isShown = TRUE;
-
-    /**
-     * @var string
-     */
-    protected $access = Access::USER;
-
-    /**
-     * @var string
-     */
-    protected $mainModule;
-
-    /**
-     * @var string
-     */
-    protected $position = '';
-
-    /**
-     * @var string
-     */
-    protected $icon = '';
-
-    /**
-     * @var string
-     */
-    protected $moduleLanguageFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
-
-    /**
-     * The module key such as m1, m2.
-     *
-     * @var string
-     */
-    protected $moduleKey = 'm1';
-
-    /**
-     * @var string[]
-     */
-    protected $additionalJavaScriptFiles = array();
-
-    /**
-     * @var string[]
-     */
-    protected $additionalStyleSheetFiles = array();
-
-    /**
-     * @var array
-     */
-    protected $components = array(
-        ModulePosition::DOC_HEADER => array(
-            ModulePosition::TOP => array(
-                ModulePosition::LEFT => array(),
-                ModulePosition::RIGHT => array(
-                    'Fab\Vidi\View\Button\ToolButton',
-                ),
-            ),
-            ModulePosition::BOTTOM => array(
-                ModulePosition::LEFT => array(
-                    'Fab\Vidi\View\Button\NewButton',
-                    'Fab\Vidi\ViewHelpers\Link\BackViewHelper',
-                ),
-                ModulePosition::RIGHT => array(),
-            ),
-        ),
-        ModulePosition::GRID => array(
-            ModulePosition::TOP => array(
-                'Fab\Vidi\View\Check\PidCheck',
-                'Fab\Vidi\View\Check\RelationsCheck',
-                'Fab\Vidi\View\Tab\DataTypeTab',
-            ),
-            ModulePosition::BUTTONS => array(
-                'Fab\Vidi\View\Button\EditButton',
-                'Fab\Vidi\View\Button\DeleteButton',
-            ),
-            ModulePosition::BOTTOM => array(),
-        ),
-        ModulePosition::MENU_MASS_ACTION => array(
-            'Fab\Vidi\View\MenuItem\ExportXlsMenuItem',
-            'Fab\Vidi\View\MenuItem\ExportXmlMenuItem',
-            'Fab\Vidi\View\MenuItem\ExportCsvMenuItem',
-            'Fab\Vidi\View\MenuItem\DividerMenuItem',
-            'Fab\Vidi\View\MenuItem\MassDeleteMenuItem',
-            #'Fab\Vidi\View\MenuItem\MassEditMenuItem',
-        ),
-    );
-
-    /**
-     * @param string $dataType
-     */
-    public function __construct($dataType = NULL)
-    {
-        $this->dataType = $dataType;
-    }
-
-    /**
-     * Tell whether a module is already registered.
-     *
-     * @param string $dataType
-     * @return bool
-     */
-    public function isRegistered($dataType)
-    {
-        $internalModuleSignature = $this->getInternalModuleSignature($dataType);
-        return !empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]);
-    }
-
-    /**
-     * Register the module
-     *
-     * @return void
-     */
-    public function register()
-    {
-
-        $this->initializeDefaultValues();
-        $internalModuleSignature = $this->getInternalModuleSignature();
-
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature] = array();
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['dataType'] = $this->dataType;
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['mainModule'] = $this->mainModule;
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['defaultPid'] = $this->defaultPid;
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['additionalJavaScriptFiles'] = $this->additionalJavaScriptFiles;
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['additionalStyleSheetFiles'] = $this->additionalStyleSheetFiles;
-        $GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['components'] = $this->components;
-
-        // Register and displays module in the BE only if told, default is TRUE.
-        if ($this->isShown) {
-            $moduleConfiguration = array(
-                #'routeTarget' => \Fab\Vidi\Controller\Backend\ContentController::class . '::mainAction', // what to do here?
-                'access' => $this->access,
-                'labels' => $this->moduleLanguageFile,
-                'inheritNavigationComponentFromMainModule' => TRUE
-            );
-
-            if (!empty($this->icon)) {
-                $moduleConfiguration['icon'] = $this->icon;
-            }
-
-            if (!is_null($this->showPageTree)) {
-                if ($this->showPageTree) {
-                    $moduleConfiguration['navigationComponentId'] = 'typo3-pagetree';
-                } else {
-                    $moduleConfiguration['inheritNavigationComponentFromMainModule'] = FALSE;
-                }
-            }
-
-            ExtensionUtility::registerModule(
-                'Fab.vidi',
-                $this->mainModule,
-                $this->dataType . '_' . $this->moduleKey,
-                $this->position,
-                array(
-                    'Content' => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
-                    'Tool' => 'welcome, work',
-                    'Facet' => 'autoSuggest, autoSuggests',
-                    'Selection' => 'edit, update, create, delete, list, show',
-                    'UserPreferences' => 'save',
-                    'Clipboard' => 'save, flush, show',
-                ),
-                $moduleConfiguration
-            );
-        }
-    }
-
-    /**
-     * Return the module code for a BE module.
-     *
-     * @return string
-     */
-    public function getSignature()
-    {
-        return GeneralUtility::_GP(Parameter::MODULE);
-    }
-
-    /**
-     * Tell whether the current module is the list one.
-     *
-     * @return bool
-     */
-    public function copeWithPageTree()
-    {
-        return GeneralUtility::_GP(Parameter::MODULE) === 'web_VidiM1';
-    }
-
-    /**
-     * Returns the current pid.
-     *
-     * @return bool
-     */
-    public function getCurrentPid()
-    {
-        return GeneralUtility::_GET(Parameter::PID) > 0 ? (int)GeneralUtility::_GET(Parameter::PID) : 0;
-    }
-
-    /**
-     * Return the Vidi module code which is stored in TBE_MODULES_EXT
-     *
-     * @return string
-     */
-    public function getVidiModuleCode()
-    {
-
-        if ($this->copeWithPageTree()) {
-            $userPreferenceKey = sprintf('Vidi_pid_%s', $this->getCurrentPid());
-
-            if (GeneralUtility::_GP(Parameter::SUBMODULE)) {
-                $subModuleCode = GeneralUtility::_GP(Parameter::SUBMODULE);
-                BackendUserPreferenceService::getInstance()->set($userPreferenceKey, $subModuleCode);
-            } else {
-
-                $defaultModuleCode = BackendUserPreferenceService::getInstance()->get($userPreferenceKey);
-                if (empty($defaultModuleCode)) {
-                    $defaultModuleCode = 'VidiTtContentM1'; // hard-coded submodule
-                    BackendUserPreferenceService::getInstance()->set($userPreferenceKey, $defaultModuleCode);
-                }
-
-                $vidiModules = ModuleService::getInstance()->getModulesForCurrentPid();
-
-                if (empty($vidiModules)) {
-                    $subModuleCode = $defaultModuleCode;
-                } elseif (isset($vidiModules[$defaultModuleCode])) {
-                    $subModuleCode = $defaultModuleCode;
-                } else {
-                    $subModuleCode = ModuleService::getInstance()->getFirstModuleForPid($this->getCurrentPid());
-                }
-            }
-        } else {
-            $moduleCode = $this->getSignature();
-
-            // Remove first part which is separated "_"
-            $delimiter = strpos($moduleCode, '_') + 1;
-            $subModuleCode = substr($moduleCode, $delimiter);
-        }
-
-        return $subModuleCode;
-    }
-
-    /**
-     * Return the module URL.
-     *
-     * @param array $additionalParameters
-     * @param bool $absoluteUrl
-     * @return string
-     */
-    public function getModuleUrl(array $additionalParameters = array(), $absoluteUrl = false)
-    {
-        $moduleCode = $this->getSignature();
-
-        // Add possible submodule if current module has page tree.
-        if ($this->copeWithPageTree() && !isset($additionalParameters[Parameter::SUBMODULE])) {
-            $additionalParameters[Parameter::SUBMODULE] = $this->getVidiModuleCode();
-        }
-
-        // And don't forget the pid!
-        if (GeneralUtility::_GET(Parameter::PID)) {
-            $additionalParameters[Parameter::PID] = GeneralUtility::_GET(Parameter::PID);
-        }
-
-        $moduleUrl = BackendUtility::getModuleUrl($moduleCode, $additionalParameters, false, $absoluteUrl);
-        return $moduleUrl;
-    }
-
-    /**
-     * Return the module absolute URL.
-     *
-     * @param array $additionalParameters
-     * @return string
-     */
-    public function getModuleAbsoluteUrl(array $additionalParameters = array())
-    {
-        return $this->getModuleUrl($additionalParameters, true);
-    }
-
-    /**
-     * Return the parameter prefix for a BE module.
-     *
-     * @return string
-     */
-    public function getParameterPrefix()
-    {
-        return 'tx_vidi_' . strtolower($this->getSignature());
-    }
-
-    /**
-     * Return a configuration key or the entire module configuration array if not key is given.
-     *
-     * @param string $key
-     * @throws InvalidKeyInArrayException
-     * @return mixed
-     */
-    public function getModuleConfiguration($key = '')
-    {
-
-        $vidiModuleCode = $this->getVidiModuleCode();
-
-        // Module code must exist
-        if (empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode])) {
-            $message = sprintf('Invalid or not existing module code "%s"', $vidiModuleCode);
-            throw new InvalidKeyInArrayException($message, 1375092053);
-        }
-
-        $result = $GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode];
-
-        if (!empty($key)) {
-            if (isset($result[$key])) {
-                $result = $result[$key];
-            } else {
-                // key must exist
-                $message = sprintf('Invalid key configuration "%s"', $key);
-                throw new InvalidKeyInArrayException($message, 1375092054);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @param string $icon
-     * @return $this
-     */
-    public function setIcon($icon)
-    {
-        $this->icon = $icon;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getIcon()
-    {
-        return $this->icon;
-    }
-
-    /**
-     * @param string $mainModule
-     * @return $this
-     */
-    public function setMainModule($mainModule)
-    {
-        $this->mainModule = $mainModule;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getMainModule()
-    {
-        if (is_null($this->mainModule)) {
-            $this->mainModule = $this->getModuleConfiguration('mainModule');
-        }
-        return $this->mainModule;
-    }
-
-    /**
-     * @param string $moduleLanguageFile
-     * @return $this
-     */
-    public function setModuleLanguageFile($moduleLanguageFile)
-    {
-        $this->moduleLanguageFile = $moduleLanguageFile;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getModuleLanguageFile()
-    {
-        return $this->moduleLanguageFile;
-    }
-
-    /**
-     * @param string $position
-     * @return $this
-     */
-    public function setPosition($position)
-    {
-        $this->position = $position;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPosition()
-    {
-        return $this->position;
-    }
-
-    /**
-     * @param array $files
-     * @return $this
-     */
-    public function addJavaScriptFiles(array $files)
-    {
-        foreach ($files as $file) {
-            $this->additionalJavaScriptFiles[] = $file;
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $fileNameAndPath
-     * @return $this
-     */
-    public function addJavaScriptFile($fileNameAndPath)
-    {
-        $this->additionalJavaScriptFiles[] = $fileNameAndPath;
-        return $this;
-    }
-
-    /**
-     * @param array $files
-     * @return $this
-     */
-    public function addStyleSheetFiles(array $files)
-    {
-        foreach ($files as $file) {
-            $this->additionalStyleSheetFiles[] = $file;
-        }
-        return $this;
-    }
-
-    /**
-     * @param string $fileNameAndPath
-     * @return $this
-     */
-    public function addStyleSheetFile($fileNameAndPath)
-    {
-        $this->additionalStyleSheetFiles[] = $fileNameAndPath;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType()
-    {
-        if (is_null($this->dataType)) {
-            $this->dataType = $this->getModuleConfiguration('dataType');
-        }
-        return $this->dataType;
-    }
-
-    /**
-     * @return array
-     */
-    public function getDataTypes()
-    {
-        $dataTypes = array();
-        foreach ($GLOBALS['TBE_MODULES_EXT']['vidi'] as $module) {
-            $dataTypes[] = $module['dataType'];
-        }
-        return $dataTypes;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType)
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultPid()
-    {
-        if (empty($this->defaultPid)) {
-            $this->defaultPid = $this->getModuleConfiguration('defaultPid');
-        }
-        return $this->defaultPid;
-    }
-
-    /**
-     * @param string $defaultPid
-     * @return $this
-     */
-    public function setDefaultPid($defaultPid)
-    {
-        $this->defaultPid = $defaultPid;
-        return $this;
-    }
-
-    /**
-     * @param bool $isPageTreeShown
-     * @return $this
-     */
-    public function showPageTree($isPageTreeShown)
-    {
-        $this->showPageTree = $isPageTreeShown;
-        return $this;
-    }
-
-    /**
-     * @param string $isShown
-     * @return $this
-     */
-    public function isShown($isShown)
-    {
-        $this->isShown = $isShown;
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderTopLeftComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderTopLeftComponents(array $components)
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderTopLeftComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderTopRightComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderTopRightComponents(array $components)
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderTopRightComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderBottomLeftComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderBottomLeftComponents(array $components)
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderBottomLeftComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getDocHeaderBottomRightComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setDocHeaderBottomRightComponents(array $components)
-    {
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addDocHeaderBottomRightComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
-        $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getGridTopComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::GRID][ModulePosition::TOP];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setGridTopComponents(array $components)
-    {
-        $this->components[ModulePosition::GRID][ModulePosition::TOP] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addGridTopComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::GRID][ModulePosition::TOP];
-        $this->components[ModulePosition::GRID][ModulePosition::TOP] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getGridBottomComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::GRID][ModulePosition::BOTTOM];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setGridBottomComponents(array $components)
-    {
-        $this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addGridBottomComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BOTTOM];
-        $this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getGridButtonsComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::GRID][ModulePosition::BUTTONS];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setGridButtonsComponents(array $components)
-    {
-        $this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addGridButtonsComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BUTTONS];
-        $this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return $array
-     */
-    public function getMenuMassActionComponents()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return $configuration['components'][ModulePosition::MENU_MASS_ACTION];
-    }
-
-    /**
-     * @param array $components
-     * @return $this
-     */
-    public function setMenuMassActionComponents(array $components)
-    {
-        $this->components[ModulePosition::MENU_MASS_ACTION] = $components;
-        return $this;
-    }
-
-    /**
-     * @param string|array $components
-     * @return $this
-     */
-    public function addMenuMassActionComponents($components)
-    {
-        if (is_string($components)) {
-            $components = array($components);
-        }
-        $currentComponents = $this->components[ModulePosition::MENU_MASS_ACTION];
-        $this->components[ModulePosition::MENU_MASS_ACTION] = array_merge($currentComponents, $components);
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getAccess()
-    {
-        return $this->access;
-    }
-
-    /**
-     * @param string $access
-     * @return $this
-     */
-    public function setAccess($access)
-    {
-        $this->access = $access;
-        return $this;
-    }
-
-    /**
-     * @return \string[]
-     */
-    public function getAdditionalJavaScriptFiles()
-    {
-        if (empty($this->additionalJavaScriptFiles)) {
-            $this->additionalJavaScriptFiles = $this->getModuleConfiguration('additionalJavaScriptFiles');
-        }
-        return $this->additionalJavaScriptFiles;
-    }
-
-    /**
-     * @return \string[]
-     */
-    public function getAdditionalStyleSheetFiles()
-    {
-        if (empty($this->additionalStyleSheetFiles)) {
-            $this->additionalStyleSheetFiles = $this->getModuleConfiguration('additionalStyleSheetFiles');
-        }
-        return $this->additionalStyleSheetFiles;
-    }
-
-    /**
-     * @return array
-     */
-    public function getComponents()
-    {
-        return $this->components;
-    }
-
-    /**
-     * @param string $pluginName
-     * @return bool
-     */
-    public function hasPlugin($pluginName = '')
-    {
-        $parameterPrefix = $this->getParameterPrefix();
-        $parameters = GeneralUtility::_GET($parameterPrefix);
-
-        $hasPlugin = !empty($parameters['plugins']) && is_array($parameters['plugins']);
-        if ($hasPlugin && $pluginName) {
-            $hasPlugin = in_array($pluginName, $parameters['plugins']);
-        }
-        return $hasPlugin;
-    }
-
-    /**
-     * Compute the internal module code
-     *
-     * @param NULL|string $dataType
-     * @return string
-     */
-    protected function getInternalModuleSignature($dataType = NULL)
-    {
-        if (is_null($dataType)) {
-            $dataType = $this->dataType;
-        }
-        $subModuleName = $dataType . '_' . $this->moduleKey;
-        return 'Vidi' . GeneralUtility::underscoredToUpperCamelCase($subModuleName);
-    }
-
-    /**
-     * Make sure default values are correctly initialized for the module.
-     *
-     * @return void
-     */
-    protected function initializeDefaultValues()
-    {
-        if (is_null($this->mainModule)) {
-            $this->mainModule = self::DEFAULT_MAIN_MODULE;
-        }
-
-        if (is_null($this->defaultPid)) {
-            $this->defaultPid = self::DEFAULT_PID;
-        }
-    }
+	/**
+	 * Define the default main module
+	 */
+	const DEFAULT_MAIN_MODULE = 'content';
+
+	/**
+	 * Define the default pid
+	 */
+	const DEFAULT_PID = 0;
+
+	/**
+	 * The type of data being listed (which corresponds to a table name in TCA)
+	 *
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var string
+	 */
+	protected $defaultPid;
+
+	/**
+	 * @var bool
+	 */
+	protected $showPageTree;
+
+	/**
+	 * @var bool
+	 */
+	protected $isShown = TRUE;
+
+	/**
+	 * @var string
+	 */
+	protected $access = Access::USER;
+
+	/**
+	 * @var string
+	 */
+	protected $mainModule;
+
+	/**
+	 * @var string
+	 */
+	protected $position = '';
+
+	/**
+	 * @var string
+	 */
+	protected $icon = '';
+
+	/**
+	 * @var string
+	 */
+	protected $moduleLanguageFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
+
+	/**
+	 * The module key such as m1, m2.
+	 *
+	 * @var string
+	 */
+	protected $moduleKey = 'm1';
+
+	/**
+	 * @var string[]
+	 */
+	protected $additionalJavaScriptFiles = array();
+
+	/**
+	 * @var string[]
+	 */
+	protected $additionalStyleSheetFiles = array();
+
+	/**
+	 * @var array
+	 */
+	protected $components = array(
+		ModulePosition::DOC_HEADER => array(
+			ModulePosition::TOP => array(
+				ModulePosition::LEFT => array(),
+				ModulePosition::RIGHT => array(
+					'Fab\Vidi\View\Button\ToolButton',
+				),
+			),
+			ModulePosition::BOTTOM => array(
+				ModulePosition::LEFT => array(
+					'Fab\Vidi\View\Button\NewButton',
+					'Fab\Vidi\ViewHelpers\Link\BackViewHelper',
+				),
+				ModulePosition::RIGHT => array(),
+			),
+		),
+		ModulePosition::GRID => array(
+			ModulePosition::TOP => array(
+				'Fab\Vidi\View\Check\PidCheck',
+				'Fab\Vidi\View\Check\RelationsCheck',
+				'Fab\Vidi\View\Tab\DataTypeTab',
+			),
+			ModulePosition::BUTTONS => array(
+				'Fab\Vidi\View\Button\EditButton',
+				'Fab\Vidi\View\Button\DeleteButton',
+			),
+			ModulePosition::BOTTOM => array(),
+		),
+		ModulePosition::MENU_MASS_ACTION => array(
+			'Fab\Vidi\View\MenuItem\ExportXlsMenuItem',
+			'Fab\Vidi\View\MenuItem\ExportXmlMenuItem',
+			'Fab\Vidi\View\MenuItem\ExportCsvMenuItem',
+			'Fab\Vidi\View\MenuItem\DividerMenuItem',
+			'Fab\Vidi\View\MenuItem\MassDeleteMenuItem',
+			#'Fab\Vidi\View\MenuItem\MassEditMenuItem',
+		),
+	);
+
+	/**
+	 * @param string $dataType
+	 */
+	public function __construct($dataType = NULL)
+	{
+		$this->dataType = $dataType;
+	}
+
+	/**
+	 * Tell whether a module is already registered.
+	 *
+	 * @param string $dataType
+	 * @return bool
+	 */
+	public function isRegistered($dataType)
+	{
+		$internalModuleSignature = $this->getInternalModuleSignature($dataType);
+		return !empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]);
+	}
+
+	/**
+	 * Register the module
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+
+		$this->initializeDefaultValues();
+		$internalModuleSignature = $this->getInternalModuleSignature();
+
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature] = array();
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['dataType'] = $this->dataType;
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['mainModule'] = $this->mainModule;
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['defaultPid'] = $this->defaultPid;
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['additionalJavaScriptFiles'] = $this->additionalJavaScriptFiles;
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['additionalStyleSheetFiles'] = $this->additionalStyleSheetFiles;
+		$GLOBALS['TBE_MODULES_EXT']['vidi'][$internalModuleSignature]['components'] = $this->components;
+
+		// Register and displays module in the BE only if told, default is TRUE.
+		if ($this->isShown) {
+			$moduleConfiguration = array(
+				#'routeTarget' => \Fab\Vidi\Controller\Backend\ContentController::class . '::mainAction', // what to do here?
+				'access' => $this->access,
+				'labels' => $this->moduleLanguageFile,
+				'inheritNavigationComponentFromMainModule' => TRUE
+			);
+
+			if (!empty($this->icon)) {
+				$moduleConfiguration['icon'] = $this->icon;
+			}
+
+			if (!is_null($this->showPageTree)) {
+				if ($this->showPageTree) {
+					$moduleConfiguration['navigationComponentId'] = 'typo3-pagetree';
+				} else {
+					$moduleConfiguration['inheritNavigationComponentFromMainModule'] = FALSE;
+				}
+			}
+
+			ExtensionUtility::registerModule(
+				'Fab.vidi',
+				$this->mainModule,
+				$this->dataType . '_' . $this->moduleKey,
+				$this->position,
+				array(
+					'Content' => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
+					'Tool' => 'welcome, work',
+					'Facet' => 'autoSuggest, autoSuggests',
+					'Selection' => 'edit, update, create, delete, list, show',
+					'UserPreferences' => 'save',
+					'Clipboard' => 'save, flush, show',
+				),
+				$moduleConfiguration
+			);
+		}
+	}
+
+	/**
+	 * Return the module code for a BE module.
+	 *
+	 * @return string
+	 */
+	public function getSignature()
+	{
+		return GeneralUtility::_GP(Parameter::MODULE);
+	}
+
+	/**
+	 * Tell whether the current module is the list one.
+	 *
+	 * @return bool
+	 */
+	public function copeWithPageTree()
+	{
+		return GeneralUtility::_GP(Parameter::MODULE) === 'web_VidiM1';
+	}
+
+	/**
+	 * Returns the current pid.
+	 *
+	 * @return bool
+	 */
+	public function getCurrentPid()
+	{
+		return GeneralUtility::_GET(Parameter::PID) > 0 ? (int)GeneralUtility::_GET(Parameter::PID) : 0;
+	}
+
+	/**
+	 * Return the Vidi module code which is stored in TBE_MODULES_EXT
+	 *
+	 * @return string
+	 */
+	public function getVidiModuleCode()
+	{
+
+		if ($this->copeWithPageTree()) {
+			$userPreferenceKey = sprintf('Vidi_pid_%s', $this->getCurrentPid());
+
+			if (GeneralUtility::_GP(Parameter::SUBMODULE)) {
+				$subModuleCode = GeneralUtility::_GP(Parameter::SUBMODULE);
+				BackendUserPreferenceService::getInstance()->set($userPreferenceKey, $subModuleCode);
+			} else {
+
+				$defaultModuleCode = BackendUserPreferenceService::getInstance()->get($userPreferenceKey);
+				if (empty($defaultModuleCode)) {
+					$defaultModuleCode = 'VidiTtContentM1'; // hard-coded submodule
+					BackendUserPreferenceService::getInstance()->set($userPreferenceKey, $defaultModuleCode);
+				}
+
+				$vidiModules = ModuleService::getInstance()->getModulesForCurrentPid();
+
+				if (empty($vidiModules)) {
+					$subModuleCode = $defaultModuleCode;
+				} elseif (isset($vidiModules[$defaultModuleCode])) {
+					$subModuleCode = $defaultModuleCode;
+				} else {
+					$subModuleCode = ModuleService::getInstance()->getFirstModuleForPid($this->getCurrentPid());
+				}
+			}
+		} else {
+			$moduleCode = $this->getSignature();
+
+			// Remove first part which is separated "_"
+			$delimiter = strpos($moduleCode, '_') + 1;
+			$subModuleCode = substr($moduleCode, $delimiter);
+		}
+
+		return $subModuleCode;
+	}
+
+	/**
+	 * Return the module URL.
+	 *
+	 * @param array $additionalParameters
+	 * @param bool $absoluteUrl
+	 * @return string
+	 */
+	public function getModuleUrl(array $additionalParameters = array(), $absoluteUrl = false)
+	{
+		$moduleCode = $this->getSignature();
+
+		// Add possible submodule if current module has page tree.
+		if ($this->copeWithPageTree() && !isset($additionalParameters[Parameter::SUBMODULE])) {
+			$additionalParameters[Parameter::SUBMODULE] = $this->getVidiModuleCode();
+		}
+
+		// And don't forget the pid!
+		if (GeneralUtility::_GET(Parameter::PID)) {
+			$additionalParameters[Parameter::PID] = GeneralUtility::_GET(Parameter::PID);
+		}
+
+		$moduleUrl = BackendUtility::getModuleUrl($moduleCode, $additionalParameters, false, $absoluteUrl);
+		return $moduleUrl;
+	}
+
+	/**
+	 * Return the module absolute URL.
+	 *
+	 * @param array $additionalParameters
+	 * @return string
+	 */
+	public function getModuleAbsoluteUrl(array $additionalParameters = array())
+	{
+		return $this->getModuleUrl($additionalParameters, true);
+	}
+
+	/**
+	 * Return the parameter prefix for a BE module.
+	 *
+	 * @return string
+	 */
+	public function getParameterPrefix()
+	{
+		return 'tx_vidi_' . strtolower($this->getSignature());
+	}
+
+	/**
+	 * Return a configuration key or the entire module configuration array if not key is given.
+	 *
+	 * @param string $key
+	 * @throws InvalidKeyInArrayException
+	 * @return mixed
+	 */
+	public function getModuleConfiguration($key = '')
+	{
+
+		$vidiModuleCode = $this->getVidiModuleCode();
+
+		// Module code must exist
+		if (empty($GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode])) {
+			$message = sprintf('Invalid or not existing module code "%s"', $vidiModuleCode);
+			throw new InvalidKeyInArrayException($message, 1375092053);
+		}
+
+		$result = $GLOBALS['TBE_MODULES_EXT']['vidi'][$vidiModuleCode];
+
+		if (!empty($key)) {
+			if (isset($result[$key])) {
+				$result = $result[$key];
+			} else {
+				// key must exist
+				$message = sprintf('Invalid key configuration "%s"', $key);
+				throw new InvalidKeyInArrayException($message, 1375092054);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 */
+	public function setIcon($icon)
+	{
+		$this->icon = $icon;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIcon()
+	{
+		return $this->icon;
+	}
+
+	/**
+	 * @param string $mainModule
+	 * @return $this
+	 */
+	public function setMainModule($mainModule)
+	{
+		$this->mainModule = $mainModule;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getMainModule()
+	{
+		if (is_null($this->mainModule)) {
+			$this->mainModule = $this->getModuleConfiguration('mainModule');
+		}
+		return $this->mainModule;
+	}
+
+	/**
+	 * @param string $moduleLanguageFile
+	 * @return $this
+	 */
+	public function setModuleLanguageFile($moduleLanguageFile)
+	{
+		$this->moduleLanguageFile = $moduleLanguageFile;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getModuleLanguageFile()
+	{
+		return $this->moduleLanguageFile;
+	}
+
+	/**
+	 * @param string $position
+	 * @return $this
+	 */
+	public function setPosition($position)
+	{
+		$this->position = $position;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPosition()
+	{
+		return $this->position;
+	}
+
+	/**
+	 * @param array $files
+	 * @return $this
+	 */
+	public function addJavaScriptFiles(array $files)
+	{
+		foreach ($files as $file) {
+			$this->additionalJavaScriptFiles[] = $file;
+		}
+		return $this;
+	}
+
+	/**
+	 * @param string $fileNameAndPath
+	 * @return $this
+	 */
+	public function addJavaScriptFile($fileNameAndPath)
+	{
+		$this->additionalJavaScriptFiles[] = $fileNameAndPath;
+		return $this;
+	}
+
+	/**
+	 * @param array $files
+	 * @return $this
+	 */
+	public function addStyleSheetFiles(array $files)
+	{
+		foreach ($files as $file) {
+			$this->additionalStyleSheetFiles[] = $file;
+		}
+		return $this;
+	}
+
+	/**
+	 * @param string $fileNameAndPath
+	 * @return $this
+	 */
+	public function addStyleSheetFile($fileNameAndPath)
+	{
+		$this->additionalStyleSheetFiles[] = $fileNameAndPath;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType()
+	{
+		if (is_null($this->dataType)) {
+			$this->dataType = $this->getModuleConfiguration('dataType');
+		}
+		return $this->dataType;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getDataTypes()
+	{
+		$dataTypes = array();
+		foreach ($GLOBALS['TBE_MODULES_EXT']['vidi'] as $module) {
+			$dataTypes[] = $module['dataType'];
+		}
+		return $dataTypes;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType)
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultPid()
+	{
+		if (empty($this->defaultPid)) {
+			$this->defaultPid = $this->getModuleConfiguration('defaultPid');
+		}
+		return $this->defaultPid;
+	}
+
+	/**
+	 * @param string $defaultPid
+	 * @return $this
+	 */
+	public function setDefaultPid($defaultPid)
+	{
+		$this->defaultPid = $defaultPid;
+		return $this;
+	}
+
+	/**
+	 * @param bool $isPageTreeShown
+	 * @return $this
+	 */
+	public function showPageTree($isPageTreeShown)
+	{
+		$this->showPageTree = $isPageTreeShown;
+		return $this;
+	}
+
+	/**
+	 * @param string $isShown
+	 * @return $this
+	 */
+	public function isShown($isShown)
+	{
+		$this->isShown = $isShown;
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderTopLeftComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderTopLeftComponents(array $components)
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderTopLeftComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::LEFT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderTopRightComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderTopRightComponents(array $components)
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderTopRightComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::TOP][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderBottomLeftComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderBottomLeftComponents(array $components)
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderBottomLeftComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::LEFT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getDocHeaderBottomRightComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setDocHeaderBottomRightComponents(array $components)
+	{
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addDocHeaderBottomRightComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT];
+		$this->components[ModulePosition::DOC_HEADER][ModulePosition::BOTTOM][ModulePosition::RIGHT] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getGridTopComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::GRID][ModulePosition::TOP];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setGridTopComponents(array $components)
+	{
+		$this->components[ModulePosition::GRID][ModulePosition::TOP] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addGridTopComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::GRID][ModulePosition::TOP];
+		$this->components[ModulePosition::GRID][ModulePosition::TOP] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getGridBottomComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::GRID][ModulePosition::BOTTOM];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setGridBottomComponents(array $components)
+	{
+		$this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addGridBottomComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BOTTOM];
+		$this->components[ModulePosition::GRID][ModulePosition::BOTTOM] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getGridButtonsComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::GRID][ModulePosition::BUTTONS];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setGridButtonsComponents(array $components)
+	{
+		$this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addGridButtonsComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::GRID][ModulePosition::BUTTONS];
+		$this->components[ModulePosition::GRID][ModulePosition::BUTTONS] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return $array
+	 */
+	public function getMenuMassActionComponents()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return $configuration['components'][ModulePosition::MENU_MASS_ACTION];
+	}
+
+	/**
+	 * @param array $components
+	 * @return $this
+	 */
+	public function setMenuMassActionComponents(array $components)
+	{
+		$this->components[ModulePosition::MENU_MASS_ACTION] = $components;
+		return $this;
+	}
+
+	/**
+	 * @param string|array $components
+	 * @return $this
+	 */
+	public function addMenuMassActionComponents($components)
+	{
+		if (is_string($components)) {
+			$components = array($components);
+		}
+		$currentComponents = $this->components[ModulePosition::MENU_MASS_ACTION];
+		$this->components[ModulePosition::MENU_MASS_ACTION] = array_merge($currentComponents, $components);
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getAccess()
+	{
+		return $this->access;
+	}
+
+	/**
+	 * @param string $access
+	 * @return $this
+	 */
+	public function setAccess($access)
+	{
+		$this->access = $access;
+		return $this;
+	}
+
+	/**
+	 * @return \string[]
+	 */
+	public function getAdditionalJavaScriptFiles()
+	{
+		if (empty($this->additionalJavaScriptFiles)) {
+			$this->additionalJavaScriptFiles = $this->getModuleConfiguration('additionalJavaScriptFiles');
+		}
+		return $this->additionalJavaScriptFiles;
+	}
+
+	/**
+	 * @return \string[]
+	 */
+	public function getAdditionalStyleSheetFiles()
+	{
+		if (empty($this->additionalStyleSheetFiles)) {
+			$this->additionalStyleSheetFiles = $this->getModuleConfiguration('additionalStyleSheetFiles');
+		}
+		return $this->additionalStyleSheetFiles;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getComponents()
+	{
+		return $this->components;
+	}
+
+	/**
+	 * @param string $pluginName
+	 * @return bool
+	 */
+	public function hasPlugin($pluginName = '')
+	{
+		$parameterPrefix = $this->getParameterPrefix();
+		$parameters = GeneralUtility::_GET($parameterPrefix);
+
+		$hasPlugin = !empty($parameters['plugins']) && is_array($parameters['plugins']);
+		if ($hasPlugin && $pluginName) {
+			$hasPlugin = in_array($pluginName, $parameters['plugins']);
+		}
+		return $hasPlugin;
+	}
+
+	/**
+	 * Compute the internal module code
+	 *
+	 * @param NULL|string $dataType
+	 * @return string
+	 */
+	protected function getInternalModuleSignature($dataType = NULL)
+	{
+		if (is_null($dataType)) {
+			$dataType = $this->dataType;
+		}
+		$subModuleName = $dataType . '_' . $this->moduleKey;
+		return 'Vidi' . GeneralUtility::underscoredToUpperCamelCase($subModuleName);
+	}
+
+	/**
+	 * Make sure default values are correctly initialized for the module.
+	 *
+	 * @return void
+	 */
+	protected function initializeDefaultValues()
+	{
+		if (is_null($this->mainModule)) {
+			$this->mainModule = self::DEFAULT_MAIN_MODULE;
+		}
+
+		if (is_null($this->defaultPid)) {
+			$this->defaultPid = self::DEFAULT_PID;
+		}
+	}
 
 }

Classes/Persistence/Query.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +644 added lines, -644 removed lines

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

Classes/Persistence/Storage/VidiDbBackend.php

Doc Comments +3 added lines, -2 removed lines

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

Unused Use Statements -1 removed lines

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

Indentation +1207 added lines, -1207 removed lines

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