fabarea / vidi

Classes/Tool/AbstractTool.php

Indentation +40 added lines, -40 removed lines

@@ -18,51 +18,51 @@
 abstract class AbstractTool implements ToolInterface
 {
 
-    /**
-     * @param string $templateNameAndPath
-     * @return StandaloneView
-     * @throws \InvalidArgumentException
-     */
-    protected function initializeStandaloneView($templateNameAndPath)
-    {
+	/**
+	 * @param string $templateNameAndPath
+	 * @return StandaloneView
+	 * @throws \InvalidArgumentException
+	 */
+	protected function initializeStandaloneView($templateNameAndPath)
+	{
 
-        $templateNameAndPath = GeneralUtility::getFileAbsFileName($templateNameAndPath);
+		$templateNameAndPath = GeneralUtility::getFileAbsFileName($templateNameAndPath);
 
-        /** @var StandaloneView $view */
-        $view = $this->getObjectManager()->get(StandaloneView::class);
+		/** @var StandaloneView $view */
+		$view = $this->getObjectManager()->get(StandaloneView::class);
 
-        $view->setTemplatePathAndFilename($templateNameAndPath);
-        return $view;
-    }
+		$view->setTemplatePathAndFilename($templateNameAndPath);
+		return $view;
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 
-    /**
-     * @return ObjectManager
-     * @throws \InvalidArgumentException
-     */
-    protected function getObjectManager()
-    {
-        return GeneralUtility::makeInstance(ObjectManager::class);
-    }
+	/**
+	 * @return ObjectManager
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getObjectManager()
+	{
+		return GeneralUtility::makeInstance(ObjectManager::class);
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     * @throws \InvalidArgumentException
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
 }

Classes/ViewHelpers/Content/FindOneViewHelper.php

Indentation +169 added lines, -169 removed lines

@@ -24,174 +24,174 @@
 class FindOneViewHelper extends AbstractViewHelper implements CompilableInterface
 {
 
-    /**
-     * @return void
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
-     */
-    public function initializeArguments()
-    {
-        parent::initializeArguments();
-
-        $this->registerArgument('type', 'string', 'The content type', true, '');
-        $this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, []);
-        $this->registerArgument('identifier', 'int', 'The identifier of the object to be fetched.', false, 0);
-        $this->registerArgument('argumentName', 'string', 'The parameter name where to retrieve the identifier', false, 'tx_vidifrontend_pi1|uid');
-        $this->registerArgument('as', 'string', 'The alias object', false, 'object');
-    }
-
-    /**
-     * @return string Rendered string
-     * @throws \Fab\Vidi\Exception\NotExistingClassException
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     * @throws \InvalidArgumentException
-     * @api
-     */
-    public function render()
-    {
-        return static::renderStatic(
-            $this->arguments,
-            $this->buildRenderChildrenClosure(),
-            $this->renderingContext
-        );
-    }
-
-    /**
-     * @param array $arguments
-     * @param \Closure $renderChildrenClosure
-     * @param RenderingContextInterface $renderingContext
-     *
-     * @return string
-     * @throws \Fab\Vidi\Exception\NotExistingClassException
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     * @throws \InvalidArgumentException
-     */
-    public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
-    {
-
-        // Fetch the object
-        $matches = self::computeMatches($arguments);
-        $matcher = self::getMatcher($arguments['type'], $matches);
-
-        $contentRepository = ContentRepositoryFactory::getInstance($arguments['type']);
-        $object = $contentRepository->findOneBy($matcher);
-
-        $output = '';
-        if ($object) {
-            // Render children with "as" variable.
-            $templateVariableContainer = $renderingContext->getTemplateVariableContainer();
-            $templateVariableContainer->add($arguments['as'], $object);
-            $output = $renderChildrenClosure();
-            $templateVariableContainer->remove($arguments['as']);
-        }
-
-        return $output;
-    }
-
-    /**
-     * @param array $arguments
-     * @return array
-     */
-    protected static function computeMatches(array $arguments)
-    {
-
-        $matches = [];
-
-        $argumentValue = self::getArgumentValue($arguments['argumentName']);
-        if ($argumentValue > 0) {
-            $matches['uid'] = $argumentValue;
-        }
-
-        if ($arguments['matches']) {
-            $matches = $arguments['matches'];
-        }
-
-        if ($arguments['identifier'] > 0) {
-            $matches['uid'] = $arguments['identifier'];
-        }
-
-        // We want a default value in any case.
-        if (!$matches) {
-            $matches['uid'] = 0;
-        }
-        return $matches;
-    }
-
-    /**
-     * Returns a matcher object.
-     *
-     * @param string $dataType
-     * @param array $matches
-     * @return Matcher
-     * @throws \Fab\Vidi\Exception\NotExistingClassException
-     * @throws \InvalidArgumentException
-     */
-    protected static function getMatcher($dataType, array $matches = [])
-    {
-
-        /** @var $matcher Matcher */
-        $matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
-
-        foreach ($matches as $fieldNameAndPath => $value) {
-
-            // CSV values should be considered as "in" operator in Query, otherwise "equals".
-            $explodedValues = GeneralUtility::trimExplode(',', $value, true);
-
-            // The matching value contains a "1,2" as example
-            if (count($explodedValues) > 1) {
-
-                $resolvedDataType = self::getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
-                $resolvedFieldName = self::getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
-
-                // "equals" if in presence of a relation.
-                // "in" if not a relation.
-                if (Tca::table($resolvedDataType)->field($resolvedFieldName)->hasRelation()) {
-                    foreach ($explodedValues as $explodedValue) {
-                        $matcher->equals($fieldNameAndPath, $explodedValue);
-                    }
-                } else {
-                    $matcher->in($fieldNameAndPath, $explodedValues);
-                }
-            } else {
-                $matcher->equals($fieldNameAndPath, $explodedValues[0]);
-            }
-        }
-
-        return $matcher;
-    }
-
-    /**
-     * @return FieldPathResolver
-     * @throws \InvalidArgumentException
-     */
-    protected static function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * @param string $argumentName
-     * @return int
-     */
-    protected static function getArgumentValue($argumentName)
-    {
-
-        $value = ''; // default value
-
-        // Merge parameters
-        $parameters = GeneralUtility::_GET();
-        $post = GeneralUtility::_POST();
-        ArrayUtility::mergeRecursiveWithOverrule($parameters, $post);
-
-        // Traverse argument parts and retrieve value.
-        $argumentParts = GeneralUtility::trimExplode('|', $argumentName);
-        foreach ($argumentParts as $argumentPart) {
-            if (isset($parameters[$argumentPart])) {
-                $value = $parameters[$argumentPart];
-                $parameters = $value;
-            }
-        }
-
-        return (int)$value;
-    }
+	/**
+	 * @return void
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
+	 */
+	public function initializeArguments()
+	{
+		parent::initializeArguments();
+
+		$this->registerArgument('type', 'string', 'The content type', true, '');
+		$this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, []);
+		$this->registerArgument('identifier', 'int', 'The identifier of the object to be fetched.', false, 0);
+		$this->registerArgument('argumentName', 'string', 'The parameter name where to retrieve the identifier', false, 'tx_vidifrontend_pi1|uid');
+		$this->registerArgument('as', 'string', 'The alias object', false, 'object');
+	}
+
+	/**
+	 * @return string Rendered string
+	 * @throws \Fab\Vidi\Exception\NotExistingClassException
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 * @throws \InvalidArgumentException
+	 * @api
+	 */
+	public function render()
+	{
+		return static::renderStatic(
+			$this->arguments,
+			$this->buildRenderChildrenClosure(),
+			$this->renderingContext
+		);
+	}
+
+	/**
+	 * @param array $arguments
+	 * @param \Closure $renderChildrenClosure
+	 * @param RenderingContextInterface $renderingContext
+	 *
+	 * @return string
+	 * @throws \Fab\Vidi\Exception\NotExistingClassException
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 * @throws \InvalidArgumentException
+	 */
+	public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext)
+	{
+
+		// Fetch the object
+		$matches = self::computeMatches($arguments);
+		$matcher = self::getMatcher($arguments['type'], $matches);
+
+		$contentRepository = ContentRepositoryFactory::getInstance($arguments['type']);
+		$object = $contentRepository->findOneBy($matcher);
+
+		$output = '';
+		if ($object) {
+			// Render children with "as" variable.
+			$templateVariableContainer = $renderingContext->getTemplateVariableContainer();
+			$templateVariableContainer->add($arguments['as'], $object);
+			$output = $renderChildrenClosure();
+			$templateVariableContainer->remove($arguments['as']);
+		}
+
+		return $output;
+	}
+
+	/**
+	 * @param array $arguments
+	 * @return array
+	 */
+	protected static function computeMatches(array $arguments)
+	{
+
+		$matches = [];
+
+		$argumentValue = self::getArgumentValue($arguments['argumentName']);
+		if ($argumentValue > 0) {
+			$matches['uid'] = $argumentValue;
+		}
+
+		if ($arguments['matches']) {
+			$matches = $arguments['matches'];
+		}
+
+		if ($arguments['identifier'] > 0) {
+			$matches['uid'] = $arguments['identifier'];
+		}
+
+		// We want a default value in any case.
+		if (!$matches) {
+			$matches['uid'] = 0;
+		}
+		return $matches;
+	}
+
+	/**
+	 * Returns a matcher object.
+	 *
+	 * @param string $dataType
+	 * @param array $matches
+	 * @return Matcher
+	 * @throws \Fab\Vidi\Exception\NotExistingClassException
+	 * @throws \InvalidArgumentException
+	 */
+	protected static function getMatcher($dataType, array $matches = [])
+	{
+
+		/** @var $matcher Matcher */
+		$matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
+
+		foreach ($matches as $fieldNameAndPath => $value) {
+
+			// CSV values should be considered as "in" operator in Query, otherwise "equals".
+			$explodedValues = GeneralUtility::trimExplode(',', $value, true);
+
+			// The matching value contains a "1,2" as example
+			if (count($explodedValues) > 1) {
+
+				$resolvedDataType = self::getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
+				$resolvedFieldName = self::getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
+
+				// "equals" if in presence of a relation.
+				// "in" if not a relation.
+				if (Tca::table($resolvedDataType)->field($resolvedFieldName)->hasRelation()) {
+					foreach ($explodedValues as $explodedValue) {
+						$matcher->equals($fieldNameAndPath, $explodedValue);
+					}
+				} else {
+					$matcher->in($fieldNameAndPath, $explodedValues);
+				}
+			} else {
+				$matcher->equals($fieldNameAndPath, $explodedValues[0]);
+			}
+		}
+
+		return $matcher;
+	}
+
+	/**
+	 * @return FieldPathResolver
+	 * @throws \InvalidArgumentException
+	 */
+	protected static function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * @param string $argumentName
+	 * @return int
+	 */
+	protected static function getArgumentValue($argumentName)
+	{
+
+		$value = ''; // default value
+
+		// Merge parameters
+		$parameters = GeneralUtility::_GET();
+		$post = GeneralUtility::_POST();
+		ArrayUtility::mergeRecursiveWithOverrule($parameters, $post);
+
+		// Traverse argument parts and retrieve value.
+		$argumentParts = GeneralUtility::trimExplode('|', $argumentName);
+		foreach ($argumentParts as $argumentPart) {
+			if (isset($parameters[$argumentPart])) {
+				$value = $parameters[$argumentPart];
+				$parameters = $value;
+			}
+		}
+
+		return (int)$value;
+	}
 
 }

