fabarea / vidi

Classes/View/Grid/Row.php

Spacing +3 added lines, -3 removed lines

@@ -126,7 +126,7 @@ 
             $output[$this->getFieldName()] = $value;
         }
 
-        $output['DT_RowId'] = 'row-' . $object->getUid();
+        $output['DT_RowId'] = 'row-'.$object->getUid();
         $output['DT_RowClass'] = sprintf('%s_%s', $object->getDataType(), $object->getUid());
 
         return $output;
@@ -327,7 +327,7 @@ 
         foreach ($localizedStructure as $index => $structure) {
 
             $localizedStructure[$index]['value'] = sprintf('<span>%s %s</span>',
-                empty($structure['languageFlag']) ? '' : $this->getIconFactory()->getIcon('flags-' . $structure['languageFlag'], Icon::SIZE_SMALL),
+                empty($structure['languageFlag']) ? '' : $this->getIconFactory()->getIcon('flags-'.$structure['languageFlag'], Icon::SIZE_SMALL),
                 $structure['value']
             );
         }
@@ -352,7 +352,7 @@ 
             $enablesMethods = array('Hidden', 'Deleted', 'StartTime', 'EndTime');
             foreach ($enablesMethods as $enableMethod) {
 
-                $methodName = 'get' . $enableMethod . 'Field';
+                $methodName = 'get'.$enableMethod.'Field';
 
                 // Fetch possible hidden filed.
                 $enableField = Tca::table($object)->$methodName();

Indentation +623 added lines, -623 removed lines

@@ -26,628 +26,628 @@
 class Row extends AbstractComponentView
 {
 
-    /**
-     * @var array
-     */
-    protected $columns = [];
-
-    /**
-     * Registry for storing variable values and speed up the processing.
-     *
-     * @var array
-     */
-    protected $variables = [];
-
-    /**
-     * @param array $columns
-     */
-    public function __construct(array $columns = [])
-    {
-        $this->columns = $columns;
-    }
-
-    /**
-     * Render a row to be displayed in the Grid given an Content Object.
-     *
-     * @param Content $object
-     * @param int $rowIndex
-     * @return array
-     * @throws \Exception
-     */
-    public function render(Content $object = null, $rowIndex = 0)
-    {
-
-        // Initialize returned array
-        $output = [];
-
-        foreach (Tca::grid()->getFields() as $fieldNameAndPath => $configuration) {
-
-            $value = ''; // default is empty at first.
-
-            $this->computeVariables($object, $fieldNameAndPath);
-
-            // Only compute the value if it is going to be shown in the Grid. Lost of time otherwise!
-            if (in_array($fieldNameAndPath, $this->columns)) {
-
-                // Fetch value
-                if (Tca::grid()->hasRenderers($fieldNameAndPath)) {
-
-                    $value = '';
-                    $renderers = Tca::grid()->getRenderers($fieldNameAndPath);
-
-                    // if is relation has one
-                    foreach ($renderers as $rendererClassName => $rendererConfiguration) {
-
-                        /** @var $rendererObject \Fab\Vidi\Grid\ColumnRendererInterface */
-                        $rendererObject = GeneralUtility::makeInstance($rendererClassName);
-                        $value .= $rendererObject
-                            ->setObject($object)
-                            ->setFieldName($fieldNameAndPath)
-                            ->setRowIndex($rowIndex)
-                            ->setFieldConfiguration($configuration)
-                            ->setGridRendererConfiguration($rendererConfiguration)
-                            ->render();
-                    }
-                } else {
-                    $value = $this->resolveValue($object, $fieldNameAndPath);
-                    $value = $this->processValue($value, $object, $fieldNameAndPath); // post resolve processing.
-                }
-
-                // Possible formatting given by configuration. @see TCA['grid']
-                $value = $this->formatValue($value, $configuration);
-
-                // Here, there is the chance to further "decorate" the value for inline editing, localization, ...
-                if ($this->willBeEnriched()) {
-
-                    $localizedStructure = $this->initializeLocalizedStructure($value);
-
-                    if ($this->isEditable()) {
-                        $localizedStructure = $this->addEditableMarkup($localizedStructure);
-                    }
-
-                    if ($this->isLocalized()) {
-                        $localizedStructure = $this->addLocalizationMarkup($localizedStructure);
-                    }
-
-                    if ($this->hasIcon()) {
-                        $localizedStructure = $this->addSpriteIconMarkup($localizedStructure);
-                    }
-
-                    $value = $this->flattenStructure($localizedStructure);
-                }
-
-                // Final wrap given by configuration. @see TCA['grid']
-                $value = $this->wrapValue($value, $configuration);
-            }
-
-            $output[$this->getFieldName()] = $value;
-        }
-
-        $output['DT_RowId'] = 'row-' . $object->getUid();
-        $output['DT_RowClass'] = sprintf('%s_%s', $object->getDataType(), $object->getUid());
-
-        return $output;
-    }
-
-    /**
-     * Flatten the localized structure to render the final value
-     *
-     * @param array $localizedStructure
-     * @return string
-     */
-    protected function flattenStructure(array $localizedStructure)
-    {
-
-        // Flatten the structure.
-        $value = '';
-        foreach ($localizedStructure as $structure) {
-            $value .= sprintf('<div class="%s">%s</div>',
-                $structure['status'] !== LocalizationStatus::LOCALIZED ? 'invisible' : '',
-                $structure['value']
-            );
-        }
-        return $value;
-    }
-
-    /**
-     * Store some often used variable values and speed up the processing.
-     *
-     * @param Content $object
-     * @param string $fieldNameAndPath
-     * @return void
-     */
-    protected function computeVariables(Content $object, $fieldNameAndPath)
-    {
-        $this->variables = [];
-        $this->variables['dataType'] = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
-        $this->variables['fieldName'] = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
-        $this->variables['fieldNameAndPath'] = $fieldNameAndPath;
-        $this->variables['object'] = $object;
-    }
-
-    /**
-     * Tell whether the object will be decorated / wrapped such as
-     *
-     * @param string $value
-     * @return array
-     */
-    protected function initializeLocalizedStructure($value)
-    {
-
-        $localizedStructure[] = [
-            'value' => empty($value) && $this->isEditable() ? $this->getEmptyValuePlaceholder() : $value,
-            'status' => empty($value) ? LocalizationStatus::EMPTY_VALUE : LocalizationStatus::LOCALIZED,
-            'language' => 0,
-            'languageFlag' => $defaultLanguage = $this->getLanguageService()->getDefaultFlag(),
-        ];
-
-        if ($this->isLocalized()) {
-
-            foreach ($this->getLanguageService()->getLanguages() as $language) {
-
-                // Make sure the language is allowed for the current Backend User.
-                if ($this->isLanguageAllowedForBackendUser($language)) {
-
-                    $resolvedObject = $this->getResolvedObject();
-                    $fieldName = $this->getFieldName();
-
-                    if ($this->getLanguageService()->hasLocalization($resolvedObject, $language['uid'])) {
-                        $localizedValue = $this->getLanguageService()->getLocalizedFieldName($resolvedObject, $language['uid'], $fieldName);
-                        $status = LocalizationStatus::LOCALIZED;
-
-                        // Replace blank value by something more meaningful for the End User.
-                        if (empty($localizedValue)) {
-                            $status = LocalizationStatus::EMPTY_VALUE;
-                            $localizedValue = $this->isEditable() ? $this->getEmptyValuePlaceholder() : '';
-                        }
-                    } else {
-                        $localizedValue = sprintf('<a href="%s" style="color: black">%s</a>',
-                            $this->getLocalizedUri($language['uid']),
-                            $this->getLabelService()->sL('LLL:EXT:vidi/Resources/Private/Language/locallang.xlf:create_translation')
-                        );
-                        $status = LocalizationStatus::NOT_YET_LOCALIZED;
-                    }
-
-                    // Feed structure.
-                    $localizedStructure[] = [
-                        'value' => $localizedValue,
-                        'status' => $status,
-                        'language' => (int)$language['uid'],
-                        'languageFlag' => $language['flag'],
-                    ];
-                }
-            }
-        }
-
-        return $localizedStructure;
-    }
-
-    /**
-     * @param array $language
-     * @return bool
-     */
-    protected function isLanguageAllowedForBackendUser(array $language)
-    {
-        return $this->getBackendUser()->checkLanguageAccess($language['uid']);
-    }
-
-    /**
-     * Returns a placeholder when the value is empty.
-     *
-     * @return string
-     */
-    protected function getEmptyValuePlaceholder()
-    {
-        return sprintf('<i>%s</i>',
-            $this->getLabelService()->sL('LLL:EXT:vidi/Resources/Private/Language/locallang.xlf:start_editing')
-        );
-    }
-
-    /**
-     * Tell whether the object will be decorated (or wrapped) for inline editing, localization purpose.
-     *
-     * @return bool
-     */
-    protected function willBeEnriched()
-    {
-
-        $willBeEnriched = false;
-
-        if ($this->fieldExists()) {
-            $willBeEnriched = $this->isEditable() || $this->hasIcon() || $this->isLocalized();
-        }
-
-        return $willBeEnriched;
-    }
-
-    /**
-     * Tell whether the field in the context will be prepended by an icon.
-     *
-     * @return bool
-     */
-    protected function hasIcon()
-    {
-        $dataType = $this->getDataType();
-        return Tca::table($dataType)->getLabelField() === $this->getFieldName();
-    }
-
-    /**
-     * Tell whether the field in the context will be prepended by an icon.
-     *
-     * @return bool
-     */
-    protected function isLocalized()
-    {
-        $object = $this->getObject();
-        $fieldName = $this->getFieldName();
-        $dataType = $this->getDataType();
-        $fieldNameAndPath = $this->getFieldNameAndPath();
-
-        return $this->getLanguageService()->hasLanguages()
-        && Tca::grid($object)->isLocalized($fieldNameAndPath)
-        && Tca::table($dataType)->field($fieldName)->isLocalized();
-    }
-
-    /**
-     * Add some markup to have the content editable in the Grid.
-     *
-     * @param array $localizedStructure
-     * @return array
-     */
-    protected function addEditableMarkup(array $localizedStructure)
-    {
-
-        $dataType = $this->getDataType();
-        $fieldName = $this->getFieldName();
-
-        foreach ($localizedStructure as $index => $structure) {
-            if ($structure['status'] !== LocalizationStatus::NOT_YET_LOCALIZED) {
-                $localizedStructure[$index]['value'] = sprintf('<span class="%s" data-language="%s">%s</span>',
-                    Tca::table($dataType)->field($fieldName)->isTextArea() ? 'editable-textarea' : 'editable-textfield',
-                    $structure['language'],
-                    $structure['value']
-                );
-            }
-        }
-        return $localizedStructure;
-    }
-
-    /**
-     * Add some markup related to the localization.
-     *
-     * @param array $localizedStructure
-     * @return array
-     */
-    protected function addLocalizationMarkup(array $localizedStructure)
-    {
-
-        foreach ($localizedStructure as $index => $structure) {
-
-            $localizedStructure[$index]['value'] = sprintf('<span>%s %s</span>',
-                empty($structure['languageFlag']) ? '' : $this->getIconFactory()->getIcon('flags-' . $structure['languageFlag'], Icon::SIZE_SMALL),
-                $structure['value']
-            );
-        }
-        return $localizedStructure;
-    }
-
-    /**
-     * Add some markup related to the prepended icon.
-     *
-     * @param array $localizedStructure
-     * @return array
-     */
-    protected function addSpriteIconMarkup(array $localizedStructure)
-    {
-
-        $object = $this->getObject();
-
-        foreach ($localizedStructure as $index => $structure) {
-
-            $recordData = [];
-
-            $enablesMethods = array('Hidden', 'Deleted', 'StartTime', 'EndTime');
-            foreach ($enablesMethods as $enableMethod) {
-
-                $methodName = 'get' . $enableMethod . 'Field';
-
-                // Fetch possible hidden filed.
-                $enableField = Tca::table($object)->$methodName();
-                if ($enableField) {
-                    $recordData[$enableField] = $object[$enableField];
-                }
-            }
-
-            // Get Enable Fields of the object to render the sprite with overlays.
-            $localizedStructure[$index]['value'] = sprintf('%s %s',
-                $this->getIconFactory()->getIconForRecord($object->getDataType(), $recordData, Icon::SIZE_SMALL),
-                $structure['value']
-            );
-        }
-
-        return $localizedStructure;
-    }
-
-    /**
-     * Return whether the field given by the context is editable.
-     *
-     * @return boolean
-     */
-    protected function isEditable()
-    {
-        $fieldNameAndPath = $this->getFieldNameAndPath();
-        $dataType = $this->getDataType();
-        $fieldName = $this->getFieldName();
-
-        return Tca::grid()->isEditable($fieldNameAndPath)
-        && Tca::table($dataType)->hasField($fieldName)
-        && Tca::table($dataType)->field($fieldName)->hasNoRelation(); // relation are editable through Renderers only.
-    }
-
-    /**
-     * Return the appropriate URI to create the translation.
-     *
-     * @param int $language
-     * @return string
-     */
-    protected function getLocalizedUri($language)
-    {
-
-        // Transmit recursive selection parameter.
-        $parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $parameters = GeneralUtility::_GP($parameterPrefix);
-
-        $additionalParameters = array(
-            $this->getModuleLoader()->getParameterPrefix() => array(
-                'controller' => 'Content',
-                'action' => 'localize',
-                'format' => 'json',
-                'hasRecursiveSelection' => isset($parameters['hasRecursiveSelection']) ? (int)$parameters['hasRecursiveSelection'] : 0,
-                'fieldNameAndPath' => $this->getFieldNameAndPath(),
-                'language' => $language,
-                'matches' => array(
-                    'uid' => $this->getObject()->getUid(),
-                ),
-            ),
-        );
-
-        return $this->getModuleLoader()->getModuleUrl($additionalParameters);
-    }
-
-    /**
-     * Compute the value for the Content object according to a field name.
-     *
-     * @param Content $object
-     * @param string $fieldNameAndPath
-     * @return string
-     */
-    protected function resolveValue(Content $object, $fieldNameAndPath)
-    {
-
-        // Get the first part of the field name and
-        $fieldName = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath);
-
-        $value = $object[$fieldName];
-
-        // Relation but contains no data.
-        if (is_array($value) && empty($value)) {
-            $value = '';
-        } elseif ($value instanceof Content) {
-
-            $fieldNameOfForeignTable = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
-
-            // true means the field name does not contains a path. "title" vs "metadata.title"
-            // Fetch the default label
-            if ($fieldNameOfForeignTable === $fieldName) {
-                $foreignTable = Tca::table($object->getDataType())->field($fieldName)->getForeignTable();
-                $fieldNameOfForeignTable = Tca::table($foreignTable)->getLabelField();
-            }
-
-            $value = $object[$fieldName][$fieldNameOfForeignTable];
-        }
-
-        return $value;
-    }
-
-    /**
-     * Check whether a string contains HTML tags.
-     *
-     * @param string $string the content to be analyzed
-     * @return boolean
-     */
-    protected function hasHtml($string)
-    {
-        $result = false;
-
-        // We compare the length of the string with html tags and without html tags.
-        if (strlen($string) !== strlen(strip_tags($string))) {
-            $result = true;
-        }
-        return $result;
-    }
-
-    /**
-     * Check whether a string contains potential XSS.
-     *
-     * @param string $string the content to be analyzed
-     * @return boolean
-     */
-    protected function isClean($string)
-    {
-
-        // @todo implement me!
-        $result = true;
-        return $result;
-    }
-
-    /**
-     * Process the value
-     *
-     * @todo implement me as a processor chain to be cleaner implementation wise. Look out at the performance however!
-     *       e.g DefaultValueGridProcessor, TextAreaGridProcessor, ...
-     *
-     * @param string $value
-     * @param Content $object
-     * @param string $fieldNameAndPath
-     * @return string
-     * @throws InvalidKeyInArrayException
-     */
-    protected function processValue($value, Content $object, $fieldNameAndPath)
-    {
-
-        // Set default value if $field name correspond to the label of the table
-        $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
-        if (Tca::table($object->getDataType())->getLabelField() === $fieldName && empty($value)) {
-            $value = sprintf('[%s]', $this->getLabelService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title'));
-        }
-
-        // Sanitize the value in case of "select" or "radio button".
-        if (is_scalar($value)) {
-            $fieldType = Tca::table($object->getDataType())->field($fieldNameAndPath)->getType();
-            if ($fieldType !== FieldType::TEXTAREA) {
-                $value = htmlspecialchars($value);
-            } elseif ($fieldType === FieldType::TEXTAREA && !$this->isClean($value)) {
-                $value = htmlspecialchars($value); // Avoid bad surprise, converts characters to HTML.
-            } elseif ($fieldType === FieldType::TEXTAREA && !$this->hasHtml($value)) {
-                $value = nl2br($value);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Possible value formatting.
-     *
-     * @param string $value
-     * @param array $configuration
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    protected function formatValue($value, array $configuration)
-    {
-        if (empty($configuration['format'])) {
-            return $value;
-        }
-        $className = $configuration['format'];
-
-        /** @var FormatterInterface $formatter */
-        $formatter = GeneralUtility::makeInstance($className);
-        $value = $formatter->format($value);
-
-        return $value;
-    }
-
-    /**
-     * Possible value wrapping.
-     *
-     * @param string $value
-     * @param array $configuration
-     * @return string
-     */
-    protected function wrapValue($value, array $configuration)
-    {
-        if (!empty($configuration['wrap'])) {
-            $parts = explode('|', $configuration['wrap']);
-            $value = implode($value, $parts);
-        }
-        return $value;
-    }
-
-    /**
-     * Tell whether the field in the context really exists.
-     *
-     * @return bool
-     */
-    protected function fieldExists()
-    {
-        if ($this->variables['hasField'] === null) {
-            $dataType = $this->getDataType();
-            $fieldName = $this->getFieldName();
-            $this->variables['hasField'] = Tca::table($dataType)->hasField($fieldName);
-        }
-        return $this->variables['hasField'];
-    }
-
-    /**
-     * @return string
-     */
-    protected function getDataType()
-    {
-        return $this->variables['dataType'];
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldName()
-    {
-        return $this->variables['fieldName'];
-    }
-
-    /**
-     * @return string
-     */
-    protected function getFieldNameAndPath()
-    {
-        return $this->variables['fieldNameAndPath'];
-    }
-
-    /**
-     * @return Content
-     */
-    protected function getObject()
-    {
-        return $this->variables['object'];
-    }
-
-    /**
-     * @return Content
-     * @throws \InvalidArgumentException
-     */
-    protected function getResolvedObject()
-    {
-        if (empty($this->variables['resolvedObject'])) {
-            $object = $this->getObject();
-            $fieldNameAndPath = $this->getFieldNameAndPath();
-            $this->variables['resolvedObject'] = $this->getContentObjectResolver()->getObject($object, $fieldNameAndPath);
-        }
-        return $this->variables['resolvedObject'];
-    }
-
-    /**
-     * @return FieldPathResolver|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
-
-    /**
-     * @return ContentObjectResolver|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance(ContentObjectResolver::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\Localization\LanguageService
-     */
-    protected function getLabelService()
-    {
-        return $GLOBALS['LANG'];
-    }
-
-    /**
-     * @return LanguageService|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getLanguageService()
-    {
-        return GeneralUtility::makeInstance(LanguageService::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $columns = [];
+
+	/**
+	 * Registry for storing variable values and speed up the processing.
+	 *
+	 * @var array
+	 */
+	protected $variables = [];
+
+	/**
+	 * @param array $columns
+	 */
+	public function __construct(array $columns = [])
+	{
+		$this->columns = $columns;
+	}
+
+	/**
+	 * Render a row to be displayed in the Grid given an Content Object.
+	 *
+	 * @param Content $object
+	 * @param int $rowIndex
+	 * @return array
+	 * @throws \Exception
+	 */
+	public function render(Content $object = null, $rowIndex = 0)
+	{
+
+		// Initialize returned array
+		$output = [];
+
+		foreach (Tca::grid()->getFields() as $fieldNameAndPath => $configuration) {
+
+			$value = ''; // default is empty at first.
+
+			$this->computeVariables($object, $fieldNameAndPath);
+
+			// Only compute the value if it is going to be shown in the Grid. Lost of time otherwise!
+			if (in_array($fieldNameAndPath, $this->columns)) {
+
+				// Fetch value
+				if (Tca::grid()->hasRenderers($fieldNameAndPath)) {
+
+					$value = '';
+					$renderers = Tca::grid()->getRenderers($fieldNameAndPath);
+
+					// if is relation has one
+					foreach ($renderers as $rendererClassName => $rendererConfiguration) {
+
+						/** @var $rendererObject \Fab\Vidi\Grid\ColumnRendererInterface */
+						$rendererObject = GeneralUtility::makeInstance($rendererClassName);
+						$value .= $rendererObject
+							->setObject($object)
+							->setFieldName($fieldNameAndPath)
+							->setRowIndex($rowIndex)
+							->setFieldConfiguration($configuration)
+							->setGridRendererConfiguration($rendererConfiguration)
+							->render();
+					}
+				} else {
+					$value = $this->resolveValue($object, $fieldNameAndPath);
+					$value = $this->processValue($value, $object, $fieldNameAndPath); // post resolve processing.
+				}
+
+				// Possible formatting given by configuration. @see TCA['grid']
+				$value = $this->formatValue($value, $configuration);
+
+				// Here, there is the chance to further "decorate" the value for inline editing, localization, ...
+				if ($this->willBeEnriched()) {
+
+					$localizedStructure = $this->initializeLocalizedStructure($value);
+
+					if ($this->isEditable()) {
+						$localizedStructure = $this->addEditableMarkup($localizedStructure);
+					}
+
+					if ($this->isLocalized()) {
+						$localizedStructure = $this->addLocalizationMarkup($localizedStructure);
+					}
+
+					if ($this->hasIcon()) {
+						$localizedStructure = $this->addSpriteIconMarkup($localizedStructure);
+					}
+
+					$value = $this->flattenStructure($localizedStructure);
+				}
+
+				// Final wrap given by configuration. @see TCA['grid']
+				$value = $this->wrapValue($value, $configuration);
+			}
+
+			$output[$this->getFieldName()] = $value;
+		}
+
+		$output['DT_RowId'] = 'row-' . $object->getUid();
+		$output['DT_RowClass'] = sprintf('%s_%s', $object->getDataType(), $object->getUid());
+
+		return $output;
+	}
+
+	/**
+	 * Flatten the localized structure to render the final value
+	 *
+	 * @param array $localizedStructure
+	 * @return string
+	 */
+	protected function flattenStructure(array $localizedStructure)
+	{
+
+		// Flatten the structure.
+		$value = '';
+		foreach ($localizedStructure as $structure) {
+			$value .= sprintf('<div class="%s">%s</div>',
+				$structure['status'] !== LocalizationStatus::LOCALIZED ? 'invisible' : '',
+				$structure['value']
+			);
+		}
+		return $value;
+	}
+
+	/**
+	 * Store some often used variable values and speed up the processing.
+	 *
+	 * @param Content $object
+	 * @param string $fieldNameAndPath
+	 * @return void
+	 */
+	protected function computeVariables(Content $object, $fieldNameAndPath)
+	{
+		$this->variables = [];
+		$this->variables['dataType'] = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
+		$this->variables['fieldName'] = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+		$this->variables['fieldNameAndPath'] = $fieldNameAndPath;
+		$this->variables['object'] = $object;
+	}
+
+	/**
+	 * Tell whether the object will be decorated / wrapped such as
+	 *
+	 * @param string $value
+	 * @return array
+	 */
+	protected function initializeLocalizedStructure($value)
+	{
+
+		$localizedStructure[] = [
+			'value' => empty($value) && $this->isEditable() ? $this->getEmptyValuePlaceholder() : $value,
+			'status' => empty($value) ? LocalizationStatus::EMPTY_VALUE : LocalizationStatus::LOCALIZED,
+			'language' => 0,
+			'languageFlag' => $defaultLanguage = $this->getLanguageService()->getDefaultFlag(),
+		];
+
+		if ($this->isLocalized()) {
+
+			foreach ($this->getLanguageService()->getLanguages() as $language) {
+
+				// Make sure the language is allowed for the current Backend User.
+				if ($this->isLanguageAllowedForBackendUser($language)) {
+
+					$resolvedObject = $this->getResolvedObject();
+					$fieldName = $this->getFieldName();
+
+					if ($this->getLanguageService()->hasLocalization($resolvedObject, $language['uid'])) {
+						$localizedValue = $this->getLanguageService()->getLocalizedFieldName($resolvedObject, $language['uid'], $fieldName);
+						$status = LocalizationStatus::LOCALIZED;
+
+						// Replace blank value by something more meaningful for the End User.
+						if (empty($localizedValue)) {
+							$status = LocalizationStatus::EMPTY_VALUE;
+							$localizedValue = $this->isEditable() ? $this->getEmptyValuePlaceholder() : '';
+						}
+					} else {
+						$localizedValue = sprintf('<a href="%s" style="color: black">%s</a>',
+							$this->getLocalizedUri($language['uid']),
+							$this->getLabelService()->sL('LLL:EXT:vidi/Resources/Private/Language/locallang.xlf:create_translation')
+						);
+						$status = LocalizationStatus::NOT_YET_LOCALIZED;
+					}
+
+					// Feed structure.
+					$localizedStructure[] = [
+						'value' => $localizedValue,
+						'status' => $status,
+						'language' => (int)$language['uid'],
+						'languageFlag' => $language['flag'],
+					];
+				}
+			}
+		}
+
+		return $localizedStructure;
+	}
+
+	/**
+	 * @param array $language
+	 * @return bool
+	 */
+	protected function isLanguageAllowedForBackendUser(array $language)
+	{
+		return $this->getBackendUser()->checkLanguageAccess($language['uid']);
+	}
+
+	/**
+	 * Returns a placeholder when the value is empty.
+	 *
+	 * @return string
+	 */
+	protected function getEmptyValuePlaceholder()
+	{
+		return sprintf('<i>%s</i>',
+			$this->getLabelService()->sL('LLL:EXT:vidi/Resources/Private/Language/locallang.xlf:start_editing')
+		);
+	}
+
+	/**
+	 * Tell whether the object will be decorated (or wrapped) for inline editing, localization purpose.
+	 *
+	 * @return bool
+	 */
+	protected function willBeEnriched()
+	{
+
+		$willBeEnriched = false;
+
+		if ($this->fieldExists()) {
+			$willBeEnriched = $this->isEditable() || $this->hasIcon() || $this->isLocalized();
+		}
+
+		return $willBeEnriched;
+	}
+
+	/**
+	 * Tell whether the field in the context will be prepended by an icon.
+	 *
+	 * @return bool
+	 */
+	protected function hasIcon()
+	{
+		$dataType = $this->getDataType();
+		return Tca::table($dataType)->getLabelField() === $this->getFieldName();
+	}
+
+	/**
+	 * Tell whether the field in the context will be prepended by an icon.
+	 *
+	 * @return bool
+	 */
+	protected function isLocalized()
+	{
+		$object = $this->getObject();
+		$fieldName = $this->getFieldName();
+		$dataType = $this->getDataType();
+		$fieldNameAndPath = $this->getFieldNameAndPath();
+
+		return $this->getLanguageService()->hasLanguages()
+		&& Tca::grid($object)->isLocalized($fieldNameAndPath)
+		&& Tca::table($dataType)->field($fieldName)->isLocalized();
+	}
+
+	/**
+	 * Add some markup to have the content editable in the Grid.
+	 *
+	 * @param array $localizedStructure
+	 * @return array
+	 */
+	protected function addEditableMarkup(array $localizedStructure)
+	{
+
+		$dataType = $this->getDataType();
+		$fieldName = $this->getFieldName();
+
+		foreach ($localizedStructure as $index => $structure) {
+			if ($structure['status'] !== LocalizationStatus::NOT_YET_LOCALIZED) {
+				$localizedStructure[$index]['value'] = sprintf('<span class="%s" data-language="%s">%s</span>',
+					Tca::table($dataType)->field($fieldName)->isTextArea() ? 'editable-textarea' : 'editable-textfield',
+					$structure['language'],
+					$structure['value']
+				);
+			}
+		}
+		return $localizedStructure;
+	}
+
+	/**
+	 * Add some markup related to the localization.
+	 *
+	 * @param array $localizedStructure
+	 * @return array
+	 */
+	protected function addLocalizationMarkup(array $localizedStructure)
+	{
+
+		foreach ($localizedStructure as $index => $structure) {
+
+			$localizedStructure[$index]['value'] = sprintf('<span>%s %s</span>',
+				empty($structure['languageFlag']) ? '' : $this->getIconFactory()->getIcon('flags-' . $structure['languageFlag'], Icon::SIZE_SMALL),
+				$structure['value']
+			);
+		}
+		return $localizedStructure;
+	}
+
+	/**
+	 * Add some markup related to the prepended icon.
+	 *
+	 * @param array $localizedStructure
+	 * @return array
+	 */
+	protected function addSpriteIconMarkup(array $localizedStructure)
+	{
+
+		$object = $this->getObject();
+
+		foreach ($localizedStructure as $index => $structure) {
+
+			$recordData = [];
+
+			$enablesMethods = array('Hidden', 'Deleted', 'StartTime', 'EndTime');
+			foreach ($enablesMethods as $enableMethod) {
+
+				$methodName = 'get' . $enableMethod . 'Field';
+
+				// Fetch possible hidden filed.
+				$enableField = Tca::table($object)->$methodName();
+				if ($enableField) {
+					$recordData[$enableField] = $object[$enableField];
+				}
+			}
+
+			// Get Enable Fields of the object to render the sprite with overlays.
+			$localizedStructure[$index]['value'] = sprintf('%s %s',
+				$this->getIconFactory()->getIconForRecord($object->getDataType(), $recordData, Icon::SIZE_SMALL),
+				$structure['value']
+			);
+		}
+
+		return $localizedStructure;
+	}
+
+	/**
+	 * Return whether the field given by the context is editable.
+	 *
+	 * @return boolean
+	 */
+	protected function isEditable()
+	{
+		$fieldNameAndPath = $this->getFieldNameAndPath();
+		$dataType = $this->getDataType();
+		$fieldName = $this->getFieldName();
+
+		return Tca::grid()->isEditable($fieldNameAndPath)
+		&& Tca::table($dataType)->hasField($fieldName)
+		&& Tca::table($dataType)->field($fieldName)->hasNoRelation(); // relation are editable through Renderers only.
+	}
+
+	/**
+	 * Return the appropriate URI to create the translation.
+	 *
+	 * @param int $language
+	 * @return string
+	 */
+	protected function getLocalizedUri($language)
+	{
+
+		// Transmit recursive selection parameter.
+		$parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$parameters = GeneralUtility::_GP($parameterPrefix);
+
+		$additionalParameters = array(
+			$this->getModuleLoader()->getParameterPrefix() => array(
+				'controller' => 'Content',
+				'action' => 'localize',
+				'format' => 'json',
+				'hasRecursiveSelection' => isset($parameters['hasRecursiveSelection']) ? (int)$parameters['hasRecursiveSelection'] : 0,
+				'fieldNameAndPath' => $this->getFieldNameAndPath(),
+				'language' => $language,
+				'matches' => array(
+					'uid' => $this->getObject()->getUid(),
+				),
+			),
+		);
+
+		return $this->getModuleLoader()->getModuleUrl($additionalParameters);
+	}
+
+	/**
+	 * Compute the value for the Content object according to a field name.
+	 *
+	 * @param Content $object
+	 * @param string $fieldNameAndPath
+	 * @return string
+	 */
+	protected function resolveValue(Content $object, $fieldNameAndPath)
+	{
+
+		// Get the first part of the field name and
+		$fieldName = $this->getFieldPathResolver()->stripFieldName($fieldNameAndPath);
+
+		$value = $object[$fieldName];
+
+		// Relation but contains no data.
+		if (is_array($value) && empty($value)) {
+			$value = '';
+		} elseif ($value instanceof Content) {
+
+			$fieldNameOfForeignTable = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+
+			// true means the field name does not contains a path. "title" vs "metadata.title"
+			// Fetch the default label
+			if ($fieldNameOfForeignTable === $fieldName) {
+				$foreignTable = Tca::table($object->getDataType())->field($fieldName)->getForeignTable();
+				$fieldNameOfForeignTable = Tca::table($foreignTable)->getLabelField();
+			}
+
+			$value = $object[$fieldName][$fieldNameOfForeignTable];
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Check whether a string contains HTML tags.
+	 *
+	 * @param string $string the content to be analyzed
+	 * @return boolean
+	 */
+	protected function hasHtml($string)
+	{
+		$result = false;
+
+		// We compare the length of the string with html tags and without html tags.
+		if (strlen($string) !== strlen(strip_tags($string))) {
+			$result = true;
+		}
+		return $result;
+	}
+
+	/**
+	 * Check whether a string contains potential XSS.
+	 *
+	 * @param string $string the content to be analyzed
+	 * @return boolean
+	 */
+	protected function isClean($string)
+	{
+
+		// @todo implement me!
+		$result = true;
+		return $result;
+	}
+
+	/**
+	 * Process the value
+	 *
+	 * @todo implement me as a processor chain to be cleaner implementation wise. Look out at the performance however!
+	 *       e.g DefaultValueGridProcessor, TextAreaGridProcessor, ...
+	 *
+	 * @param string $value
+	 * @param Content $object
+	 * @param string $fieldNameAndPath
+	 * @return string
+	 * @throws InvalidKeyInArrayException
+	 */
+	protected function processValue($value, Content $object, $fieldNameAndPath)
+	{
+
+		// Set default value if $field name correspond to the label of the table
+		$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+		if (Tca::table($object->getDataType())->getLabelField() === $fieldName && empty($value)) {
+			$value = sprintf('[%s]', $this->getLabelService()->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:labels.no_title'));
+		}
+
+		// Sanitize the value in case of "select" or "radio button".
+		if (is_scalar($value)) {
+			$fieldType = Tca::table($object->getDataType())->field($fieldNameAndPath)->getType();
+			if ($fieldType !== FieldType::TEXTAREA) {
+				$value = htmlspecialchars($value);
+			} elseif ($fieldType === FieldType::TEXTAREA && !$this->isClean($value)) {
+				$value = htmlspecialchars($value); // Avoid bad surprise, converts characters to HTML.
+			} elseif ($fieldType === FieldType::TEXTAREA && !$this->hasHtml($value)) {
+				$value = nl2br($value);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Possible value formatting.
+	 *
+	 * @param string $value
+	 * @param array $configuration
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	protected function formatValue($value, array $configuration)
+	{
+		if (empty($configuration['format'])) {
+			return $value;
+		}
+		$className = $configuration['format'];
+
+		/** @var FormatterInterface $formatter */
+		$formatter = GeneralUtility::makeInstance($className);
+		$value = $formatter->format($value);
+
+		return $value;
+	}
+
+	/**
+	 * Possible value wrapping.
+	 *
+	 * @param string $value
+	 * @param array $configuration
+	 * @return string
+	 */
+	protected function wrapValue($value, array $configuration)
+	{
+		if (!empty($configuration['wrap'])) {
+			$parts = explode('|', $configuration['wrap']);
+			$value = implode($value, $parts);
+		}
+		return $value;
+	}
+
+	/**
+	 * Tell whether the field in the context really exists.
+	 *
+	 * @return bool
+	 */
+	protected function fieldExists()
+	{
+		if ($this->variables['hasField'] === null) {
+			$dataType = $this->getDataType();
+			$fieldName = $this->getFieldName();
+			$this->variables['hasField'] = Tca::table($dataType)->hasField($fieldName);
+		}
+		return $this->variables['hasField'];
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getDataType()
+	{
+		return $this->variables['dataType'];
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldName()
+	{
+		return $this->variables['fieldName'];
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getFieldNameAndPath()
+	{
+		return $this->variables['fieldNameAndPath'];
+	}
+
+	/**
+	 * @return Content
+	 */
+	protected function getObject()
+	{
+		return $this->variables['object'];
+	}
+
+	/**
+	 * @return Content
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getResolvedObject()
+	{
+		if (empty($this->variables['resolvedObject'])) {
+			$object = $this->getObject();
+			$fieldNameAndPath = $this->getFieldNameAndPath();
+			$this->variables['resolvedObject'] = $this->getContentObjectResolver()->getObject($object, $fieldNameAndPath);
+		}
+		return $this->variables['resolvedObject'];
+	}
+
+	/**
+	 * @return FieldPathResolver|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
+
+	/**
+	 * @return ContentObjectResolver|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance(ContentObjectResolver::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\Localization\LanguageService
+	 */
+	protected function getLabelService()
+	{
+		return $GLOBALS['LANG'];
+	}
+
+	/**
+	 * @return LanguageService|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getLanguageService()
+	{
+		return GeneralUtility::makeInstance(LanguageService::class);
+	}
 
 }

Tests/Functional/Domain/Model/ContentTest.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
 
 use Fab\Vidi\Tests\Functional\AbstractFunctionalTestCase;
 
-require_once dirname(dirname(dirname(__FILE__))) . '/AbstractFunctionalTestCase.php';
+require_once dirname(dirname(dirname(__FILE__))).'/AbstractFunctionalTestCase.php';
 
 /**
  * Test case for class \Fab\Vidi\Domain\Model\Content.
@@ -113,8 +113,8 @@ 
 	 * @dataProvider propertyProvider
 	 */
 	public function testProperty($propertyName, $value) {
-		$setter = 'set' . ucfirst($propertyName);
-		$getter = 'get' . ucfirst($propertyName);
+		$setter = 'set'.ucfirst($propertyName);
+		$getter = 'get'.ucfirst($propertyName);
 		$this->markTestIncomplete(); # TCA must be faked
 		#call_user_func_array(array($this->fixture, $setter), array($value));
 		#$this->assertEquals($value, call_user_func(array($this->fixture, $getter)));

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;
+	}
 
 }

Classes/Persistence/Order.php

Indentation +38 added lines, -38 removed lines

@@ -14,45 +14,45 @@
 class Order
 {
 
-    /**
-     * The orderings
-     *
-     * @var array
-     */
-    protected $orderings = [];
+	/**
+	 * The orderings
+	 *
+	 * @var array
+	 */
+	protected $orderings = [];
 
-    /**
-     * Constructs a new Order
-     *
-     * @para array $orders
-     * @param array $orders
-     */
-    public function __construct($orders = array())
-    {
-        foreach ($orders as $order => $direction) {
-            $this->addOrdering($order, $direction);
-        }
-    }
+	/**
+	 * Constructs a new Order
+	 *
+	 * @para array $orders
+	 * @param array $orders
+	 */
+	public function __construct($orders = array())
+	{
+		foreach ($orders as $order => $direction) {
+			$this->addOrdering($order, $direction);
+		}
+	}
 
-    /**
-     * Add ordering
-     *
-     * @param string $order The order
-     * @param string $direction ASC / DESC
-     * @return void
-     */
-    public function addOrdering($order, $direction)
-    {
-        $this->orderings[$order] = $direction;
-    }
+	/**
+	 * Add ordering
+	 *
+	 * @param string $order The order
+	 * @param string $direction ASC / DESC
+	 * @return void
+	 */
+	public function addOrdering($order, $direction)
+	{
+		$this->orderings[$order] = $direction;
+	}
 
-    /**
-     * Returns the order
-     *
-     * @return array The order
-     */
-    public function getOrderings()
-    {
-        return $this->orderings;
-    }
+	/**
+	 * Returns the order
+	 *
+	 * @return array The order
+	 */
+	public function getOrderings()
+	{
+		return $this->orderings;
+	}
 }

Classes/Mvc/JsonResult.php

Indentation +117 added lines, -117 removed lines

@@ -14,121 +14,121 @@
 class JsonResult
 {
 
-    /**
-     * @var int
-     */
-    protected $numberOfObjects = 0;
-
-    /**
-     * @var int
-     */
-    protected $numberOfProcessedObjects = 0;
-
-    /**
-     * @var array
-     */
-    protected $errorMessages = [];
-
-    /**
-     * @var array
-     */
-    protected $processedObject = [];
-
-    /**
-     * @var array
-     */
-    protected $row = null;
-
-    /**
-     * @return $this
-     */
-    public function incrementNumberOfProcessedObjects()
-    {
-        $this->numberOfProcessedObjects++;
-    }
-
-    /**
-     * @param string $errorMessages
-     * @return $this
-     */
-    public function addErrorMessages($errorMessages)
-    {
-        if (!empty($errorMessages)) {
-            $this->errorMessages[] = $errorMessages;
-        } else {
-            $this->incrementNumberOfProcessedObjects();
-        }
-        return $this;
-    }
-
-    /**
-     * @param array $errorMessages
-     * @return $this
-     */
-    public function setErrorMessages($errorMessages)
-    {
-        $this->errorMessages = $errorMessages;
-        return $this;
-    }
-
-    /**
-     * @param array $processedObject
-     * @return $this
-     */
-    public function setProcessedObject($processedObject)
-    {
-        $this->processedObject = $processedObject;
-        return $this;
-    }
-
-    /**
-     * @return $this
-     */
-    public function hasErrors()
-    {
-        return !empty($this->errorMessages);
-    }
-
-    /**
-     * @param mixed $numberOfObjects
-     * @return $this
-     */
-    public function setNumberOfObjects($numberOfObjects)
-    {
-        $this->numberOfObjects = $numberOfObjects;
-        return $this;
-    }
-
-    /**
-     * @param mixed $row
-     * @return $this
-     */
-    public function setRow(array $row)
-    {
-        $this->row = $row;
-        return $this;
-    }
-
-    /**
-     * Convert $this to array
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $arrayValues = array(
-            'numberOfObjects' => $this->numberOfObjects,
-            'numberOfProcessedObjects' => $this->numberOfProcessedObjects,
-            'hasErrors' => $this->hasErrors(),
-            'errorMessages' => $this->errorMessages,
-            'row' => $this->row,
-        );
-
-        // Only feed key processedObject if it has values.
-        if (!empty($this->processedObject)) {
-            $arrayValues['processedObject'] = $this->processedObject;
-        }
-
-        return $arrayValues;
-    }
+	/**
+	 * @var int
+	 */
+	protected $numberOfObjects = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $numberOfProcessedObjects = 0;
+
+	/**
+	 * @var array
+	 */
+	protected $errorMessages = [];
+
+	/**
+	 * @var array
+	 */
+	protected $processedObject = [];
+
+	/**
+	 * @var array
+	 */
+	protected $row = null;
+
+	/**
+	 * @return $this
+	 */
+	public function incrementNumberOfProcessedObjects()
+	{
+		$this->numberOfProcessedObjects++;
+	}
+
+	/**
+	 * @param string $errorMessages
+	 * @return $this
+	 */
+	public function addErrorMessages($errorMessages)
+	{
+		if (!empty($errorMessages)) {
+			$this->errorMessages[] = $errorMessages;
+		} else {
+			$this->incrementNumberOfProcessedObjects();
+		}
+		return $this;
+	}
+
+	/**
+	 * @param array $errorMessages
+	 * @return $this
+	 */
+	public function setErrorMessages($errorMessages)
+	{
+		$this->errorMessages = $errorMessages;
+		return $this;
+	}
+
+	/**
+	 * @param array $processedObject
+	 * @return $this
+	 */
+	public function setProcessedObject($processedObject)
+	{
+		$this->processedObject = $processedObject;
+		return $this;
+	}
+
+	/**
+	 * @return $this
+	 */
+	public function hasErrors()
+	{
+		return !empty($this->errorMessages);
+	}
+
+	/**
+	 * @param mixed $numberOfObjects
+	 * @return $this
+	 */
+	public function setNumberOfObjects($numberOfObjects)
+	{
+		$this->numberOfObjects = $numberOfObjects;
+		return $this;
+	}
+
+	/**
+	 * @param mixed $row
+	 * @return $this
+	 */
+	public function setRow(array $row)
+	{
+		$this->row = $row;
+		return $this;
+	}
+
+	/**
+	 * Convert $this to array
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$arrayValues = array(
+			'numberOfObjects' => $this->numberOfObjects,
+			'numberOfProcessedObjects' => $this->numberOfProcessedObjects,
+			'hasErrors' => $this->hasErrors(),
+			'errorMessages' => $this->errorMessages,
+			'row' => $this->row,
+		);
+
+		// Only feed key processedObject if it has values.
+		if (!empty($this->processedObject)) {
+			$arrayValues['processedObject'] = $this->processedObject;
+		}
+
+		return $arrayValues;
+	}
 }
\ No newline at end of file