fabarea / vidi

Classes/ViewHelpers/Content/AbstractContentViewHelper.php

Indentation +209 added lines, -209 removed lines

@@ -27,214 +27,214 @@
 abstract class AbstractContentViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * @return void
-     * @throws Exception
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('type', 'string', 'Corresponds to the type of data to be fetched. It will basically be a table name e.g. fe_users.', false, '');
-        $this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, array());
-        $this->registerArgument('selection', 'int', 'A possible selection defined in the BE and stored in the database.', false, 0);
-        $this->registerArgument('ignoreEnableFields', 'bool', 'Whether to ignore enable fields or not (AKA hidden, deleted, starttime, ...).', false, false);
-        $this->registerArgument('aliases', 'array', 'Attribute "matches" does not support certain character such as "." in field name. Use this to create aliases.', false, array());
-    }
-
-    /**
-     * Generate a signature to be used for storing the result set.
-     *
-     * @param string $dataType
-     * @param array $matches
-     * @param array $orderings
-     * @param $limit
-     * @param $offset
-     * @return string
-     */
-    protected function getQuerySignature($dataType, array $matches, array $orderings, $limit, $offset)
-    {
-        $serializedMatches = serialize($matches);
-        $serializedOrderings = serialize($orderings);
-        return md5($dataType . $serializedMatches . $serializedOrderings . $limit . $offset);
-    }
-
-    /**
-     * Returns a matcher object.
-     *
-     * @param string $dataType
-     * @param array $matches
-     * @return Matcher
-     * @throws NotExistingClassException
-     * @throws \InvalidArgumentException
-     */
-    protected function getMatcher($dataType, $matches = array())
-    {
-
-        /** @var $matcher Matcher */
-        $matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
-
-        // @todo implement advanced selection parsing {or: {usergroup.title: {like: foo}}, {tstamp: {greaterThan: 1234}}}
-        foreach ($matches as $fieldNameAndPath => $value) {
-
-            // CSV values should be considered as "in" operator in Query, otherwise "equals".
-            $explodedValues = GeneralUtility::trimExplode(',', $value, true);
-
-            // The matching value contains a "1,2" as example
-            if (count($explodedValues) > 1) {
-
-                $resolvedDataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
-                $resolvedFieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
-
-                // "equals" if in presence of a relation.
-                // "in" if not a relation.
-                if (Tca::table($resolvedDataType)->field($resolvedFieldName)->hasRelation()) {
-                    foreach ($explodedValues as $explodedValue) {
-                        $matcher->equals($fieldNameAndPath, $explodedValue);
-                    }
-                } else {
-                    $matcher->in($fieldNameAndPath, $explodedValues);
-                }
-            } else {
-                $matcher->equals($fieldNameAndPath, $explodedValues[0]);
-            }
-        }
-
-        // Trigger signal for post processing Matcher Object.
-        $this->emitPostProcessMatcherObjectSignal($matcher->getDataType(), $matcher);
-
-        return $matcher;
-    }
-
-    /**
-     * Replace possible aliases.
-     *
-     * @param array $values
-     * @return array
-     */
-    protected function replacesAliases(array $values)
-    {
-
-        $aliases = $this->arguments['aliases'];
-
-        foreach ($aliases as $aliasName => $aliasValue) {
-            if (isset($values[$aliasName])) {
-                $values[$aliasValue] = $values[$aliasName];
-                unset($values[$aliasName]); // remove the alias.
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * Returns an order object.
-     *
-     * @param string $dataType
-     * @param array $order
-     * @return Order
-     */
-    public function getOrder($dataType, array $order = array())
-    {
-        // Default orderings in case order is empty.
-        if (empty($order)) {
-            $order = Tca::table($dataType)->getDefaultOrderings();
-        }
-
-        $order = GeneralUtility::makeInstance(Order::class, $order);
-
-        // Trigger signal for post processing Order Object.
-        $this->emitPostProcessOrderObjectSignal($dataType, $order);
-
-        return $order;
-    }
-
-    /**
-     * @return ResultSetStorage
-     */
-    public function getResultSetStorage()
-    {
-        return GeneralUtility::makeInstance(ResultSetStorage::class);
-    }
-
-    /**
-     * Signal that is called for post-processing a "order" object.
-     *
-     * @param string $dataType
-     * @param Order $order
-     */
-    protected function emitPostProcessOrderObjectSignal($dataType, Order $order)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessOrderObject', array($order, $dataType));
-    }
-
-    /**
-     * Signal that is called for post-processing a "matcher" object.
-     *
-     * @param string $dataType
-     * @param Matcher $matcher
-     */
-    protected function emitPostProcessMatcherObjectSignal($dataType, Matcher $matcher)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessMatcherObject', array($matcher, $dataType));
-    }
-
-    /**
-     * Signal that is called for post-processing a "limit".
-     *
-     * @param string $dataType
-     * @param int $limit
-     */
-    protected function emitPostProcessLimitSignal($dataType, $limit)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($limit, $dataType));
-    }
-
-    /**
-     * Signal that is called for post-processing a "offset".
-     *
-     * @param string $dataType
-     * @param int $offset
-     */
-    protected function emitPostProcessOffsetSignal($dataType, $offset)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($offset, $dataType));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher
-     *
-     * @return Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return $this->getObjectManager()->get(Dispatcher::class);
-    }
-
-    /**
-     * @return ObjectManager
-     */
-    protected function getObjectManager()
-    {
-        return GeneralUtility::makeInstance(ObjectManager::class);
-    }
-
-    /**
-     * @param $ignoreEnableFields
-     * @return QuerySettingsInterface
-     */
-    protected function getDefaultQuerySettings($ignoreEnableFields)
-    {
-        /** @var QuerySettings $defaultQuerySettings */
-        $defaultQuerySettings = GeneralUtility::makeInstance(QuerySettings::class);
-        $defaultQuerySettings->setIgnoreEnableFields($ignoreEnableFields);
-        return $defaultQuerySettings;
-    }
-
-    /**
-     * @return FieldPathResolver
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('type', 'string', 'Corresponds to the type of data to be fetched. It will basically be a table name e.g. fe_users.', false, '');
+		$this->registerArgument('matches', 'array', 'Key / value array to be used as filter. The key corresponds to a field name.', false, array());
+		$this->registerArgument('selection', 'int', 'A possible selection defined in the BE and stored in the database.', false, 0);
+		$this->registerArgument('ignoreEnableFields', 'bool', 'Whether to ignore enable fields or not (AKA hidden, deleted, starttime, ...).', false, false);
+		$this->registerArgument('aliases', 'array', 'Attribute "matches" does not support certain character such as "." in field name. Use this to create aliases.', false, array());
+	}
+
+	/**
+	 * Generate a signature to be used for storing the result set.
+	 *
+	 * @param string $dataType
+	 * @param array $matches
+	 * @param array $orderings
+	 * @param $limit
+	 * @param $offset
+	 * @return string
+	 */
+	protected function getQuerySignature($dataType, array $matches, array $orderings, $limit, $offset)
+	{
+		$serializedMatches = serialize($matches);
+		$serializedOrderings = serialize($orderings);
+		return md5($dataType . $serializedMatches . $serializedOrderings . $limit . $offset);
+	}
+
+	/**
+	 * Returns a matcher object.
+	 *
+	 * @param string $dataType
+	 * @param array $matches
+	 * @return Matcher
+	 * @throws NotExistingClassException
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMatcher($dataType, $matches = array())
+	{
+
+		/** @var $matcher Matcher */
+		$matcher = GeneralUtility::makeInstance(Matcher::class, [], $dataType);
+
+		// @todo implement advanced selection parsing {or: {usergroup.title: {like: foo}}, {tstamp: {greaterThan: 1234}}}
+		foreach ($matches as $fieldNameAndPath => $value) {
+
+			// CSV values should be considered as "in" operator in Query, otherwise "equals".
+			$explodedValues = GeneralUtility::trimExplode(',', $value, true);
+
+			// The matching value contains a "1,2" as example
+			if (count($explodedValues) > 1) {
+
+				$resolvedDataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath, $dataType);
+				$resolvedFieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath, $dataType);
+
+				// "equals" if in presence of a relation.
+				// "in" if not a relation.
+				if (Tca::table($resolvedDataType)->field($resolvedFieldName)->hasRelation()) {
+					foreach ($explodedValues as $explodedValue) {
+						$matcher->equals($fieldNameAndPath, $explodedValue);
+					}
+				} else {
+					$matcher->in($fieldNameAndPath, $explodedValues);
+				}
+			} else {
+				$matcher->equals($fieldNameAndPath, $explodedValues[0]);
+			}
+		}
+
+		// Trigger signal for post processing Matcher Object.
+		$this->emitPostProcessMatcherObjectSignal($matcher->getDataType(), $matcher);
+
+		return $matcher;
+	}
+
+	/**
+	 * Replace possible aliases.
+	 *
+	 * @param array $values
+	 * @return array
+	 */
+	protected function replacesAliases(array $values)
+	{
+
+		$aliases = $this->arguments['aliases'];
+
+		foreach ($aliases as $aliasName => $aliasValue) {
+			if (isset($values[$aliasName])) {
+				$values[$aliasValue] = $values[$aliasName];
+				unset($values[$aliasName]); // remove the alias.
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * Returns an order object.
+	 *
+	 * @param string $dataType
+	 * @param array $order
+	 * @return Order
+	 */
+	public function getOrder($dataType, array $order = array())
+	{
+		// Default orderings in case order is empty.
+		if (empty($order)) {
+			$order = Tca::table($dataType)->getDefaultOrderings();
+		}
+
+		$order = GeneralUtility::makeInstance(Order::class, $order);
+
+		// Trigger signal for post processing Order Object.
+		$this->emitPostProcessOrderObjectSignal($dataType, $order);
+
+		return $order;
+	}
+
+	/**
+	 * @return ResultSetStorage
+	 */
+	public function getResultSetStorage()
+	{
+		return GeneralUtility::makeInstance(ResultSetStorage::class);
+	}
+
+	/**
+	 * Signal that is called for post-processing a "order" object.
+	 *
+	 * @param string $dataType
+	 * @param Order $order
+	 */
+	protected function emitPostProcessOrderObjectSignal($dataType, Order $order)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessOrderObject', array($order, $dataType));
+	}
+
+	/**
+	 * Signal that is called for post-processing a "matcher" object.
+	 *
+	 * @param string $dataType
+	 * @param Matcher $matcher
+	 */
+	protected function emitPostProcessMatcherObjectSignal($dataType, Matcher $matcher)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessMatcherObject', array($matcher, $dataType));
+	}
+
+	/**
+	 * Signal that is called for post-processing a "limit".
+	 *
+	 * @param string $dataType
+	 * @param int $limit
+	 */
+	protected function emitPostProcessLimitSignal($dataType, $limit)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($limit, $dataType));
+	}
+
+	/**
+	 * Signal that is called for post-processing a "offset".
+	 *
+	 * @param string $dataType
+	 * @param int $offset
+	 */
+	protected function emitPostProcessOffsetSignal($dataType, $offset)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Vidi\ViewHelper\Content\AbstractContentViewHelper', 'postProcessLimit', array($offset, $dataType));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher
+	 *
+	 * @return Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return $this->getObjectManager()->get(Dispatcher::class);
+	}
+
+	/**
+	 * @return ObjectManager
+	 */
+	protected function getObjectManager()
+	{
+		return GeneralUtility::makeInstance(ObjectManager::class);
+	}
+
+	/**
+	 * @param $ignoreEnableFields
+	 * @return QuerySettingsInterface
+	 */
+	protected function getDefaultQuerySettings($ignoreEnableFields)
+	{
+		/** @var QuerySettings $defaultQuerySettings */
+		$defaultQuerySettings = GeneralUtility::makeInstance(QuerySettings::class);
+		$defaultQuerySettings->setIgnoreEnableFields($ignoreEnableFields);
+		return $defaultQuerySettings;
+	}
+
+	/**
+	 * @return FieldPathResolver
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
 
 }

Classes/ViewHelpers/Content/FindOneViewHelper.php

Indentation +159 added lines, -159 removed lines

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

Classes/ViewHelpers/Result/ToJsonViewHelper.php

Indentation +46 added lines, -46 removed lines

@@ -18,54 +18,54 @@
 class ToJsonViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Render a Json response
-     *
-     */
-    public function render()
-    {
-        $objects = $this->templateVariableContainer->get('objects');
-        $columns = $this->templateVariableContainer->get('columns');
-        $output = array(
-            'sEcho' => $this->getNextTransactionId(),
-            'iTotalRecords' => $this->templateVariableContainer->get('numberOfObjects'),
-            'iTotalDisplayRecords' => $this->templateVariableContainer->get('numberOfObjects'),
-            'iNumberOfRecords' => count($objects),
-            'aaData' => $this->getRowsView()->render($objects, $columns),
-        );
+	/**
+	 * Render a Json response
+	 *
+	 */
+	public function render()
+	{
+		$objects = $this->templateVariableContainer->get('objects');
+		$columns = $this->templateVariableContainer->get('columns');
+		$output = array(
+			'sEcho' => $this->getNextTransactionId(),
+			'iTotalRecords' => $this->templateVariableContainer->get('numberOfObjects'),
+			'iTotalDisplayRecords' => $this->templateVariableContainer->get('numberOfObjects'),
+			'iNumberOfRecords' => count($objects),
+			'aaData' => $this->getRowsView()->render($objects, $columns),
+		);
 
-        $this->setHttpHeaders();
-        print json_encode($output);
-    }
+		$this->setHttpHeaders();
+		print json_encode($output);
+	}
 
