fabarea / vidi

Classes/Tool/ModulePreferencesTool.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     {
         $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ModulePreferences/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 

Indentation +117 added lines, -117 removed lines

@@ -22,121 +22,121 @@
  */
 class ModulePreferencesTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return LocalizationUtility::translate(
-            'module_preferences_for',
-            'vidi',
-            array(Tca::table($this->getModuleLoader()->getDataType())->getTitle())
-        );
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ModulePreferences/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        return $view->render();
-    }
-
-    /**
-     * Do the job!
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = array())
-    {
-        if (isset($arguments['save'])) {
-            // Revert visible <-> excluded
-            $excludedFields = array_diff(
-                Tca::grid()->getAllFieldNames(),
-                $arguments['excluded_fields'],
-                $this->getExcludedFieldsFromTca()
-            );
-            $arguments['excluded_fields'] = $excludedFields;
-            $this->getModulePreferences()->save($arguments);
-        }
-
-        $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ModulePreferences/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $view->assign('title', Tca::table($this->getModuleLoader()->getDataType())->getTitle());
-
-        // Fetch the menu of visible items.
-        $menuVisibleItems = $this->getModulePreferences()->get(ConfigurablePart::MENU_VISIBLE_ITEMS);
-        $view->assign(ConfigurablePart::MENU_VISIBLE_ITEMS, $menuVisibleItems);
-
-        // Fetch the default number of menu visible items.
-        $menuDefaultVisible = $this->getModulePreferences()->get(ConfigurablePart::MENU_VISIBLE_ITEMS_DEFAULT);
-        $view->assign(ConfigurablePart::MENU_VISIBLE_ITEMS_DEFAULT, $menuDefaultVisible);
-
-        // Get the visible columns
-        $view->assign('columns', Tca::grid()->getAllFieldNames());
-
-        return $view->render();
-    }
-
-    /**
-     * @return array
-     */
-    protected function getExcludedFieldsFromTca()
-    {
-        $tca = Tca::grid()->getTca();
-        $excludedFields = [];
-        if (!empty($tca['excluded_fields'])) {
-            $excludedFields = GeneralUtility::trimExplode(',', $tca['excluded_fields'], true);
-        } elseif (!empty($tca['export']['excluded_fields'])) { // only for export for legacy reason.
-            $excludedFields = GeneralUtility::trimExplode(',', $tca['export']['excluded_fields'], true);
-        }
-        return $excludedFields;
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    /**
-     * @return ModulePreferences|object
-     */
-    protected function getModulePreferences()
-    {
-        return GeneralUtility::makeInstance(ModulePreferences::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return GridAnalyserService|object
-     */
-    protected function getGridAnalyserService()
-    {
-        return GeneralUtility::makeInstance(GridAnalyserService::class);
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return LocalizationUtility::translate(
+			'module_preferences_for',
+			'vidi',
+			array(Tca::table($this->getModuleLoader()->getDataType())->getTitle())
+		);
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ModulePreferences/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		return $view->render();
+	}
+
+	/**
+	 * Do the job!
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = array())
+	{
+		if (isset($arguments['save'])) {
+			// Revert visible <-> excluded
+			$excludedFields = array_diff(
+				Tca::grid()->getAllFieldNames(),
+				$arguments['excluded_fields'],
+				$this->getExcludedFieldsFromTca()
+			);
+			$arguments['excluded_fields'] = $excludedFields;
+			$this->getModulePreferences()->save($arguments);
+		}
+
+		$templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ModulePreferences/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$view->assign('title', Tca::table($this->getModuleLoader()->getDataType())->getTitle());
+
+		// Fetch the menu of visible items.
+		$menuVisibleItems = $this->getModulePreferences()->get(ConfigurablePart::MENU_VISIBLE_ITEMS);
+		$view->assign(ConfigurablePart::MENU_VISIBLE_ITEMS, $menuVisibleItems);
+
+		// Fetch the default number of menu visible items.
+		$menuDefaultVisible = $this->getModulePreferences()->get(ConfigurablePart::MENU_VISIBLE_ITEMS_DEFAULT);
+		$view->assign(ConfigurablePart::MENU_VISIBLE_ITEMS_DEFAULT, $menuDefaultVisible);
+
+		// Get the visible columns
+		$view->assign('columns', Tca::grid()->getAllFieldNames());
+
+		return $view->render();
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getExcludedFieldsFromTca()
+	{
+		$tca = Tca::grid()->getTca();
+		$excludedFields = [];
+		if (!empty($tca['excluded_fields'])) {
+			$excludedFields = GeneralUtility::trimExplode(',', $tca['excluded_fields'], true);
+		} elseif (!empty($tca['export']['excluded_fields'])) { // only for export for legacy reason.
+			$excludedFields = GeneralUtility::trimExplode(',', $tca['export']['excluded_fields'], true);
+		}
+		return $excludedFields;
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	/**
+	 * @return ModulePreferences|object
+	 */
+	protected function getModulePreferences()
+	{
+		return GeneralUtility::makeInstance(ModulePreferences::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return GridAnalyserService|object
+	 */
+	protected function getGridAnalyserService()
+	{
+		return GeneralUtility::makeInstance(GridAnalyserService::class);
+	}
 }

Classes/Tool/RelationAnalyserTool.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     {
         $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/RelationAnalyser/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         $view->assign('dataType', $this->getModuleLoader()->getDataType());
         return $view->render();
     }

Indentation +73 added lines, -73 removed lines

@@ -19,86 +19,86 @@
  */
 class RelationAnalyserTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle(): string
-    {
-        return LocalizationUtility::translate(
-            'analyse_relations',
-            'vidi'
-        );
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle(): string
+	{
+		return LocalizationUtility::translate(
+			'analyse_relations',
+			'vidi'
+		);
+	}
 
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/RelationAnalyser/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        $view->assign('dataType', $this->getModuleLoader()->getDataType());
-        return $view->render();
-    }
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription(): string
+	{
+		$templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/RelationAnalyser/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		$view->assign('dataType', $this->getModuleLoader()->getDataType());
+		return $view->render();
+	}
 
-    /**
-     * Do the job
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = array()): string
-    {
-        $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/RelationAnalyser/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
+	/**
+	 * Do the job
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = array()): string
+	{
+		$templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/RelationAnalyser/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
 
-        $dataType = $this->getModuleLoader()->getDataType();
-        $analyse = $this->getGridAnalyserService()->checkRelationForTable($dataType);
+		$dataType = $this->getModuleLoader()->getDataType();
+		$analyse = $this->getGridAnalyserService()->checkRelationForTable($dataType);
 
-        if (empty($analyse)) {
-            $result = 'No relation involved in this Grid.';
-        } else {
-            $result = implode("\n", $analyse);
-        }
+		if (empty($analyse)) {
+			$result = 'No relation involved in this Grid.';
+		} else {
+			$result = implode("\n", $analyse);
+		}
 
-        $view->assign('result', $result);
-        $view->assign('dataType', $dataType);
+		$view->assign('result', $result);
+		$view->assign('dataType', $dataType);
 
-        return $view->render();
-    }
+		return $view->render();
+	}
 
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown(): bool
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown(): bool
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader(): ModuleLoader
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader(): ModuleLoader
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return GridAnalyserService|object
-     */
-    protected function getGridAnalyserService()
-    {
-        return GeneralUtility::makeInstance(GridAnalyserService::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return GridAnalyserService|object
+	 */
+	protected function getGridAnalyserService()
+	{
+		return GeneralUtility::makeInstance(GridAnalyserService::class);
+	}
 }

Classes/Tool/ConfiguredPidTool.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ConfiguredPid/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
         $view->assignMultiple([
-            'sitePath' => Environment::getPublicPath() . '/',
+            'sitePath' => Environment::getPublicPath().'/',
             'dataType' => $this->getModuleLoader()->getDataType(),
             'configuredPid' => $this->getModulePidService()->getConfiguredNewRecordPid(),
             'errors' => $this->getModulePidService()->validateConfiguredPid(),

Indentation +66 added lines, -66 removed lines

@@ -19,76 +19,76 @@
  */
 class ConfiguredPidTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle(): string
-    {
-        return sprintf(
-            '%s (%s)',
-            LocalizationUtility::translate('tool.configured_pid', 'vidi'),
-            $this->getModulePidService()->getConfiguredNewRecordPid()
-        );
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle(): string
+	{
+		return sprintf(
+			'%s (%s)',
+			LocalizationUtility::translate('tool.configured_pid', 'vidi'),
+			$this->getModulePidService()->getConfiguredNewRecordPid()
+		);
+	}
 
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription(): string
-    {
-        $templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ConfiguredPid/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assignMultiple([
-            'sitePath' => Environment::getPublicPath() . '/',
-            'dataType' => $this->getModuleLoader()->getDataType(),
-            'configuredPid' => $this->getModulePidService()->getConfiguredNewRecordPid(),
-            'errors' => $this->getModulePidService()->validateConfiguredPid(),
-        ]);
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription(): string
+	{
+		$templateNameAndPath = 'EXT:vidi/Resources/Private/Standalone/Tool/ConfiguredPid/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assignMultiple([
+			'sitePath' => Environment::getPublicPath() . '/',
+			'dataType' => $this->getModuleLoader()->getDataType(),
+			'configuredPid' => $this->getModulePidService()->getConfiguredNewRecordPid(),
+			'errors' => $this->getModulePidService()->validateConfiguredPid(),
+		]);
 
-        return $view->render();
-    }
+		return $view->render();
+	}
 
-    /**
-     * Do the job
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = array()): string
-    {
-        return '';
-    }
+	/**
+	 * Do the job
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = array()): string
+	{
+		return '';
+	}
 
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown(): bool
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown(): bool
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader(): ModuleLoader
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader(): ModuleLoader
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
-    /**
-     * @return ModulePidService|object
-     */
-    public function getModulePidService()
-    {
-        /** @var ModulePidService $modulePidService */
-        return GeneralUtility::makeInstance(ModulePidService::class);
-    }
+	/**
+	 * @return ModulePidService|object
+	 */
+	public function getModulePidService()
+	{
+		/** @var ModulePidService $modulePidService */
+		return GeneralUtility::makeInstance(ModulePidService::class);
+	}
 }

Classes/ViewHelpers/Be/RequireJsViewHelper.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $pageRenderer->addJsInlineCode('vidi-inline', $content);
 
         $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:vidi/Resources/Public/');
-        $configuration['paths']['Fab/Vidi'] = $publicResourcesPath . 'JavaScript';
+        $configuration['paths']['Fab/Vidi'] = $publicResourcesPath.'JavaScript';
         $pageRenderer->addRequireJsConfiguration($configuration);
         $pageRenderer->loadRequireJsModule('Fab/Vidi/Vidi/Main');
     }

Indentation +15 added lines, -15 removed lines

@@ -19,21 +19,21 @@
  */
 class RequireJsViewHelper extends AbstractBackendViewHelper
 {
-    /**
-     * Load RequireJS code.
-     *
-     * @return void
-     */
-    public function render()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * Load RequireJS code.
+	 *
+	 * @return void
+	 */
+	public function render()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $content = $this->renderChildren();
-        $pageRenderer->addJsInlineCode('vidi-inline', $content);
+		$content = $this->renderChildren();
+		$pageRenderer->addJsInlineCode('vidi-inline', $content);
 
-        $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:vidi/Resources/Public/');
-        $configuration['paths']['Fab/Vidi'] = $publicResourcesPath . 'JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Vidi/Vidi/Main');
-    }
+		$publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:vidi/Resources/Public/');
+		$configuration['paths']['Fab/Vidi'] = $publicResourcesPath . 'JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Vidi/Vidi/Main');
+	}
 }