Classes/View/Button/EditButton.php

Indentation +28 added lines, -28 removed lines

@@ -20,35 +20,35 @@
 class EditButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a "edit" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        $editUri = $this->getUriRenderer()->render($object);
+	/**
+	 * Renders a "edit" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		$editUri = $this->getUriRenderer()->render($object);
 
-        return $this->makeLinkButton()
-            ->setHref($editUri)
-            ->setDataAttributes([
-                'uid' => $object->getUid(),
-                'toggle' => 'tooltip',
-            ])
-            ->setClasses('btn-edit')
-            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:edit'))
-            ->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
-            ->render();
-    }
+		return $this->makeLinkButton()
+			->setHref($editUri)
+			->setDataAttributes([
+				'uid' => $object->getUid(),
+				'toggle' => 'tooltip',
+			])
+			->setClasses('btn-edit')
+			->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:edit'))
+			->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
+			->render();
+	}
 
-    /**
-     * @return \Fab\Vidi\View\Uri\EditUri
-     * @throws \InvalidArgumentException
-     */
-    protected function getUriRenderer()
-    {
-        return GeneralUtility::makeInstance(EditUri::class);
-    }
+	/**
+	 * @return \Fab\Vidi\View\Uri\EditUri
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getUriRenderer()
+	{
+		return GeneralUtility::makeInstance(EditUri::class);
+	}
 
 }

Classes/View/Button/DeleteButton.php

Indentation +40 added lines, -40 removed lines

@@ -19,47 +19,47 @@
 class DeleteButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a "delete" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        $labelField = Tca::table($object->getDataType())->getLabelField();
-        $label = $object[$labelField] ? $object[$labelField] : $object->getUid();
+	/**
+	 * Renders a "delete" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		$labelField = Tca::table($object->getDataType())->getLabelField();
+		$label = $object[$labelField] ? $object[$labelField] : $object->getUid();
 
-        return $this->makeLinkButton()
-            ->setHref($this->getDeleteUri($object))
-            ->setDataAttributes([
-                'uid' => $object->getUid(),
-                'toggle' => 'tooltip',
-                'label' => $label,
-            ])
-            ->setClasses('btn-delete')
-            ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete'))
-            ->setIcon($this->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL))
-            ->render();
-    }
+		return $this->makeLinkButton()
+			->setHref($this->getDeleteUri($object))
+			->setDataAttributes([
+				'uid' => $object->getUid(),
+				'toggle' => 'tooltip',
+				'label' => $label,
+			])
+			->setClasses('btn-delete')
+			->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete'))
+			->setIcon($this->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL))
+			->render();
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     */
-    protected function getDeleteUri(Content $object)
-    {
-        $additionalParameters = array(
-            $this->getModuleLoader()->getParameterPrefix() => array(
-                'controller' => 'Content',
-                'action' => 'delete',
-                'format' => 'json',
-                'matches' => array(
-                    'uid' => $object->getUid(),
-                ),
-            ),
-        );
-        return $this->getModuleLoader()->getModuleUrl($additionalParameters);
-    }
+	/**
+	 * @param Content $object
+	 * @return string
+	 */
+	protected function getDeleteUri(Content $object)
+	{
+		$additionalParameters = array(
+			$this->getModuleLoader()->getParameterPrefix() => array(
+				'controller' => 'Content',
+				'action' => 'delete',
+				'format' => 'json',
+				'matches' => array(
+					'uid' => $object->getUid(),
+				),
+			),
+		);
+		return $this->getModuleLoader()->getModuleUrl($additionalParameters);
+	}
 
 }