-    /**
-     * @return int
-     */
-    protected function getNextTransactionId()
-    {
-        $transaction = 0;
-        if (GeneralUtility::_GET('sEcho')) {
-            $transaction = (int)GeneralUtility::_GET('sEcho') + 1;
-        }
-        return $transaction;
-    }
+	/**
+	 * @return int
+	 */
+	protected function getNextTransactionId()
+	{
+		$transaction = 0;
+		if (GeneralUtility::_GET('sEcho')) {
+			$transaction = (int)GeneralUtility::_GET('sEcho') + 1;
+		}
+		return $transaction;
+	}
 
-    /**
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    protected function setHttpHeaders()
-    {
-        /** @var Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->withHeader('Content-Type', 'application/json');
-    }
+	/**
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 */
+	protected function setHttpHeaders()
+	{
+		/** @var Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->withHeader('Content-Type', 'application/json');
+	}
 
-    /**
-     * @return Rows|object
-     */
-    protected function getRowsView()
-    {
-        return GeneralUtility::makeInstance(Rows::class);
-    }
+	/**
+	 * @return Rows|object
+	 */
+	protected function getRowsView()
+	{
+		return GeneralUtility::makeInstance(Rows::class);
+	}
 }

Classes/ViewHelpers/Result/ToXmlViewHelper.php

