fabarea / vidi

Classes/Controller/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
      */
     protected function emitProcessContentDataSignal(Content $contentObject, $fieldNameAndPath, $contentData, $counter, $savingBehavior, $language)

Indentation +758 added lines, -758 removed lines

@@ -42,763 +42,763 @@
 class ContentController extends ActionController
 {
 
-    /**
-     * @var \Fab\Vidi\Domain\Repository\SelectionRepository
-     * @inject
-     */
-    protected $selectionRepository;
-
-    /**
-     * Initialize every action.
-     */
-    public function initializeAction()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:vidi/Resources/Private/Language/locallang.xlf');
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('columns')) {
-
-            /** @var CsvToArrayConverter $typeConverter */
-            $typeConverter = $this->objectManager->get(CsvToArrayConverter::class);
-
-            $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 = [], $matches = [])
-    {
-        // 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 = [], $savingBehavior = SavingBehavior::REPLACE, $language = 0, $columns = [])
-    {
-
-        // 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(Content::class, $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 = []; // 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::class, $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 = [], $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 = [], $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 Matcher $matcher */
-            $matcher = GeneralUtility::makeInstance(Matcher::class, [], $relatedDataType);
-
-            // Default ordering for related data type.
-            $defaultOrderings = Tca::table($relatedDataType)->getDefaultOrderings();
-            /** @var Order $order */
-            $defaultOrder = GeneralUtility::makeInstance(Order::class, $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 = [];
-                foreach ($relatedContents as $node) {
-                    $flatTree[$node->getUid()] = array(
-                        'item' => $node,
-                        'parent' => $node[$parentField] ? $node[$parentField]['uid'] : null,
-                    );
-                }
-
-                $tree = [];
-
-                // 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 = [])
-    {
-
-        $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 = [])
-    {
-        // @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 = [])
-    {
-
-        $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 = [], $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 EditUri $uri */
-                $uriRenderer = GeneralUtility::makeInstance(EditUri::class);
-                $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 ContentService
-     */
-    protected function getContentService()
-    {
-        return GeneralUtility::makeInstance(ContentService::class);
-    }
-
-    /**
-     * @return ContentObjectResolver
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance(ContentObjectResolver::class);
-    }
-
-    /**
-     * @return FieldPathResolver
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * 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(JsonView::class);
-            $this->view->setResponse($this->response);
-        }
-        return $this->view;
-    }
-
-    /**
-     * @return JsonResult|object
-     */
-    protected function getJsonResult()
-    {
-        return GeneralUtility::makeInstance(JsonResult::class);
-    }
-
-    /**
-     * 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
-     */
-    protected function emitProcessContentDataSignal(Content $contentObject, $fieldNameAndPath, $contentData, $counter, $savingBehavior, $language)
-    {
-
-        /** @var \Fab\Vidi\Signal\ProcessContentDataSignalArguments $signalArguments */
-        $signalArguments = GeneralUtility::makeInstance(\Fab\Vidi\Signal\ProcessContentDataSignalArguments::class);
-        $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 Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return $this->objectManager->get(Dispatcher::class);
-    }
-
-    /**
-     * Get the Clipboard service.
-     *
-     * @return ClipboardService
-     */
-    protected function getClipboardService()
-    {
-        return GeneralUtility::makeInstance(ClipboardService::class);
-    }
-
-    /**
-     * @return LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(LanguageService::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * @var \Fab\Vidi\Domain\Repository\SelectionRepository
+	 * @inject
+	 */
+	protected $selectionRepository;
+
+	/**
+	 * Initialize every action.
+	 */
+	public function initializeAction()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile('EXT:vidi/Resources/Private/Language/locallang.xlf');
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('columns')) {
+
+			/** @var CsvToArrayConverter $typeConverter */
+			$typeConverter = $this->objectManager->get(CsvToArrayConverter::class);
+
+			$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 = [], $matches = [])
+	{
+		// 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 = [], $savingBehavior = SavingBehavior::REPLACE, $language = 0, $columns = [])
+	{
+
+		// 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(Content::class, $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 = []; // 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::class, $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 = [], $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 = [], $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 Matcher $matcher */
+			$matcher = GeneralUtility::makeInstance(Matcher::class, [], $relatedDataType);
+
+			// Default ordering for related data type.
+			$defaultOrderings = Tca::table($relatedDataType)->getDefaultOrderings();
+			/** @var Order $order */
+			$defaultOrder = GeneralUtility::makeInstance(Order::class, $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 = [];
+				foreach ($relatedContents as $node) {
+					$flatTree[$node->getUid()] = array(
+						'item' => $node,
+						'parent' => $node[$parentField] ? $node[$parentField]['uid'] : null,
+					);
+				}
+
+				$tree = [];
+
+				// 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 = [])
+	{
+
+		$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 = [])
+	{
+		// @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 = [])
+	{
+
+		$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 = [], $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 EditUri $uri */
+				$uriRenderer = GeneralUtility::makeInstance(EditUri::class);
+				$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 ContentService
+	 */
+	protected function getContentService()
+	{
+		return GeneralUtility::makeInstance(ContentService::class);
+	}
+
+	/**
+	 * @return ContentObjectResolver
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance(ContentObjectResolver::class);
+	}
+
+	/**
+	 * @return FieldPathResolver
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * 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(JsonView::class);
+			$this->view->setResponse($this->response);
+		}
+		return $this->view;
+	}
+
+	/**
+	 * @return JsonResult|object
+	 */
+	protected function getJsonResult()
+	{
+		return GeneralUtility::makeInstance(JsonResult::class);
+	}
+
+	/**
+	 * 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
+	 */
+	protected function emitProcessContentDataSignal(Content $contentObject, $fieldNameAndPath, $contentData, $counter, $savingBehavior, $language)
+	{
+
+		/** @var \Fab\Vidi\Signal\ProcessContentDataSignalArguments $signalArguments */
+		$signalArguments = GeneralUtility::makeInstance(\Fab\Vidi\Signal\ProcessContentDataSignalArguments::class);
+		$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 Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return $this->objectManager->get(Dispatcher::class);
+	}
+
+	/**
+	 * Get the Clipboard service.
+	 *
+	 * @return ClipboardService
+	 */
+	protected function getClipboardService()
+	{
+		return GeneralUtility::makeInstance(ClipboardService::class);
+	}
+
+	/**
+	 * @return LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(LanguageService::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
 }

Classes/Database/DatabaseConnection.php

Doc Comments +3 added lines, -3 removed lines

@@ -473,7 +473,7 @@ 
      * Use this to execute database queries instead of directly calling $this->link->query()
      *
      * @param string $query The query to send to the database
-     * @return bool|\mysqli_result
+     * @return string
      */
     protected function query($query)
     {
@@ -832,7 +832,7 @@ 
      *
      * @param string $query The query to execute
      * @param array $queryComponents The components of the query to execute
-     * @return \mysqli_stmt|object MySQLi statement / DBAL object
+     * @return \mysqli_stmt|null MySQLi statement / DBAL object
      * @internal This method may only be called by \Fab\Vidi\Database\PreparedStatement
      */
     public function prepare_PREPAREDquery($query, array $queryComponents)
@@ -1983,7 +1983,7 @@ 
     /**
      * Serialize destructs current connection
      *
-     * @return array All protected properties that should be saved
+     * @return string[] All protected properties that should be saved
      */
     public function __sleep()
     {

Indentation +1921 added lines, -1921 removed lines

@@ -47,146 +47,146 @@ 
  */
 class DatabaseConnection
 {
-    /**
-     * The AND constraint in where clause
-     *
-     * @var string
-     */
-    const AND_Constraint = 'AND';
-
-    /**
-     * The OR constraint in where clause
-     *
-     * @var string
-     */
-    const OR_Constraint = 'OR';
-
-    /**
-     * Set "TRUE" or "1" if you want database errors outputted. Set to "2" if you also want successful database actions outputted.
-     *
-     * @var bool|int
-     */
-    public $debugOutput = false;
-
-    /**
-     * Internally: Set to last built query (not necessarily executed...)
-     *
-     * @var string
-     */
-    public $debug_lastBuiltQuery = '';
-
-    /**
-     * Set "TRUE" if you want the last built query to be stored in $debug_lastBuiltQuery independent of $this->debugOutput
-     *
-     * @var bool
-     */
-    public $store_lastBuiltQuery = false;
-
-    /**
-     * Set this to 1 to get queries explained (devIPmask must match). Set the value to 2 to the same but disregarding the devIPmask.
-     * There is an alternative option to enable explain output in the admin panel under "TypoScript", which will produce much nicer output, but only works in FE.
-     *
-     * @var bool
-     */
-    public $explainOutput = 0;
-
-    /**
-     * @var string Database host to connect to
-     */
-    protected $databaseHost = '';
-
-    /**
-     * @var int Database port to connect to
-     */
-    protected $databasePort = 3306;
-
-    /**
-     * @var string|NULL Database socket to connect to
-     */
-    protected $databaseSocket = null;
-
-    /**
-     * @var string Database name to connect to
-     */
-    protected $databaseName = '';
-
-    /**
-     * @var string Database user to connect with
-     */
-    protected $databaseUsername = '';
-
-    /**
-     * @var string Database password to connect with
-     */
-    protected $databaseUserPassword = '';
-
-    /**
-     * @var bool TRUE if database connection should be persistent
-     * @see http://php.net/manual/de/mysqli.persistconns.php
-     */
-    protected $persistentDatabaseConnection = false;
-
-    /**
-     * @var bool TRUE if connection between client and sql server is compressed
-     */
-    protected $connectionCompression = false;
-
-    /**
-     * The charset for the connection; will be passed on to
-     * mysqli_set_charset during connection initialization.
-     *
-     * @var string
-     */
-    protected $connectionCharset = 'utf8';
-
-    /**
-     * @var array List of commands executed after connection was established
-     */
-    protected $initializeCommandsAfterConnect = [];
-
-    /**
-     * @var bool TRUE if database connection is established
-     */
-    protected $isConnected = false;
-
-    /**
-     * @var \mysqli $link Default database link object
-     */
-    protected $link = null;
-
-    /**
-     * Default character set, applies unless character set or collation are explicitly set
-     *
-     * @var string
-     */
-    public $default_charset = 'utf8';
-
-    /**
-     * @var array<PostProcessQueryHookInterface>
-     */
-    protected $preProcessHookObjects = [];
-
-    /**
-     * @var array<PreProcessQueryHookInterface>
-     */
-    protected $postProcessHookObjects = [];
-
-    /**
-     * Internal property to mark if a deprecation log warning has been thrown in this request
-     * in order to avoid a load of deprecation.
-     * @var bool
-     */
-    protected $deprecationWarningThrown = false;
-
-    /**
-     * Initialize the database connection
-     */
-    public function initialize()
-    {
-        // Intentionally blank as this will be overloaded by DBAL
-    }
-
-    /************************************
+	/**
+	 * The AND constraint in where clause
+	 *
+	 * @var string
+	 */
+	const AND_Constraint = 'AND';
+
+	/**
+	 * The OR constraint in where clause
+	 *
+	 * @var string
+	 */
+	const OR_Constraint = 'OR';
+
+	/**
+	 * Set "TRUE" or "1" if you want database errors outputted. Set to "2" if you also want successful database actions outputted.
+	 *
+	 * @var bool|int
+	 */
+	public $debugOutput = false;
+
+	/**
+	 * Internally: Set to last built query (not necessarily executed...)
+	 *
+	 * @var string
+	 */
+	public $debug_lastBuiltQuery = '';
+
+	/**
+	 * Set "TRUE" if you want the last built query to be stored in $debug_lastBuiltQuery independent of $this->debugOutput
+	 *
+	 * @var bool
+	 */
+	public $store_lastBuiltQuery = false;
+
+	/**
+	 * Set this to 1 to get queries explained (devIPmask must match). Set the value to 2 to the same but disregarding the devIPmask.
+	 * There is an alternative option to enable explain output in the admin panel under "TypoScript", which will produce much nicer output, but only works in FE.
+	 *
+	 * @var bool
+	 */
+	public $explainOutput = 0;
+
+	/**
+	 * @var string Database host to connect to
+	 */
+	protected $databaseHost = '';
+
+	/**
+	 * @var int Database port to connect to
+	 */
+	protected $databasePort = 3306;
+
+	/**
+	 * @var string|NULL Database socket to connect to
+	 */
+	protected $databaseSocket = null;
+
+	/**
+	 * @var string Database name to connect to
+	 */
+	protected $databaseName = '';
+
+	/**
+	 * @var string Database user to connect with
+	 */
+	protected $databaseUsername = '';
+
+	/**
+	 * @var string Database password to connect with
+	 */
+	protected $databaseUserPassword = '';
+
+	/**
+	 * @var bool TRUE if database connection should be persistent
+	 * @see http://php.net/manual/de/mysqli.persistconns.php
+	 */
+	protected $persistentDatabaseConnection = false;
+
+	/**
+	 * @var bool TRUE if connection between client and sql server is compressed
+	 */
+	protected $connectionCompression = false;
+
+	/**
+	 * The charset for the connection; will be passed on to
+	 * mysqli_set_charset during connection initialization.
+	 *
+	 * @var string
+	 */
+	protected $connectionCharset = 'utf8';
+
+	/**
+	 * @var array List of commands executed after connection was established
+	 */
+	protected $initializeCommandsAfterConnect = [];
+
+	/**
+	 * @var bool TRUE if database connection is established
+	 */
+	protected $isConnected = false;
+
+	/**
+	 * @var \mysqli $link Default database link object
+	 */
+	protected $link = null;
+
+	/**
+	 * Default character set, applies unless character set or collation are explicitly set
+	 *
+	 * @var string
+	 */
+	public $default_charset = 'utf8';
+
+	/**
+	 * @var array<PostProcessQueryHookInterface>
+	 */
+	protected $preProcessHookObjects = [];
+
+	/**
+	 * @var array<PreProcessQueryHookInterface>
+	 */
+	protected $postProcessHookObjects = [];
+
+	/**
+	 * Internal property to mark if a deprecation log warning has been thrown in this request
+	 * in order to avoid a load of deprecation.
+	 * @var bool
+	 */
+	protected $deprecationWarningThrown = false;
+
+	/**
+	 * Initialize the database connection
+	 */
+	public function initialize()
+	{
+		// Intentionally blank as this will be overloaded by DBAL
+	}
+
+	/************************************
      *
      * Query execution
      *
@@ -199,657 +199,657 @@ 
      *
      **************************************/
 
-    /**
-     * Creates and executes an INSERT SQL-statement for $table from the array with field/value pairs $fields_values.
-     * Using this function specifically allows us to handle BLOB and CLOB fields depending on DB
-     *
-     * @param string $table Table name
-     * @param array $fields_values Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$insertFields" with 'fieldname'=>'value' and pass it to this function as argument.
-     * @param bool|array|string $no_quote_fields See fullQuoteArray()
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     */
-    public function exec_INSERTquery($table, $fields_values, $no_quote_fields = false)
-    {
-        $this->logDeprecation();
-        $res = $this->query($this->INSERTquery($table, $fields_values, $no_quote_fields));
-        if ($this->debugOutput) {
-            $this->debug('exec_INSERTquery');
-        }
-        foreach ($this->postProcessHookObjects as $hookObject) {
-            /** @var $hookObject PostProcessQueryHookInterface */
-            $hookObject->exec_INSERTquery_postProcessAction($table, $fields_values, $no_quote_fields, $this);
-        }
-        return $res;
-    }
-
-    /**
-     * Creates and executes an INSERT SQL-statement for $table with multiple rows.
-     *
-     * @param string $table Table name
-     * @param array $fields Field names
-     * @param array $rows Table rows. Each row should be an array with field values mapping to $fields
-     * @param bool|array|string $no_quote_fields See fullQuoteArray()
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     */
-    public function exec_INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = false)
-    {
-        $this->logDeprecation();
-        $res = $this->query($this->INSERTmultipleRows($table, $fields, $rows, $no_quote_fields));
-        if ($this->debugOutput) {
-            $this->debug('exec_INSERTmultipleRows');
-        }
-        foreach ($this->postProcessHookObjects as $hookObject) {
-            /** @var $hookObject PostProcessQueryHookInterface */
-            $hookObject->exec_INSERTmultipleRows_postProcessAction($table, $fields, $rows, $no_quote_fields, $this);
-        }
-        return $res;
-    }
-
-    /**
-     * Creates and executes an UPDATE SQL-statement for $table where $where-clause (typ. 'uid=...') from the array with field/value pairs $fields_values.
-     * Using this function specifically allow us to handle BLOB and CLOB fields depending on DB
-     *
-     * @param string $table Database tablename
-     * @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
-     * @param array $fields_values Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$updateFields" with 'fieldname'=>'value' and pass it to this function as argument.
-     * @param bool|array|string $no_quote_fields See fullQuoteArray()
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     */
-    public function exec_UPDATEquery($table, $where, $fields_values, $no_quote_fields = false)
-    {
-        $this->logDeprecation();
-        $res = $this->query($this->UPDATEquery($table, $where, $fields_values, $no_quote_fields));
-        if ($this->debugOutput) {
-            $this->debug('exec_UPDATEquery');
-        }
-        foreach ($this->postProcessHookObjects as $hookObject) {
-            /** @var $hookObject PostProcessQueryHookInterface */
-            $hookObject->exec_UPDATEquery_postProcessAction($table, $where, $fields_values, $no_quote_fields, $this);
-        }
-        return $res;
-    }
-
-    /**
-     * Creates and executes a DELETE SQL-statement for $table where $where-clause
-     *
-     * @param string $table Database tablename
-     * @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     */
-    public function exec_DELETEquery($table, $where)
-    {
-        $this->logDeprecation();
-        $res = $this->query($this->DELETEquery($table, $where));
-        if ($this->debugOutput) {
-            $this->debug('exec_DELETEquery');
-        }
-        foreach ($this->postProcessHookObjects as $hookObject) {
-            /** @var $hookObject PostProcessQueryHookInterface */
-            $hookObject->exec_DELETEquery_postProcessAction($table, $where, $this);
-        }
-        return $res;
-    }
-
-    /**
-     * Creates and executes a SELECT SQL-statement
-     * Using this function specifically allow us to handle the LIMIT feature independently of DB.
-     *
-     * @param string $select_fields List of fields to select from the table. This is what comes right after "SELECT ...". Required value.
-     * @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
-     * @param string $where_clause Additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT!
-     * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
-     * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
-     * @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     */
-    public function exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '')
-    {
-        $this->logDeprecation();
-        $query = $this->SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
-        $res = $this->query($query);
-        if ($this->debugOutput) {
-            $this->debug('exec_SELECTquery');
-        }
-        if ($this->explainOutput) {
-            $this->explain($query, $from_table, $res->num_rows);
-        }
-        foreach ($this->postProcessHookObjects as $hookObject) {
-            /** @var $hookObject PostProcessQueryHookInterface */
-            $hookObject->exec_SELECTquery_postProcessAction($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', $this);
-        }
-        return $res;
-    }
-
-    /**
-     * Creates and executes a SELECT query, selecting fields ($select) from two/three tables joined
-     * Use $mm_table together with $local_table or $foreign_table to select over two tables. Or use all three tables to select the full MM-relation.
-     * The JOIN is done with [$local_table].uid <--> [$mm_table].uid_local  / [$mm_table].uid_foreign <--> [$foreign_table].uid
-     * The function is very useful for selecting MM-relations between tables adhering to the MM-format used by TCE (TYPO3 Core Engine). See the section on $GLOBALS['TCA'] in Inside TYPO3 for more details.
-     *
-     * @param string $select Field list for SELECT
-     * @param string $local_table Tablename, local table
-     * @param string $mm_table Tablename, relation table
-     * @param string $foreign_table Tablename, foreign table
-     * @param string $whereClause Optional additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT! You have to prepend 'AND ' to this parameter yourself!
-     * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
-     * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
-     * @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     * @see exec_SELECTquery()
-     */
-    public function exec_SELECT_mm_query($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '')
-    {
-        $this->logDeprecation();
-        $queryParts = $this->getSelectMmQueryParts($select, $local_table, $mm_table, $foreign_table, $whereClause, $groupBy, $orderBy, $limit);
-        return $this->exec_SELECT_queryArray($queryParts);
-    }
-
-    /**
-     * Executes a select based on input query parts array
-     *
-     * @param array $queryParts Query parts array
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     * @see exec_SELECTquery()
-     */
-    public function exec_SELECT_queryArray($queryParts)
-    {
-        $this->logDeprecation();
-        return $this->exec_SELECTquery($queryParts['SELECT'], $queryParts['FROM'], $queryParts['WHERE'], $queryParts['GROUPBY'], $queryParts['ORDERBY'], $queryParts['LIMIT']);
-    }
-
-    /**
-     * Creates and executes a SELECT SQL-statement AND traverse result set and returns array with records in.
-     *
-     * @param string $select_fields List of fields to select from the table. This is what comes right after "SELECT ...". Required value.
-     * @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
-     * @param string $where_clause Additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT!
-     * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
-     * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
-     * @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
-     * @param string $uidIndexField If set, the result array will carry this field names value as index. Requires that field to be selected of course!
-     * @return array|NULL Array of rows, or NULL in case of SQL error
-     * @see exec_SELECTquery()
-     * @throws \InvalidArgumentException
-     */
-    public function exec_SELECTgetRows($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', $uidIndexField = '')
-    {
-        $this->logDeprecation();
-        $res = $this->exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
-        if ($this->sql_error()) {
-            $this->sql_free_result($res);
-            return null;
-        }
-        $output = [];
-        $firstRecord = true;
-        while ($record = $this->sql_fetch_assoc($res)) {
-            if ($uidIndexField) {
-                if ($firstRecord) {
-                    $firstRecord = false;
-                    if (!array_key_exists($uidIndexField, $record)) {
-                        $this->sql_free_result($res);
-                        throw new \InvalidArgumentException('The given $uidIndexField "' . $uidIndexField . '" is not available in the result.', 1432933855);
-                    }
-                }
-                $output[$record[$uidIndexField]] = $record;
-            } else {
-                $output[] = $record;
-            }
-        }
-        $this->sql_free_result($res);
-        return $output;
-    }
-
-    /**
-     * Creates and executes a SELECT SQL-statement AND gets a result set and returns an array with a single record in.
-     * LIMIT is automatically set to 1 and can not be overridden.
-     *
-     * @param string $select_fields List of fields to select from the table.
-     * @param string $from_table Table(s) from which to select.
-     * @param string $where_clause Optional additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
-     * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
-     * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
-     * @param bool $numIndex If set, the result will be fetched with sql_fetch_row, otherwise sql_fetch_assoc will be used.
-     * @return array|FALSE|NULL Single row, FALSE on empty result, NULL on error
-     */
-    public function exec_SELECTgetSingleRow($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $numIndex = false)
-    {
-        $this->logDeprecation();
-        $res = $this->exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, '1');
-        $output = null;
-        if ($res !== false) {
-            if ($numIndex) {
-                $output = $this->sql_fetch_row($res);
-            } else {
-                $output = $this->sql_fetch_assoc($res);
-            }
-            $this->sql_free_result($res);
-        }
-        return $output;
-    }
-
-    /**
-     * Counts the number of rows in a table.
-     *
-     * @param string $field Name of the field to use in the COUNT() expression (e.g. '*')
-     * @param string $table Name of the table to count rows for
-     * @param string $where (optional) WHERE statement of the query
-     * @return mixed Number of rows counter (int) or FALSE if something went wrong (bool)
-     */
-    public function exec_SELECTcountRows($field, $table, $where = '1=1')
-    {
-        $this->logDeprecation();
-        $count = false;
-        $resultSet = $this->exec_SELECTquery('COUNT(' . $field . ')', $table, $where);
-        if ($resultSet !== false) {
-            list($count) = $this->sql_fetch_row($resultSet);
-            $count = (int)$count;
-            $this->sql_free_result($resultSet);
-        }
-        return $count;
-    }
-
-    /**
-     * Truncates a table.
-     *
-     * @param string $table Database tablename
-     * @return mixed Result from handler
-     */
-    public function exec_TRUNCATEquery($table)
-    {
-        $this->logDeprecation();
-        $res = $this->query($this->TRUNCATEquery($table));
-        if ($this->debugOutput) {
-            $this->debug('exec_TRUNCATEquery');
-        }
-        foreach ($this->postProcessHookObjects as $hookObject) {
-            /** @var $hookObject PostProcessQueryHookInterface */
-            $hookObject->exec_TRUNCATEquery_postProcessAction($table, $this);
-        }
-        return $res;
-    }
-
-    /**
-     * Central query method. Also checks if there is a database connection.
-     * Use this to execute database queries instead of directly calling $this->link->query()
-     *
-     * @param string $query The query to send to the database
-     * @return bool|\mysqli_result
-     */
-    protected function query($query)
-    {
-        $this->logDeprecation();
-        if (!$this->isConnected) {
-            $this->connectDB();
-        }
-        return $this->link->query($query);
-    }
-
-    /**************************************
+	/**
+	 * Creates and executes an INSERT SQL-statement for $table from the array with field/value pairs $fields_values.
+	 * Using this function specifically allows us to handle BLOB and CLOB fields depending on DB
+	 *
+	 * @param string $table Table name
+	 * @param array $fields_values Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$insertFields" with 'fieldname'=>'value' and pass it to this function as argument.
+	 * @param bool|array|string $no_quote_fields See fullQuoteArray()
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 */
+	public function exec_INSERTquery($table, $fields_values, $no_quote_fields = false)
+	{
+		$this->logDeprecation();
+		$res = $this->query($this->INSERTquery($table, $fields_values, $no_quote_fields));
+		if ($this->debugOutput) {
+			$this->debug('exec_INSERTquery');
+		}
+		foreach ($this->postProcessHookObjects as $hookObject) {
+			/** @var $hookObject PostProcessQueryHookInterface */
+			$hookObject->exec_INSERTquery_postProcessAction($table, $fields_values, $no_quote_fields, $this);
+		}
+		return $res;
+	}
+
+	/**
+	 * Creates and executes an INSERT SQL-statement for $table with multiple rows.
+	 *
+	 * @param string $table Table name
+	 * @param array $fields Field names
+	 * @param array $rows Table rows. Each row should be an array with field values mapping to $fields
+	 * @param bool|array|string $no_quote_fields See fullQuoteArray()
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 */
+	public function exec_INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = false)
+	{
+		$this->logDeprecation();
+		$res = $this->query($this->INSERTmultipleRows($table, $fields, $rows, $no_quote_fields));
+		if ($this->debugOutput) {
+			$this->debug('exec_INSERTmultipleRows');
+		}
+		foreach ($this->postProcessHookObjects as $hookObject) {
+			/** @var $hookObject PostProcessQueryHookInterface */
+			$hookObject->exec_INSERTmultipleRows_postProcessAction($table, $fields, $rows, $no_quote_fields, $this);
+		}
+		return $res;
+	}
+
+	/**
+	 * Creates and executes an UPDATE SQL-statement for $table where $where-clause (typ. 'uid=...') from the array with field/value pairs $fields_values.
+	 * Using this function specifically allow us to handle BLOB and CLOB fields depending on DB
+	 *
+	 * @param string $table Database tablename
+	 * @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
+	 * @param array $fields_values Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$updateFields" with 'fieldname'=>'value' and pass it to this function as argument.
+	 * @param bool|array|string $no_quote_fields See fullQuoteArray()
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 */
+	public function exec_UPDATEquery($table, $where, $fields_values, $no_quote_fields = false)
+	{
+		$this->logDeprecation();
+		$res = $this->query($this->UPDATEquery($table, $where, $fields_values, $no_quote_fields));
+		if ($this->debugOutput) {
+			$this->debug('exec_UPDATEquery');
+		}
+		foreach ($this->postProcessHookObjects as $hookObject) {
+			/** @var $hookObject PostProcessQueryHookInterface */
+			$hookObject->exec_UPDATEquery_postProcessAction($table, $where, $fields_values, $no_quote_fields, $this);
+		}
+		return $res;
+	}
+
+	/**
+	 * Creates and executes a DELETE SQL-statement for $table where $where-clause
+	 *
+	 * @param string $table Database tablename
+	 * @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 */
+	public function exec_DELETEquery($table, $where)
+	{
+		$this->logDeprecation();
+		$res = $this->query($this->DELETEquery($table, $where));
+		if ($this->debugOutput) {
+			$this->debug('exec_DELETEquery');
+		}
+		foreach ($this->postProcessHookObjects as $hookObject) {
+			/** @var $hookObject PostProcessQueryHookInterface */
+			$hookObject->exec_DELETEquery_postProcessAction($table, $where, $this);
+		}
+		return $res;
+	}
+
+	/**
+	 * Creates and executes a SELECT SQL-statement
+	 * Using this function specifically allow us to handle the LIMIT feature independently of DB.
+	 *
+	 * @param string $select_fields List of fields to select from the table. This is what comes right after "SELECT ...". Required value.
+	 * @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
+	 * @param string $where_clause Additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT!
+	 * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
+	 * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
+	 * @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 */
+	public function exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '')
+	{
+		$this->logDeprecation();
+		$query = $this->SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
+		$res = $this->query($query);
+		if ($this->debugOutput) {
+			$this->debug('exec_SELECTquery');
+		}
+		if ($this->explainOutput) {
+			$this->explain($query, $from_table, $res->num_rows);
+		}
+		foreach ($this->postProcessHookObjects as $hookObject) {
+			/** @var $hookObject PostProcessQueryHookInterface */
+			$hookObject->exec_SELECTquery_postProcessAction($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', $this);
+		}
+		return $res;
+	}
+
+	/**
+	 * Creates and executes a SELECT query, selecting fields ($select) from two/three tables joined
+	 * Use $mm_table together with $local_table or $foreign_table to select over two tables. Or use all three tables to select the full MM-relation.
+	 * The JOIN is done with [$local_table].uid <--> [$mm_table].uid_local  / [$mm_table].uid_foreign <--> [$foreign_table].uid
+	 * The function is very useful for selecting MM-relations between tables adhering to the MM-format used by TCE (TYPO3 Core Engine). See the section on $GLOBALS['TCA'] in Inside TYPO3 for more details.
+	 *
+	 * @param string $select Field list for SELECT
+	 * @param string $local_table Tablename, local table
+	 * @param string $mm_table Tablename, relation table
+	 * @param string $foreign_table Tablename, foreign table
+	 * @param string $whereClause Optional additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT! You have to prepend 'AND ' to this parameter yourself!
+	 * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
+	 * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
+	 * @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 * @see exec_SELECTquery()
+	 */
+	public function exec_SELECT_mm_query($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '')
+	{
+		$this->logDeprecation();
+		$queryParts = $this->getSelectMmQueryParts($select, $local_table, $mm_table, $foreign_table, $whereClause, $groupBy, $orderBy, $limit);
+		return $this->exec_SELECT_queryArray($queryParts);
+	}
+
+	/**
+	 * Executes a select based on input query parts array
+	 *
+	 * @param array $queryParts Query parts array
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 * @see exec_SELECTquery()
+	 */
+	public function exec_SELECT_queryArray($queryParts)
+	{
+		$this->logDeprecation();
+		return $this->exec_SELECTquery($queryParts['SELECT'], $queryParts['FROM'], $queryParts['WHERE'], $queryParts['GROUPBY'], $queryParts['ORDERBY'], $queryParts['LIMIT']);
+	}
+
+	/**
+	 * Creates and executes a SELECT SQL-statement AND traverse result set and returns array with records in.
+	 *
+	 * @param string $select_fields List of fields to select from the table. This is what comes right after "SELECT ...". Required value.
+	 * @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
+	 * @param string $where_clause Additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT!
+	 * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
+	 * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
+	 * @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
+	 * @param string $uidIndexField If set, the result array will carry this field names value as index. Requires that field to be selected of course!
+	 * @return array|NULL Array of rows, or NULL in case of SQL error
+	 * @see exec_SELECTquery()
+	 * @throws \InvalidArgumentException
+	 */
+	public function exec_SELECTgetRows($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', $uidIndexField = '')
+	{
+		$this->logDeprecation();
+		$res = $this->exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
+		if ($this->sql_error()) {
+			$this->sql_free_result($res);
+			return null;
+		}
+		$output = [];
+		$firstRecord = true;
+		while ($record = $this->sql_fetch_assoc($res)) {
+			if ($uidIndexField) {
+				if ($firstRecord) {
+					$firstRecord = false;
+					if (!array_key_exists($uidIndexField, $record)) {
+						$this->sql_free_result($res);
+						throw new \InvalidArgumentException('The given $uidIndexField "' . $uidIndexField . '" is not available in the result.', 1432933855);
+					}
+				}
+				$output[$record[$uidIndexField]] = $record;
+			} else {
+				$output[] = $record;
+			}
+		}
+		$this->sql_free_result($res);
+		return $output;
+	}
+
+	/**
+	 * Creates and executes a SELECT SQL-statement AND gets a result set and returns an array with a single record in.
+	 * LIMIT is automatically set to 1 and can not be overridden.
+	 *
+	 * @param string $select_fields List of fields to select from the table.
+	 * @param string $from_table Table(s) from which to select.
+	 * @param string $where_clause Optional additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
+	 * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
+	 * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
+	 * @param bool $numIndex If set, the result will be fetched with sql_fetch_row, otherwise sql_fetch_assoc will be used.
+	 * @return array|FALSE|NULL Single row, FALSE on empty result, NULL on error
+	 */
+	public function exec_SELECTgetSingleRow($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $numIndex = false)
+	{
+		$this->logDeprecation();
+		$res = $this->exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, '1');
+		$output = null;
+		if ($res !== false) {
+			if ($numIndex) {
+				$output = $this->sql_fetch_row($res);
+			} else {
+				$output = $this->sql_fetch_assoc($res);
+			}
+			$this->sql_free_result($res);
+		}
+		return $output;
+	}
+
+	/**
+	 * Counts the number of rows in a table.
+	 *
+	 * @param string $field Name of the field to use in the COUNT() expression (e.g. '*')
+	 * @param string $table Name of the table to count rows for
+	 * @param string $where (optional) WHERE statement of the query
+	 * @return mixed Number of rows counter (int) or FALSE if something went wrong (bool)
+	 */
+	public function exec_SELECTcountRows($field, $table, $where = '1=1')
+	{
+		$this->logDeprecation();
+		$count = false;
+		$resultSet = $this->exec_SELECTquery('COUNT(' . $field . ')', $table, $where);
+		if ($resultSet !== false) {
+			list($count) = $this->sql_fetch_row($resultSet);
+			$count = (int)$count;
+			$this->sql_free_result($resultSet);
+		}
+		return $count;
+	}
+
+	/**
+	 * Truncates a table.
+	 *
+	 * @param string $table Database tablename
+	 * @return mixed Result from handler
+	 */
+	public function exec_TRUNCATEquery($table)
+	{
+		$this->logDeprecation();
+		$res = $this->query($this->TRUNCATEquery($table));
+		if ($this->debugOutput) {
+			$this->debug('exec_TRUNCATEquery');
+		}
+		foreach ($this->postProcessHookObjects as $hookObject) {
+			/** @var $hookObject PostProcessQueryHookInterface */
+			$hookObject->exec_TRUNCATEquery_postProcessAction($table, $this);
+		}
+		return $res;
+	}
+
+	/**
+	 * Central query method. Also checks if there is a database connection.
+	 * Use this to execute database queries instead of directly calling $this->link->query()
+	 *
+	 * @param string $query The query to send to the database
+	 * @return bool|\mysqli_result
+	 */
+	protected function query($query)
+	{
+		$this->logDeprecation();
+		if (!$this->isConnected) {
+			$this->connectDB();
+		}
+		return $this->link->query($query);
+	}
+
+	/**************************************
      *
      * Query building
      *
      **************************************/
-    /**
-     * Creates an INSERT SQL-statement for $table from the array with field/value pairs $fields_values.
-     *
-     * @param string $table See exec_INSERTquery()
-     * @param array $fields_values See exec_INSERTquery()
-     * @param bool|array|string $no_quote_fields See fullQuoteArray()
-     * @return string|NULL Full SQL query for INSERT, NULL if $fields_values is empty
-     */
-    public function INSERTquery($table, $fields_values, $no_quote_fields = false)
-    {
-        $this->logDeprecation();
-        // Table and fieldnames should be "SQL-injection-safe" when supplied to this
-        // function (contrary to values in the arrays which may be insecure).
-        if (!is_array($fields_values) || empty($fields_values)) {
-            return null;
-        }
-        foreach ($this->preProcessHookObjects as $hookObject) {
-            $hookObject->INSERTquery_preProcessAction($table, $fields_values, $no_quote_fields, $this);
-        }
-        // Quote and escape values
-        $fields_values = $this->fullQuoteArray($fields_values, $table, $no_quote_fields, true);
-        // Build query
-        $query = 'INSERT INTO ' . $table . ' (' . implode(',', array_keys($fields_values)) . ') VALUES ' . '(' . implode(',', $fields_values) . ')';
-        // Return query
-        if ($this->debugOutput || $this->store_lastBuiltQuery) {
-            $this->debug_lastBuiltQuery = $query;
-        }
-        return $query;
-    }
-
-    /**
-     * Creates an INSERT SQL-statement for $table with multiple rows.
-     *
-     * @param string $table Table name
-     * @param array $fields Field names
-     * @param array $rows Table rows. Each row should be an array with field values mapping to $fields
-     * @param bool|array|string $no_quote_fields See fullQuoteArray()
-     * @return string|NULL Full SQL query for INSERT, NULL if $rows is empty
-     */
-    public function INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = false)
-    {
-        $this->logDeprecation();
-        // Table and fieldnames should be "SQL-injection-safe" when supplied to this
-        // function (contrary to values in the arrays which may be insecure).
-        if (empty($rows)) {
-            return null;
-        }
-        foreach ($this->preProcessHookObjects as $hookObject) {
-            /** @var $hookObject PreProcessQueryHookInterface */
-            $hookObject->INSERTmultipleRows_preProcessAction($table, $fields, $rows, $no_quote_fields, $this);
-        }
-        // Build query
-        $query = 'INSERT INTO ' . $table . ' (' . implode(', ', $fields) . ') VALUES ';
-        $rowSQL = [];
-        foreach ($rows as $row) {
-            // Quote and escape values
-            $row = $this->fullQuoteArray($row, $table, $no_quote_fields);
-            $rowSQL[] = '(' . implode(', ', $row) . ')';
-        }
-        $query .= implode(', ', $rowSQL);
-        // Return query
-        if ($this->debugOutput || $this->store_lastBuiltQuery) {
-            $this->debug_lastBuiltQuery = $query;
-        }
-        return $query;
-    }
-
-    /**
-     * Creates an UPDATE SQL-statement for $table where $where-clause (typ. 'uid=...') from the array with field/value pairs $fields_values.
-     *
-     *
-     * @param string $table See exec_UPDATEquery()
-     * @param string $where See exec_UPDATEquery()
-     * @param array $fields_values See exec_UPDATEquery()
-     * @param bool|array|string $no_quote_fields See fullQuoteArray()
-     * @throws \InvalidArgumentException
-     * @return string Full SQL query for UPDATE
-     */
-    public function UPDATEquery($table, $where, $fields_values, $no_quote_fields = false)
-    {
-        $this->logDeprecation();
-        // Table and fieldnames should be "SQL-injection-safe" when supplied to this
-        // function (contrary to values in the arrays which may be insecure).
-        if (is_string($where)) {
-            foreach ($this->preProcessHookObjects as $hookObject) {
-                /** @var $hookObject PreProcessQueryHookInterface */
-                $hookObject->UPDATEquery_preProcessAction($table, $where, $fields_values, $no_quote_fields, $this);
-            }
-            $fields = [];
-            if (is_array($fields_values) && !empty($fields_values)) {
-                // Quote and escape values
-                $nArr = $this->fullQuoteArray($fields_values, $table, $no_quote_fields, true);
-                foreach ($nArr as $k => $v) {
-                    $fields[] = $k . '=' . $v;
-                }
-            }
-            // Build query
-            $query = 'UPDATE ' . $table . ' SET ' . implode(',', $fields) . ((string)$where !== '' ? ' WHERE ' . $where : '');
-            if ($this->debugOutput || $this->store_lastBuiltQuery) {
-                $this->debug_lastBuiltQuery = $query;
-            }
-            return $query;
-        } else {
-            throw new \InvalidArgumentException('TYPO3 Fatal Error: "Where" clause argument for UPDATE query was not a string in $this->UPDATEquery() !', 1270853880);
-        }
-    }
-
-    /**
-     * Creates a DELETE SQL-statement for $table where $where-clause
-     *
-     * @param string $table See exec_DELETEquery()
-     * @param string $where See exec_DELETEquery()
-     * @return string Full SQL query for DELETE
-     * @throws \InvalidArgumentException
-     */
-    public function DELETEquery($table, $where)
-    {
-        $this->logDeprecation();
-        if (is_string($where)) {
-            foreach ($this->preProcessHookObjects as $hookObject) {
-                /** @var $hookObject PreProcessQueryHookInterface */
-                $hookObject->DELETEquery_preProcessAction($table, $where, $this);
-            }
-            // Table and fieldnames should be "SQL-injection-safe" when supplied to this function
-            $query = 'DELETE FROM ' . $table . ((string)$where !== '' ? ' WHERE ' . $where : '');
-            if ($this->debugOutput || $this->store_lastBuiltQuery) {
-                $this->debug_lastBuiltQuery = $query;
-            }
-            return $query;
-        } else {
-            throw new \InvalidArgumentException('TYPO3 Fatal Error: "Where" clause argument for DELETE query was not a string in $this->DELETEquery() !', 1270853881);
-        }
-    }
-
-    /**
-     * Creates a SELECT SQL-statement
-     *
-     * @param string $select_fields See exec_SELECTquery()
-     * @param string $from_table See exec_SELECTquery()
-     * @param string $where_clause See exec_SELECTquery()
-     * @param string $groupBy See exec_SELECTquery()
-     * @param string $orderBy See exec_SELECTquery()
-     * @param string $limit See exec_SELECTquery()
-     * @return string Full SQL query for SELECT
-     */
-    public function SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '')
-    {
-        $this->logDeprecation();
-        foreach ($this->preProcessHookObjects as $hookObject) {
-            /** @var $hookObject PreProcessQueryHookInterface */
-            $hookObject->SELECTquery_preProcessAction($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit, $this);
-        }
-        // Table and fieldnames should be "SQL-injection-safe" when supplied to this function
-        // Build basic query
-        $query = 'SELECT ' . $select_fields . ' FROM ' . $from_table . ((string)$where_clause !== '' ? ' WHERE ' . $where_clause : '');
-        // Group by
-        $query .= (string)$groupBy !== '' ? ' GROUP BY ' . $groupBy : '';
-        // Order by
-        $query .= (string)$orderBy !== '' ? ' ORDER BY ' . $orderBy : '';
-        // Group by
-        $query .= (string)$limit !== '' ? ' LIMIT ' . $limit : '';
-        // Return query
-        if ($this->debugOutput || $this->store_lastBuiltQuery) {
-            $this->debug_lastBuiltQuery = $query;
-        }
-        return $query;
-    }
-
-    /**
-     * Creates a SELECT SQL-statement to be used as subquery within another query.
-     * BEWARE: This method should not be overridden within DBAL to prevent quoting from happening.
-     *
-     * @param string $select_fields List of fields to select from the table.
-     * @param string $from_table Table from which to select.
-     * @param string $where_clause Conditional WHERE statement
-     * @return string Full SQL query for SELECT
-     */
-    public function SELECTsubquery($select_fields, $from_table, $where_clause)
-    {
-        $this->logDeprecation();
-        // Table and fieldnames should be "SQL-injection-safe" when supplied to this function
-        // Build basic query:
-        $query = 'SELECT ' . $select_fields . ' FROM ' . $from_table . ((string)$where_clause !== '' ? ' WHERE ' . $where_clause : '');
-        // Return query
-        if ($this->debugOutput || $this->store_lastBuiltQuery) {
-            $this->debug_lastBuiltQuery = $query;
-        }
-        return $query;
-    }
-
-    /**
-     * Creates a SELECT query, selecting fields ($select) from two/three tables joined
-     * Use $mm_table together with $local_table or $foreign_table to select over two tables. Or use all three tables to select the full MM-relation.
-     * The JOIN is done with [$local_table].uid <--> [$mm_table].uid_local  / [$mm_table].uid_foreign <--> [$foreign_table].uid
-     * The function is very useful for selecting MM-relations between tables adhering to the MM-format used by TCE (TYPO3 Core Engine). See the section on $GLOBALS['TCA'] in Inside TYPO3 for more details.
-     *
-     * @param string $select See exec_SELECT_mm_query()
-     * @param string $local_table See exec_SELECT_mm_query()
-     * @param string $mm_table See exec_SELECT_mm_query()
-     * @param string $foreign_table See exec_SELECT_mm_query()
-     * @param string $whereClause See exec_SELECT_mm_query()
-     * @param string $groupBy See exec_SELECT_mm_query()
-     * @param string $orderBy See exec_SELECT_mm_query()
-     * @param string $limit See exec_SELECT_mm_query()
-     * @return string Full SQL query for SELECT
-     * @see SELECTquery()
-     */
-    public function SELECT_mm_query($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '')
-    {
-        $this->logDeprecation();
-        $queryParts = $this->getSelectMmQueryParts($select, $local_table, $mm_table, $foreign_table, $whereClause, $groupBy, $orderBy, $limit);
-        return $this->SELECTquery($queryParts['SELECT'], $queryParts['FROM'], $queryParts['WHERE'], $queryParts['GROUPBY'], $queryParts['ORDERBY'], $queryParts['LIMIT']);
-    }
-
-    /**
-     * Creates a TRUNCATE TABLE SQL-statement
-     *
-     * @param string $table See exec_TRUNCATEquery()
-     * @return string Full SQL query for TRUNCATE TABLE
-     */
-    public function TRUNCATEquery($table)
-    {
-        $this->logDeprecation();
-        foreach ($this->preProcessHookObjects as $hookObject) {
-            /** @var $hookObject PreProcessQueryHookInterface */
-            $hookObject->TRUNCATEquery_preProcessAction($table, $this);
-        }
-        // Table should be "SQL-injection-safe" when supplied to this function
-        // Build basic query:
-        $query = 'TRUNCATE TABLE ' . $table;
-        // Return query:
-        if ($this->debugOutput || $this->store_lastBuiltQuery) {
-            $this->debug_lastBuiltQuery = $query;
-        }
-        return $query;
-    }
-
-    /**
-     * Returns a WHERE clause that can find a value ($value) in a list field ($field)
-     * For instance a record in the database might contain a list of numbers,
-     * "34,234,5" (with no spaces between). This query would be able to select that
-     * record based on the value "34", "234" or "5" regardless of their position in
-     * the list (left, middle or right).
-     * The value must not contain a comma (,)
-     * Is nice to look up list-relations to records or files in TYPO3 database tables.
-     *
-     * @param string $field Field name
-     * @param string $value Value to find in list
-     * @param string $table Table in which we are searching (for DBAL detection of quoteStr() method)
-     * @return string WHERE clause for a query
-     * @throws \InvalidArgumentException
-     */
-    public function listQuery($field, $value, $table)
-    {
-        $this->logDeprecation();
-        $value = (string)$value;
-        if (strpos($value, ',') !== false) {
-            throw new \InvalidArgumentException('$value must not contain a comma (,) in $this->listQuery() !', 1294585862);
-        }
-        $pattern = $this->quoteStr($value, $table);
-        $where = 'FIND_IN_SET(\'' . $pattern . '\',' . $field . ')';
-        return $where;
-    }
-
-    /**
-     * Returns a WHERE clause which will make an AND or OR search for the words in the $searchWords array in any of the fields in array $fields.
-     *
-     * @param array $searchWords Array of search words
-     * @param array $fields Array of fields
-     * @param string $table Table in which we are searching (for DBAL detection of quoteStr() method)
-     * @param string $constraint How multiple search words have to match ('AND' or 'OR')
-     * @return string WHERE clause for search
-     */
-    public function searchQuery($searchWords, $fields, $table, $constraint = self::AND_Constraint)
-    {
-        $this->logDeprecation();
-        switch ($constraint) {
-            case self::OR_Constraint:
-                $constraint = 'OR';
-                break;
-            default:
-                $constraint = 'AND';
-        }
-
-        $queryParts = [];
-        foreach ($searchWords as $sw) {
-            $like = ' LIKE \'%' . $this->quoteStr($this->escapeStrForLike($sw, $table), $table) . '%\'';
-            $queryParts[] = $table . '.' . implode(($like . ' OR ' . $table . '.'), $fields) . $like;
-        }
-        $query = '(' . implode(') ' . $constraint . ' (', $queryParts) . ')';
-
-        return $query;
-    }
-
-    /**************************************
+	/**
+	 * Creates an INSERT SQL-statement for $table from the array with field/value pairs $fields_values.
+	 *
+	 * @param string $table See exec_INSERTquery()
+	 * @param array $fields_values See exec_INSERTquery()
+	 * @param bool|array|string $no_quote_fields See fullQuoteArray()
+	 * @return string|NULL Full SQL query for INSERT, NULL if $fields_values is empty
+	 */
+	public function INSERTquery($table, $fields_values, $no_quote_fields = false)
+	{
+		$this->logDeprecation();
+		// Table and fieldnames should be "SQL-injection-safe" when supplied to this
+		// function (contrary to values in the arrays which may be insecure).
+		if (!is_array($fields_values) || empty($fields_values)) {
+			return null;
+		}
+		foreach ($this->preProcessHookObjects as $hookObject) {
+			$hookObject->INSERTquery_preProcessAction($table, $fields_values, $no_quote_fields, $this);
+		}
+		// Quote and escape values
+		$fields_values = $this->fullQuoteArray($fields_values, $table, $no_quote_fields, true);
+		// Build query
+		$query = 'INSERT INTO ' . $table . ' (' . implode(',', array_keys($fields_values)) . ') VALUES ' . '(' . implode(',', $fields_values) . ')';
+		// Return query
+		if ($this->debugOutput || $this->store_lastBuiltQuery) {
+			$this->debug_lastBuiltQuery = $query;
+		}
+		return $query;
+	}
+
+	/**
+	 * Creates an INSERT SQL-statement for $table with multiple rows.
+	 *
+	 * @param string $table Table name
+	 * @param array $fields Field names
+	 * @param array $rows Table rows. Each row should be an array with field values mapping to $fields
+	 * @param bool|array|string $no_quote_fields See fullQuoteArray()
+	 * @return string|NULL Full SQL query for INSERT, NULL if $rows is empty
+	 */
+	public function INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = false)
+	{
+		$this->logDeprecation();
+		// Table and fieldnames should be "SQL-injection-safe" when supplied to this
+		// function (contrary to values in the arrays which may be insecure).
+		if (empty($rows)) {
+			return null;
+		}
+		foreach ($this->preProcessHookObjects as $hookObject) {
+			/** @var $hookObject PreProcessQueryHookInterface */
+			$hookObject->INSERTmultipleRows_preProcessAction($table, $fields, $rows, $no_quote_fields, $this);
+		}
+		// Build query
+		$query = 'INSERT INTO ' . $table . ' (' . implode(', ', $fields) . ') VALUES ';
+		$rowSQL = [];
+		foreach ($rows as $row) {
+			// Quote and escape values
+			$row = $this->fullQuoteArray($row, $table, $no_quote_fields);
+			$rowSQL[] = '(' . implode(', ', $row) . ')';
+		}
+		$query .= implode(', ', $rowSQL);
+		// Return query
+		if ($this->debugOutput || $this->store_lastBuiltQuery) {
+			$this->debug_lastBuiltQuery = $query;
+		}
+		return $query;
+	}
+
+	/**
+	 * Creates an UPDATE SQL-statement for $table where $where-clause (typ. 'uid=...') from the array with field/value pairs $fields_values.
+	 *
+	 *
+	 * @param string $table See exec_UPDATEquery()
+	 * @param string $where See exec_UPDATEquery()
+	 * @param array $fields_values See exec_UPDATEquery()
+	 * @param bool|array|string $no_quote_fields See fullQuoteArray()
+	 * @throws \InvalidArgumentException
+	 * @return string Full SQL query for UPDATE
+	 */
+	public function UPDATEquery($table, $where, $fields_values, $no_quote_fields = false)
+	{
+		$this->logDeprecation();
+		// Table and fieldnames should be "SQL-injection-safe" when supplied to this
+		// function (contrary to values in the arrays which may be insecure).
+		if (is_string($where)) {
+			foreach ($this->preProcessHookObjects as $hookObject) {
+				/** @var $hookObject PreProcessQueryHookInterface */
+				$hookObject->UPDATEquery_preProcessAction($table, $where, $fields_values, $no_quote_fields, $this);
+			}
+			$fields = [];
+			if (is_array($fields_values) && !empty($fields_values)) {
+				// Quote and escape values
+				$nArr = $this->fullQuoteArray($fields_values, $table, $no_quote_fields, true);
+				foreach ($nArr as $k => $v) {
+					$fields[] = $k . '=' . $v;
+				}
+			}
+			// Build query
+			$query = 'UPDATE ' . $table . ' SET ' . implode(',', $fields) . ((string)$where !== '' ? ' WHERE ' . $where : '');
+			if ($this->debugOutput || $this->store_lastBuiltQuery) {
+				$this->debug_lastBuiltQuery = $query;
+			}
+			return $query;
+		} else {
+			throw new \InvalidArgumentException('TYPO3 Fatal Error: "Where" clause argument for UPDATE query was not a string in $this->UPDATEquery() !', 1270853880);
+		}
+	}
+
+	/**
+	 * Creates a DELETE SQL-statement for $table where $where-clause
+	 *
+	 * @param string $table See exec_DELETEquery()
+	 * @param string $where See exec_DELETEquery()
+	 * @return string Full SQL query for DELETE
+	 * @throws \InvalidArgumentException
+	 */
+	public function DELETEquery($table, $where)
+	{
+		$this->logDeprecation();
+		if (is_string($where)) {
+			foreach ($this->preProcessHookObjects as $hookObject) {
+				/** @var $hookObject PreProcessQueryHookInterface */
+				$hookObject->DELETEquery_preProcessAction($table, $where, $this);
+			}
+			// Table and fieldnames should be "SQL-injection-safe" when supplied to this function
+			$query = 'DELETE FROM ' . $table . ((string)$where !== '' ? ' WHERE ' . $where : '');
+			if ($this->debugOutput || $this->store_lastBuiltQuery) {
+				$this->debug_lastBuiltQuery = $query;
+			}
+			return $query;
+		} else {
+			throw new \InvalidArgumentException('TYPO3 Fatal Error: "Where" clause argument for DELETE query was not a string in $this->DELETEquery() !', 1270853881);
+		}
+	}
+
+	/**
+	 * Creates a SELECT SQL-statement
+	 *
+	 * @param string $select_fields See exec_SELECTquery()
+	 * @param string $from_table See exec_SELECTquery()
+	 * @param string $where_clause See exec_SELECTquery()
+	 * @param string $groupBy See exec_SELECTquery()
+	 * @param string $orderBy See exec_SELECTquery()
+	 * @param string $limit See exec_SELECTquery()
+	 * @return string Full SQL query for SELECT
+	 */
+	public function SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '')
+	{
+		$this->logDeprecation();
+		foreach ($this->preProcessHookObjects as $hookObject) {
+			/** @var $hookObject PreProcessQueryHookInterface */
+			$hookObject->SELECTquery_preProcessAction($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit, $this);
+		}
+		// Table and fieldnames should be "SQL-injection-safe" when supplied to this function
+		// Build basic query
+		$query = 'SELECT ' . $select_fields . ' FROM ' . $from_table . ((string)$where_clause !== '' ? ' WHERE ' . $where_clause : '');
+		// Group by
+		$query .= (string)$groupBy !== '' ? ' GROUP BY ' . $groupBy : '';
+		// Order by
+		$query .= (string)$orderBy !== '' ? ' ORDER BY ' . $orderBy : '';
+		// Group by
+		$query .= (string)$limit !== '' ? ' LIMIT ' . $limit : '';
+		// Return query
+		if ($this->debugOutput || $this->store_lastBuiltQuery) {
+			$this->debug_lastBuiltQuery = $query;
+		}
+		return $query;
+	}
+
+	/**
+	 * Creates a SELECT SQL-statement to be used as subquery within another query.
+	 * BEWARE: This method should not be overridden within DBAL to prevent quoting from happening.
+	 *
+	 * @param string $select_fields List of fields to select from the table.
+	 * @param string $from_table Table from which to select.
+	 * @param string $where_clause Conditional WHERE statement
+	 * @return string Full SQL query for SELECT
+	 */
+	public function SELECTsubquery($select_fields, $from_table, $where_clause)
+	{
+		$this->logDeprecation();
+		// Table and fieldnames should be "SQL-injection-safe" when supplied to this function
+		// Build basic query:
+		$query = 'SELECT ' . $select_fields . ' FROM ' . $from_table . ((string)$where_clause !== '' ? ' WHERE ' . $where_clause : '');
+		// Return query
+		if ($this->debugOutput || $this->store_lastBuiltQuery) {
+			$this->debug_lastBuiltQuery = $query;
+		}
+		return $query;
+	}
+
+	/**
+	 * Creates a SELECT query, selecting fields ($select) from two/three tables joined
+	 * Use $mm_table together with $local_table or $foreign_table to select over two tables. Or use all three tables to select the full MM-relation.
+	 * The JOIN is done with [$local_table].uid <--> [$mm_table].uid_local  / [$mm_table].uid_foreign <--> [$foreign_table].uid
+	 * The function is very useful for selecting MM-relations between tables adhering to the MM-format used by TCE (TYPO3 Core Engine). See the section on $GLOBALS['TCA'] in Inside TYPO3 for more details.
+	 *
+	 * @param string $select See exec_SELECT_mm_query()
+	 * @param string $local_table See exec_SELECT_mm_query()
+	 * @param string $mm_table See exec_SELECT_mm_query()
+	 * @param string $foreign_table See exec_SELECT_mm_query()
+	 * @param string $whereClause See exec_SELECT_mm_query()
+	 * @param string $groupBy See exec_SELECT_mm_query()
+	 * @param string $orderBy See exec_SELECT_mm_query()
+	 * @param string $limit See exec_SELECT_mm_query()
+	 * @return string Full SQL query for SELECT
+	 * @see SELECTquery()
+	 */
+	public function SELECT_mm_query($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '')
+	{
+		$this->logDeprecation();
+		$queryParts = $this->getSelectMmQueryParts($select, $local_table, $mm_table, $foreign_table, $whereClause, $groupBy, $orderBy, $limit);
+		return $this->SELECTquery($queryParts['SELECT'], $queryParts['FROM'], $queryParts['WHERE'], $queryParts['GROUPBY'], $queryParts['ORDERBY'], $queryParts['LIMIT']);
+	}
+
+	/**
+	 * Creates a TRUNCATE TABLE SQL-statement
+	 *
+	 * @param string $table See exec_TRUNCATEquery()
+	 * @return string Full SQL query for TRUNCATE TABLE
+	 */
+	public function TRUNCATEquery($table)
+	{
+		$this->logDeprecation();
+		foreach ($this->preProcessHookObjects as $hookObject) {
+			/** @var $hookObject PreProcessQueryHookInterface */
+			$hookObject->TRUNCATEquery_preProcessAction($table, $this);
+		}
+		// Table should be "SQL-injection-safe" when supplied to this function
+		// Build basic query:
+		$query = 'TRUNCATE TABLE ' . $table;
+		// Return query:
+		if ($this->debugOutput || $this->store_lastBuiltQuery) {
+			$this->debug_lastBuiltQuery = $query;
+		}
+		return $query;
+	}
+
+	/**
+	 * Returns a WHERE clause that can find a value ($value) in a list field ($field)
+	 * For instance a record in the database might contain a list of numbers,
+	 * "34,234,5" (with no spaces between). This query would be able to select that
+	 * record based on the value "34", "234" or "5" regardless of their position in
+	 * the list (left, middle or right).
+	 * The value must not contain a comma (,)
+	 * Is nice to look up list-relations to records or files in TYPO3 database tables.
+	 *
+	 * @param string $field Field name
+	 * @param string $value Value to find in list
+	 * @param string $table Table in which we are searching (for DBAL detection of quoteStr() method)
+	 * @return string WHERE clause for a query
+	 * @throws \InvalidArgumentException
+	 */
+	public function listQuery($field, $value, $table)
+	{
+		$this->logDeprecation();
+		$value = (string)$value;
+		if (strpos($value, ',') !== false) {
+			throw new \InvalidArgumentException('$value must not contain a comma (,) in $this->listQuery() !', 1294585862);
+		}
+		$pattern = $this->quoteStr($value, $table);
+		$where = 'FIND_IN_SET(\'' . $pattern . '\',' . $field . ')';
+		return $where;
+	}
+
+	/**
+	 * Returns a WHERE clause which will make an AND or OR search for the words in the $searchWords array in any of the fields in array $fields.
+	 *
+	 * @param array $searchWords Array of search words
+	 * @param array $fields Array of fields
+	 * @param string $table Table in which we are searching (for DBAL detection of quoteStr() method)
+	 * @param string $constraint How multiple search words have to match ('AND' or 'OR')
+	 * @return string WHERE clause for search
+	 */
+	public function searchQuery($searchWords, $fields, $table, $constraint = self::AND_Constraint)
+	{
+		$this->logDeprecation();
+		switch ($constraint) {
+			case self::OR_Constraint:
+				$constraint = 'OR';
+				break;
+			default:
+				$constraint = 'AND';
+		}
+
+		$queryParts = [];
+		foreach ($searchWords as $sw) {
+			$like = ' LIKE \'%' . $this->quoteStr($this->escapeStrForLike($sw, $table), $table) . '%\'';
+			$queryParts[] = $table . '.' . implode(($like . ' OR ' . $table . '.'), $fields) . $like;
+		}
+		$query = '(' . implode(') ' . $constraint . ' (', $queryParts) . ')';
+
+		return $query;
+	}
+
+	/**************************************
      *
      * Prepared Query Support
      *
      **************************************/
-    /**
-     * Creates a SELECT prepared SQL statement.
-     *
-     * @param string $select_fields See exec_SELECTquery()
-     * @param string $from_table See exec_SELECTquery()
-     * @param string $where_clause See exec_SELECTquery()
-     * @param string $groupBy See exec_SELECTquery()
-     * @param string $orderBy See exec_SELECTquery()
-     * @param string $limit See exec_SELECTquery()
-     * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as \Fab\Vidi\Database\PreparedStatement::PARAM_AUTOTYPE.
-     * @return \Fab\Vidi\Database\PreparedStatement Prepared statement
-     */
-    public function prepare_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', array $input_parameters = [])
-    {
-        $this->logDeprecation();
-        $query = $this->SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
-        /** @var $preparedStatement \Fab\Vidi\Database\PreparedStatement */
-        $preparedStatement = GeneralUtility::makeInstance(\Fab\Vidi\Database\PreparedStatement::class, $query, $from_table, []);
-        // Bind values to parameters
-        foreach ($input_parameters as $key => $value) {
-            $preparedStatement->bindValue($key, $value, PreparedStatement::PARAM_AUTOTYPE);
-        }
-        // Return prepared statement
-        return $preparedStatement;
-    }
-
-    /**
-     * Creates a SELECT prepared SQL statement based on input query parts array
-     *
-     * @param array $queryParts Query parts array
-     * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as \Fab\Vidi\Database\PreparedStatement::PARAM_AUTOTYPE.
-     * @return \Fab\Vidi\Database\PreparedStatement Prepared statement
-     */
-    public function prepare_SELECTqueryArray(array $queryParts, array $input_parameters = [])
-    {
-        $this->logDeprecation();
-        return $this->prepare_SELECTquery($queryParts['SELECT'], $queryParts['FROM'], $queryParts['WHERE'], $queryParts['GROUPBY'], $queryParts['ORDERBY'], $queryParts['LIMIT'], $input_parameters);
-    }
-
-    /**
-     * Prepares a prepared query.
-     *
-     * @param string $query The query to execute
-     * @param array $queryComponents The components of the query to execute
-     * @return \mysqli_stmt|object MySQLi statement / DBAL object
-     * @internal This method may only be called by \Fab\Vidi\Database\PreparedStatement
-     */
-    public function prepare_PREPAREDquery($query, array $queryComponents)
-    {
-        $this->logDeprecation();
-        if (!$this->isConnected) {
-            $this->connectDB();
-        }
-        $stmt = $this->link->stmt_init();
-        $success = $stmt->prepare($query);
-        if ($this->debugOutput) {
-            $this->debug('stmt_execute', $query);
-        }
-        return $success ? $stmt : null;
-    }
-
-    /**************************************
+	/**
+	 * Creates a SELECT prepared SQL statement.
+	 *
+	 * @param string $select_fields See exec_SELECTquery()
+	 * @param string $from_table See exec_SELECTquery()
+	 * @param string $where_clause See exec_SELECTquery()
+	 * @param string $groupBy See exec_SELECTquery()
+	 * @param string $orderBy See exec_SELECTquery()
+	 * @param string $limit See exec_SELECTquery()
+	 * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as \Fab\Vidi\Database\PreparedStatement::PARAM_AUTOTYPE.
+	 * @return \Fab\Vidi\Database\PreparedStatement Prepared statement
+	 */
+	public function prepare_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', array $input_parameters = [])
+	{
+		$this->logDeprecation();
+		$query = $this->SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
+		/** @var $preparedStatement \Fab\Vidi\Database\PreparedStatement */
+		$preparedStatement = GeneralUtility::makeInstance(\Fab\Vidi\Database\PreparedStatement::class, $query, $from_table, []);
+		// Bind values to parameters
+		foreach ($input_parameters as $key => $value) {
+			$preparedStatement->bindValue($key, $value, PreparedStatement::PARAM_AUTOTYPE);
+		}
+		// Return prepared statement
+		return $preparedStatement;
+	}
+
+	/**
+	 * Creates a SELECT prepared SQL statement based on input query parts array
+	 *
+	 * @param array $queryParts Query parts array
+	 * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as \Fab\Vidi\Database\PreparedStatement::PARAM_AUTOTYPE.
+	 * @return \Fab\Vidi\Database\PreparedStatement Prepared statement
+	 */
+	public function prepare_SELECTqueryArray(array $queryParts, array $input_parameters = [])
+	{
+		$this->logDeprecation();
+		return $this->prepare_SELECTquery($queryParts['SELECT'], $queryParts['FROM'], $queryParts['WHERE'], $queryParts['GROUPBY'], $queryParts['ORDERBY'], $queryParts['LIMIT'], $input_parameters);
+	}
+
+	/**
+	 * Prepares a prepared query.
+	 *
+	 * @param string $query The query to execute
+	 * @param array $queryComponents The components of the query to execute
+	 * @return \mysqli_stmt|object MySQLi statement / DBAL object
+	 * @internal This method may only be called by \Fab\Vidi\Database\PreparedStatement
+	 */
+	public function prepare_PREPAREDquery($query, array $queryComponents)
+	{
+		$this->logDeprecation();
+		if (!$this->isConnected) {
+			$this->connectDB();
+		}
+		$stmt = $this->link->stmt_init();
+		$success = $stmt->prepare($query);
+		if ($this->debugOutput) {
+			$this->debug('stmt_execute', $query);
+		}
+		return $success ? $stmt : null;
+	}
+
+	/**************************************
      *
      * Various helper functions
      *
@@ -859,1161 +859,1161 @@ 
      * - stripping of excess ORDER BY/GROUP BY keywords
      *
      **************************************/
-    /**
-     * Escaping and quoting values for SQL statements.
-     *
-     * @param string $str Input string
-     * @param string $table Table name for which to quote string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
-     * @param bool $allowNull Whether to allow NULL values
-     * @return string Output string; Wrapped in single quotes and quotes in the string (" / ') and \ will be backslashed (or otherwise based on DBAL handler)
-     * @see quoteStr()
-     */
-    public function fullQuoteStr($str, $table, $allowNull = false)
-    {
-        $this->logDeprecation();
-        if (!$this->isConnected) {
-            $this->connectDB();
-        }
-        if ($allowNull && $str === null) {
-            return 'NULL';
-        }
-        if (is_bool($str)) {
-            $str = (int)$str;
-        }
-
-        return '\'' . $this->link->real_escape_string($str) . '\'';
-    }
-
-    /**
-     * Will fullquote all values in the one-dimensional array so they are ready to "implode" for an sql query.
-     *
-     * @param array $arr Array with values (either associative or non-associative array)
-     * @param string $table Table name for which to quote
-     * @param bool|array|string $noQuote List/array of keys NOT to quote (eg. SQL functions) - ONLY for associative arrays
-     * @param bool $allowNull Whether to allow NULL values
-     * @return array The input array with the values quoted
-     * @see cleanIntArray()
-     */
-    public function fullQuoteArray($arr, $table, $noQuote = false, $allowNull = false)
-    {
-        $this->logDeprecation();
-        if (is_string($noQuote)) {
-            $noQuote = explode(',', $noQuote);
-        } elseif (!is_array($noQuote)) {
-            $noQuote = (bool)$noQuote;
-        }
-        if ($noQuote === true) {
-            return $arr;
-        }
-        foreach ($arr as $k => $v) {
-            if ($noQuote === false || !in_array($k, $noQuote)) {
-                $arr[$k] = $this->fullQuoteStr($v, $table, $allowNull);
-            }
-        }
-        return $arr;
-    }
-
-    /**
-     * Substitution for PHP function "addslashes()"
-     * Use this function instead of the PHP addslashes() function when you build queries - this will prepare your code for DBAL.
-     * NOTICE: You must wrap the output of this function in SINGLE QUOTES to be DBAL compatible. Unless you have to apply the single quotes yourself you should rather use ->fullQuoteStr()!
-     *
-     * @param string $str Input string
-     * @param string $table Table name for which to quote string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
-     * @return string Output string; Quotes (" / ') and \ will be backslashed (or otherwise based on DBAL handler)
-     * @see quoteStr()
-     */
-    public function quoteStr($str, $table)
-    {
-        $this->logDeprecation();
-        if (!$this->isConnected) {
-            $this->connectDB();
-        }
-        return $this->link->real_escape_string($str);
-    }
-
-    /**
-     * Escaping values for SQL LIKE statements.
-     *
-     * @param string $str Input string
-     * @param string $table Table name for which to escape string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
-     * @return string Output string; % and _ will be escaped with \ (or otherwise based on DBAL handler)
-     * @see quoteStr()
-     */
-    public function escapeStrForLike($str, $table)
-    {
-        $this->logDeprecation();
-        return addcslashes($str, '_%');
-    }
-
-    /**
-     * Will convert all values in the one-dimensional array to integers.
-     * Useful when you want to make sure an array contains only integers before imploding them in a select-list.
-     *
-     * @param array $arr Array with values
-     * @return array The input array with all values cast to (int)
-     * @see cleanIntList()
-     */
-    public function cleanIntArray($arr)
-    {
-        $this->logDeprecation();
-        return array_map('intval', $arr);
-    }
-
-    /**
-     * Will force all entries in the input comma list to integers
-     * Useful when you want to make sure a commalist of supposed integers really contain only integers; You want to know that when you don't trust content that could go into an SQL statement.
-     *
-     * @param string $list List of comma-separated values which should be integers
-     * @return string The input list but with every value cast to (int)
-     * @see cleanIntArray()
-     */
-    public function cleanIntList($list)
-    {
-        $this->logDeprecation();
-        return implode(',', GeneralUtility::intExplode(',', $list));
-    }
-
-    /**
-     * Removes the prefix "ORDER BY" from the input string.
-     * This function is used when you call the exec_SELECTquery() function and want to pass the ORDER BY parameter by can't guarantee that "ORDER BY" is not prefixed.
-     * Generally; This function provides a work-around to the situation where you cannot pass only the fields by which to order the result.
-     *
-     * @param string $str eg. "ORDER BY title, uid
-     * @return string eg. "title, uid
-     * @see exec_SELECTquery(), stripGroupBy()
-     */
-    public function stripOrderBy($str)
-    {
-        $this->logDeprecation();
-        return preg_replace('/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i', '', trim($str));
-    }
-
-    /**
-     * Removes the prefix "GROUP BY" from the input string.
-     * This function is used when you call the SELECTquery() function and want to pass the GROUP BY parameter by can't guarantee that "GROUP BY" is not prefixed.
-     * Generally; This function provides a work-around to the situation where you cannot pass only the fields by which to order the result.
-     *
-     * @param string $str eg. "GROUP BY title, uid
-     * @return string eg. "title, uid
-     * @see exec_SELECTquery(), stripOrderBy()
-     */
-    public function stripGroupBy($str)
-    {
-        $this->logDeprecation();
-        return preg_replace('/^(?:GROUP[[:space:]]*BY[[:space:]]*)+/i', '', trim($str));
-    }
-
-    /**
-     * Returns the date and time formats compatible with the given database table.
-     *
-     * @param string $table Table name for which to return an empty date. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how date and time should be formatted).
-     * @return array
-     */
-    public function getDateTimeFormats($table)
-    {
-        $this->logDeprecation();
-        return QueryHelper::getDateTimeFormats();
-    }
-
-    /**
-     * Creates SELECT query components for selecting fields ($select) from two/three tables joined
-     * Use $mm_table together with $local_table or $foreign_table to select over two tables. Or use all three tables to select the full MM-relation.
-     * The JOIN is done with [$local_table].uid <--> [$mm_table].uid_local  / [$mm_table].uid_foreign <--> [$foreign_table].uid
-     * The function is very useful for selecting MM-relations between tables adhering to the MM-format used by TCE (TYPO3 Core Engine). See the section on $GLOBALS['TCA'] in Inside TYPO3 for more details.
-     *
-     * @param string $select See exec_SELECT_mm_query()
-     * @param string $local_table See exec_SELECT_mm_query()
-     * @param string $mm_table See exec_SELECT_mm_query()
-     * @param string $foreign_table See exec_SELECT_mm_query()
-     * @param string $whereClause See exec_SELECT_mm_query()
-     * @param string $groupBy See exec_SELECT_mm_query()
-     * @param string $orderBy See exec_SELECT_mm_query()
-     * @param string $limit See exec_SELECT_mm_query()
-     * @return array SQL query components
-     */
-    protected function getSelectMmQueryParts($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '')
-    {
-        $foreign_table_as = $foreign_table == $local_table ? $foreign_table . StringUtility::getUniqueId('_join') : '';
-        $mmWhere = $local_table ? $local_table . '.uid=' . $mm_table . '.uid_local' : '';
-        $mmWhere .= ($local_table and $foreign_table) ? ' AND ' : '';
-        $tables = ($local_table ? $local_table . ',' : '') . $mm_table;
-        if ($foreign_table) {
-            $mmWhere .= ($foreign_table_as ?: $foreign_table) . '.uid=' . $mm_table . '.uid_foreign';
-            $tables .= ',' . $foreign_table . ($foreign_table_as ? ' AS ' . $foreign_table_as : '');
-        }
-        return [
-            'SELECT' => $select,
-            'FROM' => $tables,
-            'WHERE' => $mmWhere . ' ' . $whereClause,
-            'GROUPBY' => $groupBy,
-            'ORDERBY' => $orderBy,
-            'LIMIT' => $limit
-        ];
-    }
-
-    /**************************************
+	/**
+	 * Escaping and quoting values for SQL statements.
+	 *
+	 * @param string $str Input string
+	 * @param string $table Table name for which to quote string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
+	 * @param bool $allowNull Whether to allow NULL values
+	 * @return string Output string; Wrapped in single quotes and quotes in the string (" / ') and \ will be backslashed (or otherwise based on DBAL handler)
+	 * @see quoteStr()
+	 */
+	public function fullQuoteStr($str, $table, $allowNull = false)
+	{
+		$this->logDeprecation();
+		if (!$this->isConnected) {
+			$this->connectDB();
+		}
+		if ($allowNull && $str === null) {
+			return 'NULL';
+		}
+		if (is_bool($str)) {
+			$str = (int)$str;
+		}
+
+		return '\'' . $this->link->real_escape_string($str) . '\'';
+	}
+
+	/**
+	 * Will fullquote all values in the one-dimensional array so they are ready to "implode" for an sql query.
+	 *
+	 * @param array $arr Array with values (either associative or non-associative array)
+	 * @param string $table Table name for which to quote
+	 * @param bool|array|string $noQuote List/array of keys NOT to quote (eg. SQL functions) - ONLY for associative arrays
+	 * @param bool $allowNull Whether to allow NULL values
+	 * @return array The input array with the values quoted
+	 * @see cleanIntArray()
+	 */
+	public function fullQuoteArray($arr, $table, $noQuote = false, $allowNull = false)
+	{
+		$this->logDeprecation();
+		if (is_string($noQuote)) {
+			$noQuote = explode(',', $noQuote);
+		} elseif (!is_array($noQuote)) {
+			$noQuote = (bool)$noQuote;
+		}
+		if ($noQuote === true) {
+			return $arr;
+		}
+		foreach ($arr as $k => $v) {
+			if ($noQuote === false || !in_array($k, $noQuote)) {
+				$arr[$k] = $this->fullQuoteStr($v, $table, $allowNull);
+			}
+		}
+		return $arr;
+	}
+
+	/**
+	 * Substitution for PHP function "addslashes()"
+	 * Use this function instead of the PHP addslashes() function when you build queries - this will prepare your code for DBAL.
+	 * NOTICE: You must wrap the output of this function in SINGLE QUOTES to be DBAL compatible. Unless you have to apply the single quotes yourself you should rather use ->fullQuoteStr()!
+	 *
+	 * @param string $str Input string
+	 * @param string $table Table name for which to quote string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
+	 * @return string Output string; Quotes (" / ') and \ will be backslashed (or otherwise based on DBAL handler)
+	 * @see quoteStr()
+	 */
+	public function quoteStr($str, $table)
+	{
+		$this->logDeprecation();
+		if (!$this->isConnected) {
+			$this->connectDB();
+		}
+		return $this->link->real_escape_string($str);
+	}
+
+	/**
+	 * Escaping values for SQL LIKE statements.
+	 *
+	 * @param string $str Input string
+	 * @param string $table Table name for which to escape string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
+	 * @return string Output string; % and _ will be escaped with \ (or otherwise based on DBAL handler)
+	 * @see quoteStr()
+	 */
+	public function escapeStrForLike($str, $table)
+	{
+		$this->logDeprecation();
+		return addcslashes($str, '_%');
+	}
+
+	/**
+	 * Will convert all values in the one-dimensional array to integers.
+	 * Useful when you want to make sure an array contains only integers before imploding them in a select-list.
+	 *
+	 * @param array $arr Array with values
+	 * @return array The input array with all values cast to (int)
+	 * @see cleanIntList()
+	 */
+	public function cleanIntArray($arr)
+	{
+		$this->logDeprecation();
+		return array_map('intval', $arr);
+	}
+
+	/**
+	 * Will force all entries in the input comma list to integers
+	 * Useful when you want to make sure a commalist of supposed integers really contain only integers; You want to know that when you don't trust content that could go into an SQL statement.
+	 *
+	 * @param string $list List of comma-separated values which should be integers
+	 * @return string The input list but with every value cast to (int)
+	 * @see cleanIntArray()
+	 */
+	public function cleanIntList($list)
+	{
+		$this->logDeprecation();
+		return implode(',', GeneralUtility::intExplode(',', $list));
+	}
+
+	/**
+	 * Removes the prefix "ORDER BY" from the input string.
+	 * This function is used when you call the exec_SELECTquery() function and want to pass the ORDER BY parameter by can't guarantee that "ORDER BY" is not prefixed.
+	 * Generally; This function provides a work-around to the situation where you cannot pass only the fields by which to order the result.
+	 *
+	 * @param string $str eg. "ORDER BY title, uid
+	 * @return string eg. "title, uid
+	 * @see exec_SELECTquery(), stripGroupBy()
+	 */
+	public function stripOrderBy($str)
+	{
+		$this->logDeprecation();
+		return preg_replace('/^(?:ORDER[[:space:]]*BY[[:space:]]*)+/i', '', trim($str));
+	}
+
+	/**
+	 * Removes the prefix "GROUP BY" from the input string.
+	 * This function is used when you call the SELECTquery() function and want to pass the GROUP BY parameter by can't guarantee that "GROUP BY" is not prefixed.
+	 * Generally; This function provides a work-around to the situation where you cannot pass only the fields by which to order the result.
+	 *
+	 * @param string $str eg. "GROUP BY title, uid
+	 * @return string eg. "title, uid
+	 * @see exec_SELECTquery(), stripOrderBy()
+	 */
+	public function stripGroupBy($str)
+	{
+		$this->logDeprecation();
+		return preg_replace('/^(?:GROUP[[:space:]]*BY[[:space:]]*)+/i', '', trim($str));
+	}
+
+	/**
+	 * Returns the date and time formats compatible with the given database table.
+	 *
+	 * @param string $table Table name for which to return an empty date. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how date and time should be formatted).
+	 * @return array
+	 */
+	public function getDateTimeFormats($table)
+	{
+		$this->logDeprecation();
+		return QueryHelper::getDateTimeFormats();
+	}
+
+	/**
+	 * Creates SELECT query components for selecting fields ($select) from two/three tables joined
+	 * Use $mm_table together with $local_table or $foreign_table to select over two tables. Or use all three tables to select the full MM-relation.
+	 * The JOIN is done with [$local_table].uid <--> [$mm_table].uid_local  / [$mm_table].uid_foreign <--> [$foreign_table].uid
+	 * The function is very useful for selecting MM-relations between tables adhering to the MM-format used by TCE (TYPO3 Core Engine). See the section on $GLOBALS['TCA'] in Inside TYPO3 for more details.
+	 *
+	 * @param string $select See exec_SELECT_mm_query()
+	 * @param string $local_table See exec_SELECT_mm_query()
+	 * @param string $mm_table See exec_SELECT_mm_query()
+	 * @param string $foreign_table See exec_SELECT_mm_query()
+	 * @param string $whereClause See exec_SELECT_mm_query()
+	 * @param string $groupBy See exec_SELECT_mm_query()
+	 * @param string $orderBy See exec_SELECT_mm_query()
+	 * @param string $limit See exec_SELECT_mm_query()
+	 * @return array SQL query components
+	 */
+	protected function getSelectMmQueryParts($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '')
+	{
+		$foreign_table_as = $foreign_table == $local_table ? $foreign_table . StringUtility::getUniqueId('_join') : '';
+		$mmWhere = $local_table ? $local_table . '.uid=' . $mm_table . '.uid_local' : '';
+		$mmWhere .= ($local_table and $foreign_table) ? ' AND ' : '';
+		$tables = ($local_table ? $local_table . ',' : '') . $mm_table;
+		if ($foreign_table) {
+			$mmWhere .= ($foreign_table_as ?: $foreign_table) . '.uid=' . $mm_table . '.uid_foreign';
+			$tables .= ',' . $foreign_table . ($foreign_table_as ? ' AS ' . $foreign_table_as : '');
+		}
+		return [
+			'SELECT' => $select,
+			'FROM' => $tables,
+			'WHERE' => $mmWhere . ' ' . $whereClause,
+			'GROUPBY' => $groupBy,
+			'ORDERBY' => $orderBy,
+			'LIMIT' => $limit
+		];
+	}
+
+	/**************************************
      *
      * MySQL(i) wrapper functions
      * (For use in your applications)
      *
      **************************************/
-    /**
-     * Executes query
-     * MySQLi query() wrapper function
-     * Beware: Use of this method should be avoided as it is experimentally supported by DBAL. You should consider
-     * using exec_SELECTquery() and similar methods instead.
-     *
-     * @param string $query Query to execute
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     */
-    public function sql_query($query)
-    {
-        $this->logDeprecation();
-        $res = $this->query($query);
-        if ($this->debugOutput) {
-            $this->debug('sql_query', $query);
-        }
-        return $res;
-    }
-
-    /**
-     * Returns the error status on the last query() execution
-     *
-     * @return string MySQLi error string.
-     */
-    public function sql_error()
-    {
-        $this->logDeprecation();
-        return $this->link->error;
-    }
-
-    /**
-     * Returns the error number on the last query() execution
-     *
-     * @return int MySQLi error number
-     */
-    public function sql_errno()
-    {
-        $this->logDeprecation();
-        return $this->link->errno;
-    }
-
-    /**
-     * Returns the number of selected rows.
-     *
-     * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-     * @return int Number of resulting rows
-     */
-    public function sql_num_rows($res)
-    {
-        $this->logDeprecation();
-        if ($this->debug_check_recordset($res)) {
-            return $res->num_rows;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns an associative array that corresponds to the fetched row, or FALSE if there are no more rows.
-     * MySQLi fetch_assoc() wrapper function
-     *
-     * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-     * @return array|bool Associative array of result row.
-     */
-    public function sql_fetch_assoc($res)
-    {
-        $this->logDeprecation();
-        if ($this->debug_check_recordset($res)) {
-            $result = $res->fetch_assoc();
-            if ($result === null) {
-                // Needed for compatibility
-                $result = false;
-            }
-            return $result;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns an array that corresponds to the fetched row, or FALSE if there are no more rows.
-     * The array contains the values in numerical indices.
-     * MySQLi fetch_row() wrapper function
-     *
-     * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-     * @return array|bool Array with result rows.
-     */
-    public function sql_fetch_row($res)
-    {
-        $this->logDeprecation();
-        if ($this->debug_check_recordset($res)) {
-            $result = $res->fetch_row();
-            if ($result === null) {
-                // Needed for compatibility
-                $result = false;
-            }
-            return $result;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Free result memory
-     * free_result() wrapper function
-     *
-     * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-     * @return bool Returns TRUE on success or FALSE on failure.
-     */
-    public function sql_free_result($res)
-    {
-        $this->logDeprecation();
-        if ($this->debug_check_recordset($res) && is_object($res)) {
-            $res->free();
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get the ID generated from the previous INSERT operation
-     *
-     * @return int The uid of the last inserted record.
-     */
-    public function sql_insert_id()
-    {
-        $this->logDeprecation();
-        return $this->link->insert_id;
-    }
-
-    /**
-     * Returns the number of rows affected by the last INSERT, UPDATE or DELETE query
-     *
-     * @return int Number of rows affected by last query
-     */
-    public function sql_affected_rows()
-    {
-        return $this->link->affected_rows;
-    }
-
-    /**
-     * Move internal result pointer
-     *
-     * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-     * @param int $seek Seek result number.
-     * @return bool Returns TRUE on success or FALSE on failure.
-     */
-    public function sql_data_seek($res, $seek)
-    {
-        $this->logDeprecation();
-        if ($this->debug_check_recordset($res)) {
-            return $res->data_seek($seek);
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get the type of the specified field in a result
-     * mysql_field_type() wrapper function
-     *
-     * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-     * @param int $pointer Field index.
-     * @return string Returns the name of the specified field index, or FALSE on error
-     */
-    public function sql_field_type($res, $pointer)
-    {
-        // mysql_field_type compatibility map
-        // taken from: http://www.php.net/manual/en/mysqli-result.fetch-field-direct.php#89117
-        // Constant numbers see http://php.net/manual/en/mysqli.constants.php
-        $mysql_data_type_hash = [
-            1=>'tinyint',
-            2=>'smallint',
-            3=>'int',
-            4=>'float',
-            5=>'double',
-            7=>'timestamp',
-            8=>'bigint',
-            9=>'mediumint',
-            10=>'date',
-            11=>'time',
-            12=>'datetime',
-            13=>'year',
-            16=>'bit',
-            //252 is currently mapped to all text and blob types (MySQL 5.0.51a)
-            253=>'varchar',
-            254=>'char',
-            246=>'decimal'
-        ];
-        if ($this->debug_check_recordset($res)) {
-            $metaInfo = $res->fetch_field_direct($pointer);
-            if ($metaInfo === false) {
-                return false;
-            }
-            return $mysql_data_type_hash[$metaInfo->type];
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Open a (persistent) connection to a MySQL server
-     *
-     * @return bool|void
-     * @throws \RuntimeException
-     */
-    public function sql_pconnect()
-    {
-        if ($this->isConnected) {
-            return $this->link;
-        }
-
-        if (!extension_loaded('mysqli')) {
-            throw new \RuntimeException(
-                'Database Error: PHP mysqli extension not loaded. This is a must have for TYPO3 CMS!',
-                1271492607
-            );
-        }
-
-        $host = $this->persistentDatabaseConnection
-            ? 'p:' . $this->databaseHost
-            : $this->databaseHost;
-
-        // We are not using the TYPO3 CMS shim here as the database parameters in this class
-        // are settable externally. This requires building the connection parameter array
-        // just in time when establishing the connection.
-        $connection = \Doctrine\DBAL\DriverManager::getConnection([
-            'driver' => 'mysqli',
-            'wrapperClass' => Connection::class,
-            'host' => $host,
-            'port' => (int)$this->databasePort,
-            'unix_socket' => $this->databaseSocket,
-            'user' => $this->databaseUsername,
-            'password' => $this->databaseUserPassword,
-            'charset' => $this->connectionCharset,
-        ]);
-
-        // Mimic the previous behavior of returning false on connection errors
-        try {
-            /** @var \Doctrine\DBAL\Driver\Mysqli\MysqliConnection $mysqliConnection */
-            $mysqliConnection = $connection->getWrappedConnection();
-            $this->link = $mysqliConnection->getWrappedResourceHandle();
-        } catch (\Doctrine\DBAL\Exception\ConnectionException $exception) {
-            return false;
-        }
-
-        if ($connection->isConnected()) {
-            $this->isConnected = true;
-
-            foreach ($this->initializeCommandsAfterConnect as $command) {
-                if ($this->query($command) === false) {
-                    GeneralUtility::sysLog(
-                        'Could not initialize DB connection with query "' . $command . '": ' . $this->sql_error(),
-                        'core',
-                        GeneralUtility::SYSLOG_SEVERITY_ERROR
-                    );
-                }
-            }
-            $this->checkConnectionCharset();
-        } else {
-            // @todo This should raise an exception. Would be useful especially to work during installation.
-            $error_msg = $this->link->connect_error;
-            $this->link = null;
-            GeneralUtility::sysLog(
-                'Could not connect to MySQL server ' . $host . ' with user ' . $this->databaseUsername . ': '
-                . $error_msg,
-                'core',
-                GeneralUtility::SYSLOG_SEVERITY_FATAL
-            );
-        }
-
-        return $this->link;
-    }
-
-    /**
-     * Select a SQL database
-     *
-     * @return bool Returns TRUE on success or FALSE on failure.
-     */
-    public function sql_select_db()
-    {
-        if (!$this->isConnected) {
-            $this->connectDB();
-        }
-
-        $ret = $this->link->select_db($this->databaseName);
-        if (!$ret) {
-            GeneralUtility::sysLog(
-                'Could not select MySQL database ' . $this->databaseName . ': ' . $this->sql_error(),
-                'core',
-                GeneralUtility::SYSLOG_SEVERITY_FATAL
-            );
-        }
-        return $ret;
-    }
-
-    /**************************************
+	/**
+	 * Executes query
+	 * MySQLi query() wrapper function
+	 * Beware: Use of this method should be avoided as it is experimentally supported by DBAL. You should consider
+	 * using exec_SELECTquery() and similar methods instead.
+	 *
+	 * @param string $query Query to execute
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 */
+	public function sql_query($query)
+	{
+		$this->logDeprecation();
+		$res = $this->query($query);
+		if ($this->debugOutput) {
+			$this->debug('sql_query', $query);
+		}
+		return $res;
+	}
+
+	/**
+	 * Returns the error status on the last query() execution
+	 *
+	 * @return string MySQLi error string.
+	 */
+	public function sql_error()
+	{
+		$this->logDeprecation();
+		return $this->link->error;
+	}
+
+	/**
+	 * Returns the error number on the last query() execution
+	 *
+	 * @return int MySQLi error number
+	 */
+	public function sql_errno()
+	{
+		$this->logDeprecation();
+		return $this->link->errno;
+	}
+
+	/**
+	 * Returns the number of selected rows.
+	 *
+	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
+	 * @return int Number of resulting rows
+	 */
+	public function sql_num_rows($res)
+	{
+		$this->logDeprecation();
+		if ($this->debug_check_recordset($res)) {
+			return $res->num_rows;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns an associative array that corresponds to the fetched row, or FALSE if there are no more rows.
+	 * MySQLi fetch_assoc() wrapper function
+	 *
+	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
+	 * @return array|bool Associative array of result row.
+	 */
+	public function sql_fetch_assoc($res)
+	{
+		$this->logDeprecation();
+		if ($this->debug_check_recordset($res)) {
+			$result = $res->fetch_assoc();
+			if ($result === null) {
+				// Needed for compatibility
+				$result = false;
+			}
+			return $result;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Returns an array that corresponds to the fetched row, or FALSE if there are no more rows.
+	 * The array contains the values in numerical indices.
+	 * MySQLi fetch_row() wrapper function
+	 *
+	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
+	 * @return array|bool Array with result rows.
+	 */
+	public function sql_fetch_row($res)
+	{
+		$this->logDeprecation();
+		if ($this->debug_check_recordset($res)) {
+			$result = $res->fetch_row();
+			if ($result === null) {
+				// Needed for compatibility
+				$result = false;
+			}
+			return $result;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Free result memory
+	 * free_result() wrapper function
+	 *
+	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
+	 * @return bool Returns TRUE on success or FALSE on failure.
+	 */
+	public function sql_free_result($res)
+	{
+		$this->logDeprecation();
+		if ($this->debug_check_recordset($res) && is_object($res)) {
+			$res->free();
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Get the ID generated from the previous INSERT operation
+	 *
+	 * @return int The uid of the last inserted record.
+	 */
+	public function sql_insert_id()
+	{
+		$this->logDeprecation();
+		return $this->link->insert_id;
+	}
+
+	/**
+	 * Returns the number of rows affected by the last INSERT, UPDATE or DELETE query
+	 *
+	 * @return int Number of rows affected by last query
+	 */
+	public function sql_affected_rows()
+	{
+		return $this->link->affected_rows;
+	}
+
+	/**
+	 * Move internal result pointer
+	 *
+	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
+	 * @param int $seek Seek result number.
+	 * @return bool Returns TRUE on success or FALSE on failure.
+	 */
+	public function sql_data_seek($res, $seek)
+	{
+		$this->logDeprecation();
+		if ($this->debug_check_recordset($res)) {
+			return $res->data_seek($seek);
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Get the type of the specified field in a result
+	 * mysql_field_type() wrapper function
+	 *
+	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
+	 * @param int $pointer Field index.
+	 * @return string Returns the name of the specified field index, or FALSE on error
+	 */
+	public function sql_field_type($res, $pointer)
+	{
+		// mysql_field_type compatibility map
+		// taken from: http://www.php.net/manual/en/mysqli-result.fetch-field-direct.php#89117
+		// Constant numbers see http://php.net/manual/en/mysqli.constants.php
+		$mysql_data_type_hash = [
+			1=>'tinyint',
+			2=>'smallint',
+			3=>'int',
+			4=>'float',
+			5=>'double',
+			7=>'timestamp',
+			8=>'bigint',
+			9=>'mediumint',
+			10=>'date',
+			11=>'time',
+			12=>'datetime',
+			13=>'year',
+			16=>'bit',
+			//252 is currently mapped to all text and blob types (MySQL 5.0.51a)
+			253=>'varchar',
+			254=>'char',
+			246=>'decimal'
+		];
+		if ($this->debug_check_recordset($res)) {
+			$metaInfo = $res->fetch_field_direct($pointer);
+			if ($metaInfo === false) {
+				return false;
+			}
+			return $mysql_data_type_hash[$metaInfo->type];
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Open a (persistent) connection to a MySQL server
+	 *
+	 * @return bool|void
+	 * @throws \RuntimeException
+	 */
+	public function sql_pconnect()
+	{
+		if ($this->isConnected) {
+			return $this->link;
+		}
+
+		if (!extension_loaded('mysqli')) {
+			throw new \RuntimeException(
+				'Database Error: PHP mysqli extension not loaded. This is a must have for TYPO3 CMS!',
+				1271492607
+			);
+		}
+
+		$host = $this->persistentDatabaseConnection
+			? 'p:' . $this->databaseHost
+			: $this->databaseHost;
+
+		// We are not using the TYPO3 CMS shim here as the database parameters in this class
+		// are settable externally. This requires building the connection parameter array
+		// just in time when establishing the connection.
+		$connection = \Doctrine\DBAL\DriverManager::getConnection([
+			'driver' => 'mysqli',
+			'wrapperClass' => Connection::class,
+			'host' => $host,
+			'port' => (int)$this->databasePort,
+			'unix_socket' => $this->databaseSocket,
+			'user' => $this->databaseUsername,
+			'password' => $this->databaseUserPassword,
+			'charset' => $this->connectionCharset,
+		]);
+
+		// Mimic the previous behavior of returning false on connection errors
+		try {
+			/** @var \Doctrine\DBAL\Driver\Mysqli\MysqliConnection $mysqliConnection */
+			$mysqliConnection = $connection->getWrappedConnection();
+			$this->link = $mysqliConnection->getWrappedResourceHandle();
+		} catch (\Doctrine\DBAL\Exception\ConnectionException $exception) {
+			return false;
+		}
+
+		if ($connection->isConnected()) {
+			$this->isConnected = true;
+
+			foreach ($this->initializeCommandsAfterConnect as $command) {
+				if ($this->query($command) === false) {
+					GeneralUtility::sysLog(
+						'Could not initialize DB connection with query "' . $command . '": ' . $this->sql_error(),
+						'core',
+						GeneralUtility::SYSLOG_SEVERITY_ERROR
+					);
+				}
+			}
+			$this->checkConnectionCharset();
+		} else {
+			// @todo This should raise an exception. Would be useful especially to work during installation.
+			$error_msg = $this->link->connect_error;
+			$this->link = null;
+			GeneralUtility::sysLog(
+				'Could not connect to MySQL server ' . $host . ' with user ' . $this->databaseUsername . ': '
+				. $error_msg,
+				'core',
+				GeneralUtility::SYSLOG_SEVERITY_FATAL
+			);
+		}
+
+		return $this->link;
+	}
+
+	/**
+	 * Select a SQL database
+	 *
+	 * @return bool Returns TRUE on success or FALSE on failure.
+	 */
+	public function sql_select_db()
+	{
+		if (!$this->isConnected) {
+			$this->connectDB();
+		}
+
+		$ret = $this->link->select_db($this->databaseName);
+		if (!$ret) {
+			GeneralUtility::sysLog(
+				'Could not select MySQL database ' . $this->databaseName . ': ' . $this->sql_error(),
+				'core',
+				GeneralUtility::SYSLOG_SEVERITY_FATAL
+			);
+		}
+		return $ret;
+	}
+
+	/**************************************
      *
      * SQL admin functions
      * (For use in the Install Tool and Extension Manager)
      *
      **************************************/
-    /**
-     * Listing databases from current MySQL connection. NOTICE: It WILL try to select those databases and thus break selection of current database.
-     * This is only used as a service function in the (1-2-3 process) of the Install Tool.
-     * In any case a lookup should be done in the _DEFAULT handler DBMS then.
-     * Use in Install Tool only!
-     *
-     * @return array Each entry represents a database name
-     * @throws \RuntimeException
-     */
-    public function admin_get_dbs()
-    {
-        $this->logDeprecation();
-        $dbArr = [];
-        $db_list = $this->query('SELECT SCHEMA_NAME FROM information_schema.SCHEMATA');
-        if ($db_list === false) {
-            throw new \RuntimeException(
-                'MySQL Error: Cannot get tablenames: "' . $this->sql_error() . '"!',
-                1378457171
-            );
-        } else {
-            while ($row = $db_list->fetch_object()) {
-                try {
-                    $this->setDatabaseName($row->SCHEMA_NAME);
-                    if ($this->sql_select_db()) {
-                        $dbArr[] = $row->SCHEMA_NAME;
-                    }
-                } catch (\RuntimeException $exception) {
-                    // The exception happens if we cannot connect to the database
-                    // (usually due to missing permissions). This is ok here.
-                    // We catch the exception, skip the database and continue.
-                }
-            }
-        }
-        return $dbArr;
-    }
-
-    /**
-     * Returns the list of tables from the default database, TYPO3_db (quering the DBMS)
-     * In a DBAL this method should 1) look up all tables from the DBMS  of
-     * the _DEFAULT handler and then 2) add all tables *configured* to be managed by other handlers
-     *
-     * @return array Array with tablenames as key and arrays with status information as value
-     */
-    public function admin_get_tables()
-    {
-        $this->logDeprecation();
-        $whichTables = [];
-        $tables_result = $this->query('SHOW TABLE STATUS FROM `' . $this->databaseName . '`');
-        if ($tables_result !== false) {
-            while ($theTable = $tables_result->fetch_assoc()) {
-                $whichTables[$theTable['Name']] = $theTable;
-            }
-            $tables_result->free();
-        }
-        return $whichTables;
-    }
-
-    /**
-     * Returns information about each field in the $table (quering the DBMS)
-     * In a DBAL this should look up the right handler for the table and return compatible information
-     * This function is important not only for the Install Tool but probably for
-     * DBALs as well since they might need to look up table specific information
-     * in order to construct correct queries. In such cases this information should
-     * probably be cached for quick delivery.
-     *
-     * @param string $tableName Table name
-     * @return array Field information in an associative array with fieldname => field row
-     */
-    public function admin_get_fields($tableName)
-    {
-        $this->logDeprecation();
-        $output = [];
-        $columns_res = $this->query('SHOW FULL COLUMNS FROM `' . $tableName . '`');
-        if ($columns_res !== false) {
-            while ($fieldRow = $columns_res->fetch_assoc()) {
-                $output[$fieldRow['Field']] = $fieldRow;
-            }
-            $columns_res->free();
-        }
-        return $output;
-    }
-
-    /**
-     * Returns information about each index key in the $table (quering the DBMS)
-     * In a DBAL this should look up the right handler for the table and return compatible information
-     *
-     * @param string $tableName Table name
-     * @return array Key information in a numeric array
-     */
-    public function admin_get_keys($tableName)
-    {
-        $this->logDeprecation();
-        $output = [];
-        $keyRes = $this->query('SHOW KEYS FROM `' . $tableName . '`');
-        if ($keyRes !== false) {
-            while ($keyRow = $keyRes->fetch_assoc()) {
-                $output[] = $keyRow;
-            }
-            $keyRes->free();
-        }
-        return $output;
-    }
-
-    /**
-     * Returns information about the character sets supported by the current DBM
-     * This function is important not only for the Install Tool but probably for
-     * DBALs as well since they might need to look up table specific information
-     * in order to construct correct queries. In such cases this information should
-     * probably be cached for quick delivery.
-     *
-     * This is used by the Install Tool to convert tables with non-UTF8 charsets
-     * Use in Install Tool only!
-     *
-     * @return array Array with Charset as key and an array of "Charset", "Description", "Default collation", "Maxlen" as values
-     */
-    public function admin_get_charsets()
-    {
-        $this->logDeprecation();
-        $output = [];
-        $columns_res = $this->query('SHOW CHARACTER SET');
-        if ($columns_res !== false) {
-            while ($row = $columns_res->fetch_assoc()) {
-                $output[$row['Charset']] = $row;
-            }
-            $columns_res->free();
-        }
-        return $output;
-    }
-
-    /**
-     * mysqli() wrapper function, used by the Install Tool and EM for all queries regarding management of the database!
-     *
-     * @param string $query Query to execute
-     * @return bool|\mysqli_result|object MySQLi result object / DBAL object
-     */
-    public function admin_query($query)
-    {
-        $this->logDeprecation();
-        $res = $this->query($query);
-        if ($this->debugOutput) {
-            $this->debug('admin_query', $query);
-        }
-        return $res;
-    }
-
-    /******************************
+	/**
+	 * Listing databases from current MySQL connection. NOTICE: It WILL try to select those databases and thus break selection of current database.
+	 * This is only used as a service function in the (1-2-3 process) of the Install Tool.
+	 * In any case a lookup should be done in the _DEFAULT handler DBMS then.
+	 * Use in Install Tool only!
+	 *
+	 * @return array Each entry represents a database name
+	 * @throws \RuntimeException
+	 */
+	public function admin_get_dbs()
+	{
+		$this->logDeprecation();
+		$dbArr = [];
+		$db_list = $this->query('SELECT SCHEMA_NAME FROM information_schema.SCHEMATA');
+		if ($db_list === false) {
+			throw new \RuntimeException(
+				'MySQL Error: Cannot get tablenames: "' . $this->sql_error() . '"!',
+				1378457171
+			);
+		} else {
+			while ($row = $db_list->fetch_object()) {
+				try {
+					$this->setDatabaseName($row->SCHEMA_NAME);
+					if ($this->sql_select_db()) {
+						$dbArr[] = $row->SCHEMA_NAME;
+					}
+				} catch (\RuntimeException $exception) {
+					// The exception happens if we cannot connect to the database
+					// (usually due to missing permissions). This is ok here.
+					// We catch the exception, skip the database and continue.
+				}
+			}
+		}
+		return $dbArr;
+	}
+
+	/**
+	 * Returns the list of tables from the default database, TYPO3_db (quering the DBMS)
+	 * In a DBAL this method should 1) look up all tables from the DBMS  of
+	 * the _DEFAULT handler and then 2) add all tables *configured* to be managed by other handlers
+	 *
+	 * @return array Array with tablenames as key and arrays with status information as value
+	 */
+	public function admin_get_tables()
+	{
+		$this->logDeprecation();
+		$whichTables = [];
+		$tables_result = $this->query('SHOW TABLE STATUS FROM `' . $this->databaseName . '`');
+		if ($tables_result !== false) {
+			while ($theTable = $tables_result->fetch_assoc()) {
+				$whichTables[$theTable['Name']] = $theTable;
+			}
+			$tables_result->free();
+		}
+		return $whichTables;
+	}
+
+	/**
+	 * Returns information about each field in the $table (quering the DBMS)
+	 * In a DBAL this should look up the right handler for the table and return compatible information
+	 * This function is important not only for the Install Tool but probably for
+	 * DBALs as well since they might need to look up table specific information
+	 * in order to construct correct queries. In such cases this information should
+	 * probably be cached for quick delivery.
+	 *
+	 * @param string $tableName Table name
+	 * @return array Field information in an associative array with fieldname => field row
+	 */
+	public function admin_get_fields($tableName)
+	{
+		$this->logDeprecation();
+		$output = [];
+		$columns_res = $this->query('SHOW FULL COLUMNS FROM `' . $tableName . '`');
+		if ($columns_res !== false) {
+			while ($fieldRow = $columns_res->fetch_assoc()) {
+				$output[$fieldRow['Field']] = $fieldRow;
+			}
+			$columns_res->free();
+		}
+		return $output;
+	}
+
+	/**
+	 * Returns information about each index key in the $table (quering the DBMS)
+	 * In a DBAL this should look up the right handler for the table and return compatible information
+	 *
+	 * @param string $tableName Table name
+	 * @return array Key information in a numeric array
+	 */
+	public function admin_get_keys($tableName)
+	{
+		$this->logDeprecation();
+		$output = [];
+		$keyRes = $this->query('SHOW KEYS FROM `' . $tableName . '`');
+		if ($keyRes !== false) {
+			while ($keyRow = $keyRes->fetch_assoc()) {
+				$output[] = $keyRow;
+			}
+			$keyRes->free();
+		}
+		return $output;
+	}
+
+	/**
+	 * Returns information about the character sets supported by the current DBM
+	 * This function is important not only for the Install Tool but probably for
+	 * DBALs as well since they might need to look up table specific information
+	 * in order to construct correct queries. In such cases this information should
+	 * probably be cached for quick delivery.
+	 *
+	 * This is used by the Install Tool to convert tables with non-UTF8 charsets
+	 * Use in Install Tool only!
+	 *
+	 * @return array Array with Charset as key and an array of "Charset", "Description", "Default collation", "Maxlen" as values
+	 */
+	public function admin_get_charsets()
+	{
+		$this->logDeprecation();
+		$output = [];
+		$columns_res = $this->query('SHOW CHARACTER SET');
+		if ($columns_res !== false) {
+			while ($row = $columns_res->fetch_assoc()) {
+				$output[$row['Charset']] = $row;
+			}
+			$columns_res->free();
+		}
+		return $output;
+	}
+
+	/**
+	 * mysqli() wrapper function, used by the Install Tool and EM for all queries regarding management of the database!
+	 *
+	 * @param string $query Query to execute
+	 * @return bool|\mysqli_result|object MySQLi result object / DBAL object
+	 */
+	public function admin_query($query)
+	{
+		$this->logDeprecation();
+		$res = $this->query($query);
+		if ($this->debugOutput) {
+			$this->debug('admin_query', $query);
+		}
+		return $res;
+	}
+
+	/******************************
      *
      * Connect handling
      *
      ******************************/
 
-    /**
-     * Set database host
-     *
-     * @param string $host
-     */
-    public function setDatabaseHost($host = 'localhost')
-    {
-        $this->disconnectIfConnected();
-        $this->databaseHost = $host;
-    }
-
-    /**
-     * Set database port
-     *
-     * @param int $port
-     */
-    public function setDatabasePort($port = 3306)
-    {
-        $this->disconnectIfConnected();
-        $this->databasePort = (int)$port;
-    }
-
-    /**
-     * Set database socket
-     *
-     * @param string|NULL $socket
-     */
-    public function setDatabaseSocket($socket = null)
-    {
-        $this->disconnectIfConnected();
-        $this->databaseSocket = $socket;
-    }
-
-    /**
-     * Set database name
-     *
-     * @param string $name
-     */
-    public function setDatabaseName($name)
-    {
-        $this->disconnectIfConnected();
-        $this->databaseName = $name;
-    }
-
-    /**
-     * Set database username
-     *
-     * @param string $username
-     */
-    public function setDatabaseUsername($username)
-    {
-        $this->disconnectIfConnected();
-        $this->databaseUsername = $username;
-    }
-
-    /**
-     * Set database password
-     *
-     * @param string $password
-     */
-    public function setDatabasePassword($password)
-    {
-        $this->disconnectIfConnected();
-        $this->databaseUserPassword = $password;
-    }
-
-    /**
-     * Set persistent database connection
-     *
-     * @param bool $persistentDatabaseConnection
-     * @see http://php.net/manual/de/mysqli.persistconns.php
-     */
-    public function setPersistentDatabaseConnection($persistentDatabaseConnection)
-    {
-        $this->disconnectIfConnected();
-        $this->persistentDatabaseConnection = (bool)$persistentDatabaseConnection;
-    }
-
-    /**
-     * Set connection compression. Might be an advantage, if SQL server is not on localhost
-     *
-     * @param bool $connectionCompression TRUE if connection should be compressed
-     */
-    public function setConnectionCompression($connectionCompression)
-    {
-        $this->disconnectIfConnected();
-        $this->connectionCompression = (bool)$connectionCompression;
-    }
-
-    /**
-     * Set commands to be fired after connection was established
-     *
-     * @param array $commands List of SQL commands to be executed after connect
-     */
-    public function setInitializeCommandsAfterConnect(array $commands)
-    {
-        $this->disconnectIfConnected();
-        $this->initializeCommandsAfterConnect = $commands;
-    }
-
-    /**
-     * Set the charset that should be used for the MySQL connection.
-     * The given value will be passed on to mysqli_set_charset().
-     *
-     * The default value of this setting is utf8.
-     *
-     * @param string $connectionCharset The connection charset that will be passed on to mysqli_set_charset() when connecting the database. Default is utf8.
-     */
-    public function setConnectionCharset($connectionCharset = 'utf8')
-    {
-        $this->disconnectIfConnected();
-        $this->connectionCharset = $connectionCharset;
-    }
-
-    /**
-     * Connects to database for TYPO3 sites:
-     *
-     * @throws \RuntimeException
-     * @throws \UnexpectedValueException
-     */
-    public function connectDB()
-    {
-        $this->logDeprecation();
-        // Early return if connected already
-        if ($this->isConnected) {
-            return;
-        }
-
-        if (!$this->databaseName) {
-            throw new \RuntimeException(
-                'TYPO3 Fatal Error: No database selected!',
-                1270853882
-            );
-        }
-
-        if ($this->sql_pconnect()) {
-            if (!$this->sql_select_db()) {
-                throw new \RuntimeException(
-                    'TYPO3 Fatal Error: Cannot connect to the current database, "' . $this->databaseName . '"!',
-                    1270853883
-                );
-            }
-        } else {
-            throw new \RuntimeException(
-                'TYPO3 Fatal Error: The current username, password or host was not accepted when the connection to the database was attempted to be established!',
-                1270853884
-            );
-        }
-
-        // Prepare user defined objects (if any) for hooks which extend query methods
-        $this->preProcessHookObjects = [];
-        $this->postProcessHookObjects = [];
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_db.php']['queryProcessors'])) {
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_db.php']['queryProcessors'] as $className) {
-                $hookObject = GeneralUtility::makeInstance($className);
-                if (!(
-                    $hookObject instanceof PreProcessQueryHookInterface
-                    || $hookObject instanceof PostProcessQueryHookInterface
-                )) {
-                    throw new \UnexpectedValueException(
-                        '$hookObject must either implement interface TYPO3\\CMS\\Typo3DbLegacy\\Database\\PreProcessQueryHookInterface or interface TYPO3\\CMS\\Typo3DbLegacy\\Database\\PostProcessQueryHookInterface',
-                        1299158548
-                    );
-                }
-                if ($hookObject instanceof PreProcessQueryHookInterface) {
-                    $this->preProcessHookObjects[] = $hookObject;
-                }
-                if ($hookObject instanceof PostProcessQueryHookInterface) {
-                    $this->postProcessHookObjects[] = $hookObject;
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks if database is connected
-     *
-     * @return bool
-     */
-    public function isConnected()
-    {
-        // We think we're still connected
-        if ($this->isConnected) {
-            // Check if this is really the case or if the database server has gone away for some reason
-            // Using mysqlnd ping() does not reconnect (which we would not want anyway since charset etc would not be reinitialized that way)
-            $this->isConnected = $this->link->ping();
-        }
-        return $this->isConnected;
-    }
-
-    /**
-     * Checks if the current connection character set has the same value
-     * as the connectionCharset variable.
-     *
-     * To determine the character set these MySQL session variables are
-     * checked: character_set_client, character_set_results and
-     * character_set_connection.
-     *
-     * If the character set does not match or if the session variables
-     * can not be read a RuntimeException is thrown.
-     *
-     * @throws \RuntimeException
-     */
-    protected function checkConnectionCharset()
-    {
-        $sessionResult = $this->sql_query('SHOW SESSION VARIABLES LIKE \'character_set%\'');
-
-        if ($sessionResult === false) {
-            GeneralUtility::sysLog(
-                'Error while retrieving the current charset session variables from the database: ' . $this->sql_error(),
-                'core',
-                GeneralUtility::SYSLOG_SEVERITY_ERROR
-            );
-            throw new \RuntimeException(
-                'TYPO3 Fatal Error: Could not determine the current charset of the database.',
-                1381847136
-            );
-        }
-
-        $charsetVariables = [];
-        while (($row = $this->sql_fetch_row($sessionResult)) !== false) {
-            $variableName = $row[0];
-            $variableValue = $row[1];
-            $charsetVariables[$variableName] = $variableValue;
-        }
-        $this->sql_free_result($sessionResult);
-
-        // These variables are set with the "Set names" command which was
-        // used in the past. This is why we check them.
-        $charsetRequiredVariables = [
-            'character_set_client',
-            'character_set_results',
-            'character_set_connection',
-        ];
-
-        $hasValidCharset = true;
-        foreach ($charsetRequiredVariables as $variableName) {
-            if (empty($charsetVariables[$variableName])) {
-                GeneralUtility::sysLog(
-                    'A required session variable is missing in the current MySQL connection: ' . $variableName,
-                    'core',
-                    GeneralUtility::SYSLOG_SEVERITY_ERROR
-                );
-                throw new \RuntimeException(
-                    'TYPO3 Fatal Error: Could not determine the value of the database session variable: ' . $variableName,
-                    1381847779
-                );
-            }
-
-            if ($charsetVariables[$variableName] !== $this->connectionCharset) {
-                $hasValidCharset = false;
-                break;
-            }
-        }
-
-        if (!$hasValidCharset) {
-            throw new \RuntimeException(
-                'It looks like the character set ' . $this->connectionCharset . ' is not used for this connection even though it is configured as connection charset. ' .
-                'This TYPO3 installation is using the $GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'setDBinit\'] property with the following value: "' .
-                $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit'] . '". Please make sure that this command does not overwrite the configured charset. ' .
-                'Please note that for the TYPO3 database everything other than utf8 is unsupported since version 4.7.',
-                1389697515
-            );
-        }
-    }
-
-    /**
-     * Disconnect from database if connected
-     */
-    protected function disconnectIfConnected()
-    {
-        if ($this->isConnected) {
-            $this->link->close();
-            $this->isConnected = false;
-        }
-    }
-
-    /**
-     * Returns current database handle
-     *
-     * @return \mysqli|NULL
-     */
-    public function getDatabaseHandle()
-    {
-        $this->logDeprecation();
-        return $this->link;
-    }
-
-    /**
-     * Set current database handle, usually \mysqli
-     *
-     * @param \mysqli $handle
-     */
-    public function setDatabaseHandle($handle)
-    {
-        $this->link = $handle;
-    }
-
-    /**
-     * Get the MySQL server version
-     *
-     * @return string
-     */
-    public function getServerVersion()
-    {
-        $this->logDeprecation();
-        return $this->link->server_info;
-    }
-
-    /******************************
+	/**
+	 * Set database host
+	 *
+	 * @param string $host
+	 */
+	public function setDatabaseHost($host = 'localhost')
+	{
+		$this->disconnectIfConnected();
+		$this->databaseHost = $host;
+	}
+
+	/**
+	 * Set database port
+	 *
+	 * @param int $port
+	 */
+	public function setDatabasePort($port = 3306)
+	{
+		$this->disconnectIfConnected();
+		$this->databasePort = (int)$port;
+	}
+
+	/**
+	 * Set database socket
+	 *
+	 * @param string|NULL $socket
+	 */
+	public function setDatabaseSocket($socket = null)
+	{
+		$this->disconnectIfConnected();
+		$this->databaseSocket = $socket;
+	}
+
+	/**
+	 * Set database name
+	 *
+	 * @param string $name
+	 */
+	public function setDatabaseName($name)
+	{
+		$this->disconnectIfConnected();
+		$this->databaseName = $name;
+	}
+
+	/**
+	 * Set database username
+	 *
+	 * @param string $username
+	 */
+	public function setDatabaseUsername($username)
+	{
+		$this->disconnectIfConnected();
+		$this->databaseUsername = $username;
+	}
+
+	/**
+	 * Set database password
+	 *
+	 * @param string $password
+	 */
+	public function setDatabasePassword($password)
+	{
+		$this->disconnectIfConnected();
+		$this->databaseUserPassword = $password;
+	}
+
+	/**
+	 * Set persistent database connection
+	 *
+	 * @param bool $persistentDatabaseConnection
+	 * @see http://php.net/manual/de/mysqli.persistconns.php
+	 */
+	public function setPersistentDatabaseConnection($persistentDatabaseConnection)
+	{
+		$this->disconnectIfConnected();
+		$this->persistentDatabaseConnection = (bool)$persistentDatabaseConnection;
+	}
+
+	/**
+	 * Set connection compression. Might be an advantage, if SQL server is not on localhost
+	 *
+	 * @param bool $connectionCompression TRUE if connection should be compressed
+	 */
+	public function setConnectionCompression($connectionCompression)
+	{
+		$this->disconnectIfConnected();
+		$this->connectionCompression = (bool)$connectionCompression;
+	}
+
+	/**
+	 * Set commands to be fired after connection was established
+	 *
+	 * @param array $commands List of SQL commands to be executed after connect
+	 */
+	public function setInitializeCommandsAfterConnect(array $commands)
+	{
+		$this->disconnectIfConnected();
+		$this->initializeCommandsAfterConnect = $commands;
+	}
+
+	/**
+	 * Set the charset that should be used for the MySQL connection.
+	 * The given value will be passed on to mysqli_set_charset().
+	 *
+	 * The default value of this setting is utf8.
+	 *
+	 * @param string $connectionCharset The connection charset that will be passed on to mysqli_set_charset() when connecting the database. Default is utf8.
+	 */
+	public function setConnectionCharset($connectionCharset = 'utf8')
+	{
+		$this->disconnectIfConnected();
+		$this->connectionCharset = $connectionCharset;
+	}
+
+	/**
+	 * Connects to database for TYPO3 sites:
+	 *
+	 * @throws \RuntimeException
+	 * @throws \UnexpectedValueException
+	 */
+	public function connectDB()
+	{
+		$this->logDeprecation();
+		// Early return if connected already
+		if ($this->isConnected) {
+			return;
+		}
+
+		if (!$this->databaseName) {
+			throw new \RuntimeException(
+				'TYPO3 Fatal Error: No database selected!',
+				1270853882
+			);
+		}
+
+		if ($this->sql_pconnect()) {
+			if (!$this->sql_select_db()) {
+				throw new \RuntimeException(
+					'TYPO3 Fatal Error: Cannot connect to the current database, "' . $this->databaseName . '"!',
+					1270853883
+				);
+			}
+		} else {
+			throw new \RuntimeException(
+				'TYPO3 Fatal Error: The current username, password or host was not accepted when the connection to the database was attempted to be established!',
+				1270853884
+			);
+		}
+
+		// Prepare user defined objects (if any) for hooks which extend query methods
+		$this->preProcessHookObjects = [];
+		$this->postProcessHookObjects = [];
+		if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_db.php']['queryProcessors'])) {
+			foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_db.php']['queryProcessors'] as $className) {
+				$hookObject = GeneralUtility::makeInstance($className);
+				if (!(
+					$hookObject instanceof PreProcessQueryHookInterface
+					|| $hookObject instanceof PostProcessQueryHookInterface
+				)) {
+					throw new \UnexpectedValueException(
+						'$hookObject must either implement interface TYPO3\\CMS\\Typo3DbLegacy\\Database\\PreProcessQueryHookInterface or interface TYPO3\\CMS\\Typo3DbLegacy\\Database\\PostProcessQueryHookInterface',
+						1299158548
+					);
+				}
+				if ($hookObject instanceof PreProcessQueryHookInterface) {
+					$this->preProcessHookObjects[] = $hookObject;
+				}
+				if ($hookObject instanceof PostProcessQueryHookInterface) {
+					$this->postProcessHookObjects[] = $hookObject;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Checks if database is connected
+	 *
+	 * @return bool
+	 */
+	public function isConnected()
+	{
+		// We think we're still connected
+		if ($this->isConnected) {
+			// Check if this is really the case or if the database server has gone away for some reason
+			// Using mysqlnd ping() does not reconnect (which we would not want anyway since charset etc would not be reinitialized that way)
+			$this->isConnected = $this->link->ping();
+		}
+		return $this->isConnected;
+	}
+
+	/**
+	 * Checks if the current connection character set has the same value
+	 * as the connectionCharset variable.
+	 *
+	 * To determine the character set these MySQL session variables are
+	 * checked: character_set_client, character_set_results and
+	 * character_set_connection.
+	 *
+	 * If the character set does not match or if the session variables
+	 * can not be read a RuntimeException is thrown.
+	 *
+	 * @throws \RuntimeException
+	 */
+	protected function checkConnectionCharset()
+	{
+		$sessionResult = $this->sql_query('SHOW SESSION VARIABLES LIKE \'character_set%\'');
+
+		if ($sessionResult === false) {
+			GeneralUtility::sysLog(
+				'Error while retrieving the current charset session variables from the database: ' . $this->sql_error(),
+				'core',
+				GeneralUtility::SYSLOG_SEVERITY_ERROR
+			);
+			throw new \RuntimeException(
+				'TYPO3 Fatal Error: Could not determine the current charset of the database.',
+				1381847136
+			);
+		}
+
+		$charsetVariables = [];
+		while (($row = $this->sql_fetch_row($sessionResult)) !== false) {
+			$variableName = $row[0];
+			$variableValue = $row[1];
+			$charsetVariables[$variableName] = $variableValue;
+		}
+		$this->sql_free_result($sessionResult);
+
+		// These variables are set with the "Set names" command which was
+		// used in the past. This is why we check them.
+		$charsetRequiredVariables = [
+			'character_set_client',
+			'character_set_results',
+			'character_set_connection',
+		];
+
+		$hasValidCharset = true;
+		foreach ($charsetRequiredVariables as $variableName) {
+			if (empty($charsetVariables[$variableName])) {
+				GeneralUtility::sysLog(
+					'A required session variable is missing in the current MySQL connection: ' . $variableName,
+					'core',
+					GeneralUtility::SYSLOG_SEVERITY_ERROR
+				);
+				throw new \RuntimeException(
+					'TYPO3 Fatal Error: Could not determine the value of the database session variable: ' . $variableName,
+					1381847779
+				);
+			}
+
+			if ($charsetVariables[$variableName] !== $this->connectionCharset) {
+				$hasValidCharset = false;
+				break;
+			}
+		}
+
+		if (!$hasValidCharset) {
+			throw new \RuntimeException(
+				'It looks like the character set ' . $this->connectionCharset . ' is not used for this connection even though it is configured as connection charset. ' .
+				'This TYPO3 installation is using the $GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'setDBinit\'] property with the following value: "' .
+				$GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit'] . '". Please make sure that this command does not overwrite the configured charset. ' .
+				'Please note that for the TYPO3 database everything other than utf8 is unsupported since version 4.7.',
+				1389697515
+			);
+		}
+	}
+
+	/**
+	 * Disconnect from database if connected
+	 */
+	protected function disconnectIfConnected()
+	{
+		if ($this->isConnected) {
+			$this->link->close();
+			$this->isConnected = false;
+		}
+	}
+
+	/**
+	 * Returns current database handle
+	 *
+	 * @return \mysqli|NULL
+	 */
+	public function getDatabaseHandle()
+	{
+		$this->logDeprecation();
+		return $this->link;
+	}
+
+	/**
+	 * Set current database handle, usually \mysqli
+	 *
+	 * @param \mysqli $handle
+	 */
+	public function setDatabaseHandle($handle)
+	{
+		$this->link = $handle;
+	}
+
+	/**
+	 * Get the MySQL server version
+	 *
+	 * @return string
+	 */
+	public function getServerVersion()
+	{
+		$this->logDeprecation();
+		return $this->link->server_info;
+	}
+
+	/******************************
      *
      * Debugging
      *
      ******************************/
-    /**
-     * Debug function: Outputs error if any
-     *
-     * @param string $func Function calling debug()
-     * @param string $query Last query if not last built query
-     */
-    public function debug($func, $query = '')
-    {
-        $this->logDeprecation();
-        $error = $this->sql_error();
-        if ($error || (int)$this->debugOutput === 2) {
-            \TYPO3\CMS\Core\Utility\DebugUtility::debug(
-                [
-                    'caller' => \Fab\Vidi\Database\DatabaseConnection::class . '::' . $func,
-                    'ERROR' => $error,
-                    'lastBuiltQuery' => $query ? $query : $this->debug_lastBuiltQuery,
-                    'debug_backtrace' => \TYPO3\CMS\Core\Utility\DebugUtility::debugTrail()
-                ],
-                $func,
-                is_object($GLOBALS['error']) && @is_callable([$GLOBALS['error'], 'debug'])
-                    ? ''
-                    : 'DB Error'
-            );
-        }
-    }
-
-    /**
-     * Checks if record set is valid and writes debugging information into devLog if not.
-     *
-     * @param bool|\mysqli_result|object MySQLi result object / DBAL object
-     * @return bool TRUE if the  record set is valid, FALSE otherwise
-     */
-    public function debug_check_recordset($res)
-    {
-        $this->logDeprecation();
-        if ($res !== false && $res !== null) {
-            return true;
-        }
-        $trace = debug_backtrace(0);
-        array_shift($trace);
-        $msg = 'Invalid database result detected: function TYPO3\\CMS\\Typo3DbLegacy\\Database\\DatabaseConnection->'
-            . $trace[0]['function'] . ' called from file ' . substr($trace[0]['file'], (strlen(PATH_site) + 2))
-            . ' in line ' . $trace[0]['line'] . '.';
-        GeneralUtility::sysLog(
-            $msg . ' Use a devLog extension to get more details.',
-            'core',
-            GeneralUtility::SYSLOG_SEVERITY_ERROR
-        );
-        // Send to devLog if enabled
-        if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['devLog'])) {
-            $debugLogData = [
-                'SQL Error' => $this->sql_error(),
-                'Backtrace' => $trace
-            ];
-            if ($this->debug_lastBuiltQuery) {
-                $debugLogData = ['SQL Query' => $this->debug_lastBuiltQuery] + $debugLogData;
-            }
-            GeneralUtility::devLog($msg, 'Core/t3lib_db', 3, $debugLogData);
-        }
-        return false;
-    }
-
-    /**
-     * Explain select queries
-     * If $this->explainOutput is set, SELECT queries will be explained here. Only queries with more than one possible result row will be displayed.
-     * The output is either printed as raw HTML output or embedded into the TS admin panel (checkbox must be enabled!)
-     *
-     * @todo Feature is not DBAL-compliant
-     *
-     * @param string $query SQL query
-     * @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
-     * @param int $row_count Number of resulting rows
-     * @return bool TRUE if explain was run, FALSE otherwise
-     */
-    protected function explain($query, $from_table, $row_count)
-    {
-        $debugAllowedForIp = GeneralUtility::cmpIP(
-            GeneralUtility::getIndpEnv('REMOTE_ADDR'),
-            $GLOBALS['TYPO3_CONF_VARS']['SYS']['devIPmask']
-        );
-        if (
-            (int)$this->explainOutput == 1
-            || ((int)$this->explainOutput == 2 && $debugAllowedForIp)
-        ) {
-            // Raw HTML output
-            $explainMode = 1;
-        } elseif ((int)$this->explainOutput == 3) {
-            // Embed the output into the TS admin panel
-            $explainMode = 2;
-        } else {
-            return false;
-        }
-        $error = $this->sql_error();
-        $trail = \TYPO3\CMS\Core\Utility\DebugUtility::debugTrail();
-        $explain_tables = [];
-        $explain_output = [];
-        $res = $this->sql_query('EXPLAIN ' . $query, $this->link);
-        if (is_a($res, '\\mysqli_result')) {
-            while ($tempRow = $this->sql_fetch_assoc($res)) {
-                $explain_output[] = $tempRow;
-                $explain_tables[] = $tempRow['table'];
-            }
-            $this->sql_free_result($res);
-        }
-        $indices_output = [];
-        // Notice: Rows are skipped if there is only one result, or if no conditions are set
-        if ($explain_output[0]['rows'] > 1 || $explain_output[0]['type'] === 'ALL') {
-            // Only enable output if it's really useful
-            $debug = true;
-            foreach ($explain_tables as $table) {
-                $tableRes = $this->sql_query('SHOW TABLE STATUS LIKE \'' . $table . '\'');
-                $isTable = $this->sql_num_rows($tableRes);
-                if ($isTable) {
-                    $res = $this->sql_query('SHOW INDEX FROM ' . $table, $this->link);
-                    if (is_a($res, '\\mysqli_result')) {
-                        while ($tempRow = $this->sql_fetch_assoc($res)) {
-                            $indices_output[] = $tempRow;
-                        }
-                        $this->sql_free_result($res);
-                    }
-                }
-                $this->sql_free_result($tableRes);
-            }
-        } else {
-            $debug = false;
-        }
-        if ($debug) {
-            if ($explainMode) {
-                $data = [];
-                $data['query'] = $query;
-                $data['trail'] = $trail;
-                $data['row_count'] = $row_count;
-                if ($error) {
-                    $data['error'] = $error;
-                }
-                if (!empty($explain_output)) {
-                    $data['explain'] = $explain_output;
-                }
-                if (!empty($indices_output)) {
-                    $data['indices'] = $indices_output;
-                }
-                if ($explainMode == 1) {
-                    \TYPO3\CMS\Core\Utility\DebugUtility::debug($data, 'Tables: ' . $from_table, 'DB SQL EXPLAIN');
-                } elseif ($explainMode == 2) {
-                    /** @var TimeTracker $timeTracker */
-                    $timeTracker = GeneralUtility::makeInstance(TimeTracker::class);
-                    $timeTracker->setTSselectQuery($data);
-                }
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Serialize destructs current connection
-     *
-     * @return array All protected properties that should be saved
-     */
-    public function __sleep()
-    {
-        $this->disconnectIfConnected();
-        return [
-            'debugOutput',
-            'explainOutput',
-            'databaseHost',
-            'databasePort',
-            'databaseSocket',
-            'databaseName',
-            'databaseUsername',
-            'databaseUserPassword',
-            'persistentDatabaseConnection',
-            'connectionCompression',
-            'initializeCommandsAfterConnect',
-            'default_charset',
-        ];
-    }
-
-    /**
-     * function to call a deprecation log entry (but only once per request / class)
-     */
-    protected function logDeprecation()
-    {
-        if (!$this->deprecationWarningThrown) {
-            $this->deprecationWarningThrown = true;
-            GeneralUtility::deprecationLog('DatabaseConnection a.k.a. $["TYPO3_DB"] has been marked as deprecated in'
-            . ' TYPO3 v8 and will be removed in TYPO3 v9. Please use the newly available ConnectionPool and QueryBuilder'
-            . ' classes.');
-        }
-    }
+	/**
+	 * Debug function: Outputs error if any
+	 *
+	 * @param string $func Function calling debug()
+	 * @param string $query Last query if not last built query
+	 */
+	public function debug($func, $query = '')
+	{
+		$this->logDeprecation();
+		$error = $this->sql_error();
+		if ($error || (int)$this->debugOutput === 2) {
+			\TYPO3\CMS\Core\Utility\DebugUtility::debug(
+				[
+					'caller' => \Fab\Vidi\Database\DatabaseConnection::class . '::' . $func,
+					'ERROR' => $error,
+					'lastBuiltQuery' => $query ? $query : $this->debug_lastBuiltQuery,
+					'debug_backtrace' => \TYPO3\CMS\Core\Utility\DebugUtility::debugTrail()
+				],
+				$func,
+				is_object($GLOBALS['error']) && @is_callable([$GLOBALS['error'], 'debug'])
+					? ''
+					: 'DB Error'
+			);
+		}
+	}
+
+	/**
+	 * Checks if record set is valid and writes debugging information into devLog if not.
+	 *
+	 * @param bool|\mysqli_result|object MySQLi result object / DBAL object
+	 * @return bool TRUE if the  record set is valid, FALSE otherwise
+	 */
+	public function debug_check_recordset($res)
+	{
+		$this->logDeprecation();
+		if ($res !== false && $res !== null) {
+			return true;
+		}
+		$trace = debug_backtrace(0);
+		array_shift($trace);
+		$msg = 'Invalid database result detected: function TYPO3\\CMS\\Typo3DbLegacy\\Database\\DatabaseConnection->'
+			. $trace[0]['function'] . ' called from file ' . substr($trace[0]['file'], (strlen(PATH_site) + 2))
+			. ' in line ' . $trace[0]['line'] . '.';
+		GeneralUtility::sysLog(
+			$msg . ' Use a devLog extension to get more details.',
+			'core',
+			GeneralUtility::SYSLOG_SEVERITY_ERROR
+		);
+		// Send to devLog if enabled
+		if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_div.php']['devLog'])) {
+			$debugLogData = [
+				'SQL Error' => $this->sql_error(),
+				'Backtrace' => $trace
+			];
+			if ($this->debug_lastBuiltQuery) {
+				$debugLogData = ['SQL Query' => $this->debug_lastBuiltQuery] + $debugLogData;
+			}
+			GeneralUtility::devLog($msg, 'Core/t3lib_db', 3, $debugLogData);
+		}
+		return false;
+	}
+
+	/**
+	 * Explain select queries
+	 * If $this->explainOutput is set, SELECT queries will be explained here. Only queries with more than one possible result row will be displayed.
+	 * The output is either printed as raw HTML output or embedded into the TS admin panel (checkbox must be enabled!)
+	 *
+	 * @todo Feature is not DBAL-compliant
+	 *
+	 * @param string $query SQL query
+	 * @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
+	 * @param int $row_count Number of resulting rows
+	 * @return bool TRUE if explain was run, FALSE otherwise
+	 */
+	protected function explain($query, $from_table, $row_count)
+	{
+		$debugAllowedForIp = GeneralUtility::cmpIP(
+			GeneralUtility::getIndpEnv('REMOTE_ADDR'),
+			$GLOBALS['TYPO3_CONF_VARS']['SYS']['devIPmask']
+		);
+		if (
+			(int)$this->explainOutput == 1
+			|| ((int)$this->explainOutput == 2 && $debugAllowedForIp)
+		) {
+			// Raw HTML output
+			$explainMode = 1;
+		} elseif ((int)$this->explainOutput == 3) {
+			// Embed the output into the TS admin panel
+			$explainMode = 2;
+		} else {
+			return false;
+		}
+		$error = $this->sql_error();
+		$trail = \TYPO3\CMS\Core\Utility\DebugUtility::debugTrail();
+		$explain_tables = [];
+		$explain_output = [];
+		$res = $this->sql_query('EXPLAIN ' . $query, $this->link);
+		if (is_a($res, '\\mysqli_result')) {
+			while ($tempRow = $this->sql_fetch_assoc($res)) {
+				$explain_output[] = $tempRow;
+				$explain_tables[] = $tempRow['table'];
+			}
+			$this->sql_free_result($res);
+		}
+		$indices_output = [];
+		// Notice: Rows are skipped if there is only one result, or if no conditions are set
+		if ($explain_output[0]['rows'] > 1 || $explain_output[0]['type'] === 'ALL') {
+			// Only enable output if it's really useful
+			$debug = true;
+			foreach ($explain_tables as $table) {
+				$tableRes = $this->sql_query('SHOW TABLE STATUS LIKE \'' . $table . '\'');
+				$isTable = $this->sql_num_rows($tableRes);
+				if ($isTable) {
+					$res = $this->sql_query('SHOW INDEX FROM ' . $table, $this->link);
+					if (is_a($res, '\\mysqli_result')) {
+						while ($tempRow = $this->sql_fetch_assoc($res)) {
+							$indices_output[] = $tempRow;
+						}
+						$this->sql_free_result($res);
+					}
+				}
+				$this->sql_free_result($tableRes);
+			}
+		} else {
+			$debug = false;
+		}
+		if ($debug) {
+			if ($explainMode) {
+				$data = [];
+				$data['query'] = $query;
+				$data['trail'] = $trail;
+				$data['row_count'] = $row_count;
+				if ($error) {
+					$data['error'] = $error;
+				}
+				if (!empty($explain_output)) {
+					$data['explain'] = $explain_output;
+				}
+				if (!empty($indices_output)) {
+					$data['indices'] = $indices_output;
+				}
+				if ($explainMode == 1) {
+					\TYPO3\CMS\Core\Utility\DebugUtility::debug($data, 'Tables: ' . $from_table, 'DB SQL EXPLAIN');
+				} elseif ($explainMode == 2) {
+					/** @var TimeTracker $timeTracker */
+					$timeTracker = GeneralUtility::makeInstance(TimeTracker::class);
+					$timeTracker->setTSselectQuery($data);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Serialize destructs current connection
+	 *
+	 * @return array All protected properties that should be saved
+	 */
+	public function __sleep()
+	{
+		$this->disconnectIfConnected();
+		return [
+			'debugOutput',
+			'explainOutput',
+			'databaseHost',
+			'databasePort',
+			'databaseSocket',
+			'databaseName',
+			'databaseUsername',
+			'databaseUserPassword',
+			'persistentDatabaseConnection',
+			'connectionCompression',
+			'initializeCommandsAfterConnect',
+			'default_charset',
+		];
+	}
+
+	/**
+	 * function to call a deprecation log entry (but only once per request / class)
+	 */
+	protected function logDeprecation()
+	{
+		if (!$this->deprecationWarningThrown) {
+			$this->deprecationWarningThrown = true;
+			GeneralUtility::deprecationLog('DatabaseConnection a.k.a. $["TYPO3_DB"] has been marked as deprecated in'
+			. ' TYPO3 v8 and will be removed in TYPO3 v9. Please use the newly available ConnectionPool and QueryBuilder'
+			. ' classes.');
+		}
+	}
 }

Spacing +48 added lines, -48 removed lines

@@ -387,7 +387,7 @@ 
                     $firstRecord = false;
                     if (!array_key_exists($uidIndexField, $record)) {
                         $this->sql_free_result($res);
-                        throw new \InvalidArgumentException('The given $uidIndexField "' . $uidIndexField . '" is not available in the result.', 1432933855);
+                        throw new \InvalidArgumentException('The given $uidIndexField "'.$uidIndexField.'" is not available in the result.', 1432933855);
                     }
                 }
                 $output[$record[$uidIndexField]] = $record;
@@ -439,7 +439,7 @@ 
     {
         $this->logDeprecation();
         $count = false;
-        $resultSet = $this->exec_SELECTquery('COUNT(' . $field . ')', $table, $where);
+        $resultSet = $this->exec_SELECTquery('COUNT('.$field.')', $table, $where);
         if ($resultSet !== false) {
             list($count) = $this->sql_fetch_row($resultSet);
             $count = (int)$count;
@@ -511,7 +511,7 @@ 
         // Quote and escape values
         $fields_values = $this->fullQuoteArray($fields_values, $table, $no_quote_fields, true);
         // Build query
-        $query = 'INSERT INTO ' . $table . ' (' . implode(',', array_keys($fields_values)) . ') VALUES ' . '(' . implode(',', $fields_values) . ')';
+        $query = 'INSERT INTO '.$table.' ('.implode(',', array_keys($fields_values)).') VALUES '.'('.implode(',', $fields_values).')';
         // Return query
         if ($this->debugOutput || $this->store_lastBuiltQuery) {
             $this->debug_lastBuiltQuery = $query;
@@ -541,12 +541,12 @@ 
             $hookObject->INSERTmultipleRows_preProcessAction($table, $fields, $rows, $no_quote_fields, $this);
         }
         // Build query
-        $query = 'INSERT INTO ' . $table . ' (' . implode(', ', $fields) . ') VALUES ';
+        $query = 'INSERT INTO '.$table.' ('.implode(', ', $fields).') VALUES ';
         $rowSQL = [];
         foreach ($rows as $row) {
             // Quote and escape values
             $row = $this->fullQuoteArray($row, $table, $no_quote_fields);
-            $rowSQL[] = '(' . implode(', ', $row) . ')';
+            $rowSQL[] = '('.implode(', ', $row).')';
         }
         $query .= implode(', ', $rowSQL);
         // Return query
@@ -582,11 +582,11 @@ 
                 // Quote and escape values
                 $nArr = $this->fullQuoteArray($fields_values, $table, $no_quote_fields, true);
                 foreach ($nArr as $k => $v) {
-                    $fields[] = $k . '=' . $v;
+                    $fields[] = $k.'='.$v;
                 }
             }
             // Build query
-            $query = 'UPDATE ' . $table . ' SET ' . implode(',', $fields) . ((string)$where !== '' ? ' WHERE ' . $where : '');
+            $query = 'UPDATE '.$table.' SET '.implode(',', $fields).((string)$where !== '' ? ' WHERE '.$where : '');
             if ($this->debugOutput || $this->store_lastBuiltQuery) {
                 $this->debug_lastBuiltQuery = $query;
             }
@@ -613,7 +613,7 @@ 
                 $hookObject->DELETEquery_preProcessAction($table, $where, $this);
             }
             // Table and fieldnames should be "SQL-injection-safe" when supplied to this function
-            $query = 'DELETE FROM ' . $table . ((string)$where !== '' ? ' WHERE ' . $where : '');
+            $query = 'DELETE FROM '.$table.((string)$where !== '' ? ' WHERE '.$where : '');
             if ($this->debugOutput || $this->store_lastBuiltQuery) {
                 $this->debug_lastBuiltQuery = $query;
             }
@@ -643,13 +643,13 @@ 
         }
         // Table and fieldnames should be "SQL-injection-safe" when supplied to this function
         // Build basic query
-        $query = 'SELECT ' . $select_fields . ' FROM ' . $from_table . ((string)$where_clause !== '' ? ' WHERE ' . $where_clause : '');
+        $query = 'SELECT '.$select_fields.' FROM '.$from_table.((string)$where_clause !== '' ? ' WHERE '.$where_clause : '');
         // Group by
-        $query .= (string)$groupBy !== '' ? ' GROUP BY ' . $groupBy : '';
+        $query .= (string)$groupBy !== '' ? ' GROUP BY '.$groupBy : '';
         // Order by
-        $query .= (string)$orderBy !== '' ? ' ORDER BY ' . $orderBy : '';
+        $query .= (string)$orderBy !== '' ? ' ORDER BY '.$orderBy : '';
         // Group by
-        $query .= (string)$limit !== '' ? ' LIMIT ' . $limit : '';
+        $query .= (string)$limit !== '' ? ' LIMIT '.$limit : '';
         // Return query
         if ($this->debugOutput || $this->store_lastBuiltQuery) {
             $this->debug_lastBuiltQuery = $query;
@@ -671,7 +671,7 @@ 
         $this->logDeprecation();
         // Table and fieldnames should be "SQL-injection-safe" when supplied to this function
         // Build basic query:
-        $query = 'SELECT ' . $select_fields . ' FROM ' . $from_table . ((string)$where_clause !== '' ? ' WHERE ' . $where_clause : '');
+        $query = 'SELECT '.$select_fields.' FROM '.$from_table.((string)$where_clause !== '' ? ' WHERE '.$where_clause : '');
         // Return query
         if ($this->debugOutput || $this->store_lastBuiltQuery) {
             $this->debug_lastBuiltQuery = $query;
@@ -718,7 +718,7 @@ 
         }
         // Table should be "SQL-injection-safe" when supplied to this function
         // Build basic query:
-        $query = 'TRUNCATE TABLE ' . $table;
+        $query = 'TRUNCATE TABLE '.$table;
         // Return query:
         if ($this->debugOutput || $this->store_lastBuiltQuery) {
             $this->debug_lastBuiltQuery = $query;
@@ -749,7 +749,7 @@ 
             throw new \InvalidArgumentException('$value must not contain a comma (,) in $this->listQuery() !', 1294585862);
         }
         $pattern = $this->quoteStr($value, $table);
-        $where = 'FIND_IN_SET(\'' . $pattern . '\',' . $field . ')';
+        $where = 'FIND_IN_SET(\''.$pattern.'\','.$field.')';
         return $where;
     }
 
@@ -775,10 +775,10 @@ 
 
         $queryParts = [];
         foreach ($searchWords as $sw) {
-            $like = ' LIKE \'%' . $this->quoteStr($this->escapeStrForLike($sw, $table), $table) . '%\'';
-            $queryParts[] = $table . '.' . implode(($like . ' OR ' . $table . '.'), $fields) . $like;
+            $like = ' LIKE \'%'.$this->quoteStr($this->escapeStrForLike($sw, $table), $table).'%\'';
+            $queryParts[] = $table.'.'.implode(($like.' OR '.$table.'.'), $fields).$like;
         }
-        $query = '(' . implode(') ' . $constraint . ' (', $queryParts) . ')';
+        $query = '('.implode(') '.$constraint.' (', $queryParts).')';
 
         return $query;
     }
@@ -881,7 +881,7 @@ 
             $str = (int)$str;
         }
 
-        return '\'' . $this->link->real_escape_string($str) . '\'';
+        return '\''.$this->link->real_escape_string($str).'\'';
     }
 
     /**
@@ -1034,18 +1034,18 @@ 
      */
     protected function getSelectMmQueryParts($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '')
     {
-        $foreign_table_as = $foreign_table == $local_table ? $foreign_table . StringUtility::getUniqueId('_join') : '';
-        $mmWhere = $local_table ? $local_table . '.uid=' . $mm_table . '.uid_local' : '';
+        $foreign_table_as = $foreign_table == $local_table ? $foreign_table.StringUtility::getUniqueId('_join') : '';
+        $mmWhere = $local_table ? $local_table.'.uid='.$mm_table.'.uid_local' : '';
         $mmWhere .= ($local_table and $foreign_table) ? ' AND ' : '';
-        $tables = ($local_table ? $local_table . ',' : '') . $mm_table;
+        $tables = ($local_table ? $local_table.',' : '').$mm_table;
         if ($foreign_table) {
-            $mmWhere .= ($foreign_table_as ?: $foreign_table) . '.uid=' . $mm_table . '.uid_foreign';
-            $tables .= ',' . $foreign_table . ($foreign_table_as ? ' AS ' . $foreign_table_as : '');
+            $mmWhere .= ($foreign_table_as ?: $foreign_table).'.uid='.$mm_table.'.uid_foreign';
+            $tables .= ','.$foreign_table.($foreign_table_as ? ' AS '.$foreign_table_as : '');
         }
         return [
             'SELECT' => $select,
             'FROM' => $tables,
-            'WHERE' => $mmWhere . ' ' . $whereClause,
+            'WHERE' => $mmWhere.' '.$whereClause,
             'GROUPBY' => $groupBy,
             'ORDERBY' => $orderBy,
             'LIMIT' => $limit
@@ -1279,7 +1279,7 @@ 
         }
 
         $host = $this->persistentDatabaseConnection
-            ? 'p:' . $this->databaseHost
+            ? 'p:'.$this->databaseHost
             : $this->databaseHost;
 
         // We are not using the TYPO3 CMS shim here as the database parameters in this class
@@ -1311,7 +1311,7 @@ 
             foreach ($this->initializeCommandsAfterConnect as $command) {
                 if ($this->query($command) === false) {
                     GeneralUtility::sysLog(
-                        'Could not initialize DB connection with query "' . $command . '": ' . $this->sql_error(),
+                        'Could not initialize DB connection with query "'.$command.'": '.$this->sql_error(),
                         'core',
                         GeneralUtility::SYSLOG_SEVERITY_ERROR
                     );
@@ -1323,7 +1323,7 @@ 
             $error_msg = $this->link->connect_error;
             $this->link = null;
             GeneralUtility::sysLog(
-                'Could not connect to MySQL server ' . $host . ' with user ' . $this->databaseUsername . ': '
+                'Could not connect to MySQL server '.$host.' with user '.$this->databaseUsername.': '
                 . $error_msg,
                 'core',
                 GeneralUtility::SYSLOG_SEVERITY_FATAL
@@ -1347,7 +1347,7 @@ 
         $ret = $this->link->select_db($this->databaseName);
         if (!$ret) {
             GeneralUtility::sysLog(
-                'Could not select MySQL database ' . $this->databaseName . ': ' . $this->sql_error(),
+                'Could not select MySQL database '.$this->databaseName.': '.$this->sql_error(),
                 'core',
                 GeneralUtility::SYSLOG_SEVERITY_FATAL
             );
@@ -1377,7 +1377,7 @@ 
         $db_list = $this->query('SELECT SCHEMA_NAME FROM information_schema.SCHEMATA');
         if ($db_list === false) {
             throw new \RuntimeException(
-                'MySQL Error: Cannot get tablenames: "' . $this->sql_error() . '"!',
+                'MySQL Error: Cannot get tablenames: "'.$this->sql_error().'"!',
                 1378457171
             );
         } else {
@@ -1408,7 +1408,7 @@ 
     {
         $this->logDeprecation();
         $whichTables = [];
-        $tables_result = $this->query('SHOW TABLE STATUS FROM `' . $this->databaseName . '`');
+        $tables_result = $this->query('SHOW TABLE STATUS FROM `'.$this->databaseName.'`');
         if ($tables_result !== false) {
             while ($theTable = $tables_result->fetch_assoc()) {
                 $whichTables[$theTable['Name']] = $theTable;
@@ -1433,7 +1433,7 @@ 
     {
         $this->logDeprecation();
         $output = [];
-        $columns_res = $this->query('SHOW FULL COLUMNS FROM `' . $tableName . '`');
+        $columns_res = $this->query('SHOW FULL COLUMNS FROM `'.$tableName.'`');
         if ($columns_res !== false) {
             while ($fieldRow = $columns_res->fetch_assoc()) {
                 $output[$fieldRow['Field']] = $fieldRow;
@@ -1454,7 +1454,7 @@ 
     {
         $this->logDeprecation();
         $output = [];
-        $keyRes = $this->query('SHOW KEYS FROM `' . $tableName . '`');
+        $keyRes = $this->query('SHOW KEYS FROM `'.$tableName.'`');
         if ($keyRes !== false) {
             while ($keyRow = $keyRes->fetch_assoc()) {
                 $output[] = $keyRow;
@@ -1650,7 +1650,7 @@ 
         if ($this->sql_pconnect()) {
             if (!$this->sql_select_db()) {
                 throw new \RuntimeException(
-                    'TYPO3 Fatal Error: Cannot connect to the current database, "' . $this->databaseName . '"!',
+                    'TYPO3 Fatal Error: Cannot connect to the current database, "'.$this->databaseName.'"!',
                     1270853883
                 );
             }
@@ -1721,7 +1721,7 @@ 
 
         if ($sessionResult === false) {
             GeneralUtility::sysLog(
-                'Error while retrieving the current charset session variables from the database: ' . $this->sql_error(),
+                'Error while retrieving the current charset session variables from the database: '.$this->sql_error(),
                 'core',
                 GeneralUtility::SYSLOG_SEVERITY_ERROR
             );
@@ -1751,12 +1751,12 @@ 
         foreach ($charsetRequiredVariables as $variableName) {
             if (empty($charsetVariables[$variableName])) {
                 GeneralUtility::sysLog(
-                    'A required session variable is missing in the current MySQL connection: ' . $variableName,
+                    'A required session variable is missing in the current MySQL connection: '.$variableName,
                     'core',
                     GeneralUtility::SYSLOG_SEVERITY_ERROR
                 );
                 throw new \RuntimeException(
-                    'TYPO3 Fatal Error: Could not determine the value of the database session variable: ' . $variableName,
+                    'TYPO3 Fatal Error: Could not determine the value of the database session variable: '.$variableName,
                     1381847779
                 );
             }
@@ -1769,9 +1769,9 @@ 
 
         if (!$hasValidCharset) {
             throw new \RuntimeException(
-                'It looks like the character set ' . $this->connectionCharset . ' is not used for this connection even though it is configured as connection charset. ' .
-                'This TYPO3 installation is using the $GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'setDBinit\'] property with the following value: "' .
-                $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit'] . '". Please make sure that this command does not overwrite the configured charset. ' .
+                'It looks like the character set '.$this->connectionCharset.' is not used for this connection even though it is configured as connection charset. '.
+                'This TYPO3 installation is using the $GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'setDBinit\'] property with the following value: "'.
+                $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit'].'". Please make sure that this command does not overwrite the configured charset. '.
                 'Please note that for the TYPO3 database everything other than utf8 is unsupported since version 4.7.',
                 1389697515
             );
@@ -1839,7 +1839,7 @@ 
         if ($error || (int)$this->debugOutput === 2) {
             \TYPO3\CMS\Core\Utility\DebugUtility::debug(
                 [
-                    'caller' => \Fab\Vidi\Database\DatabaseConnection::class . '::' . $func,
+                    'caller' => \Fab\Vidi\Database\DatabaseConnection::class.'::'.$func,
                     'ERROR' => $error,
                     'lastBuiltQuery' => $query ? $query : $this->debug_lastBuiltQuery,
                     'debug_backtrace' => \TYPO3\CMS\Core\Utility\DebugUtility::debugTrail()
@@ -1867,10 +1867,10 @@ 
         $trace = debug_backtrace(0);
         array_shift($trace);
         $msg = 'Invalid database result detected: function TYPO3\\CMS\\Typo3DbLegacy\\Database\\DatabaseConnection->'
-            . $trace[0]['function'] . ' called from file ' . substr($trace[0]['file'], (strlen(PATH_site) + 2))
-            . ' in line ' . $trace[0]['line'] . '.';
+            . $trace[0]['function'].' called from file '.substr($trace[0]['file'], (strlen(PATH_site) + 2))
+            . ' in line '.$trace[0]['line'].'.';
         GeneralUtility::sysLog(
-            $msg . ' Use a devLog extension to get more details.',
+            $msg.' Use a devLog extension to get more details.',
             'core',
             GeneralUtility::SYSLOG_SEVERITY_ERROR
         );
@@ -1922,7 +1922,7 @@ 
         $trail = \TYPO3\CMS\Core\Utility\DebugUtility::debugTrail();
         $explain_tables = [];
         $explain_output = [];
-        $res = $this->sql_query('EXPLAIN ' . $query, $this->link);
+        $res = $this->sql_query('EXPLAIN '.$query, $this->link);
         if (is_a($res, '\\mysqli_result')) {
             while ($tempRow = $this->sql_fetch_assoc($res)) {
                 $explain_output[] = $tempRow;
@@ -1936,10 +1936,10 @@ 
             // Only enable output if it's really useful
             $debug = true;
             foreach ($explain_tables as $table) {
-                $tableRes = $this->sql_query('SHOW TABLE STATUS LIKE \'' . $table . '\'');
+                $tableRes = $this->sql_query('SHOW TABLE STATUS LIKE \''.$table.'\'');
                 $isTable = $this->sql_num_rows($tableRes);
                 if ($isTable) {
-                    $res = $this->sql_query('SHOW INDEX FROM ' . $table, $this->link);
+                    $res = $this->sql_query('SHOW INDEX FROM '.$table, $this->link);
                     if (is_a($res, '\\mysqli_result')) {
                         while ($tempRow = $this->sql_fetch_assoc($res)) {
                             $indices_output[] = $tempRow;
@@ -1968,7 +1968,7 @@ 
                     $data['indices'] = $indices_output;
                 }
                 if ($explainMode == 1) {
-                    \TYPO3\CMS\Core\Utility\DebugUtility::debug($data, 'Tables: ' . $from_table, 'DB SQL EXPLAIN');
+                    \TYPO3\CMS\Core\Utility\DebugUtility::debug($data, 'Tables: '.$from_table, 'DB SQL EXPLAIN');
                 } elseif ($explainMode == 2) {
                     /** @var TimeTracker $timeTracker */
                     $timeTracker = GeneralUtility::makeInstance(TimeTracker::class);

Classes/Service/FileReferenceService.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
     /**
      * Fetch the files given an object assuming
      *
-     * @param $propertyName
+     * @param string $propertyName
      * @param Content $object
      * @return File[]
      */
@@ -100,7 +100,7 @@ 
      * get the WHERE clause for the enabled fields of this TCA table
      * depending on the context
      *
-     * @param $tableName
+     * @param string $tableName
      * @return string
      */
     protected function getWhereClauseForEnabledFields($tableName)

Indentation +123 added lines, -123 removed lines

@@ -23,127 +23,127 @@
 class FileReferenceService implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    static protected $instances = [];
-
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Vidi\Service\FileReferenceService|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Service\FileReferenceService::class);
-    }
-
-    /**
-     * @param Content $object
-     * @param string $propertyName
-     * @return File[]
-     */
-    public function findReferencedBy($propertyName, Content $object)
-    {
-
-        if (!isset(self::$instances[$object->getUid()][$propertyName])) {
-
-            // Initialize instances value
-            if (!isset(self::$instances[$object->getUid()])) {
-                self::$instances[$object->getUid()] = [];
-            }
-
-            $fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
-            $field = Tca::table($object->getDataType())->field($fieldName);
-            if ($field->getForeignTable() === 'sys_file_reference') {
-                $files = $this->findByFileReference($propertyName, $object);
-                self::$instances[$object->getUid()][$propertyName] = $files;
-            } else {
-                // @todo the standard way of handling file references is by "sys_file_reference". Let see if there is other use cases...
-            }
-        }
-
-        return self::$instances[$object->getUid()][$propertyName];
-    }
-
-    /**
-     * Fetch the files given an object assuming
-     *
-     * @param $propertyName
-     * @param Content $object
-     * @return File[]
-     */
-    protected function findByFileReference($propertyName, Content $object)
-    {
-
-        $fileField = 'uid_local';
-        $tableName = 'sys_file_reference';
-
-        $clause = sprintf('tablenames = "%s" %s AND fieldname = "%s" AND uid_foreign = %s',
-            $object->getDataType(),
-            $this->getWhereClauseForEnabledFields($tableName),
-            GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName),
-            $object->getUid()
-        );
-        $rows = $this->getDatabaseConnection()->exec_SELECTgetRows($fileField, $tableName, $clause);
-
-        // Build array of Files
-        $files = [];
-        foreach ($rows as $row) {
-            $files[] = ResourceFactory::getInstance()->getFileObject($row[$fileField]);
-        }
-
-        return $files;
-    }
-
-    /**
-     * get the WHERE clause for the enabled fields of this TCA table
-     * depending on the context
-     *
-     * @param $tableName
-     * @return string
-     */
-    protected function getWhereClauseForEnabledFields($tableName)
-    {
-        if ($this->isFrontendMode()) {
-            // frontend context
-            $whereClause = $this->getPageRepository()->enableFields($tableName);
-            $whereClause .= $this->getPageRepository()->deleteClause($tableName);
-        } else {
-            // backend context
-            $whereClause = BackendUtility::BEenableFields($tableName);
-            $whereClause .= BackendUtility::deleteClause($tableName);
-        }
-        return $whereClause;
-    }
-
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return bool
-     */
-    protected function isFrontendMode()
-    {
-        return TYPO3_MODE === 'FE';
-    }
-
-    /**
-     * Returns an instance of the page repository.
-     *
-     * @return \TYPO3\CMS\Frontend\Page\PageRepository
-     */
-    protected function getPageRepository()
-    {
-        return $GLOBALS['TSFE']->sys_page;
-    }
-
-    /**
-     * Returns a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * @var array
+	 */
+	static protected $instances = [];
+
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Vidi\Service\FileReferenceService|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Service\FileReferenceService::class);
+	}
+
+	/**
+	 * @param Content $object
+	 * @param string $propertyName
+	 * @return File[]
+	 */
+	public function findReferencedBy($propertyName, Content $object)
+	{
+
+		if (!isset(self::$instances[$object->getUid()][$propertyName])) {
+
+			// Initialize instances value
+			if (!isset(self::$instances[$object->getUid()])) {
+				self::$instances[$object->getUid()] = [];
+			}
+
+			$fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
+			$field = Tca::table($object->getDataType())->field($fieldName);
+			if ($field->getForeignTable() === 'sys_file_reference') {
+				$files = $this->findByFileReference($propertyName, $object);
+				self::$instances[$object->getUid()][$propertyName] = $files;
+			} else {
+				// @todo the standard way of handling file references is by "sys_file_reference". Let see if there is other use cases...
+			}
+		}
+
+		return self::$instances[$object->getUid()][$propertyName];
+	}
+
+	/**
+	 * Fetch the files given an object assuming
+	 *
+	 * @param $propertyName
+	 * @param Content $object
+	 * @return File[]
+	 */
+	protected function findByFileReference($propertyName, Content $object)
+	{
+
+		$fileField = 'uid_local';
+		$tableName = 'sys_file_reference';
+
+		$clause = sprintf('tablenames = "%s" %s AND fieldname = "%s" AND uid_foreign = %s',
+			$object->getDataType(),
+			$this->getWhereClauseForEnabledFields($tableName),
+			GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName),
+			$object->getUid()
+		);
+		$rows = $this->getDatabaseConnection()->exec_SELECTgetRows($fileField, $tableName, $clause);
+
+		// Build array of Files
+		$files = [];
+		foreach ($rows as $row) {
+			$files[] = ResourceFactory::getInstance()->getFileObject($row[$fileField]);
+		}
+
+		return $files;
+	}
+
+	/**
+	 * get the WHERE clause for the enabled fields of this TCA table
+	 * depending on the context
+	 *
+	 * @param $tableName
+	 * @return string
+	 */
+	protected function getWhereClauseForEnabledFields($tableName)
+	{
+		if ($this->isFrontendMode()) {
+			// frontend context
+			$whereClause = $this->getPageRepository()->enableFields($tableName);
+			$whereClause .= $this->getPageRepository()->deleteClause($tableName);
+		} else {
+			// backend context
+			$whereClause = BackendUtility::BEenableFields($tableName);
+			$whereClause .= BackendUtility::deleteClause($tableName);
+		}
+		return $whereClause;
+	}
+
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return bool
+	 */
+	protected function isFrontendMode()
+	{
+		return TYPO3_MODE === 'FE';
+	}
+
+	/**
+	 * Returns an instance of the page repository.
+	 *
+	 * @return \TYPO3\CMS\Frontend\Page\PageRepository
+	 */
+	protected function getPageRepository()
+	{
+		return $GLOBALS['TSFE']->sys_page;
+	}
+
+	/**
+	 * Returns a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 }

Classes/Utility/BackendUtility.php

Unused Use Statements -41 removed lines

@@ -8,50 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use Psr\Log\LoggerInterface;
-use TYPO3\CMS\Backend\Backend\Shortcut\ShortcutRepository;
 use TYPO3\CMS\Backend\Routing\UriBuilder;
-use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
-use TYPO3\CMS\Core\Cache\CacheManager;
-use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
-use TYPO3\CMS\Core\Core\Environment;
-use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\QueryBuilder;
-use TYPO3\CMS\Core\Database\Query\QueryHelper;
-use TYPO3\CMS\Core\Database\Query\Restriction\BackendWorkspaceRestriction;
-use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
-use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction;
-use TYPO3\CMS\Core\Database\RelationHandler;
-use TYPO3\CMS\Core\Exception\SiteNotFoundException;
-use TYPO3\CMS\Core\Http\ServerRequest;
-use TYPO3\CMS\Core\Imaging\Icon;
-use TYPO3\CMS\Core\Imaging\IconFactory;
-use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
-use TYPO3\CMS\Core\Localization\LanguageService;
-use TYPO3\CMS\Core\Log\LogManager;
-use TYPO3\CMS\Core\Resource\AbstractFile;
-use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
-use TYPO3\CMS\Core\Resource\File;
-use TYPO3\CMS\Core\Resource\ProcessedFile;
-use TYPO3\CMS\Core\Resource\ResourceFactory;
-use TYPO3\CMS\Core\Routing\InvalidRouteArgumentsException;
-use TYPO3\CMS\Core\Routing\RouterInterface;
-use TYPO3\CMS\Core\Routing\SiteMatcher;
-use TYPO3\CMS\Core\Site\Entity\PseudoSite;
-use TYPO3\CMS\Core\Site\Entity\Site;
-use TYPO3\CMS\Core\Site\SiteFinder;
-use TYPO3\CMS\Core\Type\Bitmask\Permission;
-use TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser;
-use TYPO3\CMS\Core\Utility\ArrayUtility;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\HttpUtility;
-use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Core\Utility\PathUtility;
-use TYPO3\CMS\Core\Versioning\VersionState;
-use TYPO3\CMS\Frontend\Compatibility\LegacyDomainResolver;
-use TYPO3\CMS\Frontend\Page\PageRepository;
 
 /**
  * Standard functions available for the TYPO3 backend.

Indentation +102 added lines, -102 removed lines

@@ -61,115 +61,115 @@
 class BackendUtility
 {
 
-    /*******************************************
+	/*******************************************
      *
      * SQL-related, selecting records, searching
      *
      *******************************************/
-    /**
-     * Returns the WHERE clause " AND NOT [tablename].[deleted-field]" if a deleted-field
-     * is configured in $GLOBALS['TCA'] for the tablename, $table
-     * This function should ALWAYS be called in the backend for selection on tables which
-     * are configured in $GLOBALS['TCA'] since it will ensure consistent selection of records,
-     * even if they are marked deleted (in which case the system must always treat them as non-existent!)
-     * In the frontend a function, ->enableFields(), is known to filter hidden-field, start- and endtime
-     * and fe_groups as well. But that is a job of the frontend, not the backend. If you need filtering
-     * on those fields as well in the backend you can use ->BEenableFields() though.
-     *
-     * @param string $table Table name present in $GLOBALS['TCA']
-     * @param string $tableAlias Table alias if any
-     * @return string WHERE clause for filtering out deleted records, eg " AND tablename.deleted=0
-     */
-    public static function deleteClause($table, $tableAlias = '')
-    {
-        if (empty($GLOBALS['TCA'][$table]['ctrl']['delete'])) {
-            return '';
-        }
-        $expressionBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getQueryBuilderForTable($table)
-            ->expr();
-        return ' AND ' . $expressionBuilder->eq(
-                ($tableAlias ?: $table) . '.' . $GLOBALS['TCA'][$table]['ctrl']['delete'],
-                0
-            );
-    }
-    /**
-     * Backend implementation of enableFields()
-     * Notice that "fe_groups" is not selected for - only disabled, starttime and endtime.
-     * Notice that deleted-fields are NOT filtered - you must ALSO call deleteClause in addition.
-     * $GLOBALS["SIM_ACCESS_TIME"] is used for date.
-     *
-     * @param string $table The table from which to return enableFields WHERE clause. Table name must have a 'ctrl' section in $GLOBALS['TCA'].
-     * @param bool $inv Means that the query will select all records NOT VISIBLE records (inverted selection)
-     * @return string WHERE clause part
-     */
-    public static function BEenableFields($table, $inv = false)
-    {
-        $ctrl = $GLOBALS['TCA'][$table]['ctrl'];
-        $expressionBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
-            ->getConnectionForTable($table)
-            ->getExpressionBuilder();
-        $query = $expressionBuilder->andX();
-        $invQuery = $expressionBuilder->orX();
+	/**
+	 * Returns the WHERE clause " AND NOT [tablename].[deleted-field]" if a deleted-field
+	 * is configured in $GLOBALS['TCA'] for the tablename, $table
+	 * This function should ALWAYS be called in the backend for selection on tables which
+	 * are configured in $GLOBALS['TCA'] since it will ensure consistent selection of records,
+	 * even if they are marked deleted (in which case the system must always treat them as non-existent!)
+	 * In the frontend a function, ->enableFields(), is known to filter hidden-field, start- and endtime
+	 * and fe_groups as well. But that is a job of the frontend, not the backend. If you need filtering
+	 * on those fields as well in the backend you can use ->BEenableFields() though.
+	 *
+	 * @param string $table Table name present in $GLOBALS['TCA']
+	 * @param string $tableAlias Table alias if any
+	 * @return string WHERE clause for filtering out deleted records, eg " AND tablename.deleted=0
+	 */
+	public static function deleteClause($table, $tableAlias = '')
+	{
+		if (empty($GLOBALS['TCA'][$table]['ctrl']['delete'])) {
+			return '';
+		}
+		$expressionBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
+			->getQueryBuilderForTable($table)
+			->expr();
+		return ' AND ' . $expressionBuilder->eq(
+				($tableAlias ?: $table) . '.' . $GLOBALS['TCA'][$table]['ctrl']['delete'],
+				0
+			);
+	}
+	/**
+	 * Backend implementation of enableFields()
+	 * Notice that "fe_groups" is not selected for - only disabled, starttime and endtime.
+	 * Notice that deleted-fields are NOT filtered - you must ALSO call deleteClause in addition.
+	 * $GLOBALS["SIM_ACCESS_TIME"] is used for date.
+	 *
+	 * @param string $table The table from which to return enableFields WHERE clause. Table name must have a 'ctrl' section in $GLOBALS['TCA'].
+	 * @param bool $inv Means that the query will select all records NOT VISIBLE records (inverted selection)
+	 * @return string WHERE clause part
+	 */
+	public static function BEenableFields($table, $inv = false)
+	{
+		$ctrl = $GLOBALS['TCA'][$table]['ctrl'];
+		$expressionBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
+			->getConnectionForTable($table)
+			->getExpressionBuilder();
+		$query = $expressionBuilder->andX();
+		$invQuery = $expressionBuilder->orX();
 
-        if (is_array($ctrl)) {
-            if (is_array($ctrl['enablecolumns'])) {
-                if ($ctrl['enablecolumns']['disabled'] ?? false) {
-                    $field = $table . '.' . $ctrl['enablecolumns']['disabled'];
-                    $query->add($expressionBuilder->eq($field, 0));
-                    $invQuery->add($expressionBuilder->neq($field, 0));
-                }
-                if ($ctrl['enablecolumns']['starttime'] ?? false) {
-                    $field = $table . '.' . $ctrl['enablecolumns']['starttime'];
-                    $query->add($expressionBuilder->lte($field, (int)$GLOBALS['SIM_ACCESS_TIME']));
-                    $invQuery->add(
-                        $expressionBuilder->andX(
-                            $expressionBuilder->neq($field, 0),
-                            $expressionBuilder->gt($field, (int)$GLOBALS['SIM_ACCESS_TIME'])
-                        )
-                    );
-                }
-                if ($ctrl['enablecolumns']['endtime'] ?? false) {
-                    $field = $table . '.' . $ctrl['enablecolumns']['endtime'];
-                    $query->add(
-                        $expressionBuilder->orX(
-                            $expressionBuilder->eq($field, 0),
-                            $expressionBuilder->gt($field, (int)$GLOBALS['SIM_ACCESS_TIME'])
-                        )
-                    );
-                    $invQuery->add(
-                        $expressionBuilder->andX(
-                            $expressionBuilder->neq($field, 0),
-                            $expressionBuilder->lte($field, (int)$GLOBALS['SIM_ACCESS_TIME'])
-                        )
-                    );
-                }
-            }
-        }
+		if (is_array($ctrl)) {
+			if (is_array($ctrl['enablecolumns'])) {
+				if ($ctrl['enablecolumns']['disabled'] ?? false) {
+					$field = $table . '.' . $ctrl['enablecolumns']['disabled'];
+					$query->add($expressionBuilder->eq($field, 0));
+					$invQuery->add($expressionBuilder->neq($field, 0));
+				}
+				if ($ctrl['enablecolumns']['starttime'] ?? false) {
+					$field = $table . '.' . $ctrl['enablecolumns']['starttime'];
+					$query->add($expressionBuilder->lte($field, (int)$GLOBALS['SIM_ACCESS_TIME']));
+					$invQuery->add(
+						$expressionBuilder->andX(
+							$expressionBuilder->neq($field, 0),
+							$expressionBuilder->gt($field, (int)$GLOBALS['SIM_ACCESS_TIME'])
+						)
+					);
+				}
+				if ($ctrl['enablecolumns']['endtime'] ?? false) {
+					$field = $table . '.' . $ctrl['enablecolumns']['endtime'];
+					$query->add(
+						$expressionBuilder->orX(
+							$expressionBuilder->eq($field, 0),
+							$expressionBuilder->gt($field, (int)$GLOBALS['SIM_ACCESS_TIME'])
+						)
+					);
+					$invQuery->add(
+						$expressionBuilder->andX(
+							$expressionBuilder->neq($field, 0),
+							$expressionBuilder->lte($field, (int)$GLOBALS['SIM_ACCESS_TIME'])
+						)
+					);
+				}
+			}
+		}
 
-        if ($query->count() === 0) {
-            return '';
-        }
+		if ($query->count() === 0) {
+			return '';
+		}
 
-        return ' AND ' . ($inv ? $invQuery : $query);
-    }
+		return ' AND ' . ($inv ? $invQuery : $query);
+	}
 
-    /**
-     * Returns the URL to a given module
-     *
-     * @param string $moduleName Name of the module
-     * @param array $urlParameters URL parameters that should be added as key value pairs
-     * @return string Calculated URL
-     */
-    public static function getModuleUrl($moduleName, $urlParameters = [])
-    {
-        $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
-        try {
-            $uri = $uriBuilder->buildUriFromRoute($moduleName, $urlParameters);
-        } catch (\TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException $e) {
-            $uri = $uriBuilder->buildUriFromRoutePath($moduleName, $urlParameters);
-        }
-        return (string)$uri;
-    }
+	/**
+	 * Returns the URL to a given module
+	 *
+	 * @param string $moduleName Name of the module
+	 * @param array $urlParameters URL parameters that should be added as key value pairs
+	 * @return string Calculated URL
+	 */
+	public static function getModuleUrl($moduleName, $urlParameters = [])
+	{
+		$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
+		try {
+			$uri = $uriBuilder->buildUriFromRoute($moduleName, $urlParameters);
+		} catch (\TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException $e) {
+			$uri = $uriBuilder->buildUriFromRoutePath($moduleName, $urlParameters);
+		}
+		return (string)$uri;
+	}
 
 }

Spacing +6 added lines, -6 removed lines

@@ -88,8 +88,8 @@ 
         $expressionBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable($table)
             ->expr();
-        return ' AND ' . $expressionBuilder->eq(
-                ($tableAlias ?: $table) . '.' . $GLOBALS['TCA'][$table]['ctrl']['delete'],
+        return ' AND '.$expressionBuilder->eq(
+                ($tableAlias ?: $table).'.'.$GLOBALS['TCA'][$table]['ctrl']['delete'],
                 0
             );
     }
@@ -115,12 +115,12 @@ 
         if (is_array($ctrl)) {
             if (is_array($ctrl['enablecolumns'])) {
                 if ($ctrl['enablecolumns']['disabled'] ?? false) {
-                    $field = $table . '.' . $ctrl['enablecolumns']['disabled'];
+                    $field = $table.'.'.$ctrl['enablecolumns']['disabled'];
                     $query->add($expressionBuilder->eq($field, 0));
                     $invQuery->add($expressionBuilder->neq($field, 0));
                 }
                 if ($ctrl['enablecolumns']['starttime'] ?? false) {
-                    $field = $table . '.' . $ctrl['enablecolumns']['starttime'];
+                    $field = $table.'.'.$ctrl['enablecolumns']['starttime'];
                     $query->add($expressionBuilder->lte($field, (int)$GLOBALS['SIM_ACCESS_TIME']));
                     $invQuery->add(
                         $expressionBuilder->andX(
@@ -130,7 +130,7 @@ 
                     );
                 }
                 if ($ctrl['enablecolumns']['endtime'] ?? false) {
-                    $field = $table . '.' . $ctrl['enablecolumns']['endtime'];
+                    $field = $table.'.'.$ctrl['enablecolumns']['endtime'];
                     $query->add(
                         $expressionBuilder->orX(
                             $expressionBuilder->eq($field, 0),
@@ -151,7 +151,7 @@ 
             return '';
         }
 
-        return ' AND ' . ($inv ? $invQuery : $query);
+        return ' AND '.($inv ? $invQuery : $query);
     }
 
     /**

ext_tables.php

Indentation +171 added lines, -171 removed lines

@@ -3,175 +3,175 @@
 
 call_user_func(function () {
 
-    // Check from Vidi configuration what default module should be loaded.
-    // Make sure the class exists to avoid a Runtime Error
-    if (TYPO3_MODE === 'BE') {
-
-        // Add content main module before 'user'
-        if (!isset($GLOBALS['TBE_MODULES']['content'])) {
-
-            // Position module "content" after module "user" manually. No API is available for that, it seems...
-            $modules = [];
-            foreach ($GLOBALS['TBE_MODULES'] as $key => $val) {
-                if ($key === 'user') {
-                    $modules['content'] = '';
-                }
-                $modules[$key] = $val;
-            }
-            $GLOBALS['TBE_MODULES'] = $modules;
-
-            // Register "data management" module.
-            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
-                'content',
-                '',
-                '',
-                '',
-                [
-                    'name' => 'content',
-                    'access' => 'user,group',
-                    'labels' => [
-                        'll_ref' => 'LLL:EXT:vidi/Resources/Private/Language/content_module.xlf',
-                    ],
-                ]
-            );
-        }
-
-        $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-            \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
-        )->get('vidi');
-
-        $pids = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['default_pid'], true);
-        $defaultPid = array_shift($pids);
-        $defaultPids = [];
-        foreach ($pids as $dataTypeAndPid) {
-            $parts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':', $dataTypeAndPid);
-            if (count($parts) === 2) {
-                $defaultPids[$parts[0]] = $parts[1];
-            }
-        }
-
-        // Loop around the data types and register them to be displayed within a BE module.
-        if ($configuration['data_types']) {
-
-            $dataTypes = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['data_types'], true);
-            foreach ($dataTypes as $dataType) {
-
-
-                /** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
-                $moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class, $dataType);
-
-                // Special case already defined in Vidi.
-                if ($dataType === 'fe_users') {
-                    $languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_users.xlf';
-                    $icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-frontend.svg';
-                    $icon = 'EXT:vidi/Resources/Public/Images/fe_users.svg';
-                } elseif ($dataType === 'fe_groups') {
-                    $languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_groups.xlf';
-                    $icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-group-frontend.svg';
-                    $icon = 'EXT:vidi/Resources/Public/Images/fe_groups.svg';
-                } else {
-                    /** @var \Fab\Vidi\Backend\LanguageFileGenerator $languageService */
-                    $languageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(Fab\Vidi\Backend\LanguageFileGenerator::class);
-                    $languageFile = $languageService->generate($dataType);
-                    $icon = '';
-                }
-
-                $pid = isset($defaultPids[$dataType]) ? $defaultPids[$dataType] : $defaultPid;
-
-                /** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
-                $moduleLoader->setIcon($icon)
-                    ->setModuleLanguageFile($languageFile)
-                    ->setDefaultPid($pid)
-                    ->register();
-            }
-        }
-
-        // Possible Static TS loading
-        if (true === isset($configuration['autoload_typoscript']) && false === (bool)$configuration['autoload_typoscript']) {
-            \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('vidi', 'Configuration/TypoScript', 'Vidi: versatile and interactive display');
-        }
-
-        // Register List2 only if beta feature is enabled.
-        // @todo let see what we do with that
-        #if ($configuration['activate_beta_features']) {
-        #	$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
-        #
-        #	if (!$configuration['hide_module_list']) {
-        #		$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module_transitional.xlf';
-        #	}
-        #
-        #	\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-        #		'vidi',
-        #		'web', // Make module a submodule of 'web'
-        #		'm1', // Submodule key
-        #		'after:list', // 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',
-        #		), array(
-        #			'access' => 'user,group',
-        #			'icon' => 'EXT:vidi/Resources/Public/Images/list.png',
-        #			'labels' => $labelFile,
-        #		)
-        #	);
-        #}
-        #if ($configuration['hide_module_list']) {
-        #
-        #	// Default User TSConfig to be added in any case.
-        #	TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
-        #
-        #		# Hide the module in the BE.
-        #		options.hideModules.web := addToList(list)
-        #	');
-        #}
-
-        /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
-        $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-
-        /** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
-        $signalSlotDispatcher = $objectManager->get('TYPO3\CMS\Extbase\SignalSlot\Dispatcher');
-
-        // Connect "processContentData" signal slot with the "ContentObjectProcessor".
-        $signalSlotDispatcher->connect(
-            'Fab\Vidi\Controller\Backend\ContentController',
-            'processContentData',
-            'Fab\Vidi\Processor\ContentObjectProcessor',
-            'processRelations',
-            true
-        );
-
-        // Connect "processContentData" signal with the "MarkerProcessor".
-        $signalSlotDispatcher->connect(
-            'Fab\Vidi\Controller\Backend\ContentController',
-            'processContentData',
-            'Fab\Vidi\Processor\MarkerProcessor',
-            'processMarkers',
-            true
-        );
-
-        // Register default Tools for Vidi.
-        \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\ModulePreferencesTool');
-        \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\RelationAnalyserTool');
-    }
-
-    // Add new sprite icon.
-    $icons = [
-        'go' => 'EXT:vidi/Resources/Public/Images/bullet_go.png',
-        'query' => 'EXT:vidi/Resources/Public/Images/drive_disk.png',
-    ];
-    /** @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */
-    $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
-    foreach ($icons as $key => $icon) {
-        $iconRegistry->registerIcon('extensions-vidi-' . $key,
-            \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-            [
-                'source' => $icon
-            ]
-        );
-    }
-    unset($iconRegistry);
+	// Check from Vidi configuration what default module should be loaded.
+	// Make sure the class exists to avoid a Runtime Error
+	if (TYPO3_MODE === 'BE') {
+
+		// Add content main module before 'user'
+		if (!isset($GLOBALS['TBE_MODULES']['content'])) {
+
+			// Position module "content" after module "user" manually. No API is available for that, it seems...
+			$modules = [];
+			foreach ($GLOBALS['TBE_MODULES'] as $key => $val) {
+				if ($key === 'user') {
+					$modules['content'] = '';
+				}
+				$modules[$key] = $val;
+			}
+			$GLOBALS['TBE_MODULES'] = $modules;
+
+			// Register "data management" module.
+			\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+				'content',
+				'',
+				'',
+				'',
+				[
+					'name' => 'content',
+					'access' => 'user,group',
+					'labels' => [
+						'll_ref' => 'LLL:EXT:vidi/Resources/Private/Language/content_module.xlf',
+					],
+				]
+			);
+		}
+
+		$configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+			\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
+		)->get('vidi');
+
+		$pids = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['default_pid'], true);
+		$defaultPid = array_shift($pids);
+		$defaultPids = [];
+		foreach ($pids as $dataTypeAndPid) {
+			$parts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':', $dataTypeAndPid);
+			if (count($parts) === 2) {
+				$defaultPids[$parts[0]] = $parts[1];
+			}
+		}
+
+		// Loop around the data types and register them to be displayed within a BE module.
+		if ($configuration['data_types']) {
+
+			$dataTypes = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['data_types'], true);
+			foreach ($dataTypes as $dataType) {
+
+
+				/** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
+				$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class, $dataType);
+
+				// Special case already defined in Vidi.
+				if ($dataType === 'fe_users') {
+					$languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_users.xlf';
+					$icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-frontend.svg';
+					$icon = 'EXT:vidi/Resources/Public/Images/fe_users.svg';
+				} elseif ($dataType === 'fe_groups') {
+					$languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_groups.xlf';
+					$icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-group-frontend.svg';
+					$icon = 'EXT:vidi/Resources/Public/Images/fe_groups.svg';
+				} else {
+					/** @var \Fab\Vidi\Backend\LanguageFileGenerator $languageService */
+					$languageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(Fab\Vidi\Backend\LanguageFileGenerator::class);
+					$languageFile = $languageService->generate($dataType);
+					$icon = '';
+				}
+
+				$pid = isset($defaultPids[$dataType]) ? $defaultPids[$dataType] : $defaultPid;
+
+				/** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
+				$moduleLoader->setIcon($icon)
+					->setModuleLanguageFile($languageFile)
+					->setDefaultPid($pid)
+					->register();
+			}
+		}
+
+		// Possible Static TS loading
+		if (true === isset($configuration['autoload_typoscript']) && false === (bool)$configuration['autoload_typoscript']) {
+			\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('vidi', 'Configuration/TypoScript', 'Vidi: versatile and interactive display');
+		}
+
+		// Register List2 only if beta feature is enabled.
+		// @todo let see what we do with that
+		#if ($configuration['activate_beta_features']) {
+		#	$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
+		#
+		#	if (!$configuration['hide_module_list']) {
+		#		$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module_transitional.xlf';
+		#	}
+		#
+		#	\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
+		#		'vidi',
+		#		'web', // Make module a submodule of 'web'
+		#		'm1', // Submodule key
+		#		'after:list', // 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',
+		#		), array(
+		#			'access' => 'user,group',
+		#			'icon' => 'EXT:vidi/Resources/Public/Images/list.png',
+		#			'labels' => $labelFile,
+		#		)
+		#	);
+		#}
+		#if ($configuration['hide_module_list']) {
+		#
+		#	// Default User TSConfig to be added in any case.
+		#	TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
+		#
+		#		# Hide the module in the BE.
+		#		options.hideModules.web := addToList(list)
+		#	');
+		#}
+
+		/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
+		$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+
+		/** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
+		$signalSlotDispatcher = $objectManager->get('TYPO3\CMS\Extbase\SignalSlot\Dispatcher');
+
+		// Connect "processContentData" signal slot with the "ContentObjectProcessor".
+		$signalSlotDispatcher->connect(
+			'Fab\Vidi\Controller\Backend\ContentController',
+			'processContentData',
+			'Fab\Vidi\Processor\ContentObjectProcessor',
+			'processRelations',
+			true
+		);
+
+		// Connect "processContentData" signal with the "MarkerProcessor".
+		$signalSlotDispatcher->connect(
+			'Fab\Vidi\Controller\Backend\ContentController',
+			'processContentData',
+			'Fab\Vidi\Processor\MarkerProcessor',
+			'processMarkers',
+			true
+		);
+
+		// Register default Tools for Vidi.
+		\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\ModulePreferencesTool');
+		\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\RelationAnalyserTool');
+	}
+
+	// Add new sprite icon.
+	$icons = [
+		'go' => 'EXT:vidi/Resources/Public/Images/bullet_go.png',
+		'query' => 'EXT:vidi/Resources/Public/Images/drive_disk.png',
+	];
+	/** @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */
+	$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
+	foreach ($icons as $key => $icon) {
+		$iconRegistry->registerIcon('extensions-vidi-' . $key,
+			\TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
+			[
+				'source' => $icon
+			]
+		);
+	}
+	unset($iconRegistry);
 });

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 defined('TYPO3_MODE') or die();
 
-call_user_func(function () {
+call_user_func(function() {
 
     // Check from Vidi configuration what default module should be loaded.
     // Make sure the class exists to avoid a Runtime Error
@@ -166,7 +166,7 @@ 
     /** @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */
     $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
     foreach ($icons as $key => $icon) {
-        $iconRegistry->registerIcon('extensions-vidi-' . $key,
+        $iconRegistry->registerIcon('extensions-vidi-'.$key,
             \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
             [
                 'source' => $icon

Tests/Unit/Tca/GridServiceTest.php

Indentation +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 	#public function getLabelReturnNameAsValue() {
 	#	$GLOBALS['LANG'] = $this->getMock('TYPO3\CMS\Lang\LanguageService', [], [], '', false);
 	#	$GLOBALS['LANG']->expects($this->once())->method('sL')->will($this->returnValue('Name'));
-    #
+	#
 	#	$this->assertEquals('Name', $this->fixture->getLabel('name'));
 	#}
 

Classes/Domain/Validator/LanguageValidator.php

Indentation +20 added lines, -20 removed lines

@@ -16,27 +16,27 @@
 class LanguageValidator
 {
 
-    /**
-     * Check whether the $language is valid.
-     *
-     * @param int $language
-     * @throws \Exception
-     * @return void
-     */
-    public function validate($language)
-    {
+	/**
+	 * Check whether the $language is valid.
+	 *
+	 * @param int $language
+	 * @throws \Exception
+	 * @return void
+	 */
+	public function validate($language)
+	{
 
-        if (!$this->getLanguageService()->languageExists((int)$language)) {
-            throw new \Exception('The language "' . $language . '" does not exist', 1351605542);
-        }
-    }
+		if (!$this->getLanguageService()->languageExists((int)$language)) {
+			throw new \Exception('The language "' . $language . '" does not exist', 1351605542);
+		}
+	}
 
-    /**
-     * @return \Fab\Vidi\Language\LanguageService|object
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Language\LanguageService::class);
-    }
+	/**
+	 * @return \Fab\Vidi\Language\LanguageService|object
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Language\LanguageService::class);
+	}
 
 }

Classes/Domain/Validator/ToolValidator.php

Indentation +32 added lines, -32 removed lines

@@ -18,36 +18,36 @@
 class ToolValidator extends AbstractValidator
 {
 
-    /**
-     * Check whether $tool is valid.
-     *
-     * @param string $tool
-     * @return void
-     */
-    public function isValid($tool)
-    {
-
-        $dataType = $this->getModuleLoader()->getDataType();
-        $isValid = ToolRegistry::getInstance()->isAllowed($dataType, $tool);
-
-        if (!$isValid) {
-            $message = sprintf('This Tool "%s" is not allowed for the current data type.', $tool);
-            $this->addError($message, 1409041510);
-        }
-
-        if (!class_exists($tool)) {
-            $message = sprintf('I could not find class "%s"', $tool);
-            $this->addError($message, 1409041511);
-        }
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	/**
+	 * Check whether $tool is valid.
+	 *
+	 * @param string $tool
+	 * @return void
+	 */
+	public function isValid($tool)
+	{
+
+		$dataType = $this->getModuleLoader()->getDataType();
+		$isValid = ToolRegistry::getInstance()->isAllowed($dataType, $tool);
+
+		if (!$isValid) {
+			$message = sprintf('This Tool "%s" is not allowed for the current data type.', $tool);
+			$this->addError($message, 1409041510);
+		}
+
+		if (!class_exists($tool)) {
+			$message = sprintf('I could not find class "%s"', $tool);
+			$this->addError($message, 1409041511);
+		}
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 }

Classes/Domain/Repository/ContentRepositoryFactory.php

Indentation +39 added lines, -39 removed lines

@@ -17,44 +17,44 @@
 class ContentRepositoryFactory implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    static protected $instances = [];
-
-    /**
-     * Returns a class instance of a repository.
-     * If not data type is given, get the value from the module loader.
-     *
-     * @param string $dataType
-     * @param string $sourceFieldName
-     * @return \Fab\Vidi\Domain\Repository\ContentRepository
-     */
-    static public function getInstance($dataType = null, $sourceFieldName = '')
-    {
-
-        /** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
-        if (is_null($dataType)) {
-
-            // Try to get the data type from the module loader.
-            $moduleLoader = GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-            $dataType = $moduleLoader->getDataType();
-        }
-
-        // This should not happen.
-        if (!$dataType) {
-            throw new \RuntimeException('No data type given nor could be fetched by the module loader.', 1376118278);
-        }
-
-        if (empty(self::$instances[$dataType])) {
-            $className = 'Fab\Vidi\Domain\Repository\ContentRepository';
-            self::$instances[$dataType] = GeneralUtility::makeInstance($className, $dataType, $sourceFieldName);
-        }
-
-        /** @var ContentRepository $contentRepository */
-        $contentRepository = self::$instances[$dataType];
-        $contentRepository->setSourceFieldName($sourceFieldName);
-        return $contentRepository;
-    }
+	/**
+	 * @var array
+	 */
+	static protected $instances = [];
+
+	/**
+	 * Returns a class instance of a repository.
+	 * If not data type is given, get the value from the module loader.
+	 *
+	 * @param string $dataType
+	 * @param string $sourceFieldName
+	 * @return \Fab\Vidi\Domain\Repository\ContentRepository
+	 */
+	static public function getInstance($dataType = null, $sourceFieldName = '')
+	{
+
+		/** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
+		if (is_null($dataType)) {
+
+			// Try to get the data type from the module loader.
+			$moduleLoader = GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+			$dataType = $moduleLoader->getDataType();
+		}
+
+		// This should not happen.
+		if (!$dataType) {
+			throw new \RuntimeException('No data type given nor could be fetched by the module loader.', 1376118278);
+		}
+
+		if (empty(self::$instances[$dataType])) {
+			$className = 'Fab\Vidi\Domain\Repository\ContentRepository';
+			self::$instances[$dataType] = GeneralUtility::makeInstance($className, $dataType, $sourceFieldName);
+		}
+
+		/** @var ContentRepository $contentRepository */
+		$contentRepository = self::$instances[$dataType];
+		$contentRepository->setSourceFieldName($sourceFieldName);
+		return $contentRepository;
+	}
 
 }