Classes/ViewHelpers/Result/ToXlsViewHelper.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
         $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-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');

Indentation +87 added lines, -87 removed lines

@@ -18,91 +18,91 @@
  */
 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');
+	}
 }

Tests/Functional/Grid/RelationRendererTest.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 use Fab\Vidi\Domain\Model\Content;
 use Fab\Vidi\Tests\Functional\AbstractFunctionalTestCase;
 
-require_once dirname(dirname(__FILE__)) . '/AbstractFunctionalTestCase.php';
+require_once dirname(dirname(__FILE__)).'/AbstractFunctionalTestCase.php';
 
 /**
  * Test case for class \Fab\Vidi\Grid\CategoryRenderer.

Indentation +33 added lines, -33 removed lines

@@ -25,42 +25,42 @@
  */
 class RelationRendererTest extends AbstractFunctionalTestCase
 {
-    /**
-     * @var RelationRenderer
-     */
-    private $fixture;
+	/**
+	 * @var RelationRenderer
+	 */
+	private $fixture;
 
-    /**
-     * @var string
-     */
-    private $dataType = 'fe_users';
+	/**
+	 * @var string
+	 */
+	private $dataType = 'fe_users';
 
-    /**
-     * @var string
-     */
-    private $moduleCode = 'user_VidiFeUsersM1';
+	/**
+	 * @var string
+	 */
+	private $moduleCode = 'user_VidiFeUsersM1';
 
-    public function setUp()
-    {
-        parent::setUp();
-        $moduleLoader = new ModuleLoader($this->dataType);
-        $moduleLoader->register();
-        $GLOBALS['_GET']['M'] = $this->moduleCode;
-        $this->fixture = new RelationRenderer();
-    }
+	public function setUp()
+	{
+		parent::setUp();
+		$moduleLoader = new ModuleLoader($this->dataType);
+		$moduleLoader->register();
+		$GLOBALS['_GET']['M'] = $this->moduleCode;
+		$this->fixture = new RelationRenderer();
+	}
 
-    public function tearDown()
-    {
-        unset($this->fixture, $GLOBALS['_GET']['M']);
-    }
+	public function tearDown()
+	{
+		unset($this->fixture, $GLOBALS['_GET']['M']);
+	}
 
-    /**
-     * @test
-     */
-    public function renderAssetWithNoCategoryReturnsEmpty()
-    {
-        $content = new Content($this->dataType);
-        $this->markTestIncomplete(); # TCA must be faked
-        #$actual = $this->fixture->setObject($content)->render();
-    }
+	/**
+	 * @test
+	 */
+	public function renderAssetWithNoCategoryReturnsEmpty()
+	{
+		$content = new Content($this->dataType);
+		$this->markTestIncomplete(); # TCA must be faked
+		#$actual = $this->fixture->setObject($content)->render();
+	}
 }