Classes/View/System/ButtonsSystem.php

Indentation +10 added lines, -10 removed lines

@@ -19,15 +19,15 @@
 class ButtonsSystem extends AbstractComponentView
 {
 
-    /**
-     * Rendering buttons in the grids given a Content object.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        return '';
-    }
+	/**
+	 * Rendering buttons in the grids given a Content object.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		return '';
+	}
 
 }

Classes/View/System/CheckboxSystem.php

Indentation +11 added lines, -11 removed lines

@@ -18,15 +18,15 @@
 class CheckboxSystem extends AbstractComponentView
 {
 
-    /**
-     * Returns a checkbox for the grids.
-     *
-     * @param Content $object
-     * @param  int $offset
-     * @return string
-     */
-    public function render(Content $object = null, $offset = 0)
-    {
-        return '';
-    }
+	/**
+	 * Returns a checkbox for the grids.
+	 *
+	 * @param Content $object
+	 * @param  int $offset
+	 * @return string
+	 */
+	public function render(Content $object = null, $offset = 0)
+	{
+		return '';
+	}
 }

Classes/View/Uri/EditUri.php

Indentation +29 added lines, -29 removed lines

@@ -18,35 +18,35 @@
 class EditUri extends AbstractComponentView
 {
 
-    /**
-     * Renders a "edit" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        $uri = BackendUtility::getModuleUrl(
-            'record_edit',
-            array(
-                $this->getEditParameterName($object) => 'edit',
-                'returnUrl' => $this->getModuleLoader()->getModuleUrl()
-            )
-        );
-        return $uri;
-    }
+	/**
+	 * Renders a "edit" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		$uri = BackendUtility::getModuleUrl(
+			'record_edit',
+			array(
+				$this->getEditParameterName($object) => 'edit',
+				'returnUrl' => $this->getModuleLoader()->getModuleUrl()
+			)
+		);
+		return $uri;
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     */
-    protected function getEditParameterName(Content $object)
-    {
-        return sprintf(
-            'edit[%s][%s]',
-            $object->getDataType(),
-            $object->getUid()
-        );
-    }
+	/**
+	 * @param Content $object
+	 * @return string
+	 */
+	protected function getEditParameterName(Content $object)
+	{
+		return sprintf(
+			'edit[%s][%s]',
+			$object->getDataType(),
+			$object->getUid()
+		);
+	}
 
 }