Indentation +101 added lines, -101 removed lines

@@ -17,115 +17,115 @@
 class ToXmlViewHelper extends AbstractToFormatViewHelper
 {
 
-    /**
-     * Render an XML export.
-     *
-     */
-    public function render()
-    {
-
-        $objects = $this->templateVariableContainer->get('objects');
-
-        // Make sure we have something to process...
-        if (!empty($objects)) {
-
-            // Initialization step.
-            $this->initializeEnvironment($objects);
-            $this->exportFileNameAndPath .= '.xml'; // add extension to the file.
-
-            // Write the exported data to a XML file.
-            $this->writeXmlFile($objects);
-
-            // We must generate a zip archive since there are files included.
-            if ($this->hasCollectedFiles()) {
-
-                $this->writeZipFile();
-                $this->sendZipHttpHeaders();
-
-                readfile($this->zipFileNameAndPath);
-            } else {
-                $this->sendXmlHttpHeaders();
-                readfile($this->exportFileNameAndPath);
-            }
-
-            GeneralUtility::rmdir($this->temporaryDirectory, true);
-        }
-    }
-
-    /**
-     * Write the XML file to a temporary location.
-     *
-     * @param array $objects
-     * @return void
-     */
-    protected function writeXmlFile(array $objects)
-    {
-
-        // Get first object of $objects to check whether it contains possible files to include.
-        /** @var Content $object */
-        $object = reset($objects);
-        $this->checkWhetherObjectMayIncludeFiles($object);
-
-        $items = [];
-        foreach ($objects as $object) {
-            if ($this->hasFileFields()) {
-                $this->collectFiles($object);
-            }
-            $items[] = $object->toValues();
-        }
-
-        $xml = new \SimpleXMLElement('<items/>');
-        $xml = $this->arrayToXml($items, $xml);
-        file_put_contents($this->exportFileNameAndPath, $this->formatXml($xml->asXML()));
-    }
-
-    /*
+	/**
+	 * Render an XML export.
+	 *
+	 */
+	public function render()
+	{
+
+		$objects = $this->templateVariableContainer->get('objects');
+
+		// Make sure we have something to process...
+		if (!empty($objects)) {
+
+			// Initialization step.
+			$this->initializeEnvironment($objects);
+			$this->exportFileNameAndPath .= '.xml'; // add extension to the file.
+
+			// Write the exported data to a XML file.
+			$this->writeXmlFile($objects);
+
+			// We must generate a zip archive since there are files included.
+			if ($this->hasCollectedFiles()) {
+
+				$this->writeZipFile();
+				$this->sendZipHttpHeaders();
+
+				readfile($this->zipFileNameAndPath);
+			} else {
+				$this->sendXmlHttpHeaders();
+				readfile($this->exportFileNameAndPath);
+			}
+
+			GeneralUtility::rmdir($this->temporaryDirectory, true);
+		}
+	}
+
+	/**
+	 * Write the XML file to a temporary location.
+	 *
+	 * @param array $objects
+	 * @return void
+	 */
+	protected function writeXmlFile(array $objects)
+	{
+
+		// Get first object of $objects to check whether it contains possible files to include.
+		/** @var Content $object */
+		$object = reset($objects);
+		$this->checkWhetherObjectMayIncludeFiles($object);
+
+		$items = [];
+		foreach ($objects as $object) {
+			if ($this->hasFileFields()) {
+				$this->collectFiles($object);
+			}
+			$items[] = $object->toValues();
+		}
+
+		$xml = new \SimpleXMLElement('<items/>');
+		$xml = $this->arrayToXml($items, $xml);
+		file_put_contents($this->exportFileNameAndPath, $this->formatXml($xml->asXML()));
+	}
+
+	/*
      * Convert an array to xml
      *
      * @return \SimpleXMLElement
      */
-    protected function arrayToXml($array, \SimpleXMLElement $xml)
-    {
-        foreach ($array as $key => $value) {
-            if (is_array($value)) {
-                $key = is_numeric($key) ? 'item' : $key;
-                $subNode = $xml->addChild($key);
-                $this->arrayToXml($value, $subNode);
-            } else {
-                $key = is_numeric($key) ? 'item' : $key;
-                $xml->addChild($key, "$value");
-            }
-        }
-        return $xml;
-    }
-
-    /*
+	protected function arrayToXml($array, \SimpleXMLElement $xml)
+	{
+		foreach ($array as $key => $value) {
+			if (is_array($value)) {
+				$key = is_numeric($key) ? 'item' : $key;
+				$subNode = $xml->addChild($key);
+				$this->arrayToXml($value, $subNode);
+			} else {
+				$key = is_numeric($key) ? 'item' : $key;
+				$xml->addChild($key, "$value");
+			}
+		}
+		return $xml;
+	}
+
+	/*
      * Format the XML so that is looks human friendly.
      *
      * @param string $xml
      * @return string
      */
-    protected function formatXml($xml)
-    {
-        $dom = new \DOMDocument("1.0");
-        $dom->preserveWhiteSpace = false;
-        $dom->formatOutput = true;
-        $dom->loadXML($xml);
-        return $dom->saveXML();
-    }
-
-    /**
-     * @return void
-     */
-    protected function sendXmlHttpHeaders()
-    {
-
-        /** @var Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->withHeader('Content-Type', 'application/xml');
-        $response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
-        $response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
-        $response->withHeader('Content-Description', 'File Transfer');
-    }
+	protected function formatXml($xml)
+	{
+		$dom = new \DOMDocument("1.0");
+		$dom->preserveWhiteSpace = false;
+		$dom->formatOutput = true;
+		$dom->loadXML($xml);
+		return $dom->saveXML();
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function sendXmlHttpHeaders()
+	{
+
+		/** @var Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->withHeader('Content-Type', 'application/xml');
+		$response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+		$response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
+		$response->withHeader('Content-Description', 'File Transfer');
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
         /** @var Response $response */
         $response = $this->templateVariableContainer->get('response');
         $response->withHeader('Content-Type', 'application/xml');
-        $response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+        $response->withHeader('Content-Disposition', 'attachment; filename="'.basename($this->exportFileNameAndPath).'"');
         $response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
         $response->withHeader('Content-Description', 'File Transfer');
     }

Classes/ViewHelpers/Result/AbstractToFormatViewHelper.php

Indentation +152 added lines, -152 removed lines

@@ -24,157 +24,157 @@
 abstract class AbstractToFormatViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Store fields of type "file".
-     *
-     * @var array
-     */
-    protected $fileTypeProperties = [];
-
-    /**
-     * @var File[]
-     */
-    protected $collectedFiles = [];
-
-    /**
-     * @var string
-     */
-    protected $exportFileNameAndPath;
-
-    /**
-     * @var string
-     */
-    protected $zipFileNameAndPath;
-
-    /**
-     * @var string
-     */
-    protected $temporaryDirectory;
-
-
-    /**
-     * Write the zip file to a temporary location.
-     *
-     * @return void
-     * @throws \RuntimeException
-     */
-    protected function writeZipFile()
-    {
-
-        $zip = new \ZipArchive();
-        $zip->open($this->zipFileNameAndPath, \ZipArchive::CREATE);
-
-        // Add the CSV content into the zipball.
-        $zip->addFile($this->exportFileNameAndPath, basename($this->exportFileNameAndPath));
-
-        // Add the files into the zipball.
-        foreach ($this->collectedFiles as $file) {
-            $zip->addFile($file->getForLocalProcessing(false), $file->getIdentifier());
-        }
-
-        $zip->close();
-    }
-
-    /**
-     * Initialize some properties
-     *
-     * @param array $objects
-     * @return void
-     */
-    protected function initializeEnvironment(array $objects)
-    {
-
-        /** @var Content $object */
-        $object = reset($objects);
-
-        $this->temporaryDirectory = Environment::getPublicPath() . '/typo3temp/' . uniqid() . '/';
-        GeneralUtility::mkdir($this->temporaryDirectory);
-
-        // Compute file name and path variable
-        $this->exportFileNameAndPath = $this->temporaryDirectory . $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']);
-
-        // Compute file name and path variable for zip
-        $zipFileName = $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']) . '.zip';
-        $this->zipFileNameAndPath = $this->temporaryDirectory . $zipFileName;
-    }
-
-    /**
-     * Fetch the files given an object.
-     *
-     * @param Content $object
-     * @return void
-     */
-    protected function collectFiles(Content $object)
-    {
-        foreach ($this->fileTypeProperties as $property) {
-            $files = FileReferenceService::getInstance()->findReferencedBy($property, $object);
-            foreach ($files as $file) {
-                $this->collectedFiles[$file->getUid()] = $file;
-            }
-        }
-    }
-
-    /**
-     * Tells whether the object has fields containing files.
-     *
-     * @return boolean
-     */
-    protected function hasCollectedFiles()
-    {
-        return !empty($this->collectedFiles);
-    }
-
-    /**
-     * Tells whether the object has fields containing files.
-     *
-     * @return boolean
-     */
-    protected function hasFileFields()
-    {
-        return !empty($this->fileTypeProperties);
-    }
-
-    /**
-     * Check whether the given object is meant to include files in some fields.
-     *
-     * @param Content $object
-     */
-    protected function checkWhetherObjectMayIncludeFiles(Content $object)
-    {
-        if (Tca::grid($object->getDataType())->areFilesIncludedInExport()) {
-            foreach ($object->toFields() as $fieldName) {
-                $fieldType = Tca::table($object->getDataType())->field($fieldName)->getType();
-
-                if ($fieldType === FieldType::FILE) {
-                    $this->fileTypeProperties[] = GeneralUtility::camelCaseToLowerCaseUnderscored($fieldName);
-                }
-            }
-        }
-    }
-
-    /**
-     * @return void
-     */
-    protected function sendZipHttpHeaders()
-    {
-        /** @var Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->withHeader('Pragma', 'public');
-        $response->withHeader('Expires', '0');
-        $response->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
-        $response->withHeader('Content-Type', 'application/zip');
-        $response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->zipFileNameAndPath) . '"');
-        $response->withHeader('Content-Length', filesize($this->zipFileNameAndPath));
-        $response->withHeader('Content-Description', 'File Transfer');
-        $response->withHeader('Content-Transfer-Encoding', 'binary');
-    }
-
-    /**
-     * @return Rows|object
-     */
-    protected function getRowsView()
-    {
-        return GeneralUtility::makeInstance(Rows::class);
-    }
+	/**
+	 * Store fields of type "file".
+	 *
+	 * @var array
+	 */
+	protected $fileTypeProperties = [];
+
+	/**
+	 * @var File[]
+	 */
+	protected $collectedFiles = [];
+
+	/**
+	 * @var string
+	 */
+	protected $exportFileNameAndPath;
+
+	/**
+	 * @var string
+	 */
+	protected $zipFileNameAndPath;
+
+	/**
+	 * @var string
+	 */
+	protected $temporaryDirectory;
+
+
+	/**
+	 * Write the zip file to a temporary location.
+	 *
+	 * @return void
+	 * @throws \RuntimeException
+	 */
+	protected function writeZipFile()
+	{
+
+		$zip = new \ZipArchive();
+		$zip->open($this->zipFileNameAndPath, \ZipArchive::CREATE);
+
+		// Add the CSV content into the zipball.
+		$zip->addFile($this->exportFileNameAndPath, basename($this->exportFileNameAndPath));
+
+		// Add the files into the zipball.
+		foreach ($this->collectedFiles as $file) {
+			$zip->addFile($file->getForLocalProcessing(false), $file->getIdentifier());
+		}
+
+		$zip->close();
+	}
+
+	/**
+	 * Initialize some properties
+	 *
+	 * @param array $objects
+	 * @return void
+	 */
+	protected function initializeEnvironment(array $objects)
+	{
+
+		/** @var Content $object */
+		$object = reset($objects);
+
+		$this->temporaryDirectory = Environment::getPublicPath() . '/typo3temp/' . uniqid() . '/';
+		GeneralUtility::mkdir($this->temporaryDirectory);
+
+		// Compute file name and path variable
+		$this->exportFileNameAndPath = $this->temporaryDirectory . $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']);
+
+		// Compute file name and path variable for zip
+		$zipFileName = $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']) . '.zip';
+		$this->zipFileNameAndPath = $this->temporaryDirectory . $zipFileName;
+	}
+
+	/**
+	 * Fetch the files given an object.
+	 *
+	 * @param Content $object
+	 * @return void
+	 */
+	protected function collectFiles(Content $object)
+	{
+		foreach ($this->fileTypeProperties as $property) {
+			$files = FileReferenceService::getInstance()->findReferencedBy($property, $object);
+			foreach ($files as $file) {
+				$this->collectedFiles[$file->getUid()] = $file;
+			}
+		}
+	}
+
+	/**
+	 * Tells whether the object has fields containing files.
+	 *
+	 * @return boolean
+	 */
+	protected function hasCollectedFiles()
+	{
+		return !empty($this->collectedFiles);
+	}
+
+	/**
+	 * Tells whether the object has fields containing files.
+	 *
+	 * @return boolean
+	 */
+	protected function hasFileFields()
+	{
+		return !empty($this->fileTypeProperties);
+	}
+
+	/**
+	 * Check whether the given object is meant to include files in some fields.
+	 *
+	 * @param Content $object
+	 */
+	protected function checkWhetherObjectMayIncludeFiles(Content $object)
+	{
+		if (Tca::grid($object->getDataType())->areFilesIncludedInExport()) {
+			foreach ($object->toFields() as $fieldName) {
+				$fieldType = Tca::table($object->getDataType())->field($fieldName)->getType();
+
+				if ($fieldType === FieldType::FILE) {
+					$this->fileTypeProperties[] = GeneralUtility::camelCaseToLowerCaseUnderscored($fieldName);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function sendZipHttpHeaders()
+	{
+		/** @var Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->withHeader('Pragma', 'public');
+		$response->withHeader('Expires', '0');
+		$response->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
+		$response->withHeader('Content-Type', 'application/zip');
+		$response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->zipFileNameAndPath) . '"');
+		$response->withHeader('Content-Length', filesize($this->zipFileNameAndPath));
+		$response->withHeader('Content-Description', 'File Transfer');
+		$response->withHeader('Content-Transfer-Encoding', 'binary');
+	}
+
+	/**
+	 * @return Rows|object
+	 */
+	protected function getRowsView()
+	{
+		return GeneralUtility::makeInstance(Rows::class);
+	}
 
 }

Spacing +5 added lines, -5 removed lines

@@ -87,15 +87,15 @@ 
         /** @var Content $object */
         $object = reset($objects);
 
-        $this->temporaryDirectory = Environment::getPublicPath() . '/typo3temp/' . uniqid() . '/';
+        $this->temporaryDirectory = Environment::getPublicPath().'/typo3temp/'.uniqid().'/';
         GeneralUtility::mkdir($this->temporaryDirectory);
 
         // Compute file name and path variable
-        $this->exportFileNameAndPath = $this->temporaryDirectory . $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']);
+        $this->exportFileNameAndPath = $this->temporaryDirectory.$object->getDataType().'-'.date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']);
 
         // Compute file name and path variable for zip
-        $zipFileName = $object->getDataType() . '-' . date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']) . '.zip';
-        $this->zipFileNameAndPath = $this->temporaryDirectory . $zipFileName;
+        $zipFileName = $object->getDataType().'-'.date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy']).'.zip';
+        $this->zipFileNameAndPath = $this->temporaryDirectory.$zipFileName;
     }
 
     /**
@@ -163,7 +163,7 @@ 
         $response->withHeader('Expires', '0');
         $response->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
         $response->withHeader('Content-Type', 'application/zip');
-        $response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->zipFileNameAndPath) . '"');
+        $response->withHeader('Content-Disposition', 'attachment; filename="'.basename($this->zipFileNameAndPath).'"');
         $response->withHeader('Content-Length', filesize($this->zipFileNameAndPath));
         $response->withHeader('Content-Description', 'File Transfer');
         $response->withHeader('Content-Transfer-Encoding', 'binary');

Classes/ViewHelpers/Result/ToCsvViewHelper.php

Indentation +84 added lines, -84 removed lines

@@ -17,89 +17,89 @@
 class ToCsvViewHelper extends AbstractToFormatViewHelper
 {
 
-    /**
-     * Render a CSV export request.
-     *
-     */
-    public function render()
-    {
-        $objects = $this->templateVariableContainer->get('objects');
-
-        // Make sure we have something to process...
-        if (!empty($objects)) {
-
-            // Initialization step.
-            $this->initializeEnvironment($objects);
-            $this->exportFileNameAndPath .= '.csv'; // add extension to the file.
-
-            // Write the exported data to a CSV file.
-            $this->writeCsvFile($objects);
-
-            // We must generate a zip archive since there are files included.
-            if ($this->hasCollectedFiles()) {
-
-                $this->writeZipFile();
-                $this->sendZipHttpHeaders();
-
-                readfile($this->zipFileNameAndPath);
-            } else {
-                $this->sendCsvHttpHeaders();
-                readfile($this->exportFileNameAndPath);
-            }
-
-            GeneralUtility::rmdir($this->temporaryDirectory, true);
-        }
-    }
-
-    /**
-     * Write the CSV file to a temporary location.
-     *
-     * @param array $objects
-     */
-    protected function writeCsvFile(array $objects)
-    {
-        // Create a file pointer
-        $output = fopen($this->exportFileNameAndPath, 'w');
-
-        // Handle CSV header, get the first object and get the list of fields.
-        /** @var Content $object */
-        $object = reset($objects);
-        fputcsv($output, $object->toFields());
-        $this->checkWhetherObjectMayIncludeFiles($object);
-
-        foreach ($objects as $object) {
-            if ($this->hasFileFields()) {
-                $this->collectFiles($object);
-            }
-
-            // Make sure we have a flat array of values for the CSV purpose.
-            $flattenValues = [];
-            foreach ($object->toValues() as $fieldName => $value) {
-                if (is_array($value)) {
-                    $flattenValues[$fieldName] = implode(', ', $value);
-                } else {
-                    $flattenValues[$fieldName] = str_replace("\n", "\r", $value); // for Excel purpose.
-                }
-            }
-
-            fputcsv($output, $flattenValues);
-        }
-
-        // close file handler
-        fclose($output);
-    }
-
-    /**
-     * @return void
-     */
-    protected function sendCsvHttpHeaders()
-    {
-        /** @var Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->withHeader('Content-Type', 'application/csv');
-        $response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
-        $response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
-        $response->withHeader('Content-Description', 'File Transfer');
-    }
+	/**
+	 * Render a CSV export request.
+	 *
+	 */
+	public function render()
+	{
+		$objects = $this->templateVariableContainer->get('objects');
+
+		// Make sure we have something to process...
+		if (!empty($objects)) {
+
+			// Initialization step.
+			$this->initializeEnvironment($objects);
+			$this->exportFileNameAndPath .= '.csv'; // add extension to the file.
+
+			// Write the exported data to a CSV file.
+			$this->writeCsvFile($objects);
+
+			// We must generate a zip archive since there are files included.
+			if ($this->hasCollectedFiles()) {
+
+				$this->writeZipFile();
+				$this->sendZipHttpHeaders();
+
+				readfile($this->zipFileNameAndPath);
+			} else {
+				$this->sendCsvHttpHeaders();
+				readfile($this->exportFileNameAndPath);
+			}
+
+			GeneralUtility::rmdir($this->temporaryDirectory, true);
+		}
+	}
+
+	/**
+	 * Write the CSV file to a temporary location.
+	 *
+	 * @param array $objects
+	 */
+	protected function writeCsvFile(array $objects)
+	{
+		// Create a file pointer
+		$output = fopen($this->exportFileNameAndPath, 'w');
+
+		// Handle CSV header, get the first object and get the list of fields.
+		/** @var Content $object */
+		$object = reset($objects);
+		fputcsv($output, $object->toFields());
+		$this->checkWhetherObjectMayIncludeFiles($object);
+
+		foreach ($objects as $object) {
+			if ($this->hasFileFields()) {
+				$this->collectFiles($object);
+			}
+
+			// Make sure we have a flat array of values for the CSV purpose.
+			$flattenValues = [];
+			foreach ($object->toValues() as $fieldName => $value) {
+				if (is_array($value)) {
+					$flattenValues[$fieldName] = implode(', ', $value);
+				} else {
+					$flattenValues[$fieldName] = str_replace("\n", "\r", $value); // for Excel purpose.
+				}
+			}
+
+			fputcsv($output, $flattenValues);
+		}
+
+		// close file handler
+		fclose($output);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function sendCsvHttpHeaders()
+	{
+		/** @var Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->withHeader('Content-Type', 'application/csv');
+		$response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+		$response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
+		$response->withHeader('Content-Description', 'File Transfer');
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
         /** @var Response $response */
         $response = $this->templateVariableContainer->get('response');
         $response->withHeader('Content-Type', 'application/csv');
-        $response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+        $response->withHeader('Content-Disposition', 'attachment; filename="'.basename($this->exportFileNameAndPath).'"');
         $response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
         $response->withHeader('Content-Description', 'File Transfer');
     }

Classes/ViewHelpers/Result/ToXlsViewHelper.php

Indentation +91 added lines, -91 removed lines

@@ -18,96 +18,96 @@
 class ToXlsViewHelper extends AbstractToFormatViewHelper
 {
 
-    /**
-     * Render a XLS export request.
-     *
-     */
-    public function render()
-    {
-
-        $objects = $this->templateVariableContainer->get('objects');
-
-        // Make sure we have something to process...
-        if (!empty($objects)) {
-
-            // Initialization step.
-            $this->initializeEnvironment($objects);
-            $this->exportFileNameAndPath .= '.xls'; // add extension to the file.
-
-            // Write the exported data to a CSV file.
-            $this->writeXlsFile($objects);
-
-            // We must generate a zip archive since there are files included.
-            if ($this->hasCollectedFiles()) {
-
-                $this->writeZipFile();
-                $this->sendZipHttpHeaders();
-
-                readfile($this->zipFileNameAndPath);
-            } else {
-                $this->sendXlsHttpHeaders();
-                readfile($this->exportFileNameAndPath);
-            }
-
-            GeneralUtility::rmdir($this->temporaryDirectory, true);
-        }
-    }
-
-    /**
-     * Write the CSV file to a temporary location.
-     *
-     * @param array $objects
-     * @return void
-     */
-    protected function writeXlsFile(array $objects)
-    {
-
-        /** @var SpreadSheetService $spreadSheet */
-        $spreadSheet = GeneralUtility::makeInstance(SpreadSheetService::class);
-
-        // Handle object header, get the first object and get the list of fields.
-        /** @var Content $object */
-        $object = reset($objects);
-        $spreadSheet->addRow($object->toFields());
-
-        $this->checkWhetherObjectMayIncludeFiles($object);
-
-        foreach ($objects as $object) {
-            if ($this->hasFileFields()) {
-                $this->collectFiles($object);
-            }
-
-            // Make sure we have a flat array of values for the CSV purpose.
-            $flattenValues = [];
-            foreach ($object->toValues() as $fieldName => $value) {
-                if (is_array($value)) {
-                    $flattenValues[$fieldName] = implode(', ', $value);
-                } else {
-                    $flattenValues[$fieldName] = $value;
-                }
-            }
-
-            $spreadSheet->addRow($flattenValues);
-        }
-
-        file_put_contents($this->exportFileNameAndPath, $spreadSheet->toString());
-    }
-
-    /**
-     * @return void
-     */
-    protected function sendXlsHttpHeaders()
-    {
-        /** @var Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->withHeader('Pragma', 'public');
-        $response->withHeader('Expires', '0');
-        $response->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
-        $response->withHeader('Content-Type', 'application/vnd.ms-excel');
-        $response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
-        $response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
-        $response->withHeader('Content-Description', 'File Transfer');
-        $response->withHeader('Content-Transfer-Encoding', 'binary');
-    }
+	/**
+	 * Render a XLS export request.
+	 *
+	 */
+	public function render()
+	{
+
+		$objects = $this->templateVariableContainer->get('objects');
+
+		// Make sure we have something to process...
+		if (!empty($objects)) {
+
+			// Initialization step.
+			$this->initializeEnvironment($objects);
+			$this->exportFileNameAndPath .= '.xls'; // add extension to the file.
+
+			// Write the exported data to a CSV file.
+			$this->writeXlsFile($objects);
+
+			// We must generate a zip archive since there are files included.
+			if ($this->hasCollectedFiles()) {
+
+				$this->writeZipFile();
+				$this->sendZipHttpHeaders();
+
+				readfile($this->zipFileNameAndPath);
+			} else {
+				$this->sendXlsHttpHeaders();
+				readfile($this->exportFileNameAndPath);
+			}
+
+			GeneralUtility::rmdir($this->temporaryDirectory, true);
+		}
+	}
+
+	/**
+	 * Write the CSV file to a temporary location.
+	 *
+	 * @param array $objects
+	 * @return void
+	 */
+	protected function writeXlsFile(array $objects)
+	{
+
+		/** @var SpreadSheetService $spreadSheet */
+		$spreadSheet = GeneralUtility::makeInstance(SpreadSheetService::class);
+
+		// Handle object header, get the first object and get the list of fields.
+		/** @var Content $object */
+		$object = reset($objects);
+		$spreadSheet->addRow($object->toFields());
+
+		$this->checkWhetherObjectMayIncludeFiles($object);
+
+		foreach ($objects as $object) {
+			if ($this->hasFileFields()) {
+				$this->collectFiles($object);
+			}
+
+			// Make sure we have a flat array of values for the CSV purpose.
+			$flattenValues = [];
+			foreach ($object->toValues() as $fieldName => $value) {
+				if (is_array($value)) {
+					$flattenValues[$fieldName] = implode(', ', $value);
+				} else {
+					$flattenValues[$fieldName] = $value;
+				}
+			}
+
+			$spreadSheet->addRow($flattenValues);
+		}
+
+		file_put_contents($this->exportFileNameAndPath, $spreadSheet->toString());
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function sendXlsHttpHeaders()
+	{
+		/** @var Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->withHeader('Pragma', 'public');
+		$response->withHeader('Expires', '0');
+		$response->withHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
+		$response->withHeader('Content-Type', 'application/vnd.ms-excel');
+		$response->withHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+		$response->withHeader('Content-Length', filesize($this->exportFileNameAndPath));
+		$response->withHeader('Content-Description', 'File Transfer');
+		$response->withHeader('Content-Transfer-Encoding', 'binary');
+	}
 
 }

Classes/ViewHelpers/PublicPathViewHelper.php

Indentation +9 added lines, -9 removed lines

@@ -16,13 +16,13 @@
 class PublicPathViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Returns the public path to Vidi extension.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        return ExtensionManagementUtility::siteRelPath('vidi');
-    }
+	/**
+	 * Returns the public path to Vidi extension.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		return ExtensionManagementUtility::siteRelPath('vidi');
+	}
 }

Classes/ViewHelpers/Grid/Column/HasRelationViewHelper.php

Indentation +20 added lines, -20 removed lines

@@ -18,25 +18,25 @@
 class HasRelationViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Return whether the current field name has a relation to the main content.
-     *
-     * @return boolean
-     */
-    public function render()
-    {
-        $fieldNameAndPath = $this->templateVariableContainer->get('columnName');
-        $dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
-        $fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
-        $hasRelation = Tca::table($dataType)->field($fieldName)->hasRelation();
-        return $hasRelation;
-    }
+	/**
+	 * Return whether the current field name has a relation to the main content.
+	 *
+	 * @return boolean
+	 */
+	public function render()
+	{
+		$fieldNameAndPath = $this->templateVariableContainer->get('columnName');
+		$dataType = $this->getFieldPathResolver()->getDataType($fieldNameAndPath);
+		$fieldName = $this->getFieldPathResolver()->stripFieldPath($fieldNameAndPath);
+		$hasRelation = Tca::table($dataType)->field($fieldName)->hasRelation();
+		return $hasRelation;
+	}
 
-    /**
-     * @return FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(FieldPathResolver::class);
-    }
+	/**
+	 * @return FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(FieldPathResolver::class);
+	}
 }