fabarea / vidi

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

Classes/Converter/Field.php

Indentation +93 added lines, -93 removed lines

@@ -18,98 +18,98 @@
 class Field implements SingletonInterface
 {
 
-    /**
-     * @var string
-     */
-    static protected $currentField;
-
-    /**
-     * @var string
-     */
-    static protected $currentTable;
-
-    /**
-     * @var array
-     */
-    protected $storage = [];
-
-    /**
-     * @param string $fieldName
-     * @return $this
-     * @throws \InvalidArgumentException
-     */
-    static public function name($fieldName)
-    {
-        self::$currentField = $fieldName;
-        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
-     * @throws \RuntimeException
-     */
-    public function toPropertyName()
-    {
-
-        $fieldName = $this->getFieldName();
-        $tableName = $this->getTableName();
-
-        if (empty($this->storage[$tableName][$fieldName])) {
-            if ($this->storage[$tableName]) {
-                $this->storage[$tableName] = [];
-            }
-
-            // Special case when the field name does not follow the conventions "field_name" => "fieldName".
-            // Rely on mapping for those cases.
-            if (!empty($GLOBALS['TCA'][$tableName]['vidi']['mappings'][$fieldName])) {
-                $propertyName = $GLOBALS['TCA'][$tableName]['vidi']['mappings'][$fieldName];
-            } else {
-                $propertyName = GeneralUtility::underscoredToLowerCamelCase($fieldName);
-            }
-
-            $this->storage[$tableName][$fieldName] = $propertyName;
-        }
-
-        return $this->storage[$tableName][$fieldName];
-    }
-
-    /**
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getFieldName()
-    {
-        $fieldName = self::$currentField;
-        if (empty($fieldName)) {
-            throw new \RuntimeException('I could not find a field name value.', 1403203290);
-        }
-        return $fieldName;
-    }
-
-    /**
-     * @return string
-     */
-    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 $currentField;
+
+	/**
+	 * @var string
+	 */
+	static protected $currentTable;
+
+	/**
+	 * @var array
+	 */
+	protected $storage = [];
+
+	/**
+	 * @param string $fieldName
+	 * @return $this
+	 * @throws \InvalidArgumentException
+	 */
+	static public function name($fieldName)
+	{
+		self::$currentField = $fieldName;
+		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
+	 * @throws \RuntimeException
+	 */
+	public function toPropertyName()
+	{
+
+		$fieldName = $this->getFieldName();
+		$tableName = $this->getTableName();
+
+		if (empty($this->storage[$tableName][$fieldName])) {
+			if ($this->storage[$tableName]) {
+				$this->storage[$tableName] = [];
+			}
+
+			// Special case when the field name does not follow the conventions "field_name" => "fieldName".
+			// Rely on mapping for those cases.
+			if (!empty($GLOBALS['TCA'][$tableName]['vidi']['mappings'][$fieldName])) {
+				$propertyName = $GLOBALS['TCA'][$tableName]['vidi']['mappings'][$fieldName];
+			} else {
+				$propertyName = GeneralUtility::underscoredToLowerCamelCase($fieldName);
+			}
+
+			$this->storage[$tableName][$fieldName] = $propertyName;
+		}
+
+		return $this->storage[$tableName][$fieldName];
+	}
+
+	/**
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getFieldName()
+	{
+		$fieldName = self::$currentField;
+		if (empty($fieldName)) {
+			throw new \RuntimeException('I could not find a field name value.', 1403203290);
+		}
+		return $fieldName;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getTableName()
+	{
+		$tableName = self::$currentTable;
+		if (empty($tableName)) {
+			throw new \RuntimeException('I could not find a table name value.', 1403203291);
+		}
+		return $tableName;
+	}
 
 }

Classes/Processor/MarkerProcessor.php

Indentation +109 added lines, -109 removed lines

@@ -20,114 +20,114 @@
 class MarkerProcessor implements SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $wellKnownMarkers = array(
-        '{*}',
-        '{counter}',
-        '{date}',
-        '{creation_date}'
-    );
-
-    /**
-     * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
-     */
-    public function processMarkers(ProcessContentDataSignalArguments $signalArguments)
-    {
-
-        $contentData = $signalArguments->getContentData();
-        $creationTime = $this->getCreationTime($signalArguments);
-
-        // Process markers
-        foreach ($signalArguments->getContentData() as $fieldName => $updateValue) {
-            if (is_scalar($updateValue)) {
-
-                $currentValue = $this->getContentObjectResolver()->getValue(
-                    $signalArguments->getContentObject(),
-                    $signalArguments->getFieldNameAndPath(),
-                    $fieldName,
-                    $signalArguments->getLanguage()
-                );
-                $counter = $signalArguments->getCounter();
-
-                $updateValue = $this->searchAndReplace($updateValue, $currentValue);
-                $updateValue = $this->replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime);
-
-                $contentData[$fieldName] = $updateValue;
-            }
-        }
-
-        $signalArguments->setContentData($contentData);
-        return array($signalArguments);
-    }
-
-    /**
-     * @param string $updateValue
-     * @param string $currentValue
-     * @param int $counter
-     * @param $creationTime
-     * @return string
-     */
-    protected function replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime)
-    {
-
-        // Replaces values.
-        $replaces = array(
-            $currentValue,
-            $counter,
-            date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']),
-            date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'], $creationTime),
-        );
-
-        // Replace me!
-        return str_replace($this->wellKnownMarkers, $replaces, $updateValue);
-    }
-
-    /**
-     * @param string $updateValue
-     * @param string $currentValue
-     * @return string
-     */
-    protected function searchAndReplace($updateValue, $currentValue)
-    {
-
-        if (strpos($updateValue, 's/') !== false) {
-            $structure = explode('/', $updateValue);
-            $search = $structure[1];
-            $replace = $structure[2];
-
-            // Perhaps needs to be improved here if $search contains "/" precisely.
-            $updateValue = preg_replace('/' . $search . '/isU', $replace, $currentValue);
-        }
-        return $updateValue;
-    }
-
-    /**
-     * @param ProcessContentDataSignalArguments $signalArguments
-     * @return int
-     */
-    protected function getCreationTime(ProcessContentDataSignalArguments $signalArguments)
-    {
-        $creationTime = 0;
-        $creationTimeField = Tca::table($signalArguments->getContentObject()->getDataType())->getTimeCreationField();
-        if ($creationTimeField) {
-            $creationTime = $this->getContentObjectResolver()->getValue(
-                $signalArguments->getContentObject(),
-                $signalArguments->getFieldNameAndPath(),
-                $creationTimeField
-            );
-        }
-        return $creationTime;
-    }
-
-    /**
-     * @return ContentObjectResolver
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance(ContentObjectResolver::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $wellKnownMarkers = array(
+		'{*}',
+		'{counter}',
+		'{date}',
+		'{creation_date}'
+	);
+
+	/**
+	 * @param ProcessContentDataSignalArguments $signalArguments
+	 * @return array
+	 */
+	public function processMarkers(ProcessContentDataSignalArguments $signalArguments)
+	{
+
+		$contentData = $signalArguments->getContentData();
+		$creationTime = $this->getCreationTime($signalArguments);
+
+		// Process markers
+		foreach ($signalArguments->getContentData() as $fieldName => $updateValue) {
+			if (is_scalar($updateValue)) {
+
+				$currentValue = $this->getContentObjectResolver()->getValue(
+					$signalArguments->getContentObject(),
+					$signalArguments->getFieldNameAndPath(),
+					$fieldName,
+					$signalArguments->getLanguage()
+				);
+				$counter = $signalArguments->getCounter();
+
+				$updateValue = $this->searchAndReplace($updateValue, $currentValue);
+				$updateValue = $this->replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime);
+
+				$contentData[$fieldName] = $updateValue;
+			}
+		}
+
+		$signalArguments->setContentData($contentData);
+		return array($signalArguments);
+	}
+
+	/**
+	 * @param string $updateValue
+	 * @param string $currentValue
+	 * @param int $counter
+	 * @param $creationTime
+	 * @return string
+	 */
+	protected function replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime)
+	{
+
+		// Replaces values.
+		$replaces = array(
+			$currentValue,
+			$counter,
+			date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']),
+			date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'], $creationTime),
+		);
+
+		// Replace me!
+		return str_replace($this->wellKnownMarkers, $replaces, $updateValue);
+	}
+
+	/**
+	 * @param string $updateValue
+	 * @param string $currentValue
+	 * @return string
+	 */
+	protected function searchAndReplace($updateValue, $currentValue)
+	{
+
+		if (strpos($updateValue, 's/') !== false) {
+			$structure = explode('/', $updateValue);
+			$search = $structure[1];
+			$replace = $structure[2];
+
+			// Perhaps needs to be improved here if $search contains "/" precisely.
+			$updateValue = preg_replace('/' . $search . '/isU', $replace, $currentValue);
+		}
+		return $updateValue;
+	}
+
+	/**
+	 * @param ProcessContentDataSignalArguments $signalArguments
+	 * @return int
+	 */
+	protected function getCreationTime(ProcessContentDataSignalArguments $signalArguments)
+	{
+		$creationTime = 0;
+		$creationTimeField = Tca::table($signalArguments->getContentObject()->getDataType())->getTimeCreationField();
+		if ($creationTimeField) {
+			$creationTime = $this->getContentObjectResolver()->getValue(
+				$signalArguments->getContentObject(),
+				$signalArguments->getFieldNameAndPath(),
+				$creationTimeField
+			);
+		}
+		return $creationTime;
+	}
+
+	/**
+	 * @return ContentObjectResolver
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance(ContentObjectResolver::class);
+	}
 
 }

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

Classes/TypeConverter/CsvToArrayConverter.php

Indentation +31 added lines, -31 removed lines

@@ -18,36 +18,36 @@
 class CsvToArrayConverter extends AbstractTypeConverter
 {
 
-    /**
-     * @var array<string>
-     */
-    protected $sourceTypes = array('string');
-
-    /**
-     * @var string
-     */
-    protected $targetType = 'array';
-
-    /**
-     * @var integer
-     */
-    protected $priority = 1;
-
-    /**
-     * Actually convert from $source to $targetType
-     *
-     * @param string $source
-     * @param string $targetType
-     * @param array $convertedChildProperties
-     * @param PropertyMappingConfigurationInterface $configuration
-     * @return array
-     * @throws \Exception
-     * @throws \TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException
-     * @api
-     */
-    public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
-    {
-        return GeneralUtility::trimExplode(',', $source, true);
-    }
+	/**
+	 * @var array<string>
+	 */
+	protected $sourceTypes = array('string');
+
+	/**
+	 * @var string
+	 */
+	protected $targetType = 'array';
+
+	/**
+	 * @var integer
+	 */
+	protected $priority = 1;
+
+	/**
+	 * Actually convert from $source to $targetType
+	 *
+	 * @param string $source
+	 * @param string $targetType
+	 * @param array $convertedChildProperties
+	 * @param PropertyMappingConfigurationInterface $configuration
+	 * @return array
+	 * @throws \Exception
+	 * @throws \TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException
+	 * @api
+	 */
+	public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
+	{
+		return GeneralUtility::trimExplode(',', $source, true);
+	}
 
 }
\ No newline at end of file

Classes/Grid/GridAnalyserService.php

Indentation +102 added lines, -102 removed lines

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