Classes/Converter/Property.php

Indentation +97 added lines, -97 removed lines

@@ -17,102 +17,102 @@
 class Property
 {
 
-    /**
-     * @var string
-     */
-    static protected $currentProperty;
-
-    /**
-     * @var string
-     */
-    static protected $currentTable;
-
-    /**
-     * @var array
-     */
-    protected $storage = [];
-
-    /**
-     * @param string $propertyName
-     * @return $this
-     * @throws \InvalidArgumentException
-     */
-    static public function name($propertyName)
-    {
-        self::$currentProperty = $propertyName;
-        self::$currentTable = ''; // reset the table name value.
-        return GeneralUtility::makeInstance(self::class);
-    }
-
-    /**
-     * @param string|Content $tableNameOrContentObject
-     * @return $this
-     */
-    public function of($tableNameOrContentObject)
-    {
-        // Resolve the table name.
-        self::$currentTable = $tableNameOrContentObject instanceof Content ?
-            $tableNameOrContentObject->getDataType() :
-            $tableNameOrContentObject;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function toFieldName()
-    {
-
-        $propertyName = $this->getPropertyName();
-        $tableName = $this->getTableName();
-
-        if (empty($this->storage[$tableName][$propertyName])) {
-            if ($this->storage[$tableName]) {
-                $this->storage[$tableName] = [];
-            }
-
-            // Default case
-            $fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
-
-            // Special case in case the field name does not follow the conventions "field_name" => "fieldName"
-            // There is the chance to make some mapping
-            if (!empty($GLOBALS['TCA'][$tableName]['vidi']['mappings'])) {
-                $key = array_search($propertyName, $GLOBALS['TCA'][$tableName]['vidi']['mappings']);
-                if ($key !== false) {
-                    $fieldName = $key;
-                }
-            }
-
-            $this->storage[$tableName][$propertyName] = $fieldName;
-        }
-
-        return $this->storage[$tableName][$propertyName];
-    }
-
-    /**
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getPropertyName()
-    {
-        $propertyName = self::$currentProperty;
-        if (empty($propertyName)) {
-            throw new \RuntimeException('I could not find a field name value.', 1403203290);
-        }
-        return $propertyName;
-    }
-
-    /**
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getTableName()
-    {
-        $tableName = self::$currentTable;
-        if (empty($tableName)) {
-            throw new \RuntimeException('I could not find a table name value.', 1403203291);
-        }
-        return $tableName;
-    }
+	/**
+	 * @var string
+	 */
+	static protected $currentProperty;
+
+	/**
+	 * @var string
+	 */
+	static protected $currentTable;
+
+	/**
+	 * @var array
+	 */
+	protected $storage = [];
+
+	/**
+	 * @param string $propertyName
+	 * @return $this
+	 * @throws \InvalidArgumentException
+	 */
+	static public function name($propertyName)
+	{
+		self::$currentProperty = $propertyName;
+		self::$currentTable = ''; // reset the table name value.
+		return GeneralUtility::makeInstance(self::class);
+	}
+
+	/**
+	 * @param string|Content $tableNameOrContentObject
+	 * @return $this
+	 */
+	public function of($tableNameOrContentObject)
+	{
+		// Resolve the table name.
+		self::$currentTable = $tableNameOrContentObject instanceof Content ?
+			$tableNameOrContentObject->getDataType() :
+			$tableNameOrContentObject;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function toFieldName()
+	{
+
+		$propertyName = $this->getPropertyName();
+		$tableName = $this->getTableName();
+
+		if (empty($this->storage[$tableName][$propertyName])) {
+			if ($this->storage[$tableName]) {
+				$this->storage[$tableName] = [];
+			}
+
+			// Default case
+			$fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
+
+			// Special case in case the field name does not follow the conventions "field_name" => "fieldName"
+			// There is the chance to make some mapping
+			if (!empty($GLOBALS['TCA'][$tableName]['vidi']['mappings'])) {
+				$key = array_search($propertyName, $GLOBALS['TCA'][$tableName]['vidi']['mappings']);
+				if ($key !== false) {
+					$fieldName = $key;
+				}
+			}
+
+			$this->storage[$tableName][$propertyName] = $fieldName;
+		}
+
+		return $this->storage[$tableName][$propertyName];
+	}
+
+	/**
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getPropertyName()
+	{
+		$propertyName = self::$currentProperty;
+		if (empty($propertyName)) {
+			throw new \RuntimeException('I could not find a field name value.', 1403203290);
+		}
+		return $propertyName;
+	}
+
+	/**
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getTableName()
+	{
+		$tableName = self::$currentTable;
+		if (empty($tableName)) {
+			throw new \RuntimeException('I could not find a table name value.', 1403203291);
+		}
+		return $tableName;
+	}
 
 }

Spacing +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
     {
         // Resolve the table name.
         self::$currentTable = $tableNameOrContentObject instanceof Content ?
-            $tableNameOrContentObject->getDataType() :
-            $tableNameOrContentObject;
+            $tableNameOrContentObject->getDataType() : $tableNameOrContentObject;
         return $this;
     }
 

Classes/Persistence/ResultSetStorage.php

Indentation +25 added lines, -25 removed lines

@@ -16,32 +16,32 @@
 class ResultSetStorage implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $resultSets = [];
+	/**
+	 * @var array
+	 */
+	protected $resultSets = [];
 
-    /**
-     * @param string $querySignature
-     * @return array
-     */
-    public function get($querySignature)
-    {
-        $resultSet = null;
-        if (isset($this->resultSets[$querySignature])) {
-            $resultSet = $this->resultSets[$querySignature];
-        }
-        return $resultSet;
-    }
+	/**
+	 * @param string $querySignature
+	 * @return array
+	 */
+	public function get($querySignature)
+	{
+		$resultSet = null;
+		if (isset($this->resultSets[$querySignature])) {
+			$resultSet = $this->resultSets[$querySignature];
+		}
+		return $resultSet;
+	}
 
-    /**
-     * @param $querySignature
-     * @param array $resultSet
-     * @internal param array $resultSets
-     */
-    public function set($querySignature, array $resultSet)
-    {
-        $this->resultSets[$querySignature] = $resultSet;
-    }
+	/**
+	 * @param $querySignature
+	 * @param array $resultSet
+	 * @internal param array $resultSets
+	 */
+	public function set($querySignature, array $resultSet)
+	{
+		$this->resultSets[$querySignature] = $resultSet;
+	}
 
 }