Configuration/Extbase/Persistence/Classes.php

Indentation +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@
 use Fab\Vidi\Domain\Model\Selection;
 
 return [
-    Selection::class => [
-        'tableName' => 'tx_vidi_selection',
-    ],
+	Selection::class => [
+		'tableName' => 'tx_vidi_selection',
+	],
 ];

Classes/ViewHelpers/Result/ToXmlViewHelper.php

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');
     }

Indentation +85 added lines, -85 removed lines

@@ -17,109 +17,109 @@
  */
 class ToXmlViewHelper extends AbstractToFormatViewHelper
 {
-    /**
-     * Render an XML export.
-     *
-     */
-    public function render()
-    {
-        $objects = $this->templateVariableContainer->get('objects');
+	/**
+	 * 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.
+		// 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);
+			// 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();
+			// 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);
-            }
+				readfile($this->zipFileNameAndPath);
+			} else {
+				$this->sendXmlHttpHeaders();
+				readfile($this->exportFileNameAndPath);
+			}
 
-            GeneralUtility::rmdir($this->temporaryDirectory, true);
-        }
-    }
+			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);
+	/**
+	 * 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();
-        }
+		$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()));
-    }
+		$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();
-    }
+	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');
-    }
+	/**
+	 * @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');
+	}
 }

Classes/ViewHelpers/Result/AbstractToFormatViewHelper.php

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');

Indentation +150 added lines, -150 removed lines

@@ -24,154 +24,154 @@
  */
 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);
+	}
 }