fabarea / vidi

Classes/DataHandler/CoreDataHandler.php

Indentation +131 added lines, -131 removed lines

@@ -18,135 +18,135 @@
  */
 class CoreDataHandler extends AbstractDataHandler
 {
-    /**
-     * @var array
-     */
-    protected $dataHandler;
-
-    /**
-     * Process Content with action "update".
-     *
-     * @param Content $content
-     * @throws \Exception
-     * @return bool
-     */
-    public function processUpdate(Content $content)
-    {
-        $values = [];
-
-        // Check the field to be updated exists
-        foreach ($content->toArray() as $fieldName => $value) {
-            if (!Tca::table($content->getDataType())->hasField($fieldName)) {
-                $message = sprintf('It looks field "%s" does not exist for data type "%s"', $fieldName, $content->getDataType());
-                throw new \Exception($message, 1390668497);
-            }
-
-            // Flatten value if array given which is required for the DataHandler.
-            if (is_array($value)) {
-                $value = implode(',', $value);
-            }
-            $values[$fieldName] = $value;
-        }
-
-        $data[$content->getDataType()][$content->getUid()] = $values;
-
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start($data, array());
-        $dataHandler->process_datamap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * Process Content with action "remove".
-     *
-     * @param Content $content
-     * @return bool
-     */
-    public function processRemove(Content $content)
-    {
-        // Build command
-        $cmd[$content->getDataType()][$content->getUid()]['delete'] = 1;
-
-        /** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start([], $cmd);
-        $dataHandler->process_datamap();
-        $dataHandler->process_cmdmap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * Process Content with action "copy".
-     *
-     * @param Content $content
-     * @param string $target
-     * @return bool
-     */
-    public function processCopy(Content $content, $target)
-    {
-        // TODO: Implement processCopy() method.
-    }
-
-    /**
-     * Process Content with action "move".
-     * The $target corresponds to the pid to move the records to.
-     * It can also be a negative value in case of sorting. The negative value would be the uid of its predecessor.
-     *
-     * @param Content $content
-     * @param int $target corresponds
-     * @return bool
-     */
-    public function processMove(Content $content, $target)
-    {
-        // Build command
-        $cmd[$content->getDataType()][$content->getUid()]['move'] = $target;
-
-        /** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start([], $cmd);
-        $dataHandler->process_datamap();
-        $dataHandler->process_cmdmap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * Process Content with action "localize".
-     *
-     * @param Content $content
-     * @param int $language
-     * @return bool
-     */
-    public function processLocalize(Content $content, $language)
-    {
-        $command[$content->getDataType()][$content->getUid()]['localize'] = $language;
-
-        $dataHandler = $this->getDataHandler();
-        $dataHandler->start([], $command);
-        $dataHandler->process_datamap();
-        $dataHandler->process_cmdmap();
-        $this->errorMessages = $dataHandler->errorLog;
-
-        // Returns true is log does not contain errors.
-        return empty($dataHandler->errorLog);
-    }
-
-    /**
-     * @return DataHandler
-     */
-    protected function getDataHandler()
-    {
-        if (!$this->dataHandler) {
-            $this->dataHandler = GeneralUtility::makeInstance(DataHandler::class);
-        }
-        return $this->dataHandler;
-    }
+	/**
+	 * @var array
+	 */
+	protected $dataHandler;
+
+	/**
+	 * Process Content with action "update".
+	 *
+	 * @param Content $content
+	 * @throws \Exception
+	 * @return bool
+	 */
+	public function processUpdate(Content $content)
+	{
+		$values = [];
+
+		// Check the field to be updated exists
+		foreach ($content->toArray() as $fieldName => $value) {
+			if (!Tca::table($content->getDataType())->hasField($fieldName)) {
+				$message = sprintf('It looks field "%s" does not exist for data type "%s"', $fieldName, $content->getDataType());
+				throw new \Exception($message, 1390668497);
+			}
+
+			// Flatten value if array given which is required for the DataHandler.
+			if (is_array($value)) {
+				$value = implode(',', $value);
+			}
+			$values[$fieldName] = $value;
+		}
+
+		$data[$content->getDataType()][$content->getUid()] = $values;
+
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start($data, array());
+		$dataHandler->process_datamap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * Process Content with action "remove".
+	 *
+	 * @param Content $content
+	 * @return bool
+	 */
+	public function processRemove(Content $content)
+	{
+		// Build command
+		$cmd[$content->getDataType()][$content->getUid()]['delete'] = 1;
+
+		/** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start([], $cmd);
+		$dataHandler->process_datamap();
+		$dataHandler->process_cmdmap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * Process Content with action "copy".
+	 *
+	 * @param Content $content
+	 * @param string $target
+	 * @return bool
+	 */
+	public function processCopy(Content $content, $target)
+	{
+		// TODO: Implement processCopy() method.
+	}
+
+	/**
+	 * Process Content with action "move".
+	 * The $target corresponds to the pid to move the records to.
+	 * It can also be a negative value in case of sorting. The negative value would be the uid of its predecessor.
+	 *
+	 * @param Content $content
+	 * @param int $target corresponds
+	 * @return bool
+	 */
+	public function processMove(Content $content, $target)
+	{
+		// Build command
+		$cmd[$content->getDataType()][$content->getUid()]['move'] = $target;
+
+		/** @var $dataHandler \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start([], $cmd);
+		$dataHandler->process_datamap();
+		$dataHandler->process_cmdmap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * Process Content with action "localize".
+	 *
+	 * @param Content $content
+	 * @param int $language
+	 * @return bool
+	 */
+	public function processLocalize(Content $content, $language)
+	{
+		$command[$content->getDataType()][$content->getUid()]['localize'] = $language;
+
+		$dataHandler = $this->getDataHandler();
+		$dataHandler->start([], $command);
+		$dataHandler->process_datamap();
+		$dataHandler->process_cmdmap();
+		$this->errorMessages = $dataHandler->errorLog;
+
+		// Returns true is log does not contain errors.
+		return empty($dataHandler->errorLog);
+	}
+
+	/**
+	 * @return DataHandler
+	 */
+	protected function getDataHandler()
+	{
+		if (!$this->dataHandler) {
+			$this->dataHandler = GeneralUtility::makeInstance(DataHandler::class);
+		}
+		return $this->dataHandler;
+	}
 }

Classes/Service/BackendUserPreferenceService.php

Indentation +46 added lines, -46 removed lines

@@ -16,53 +16,53 @@
  */
 class BackendUserPreferenceService
 {
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Vidi\Service\BackendUserPreferenceService|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Service\BackendUserPreferenceService::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Vidi\Service\BackendUserPreferenceService|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Service\BackendUserPreferenceService::class);
+	}
 
-    /**
-     * Returns a configuration key for the current BE User.
-     *
-     * @param string $key
-     * @return mixed
-     */
-    public function get($key)
-    {
-        $result = '';
-        if ($this->getBackendUser() && !empty($this->getBackendUser()->uc[$key])) {
-            $result = $this->getBackendUser()->uc[$key];
-        }
-        return $result;
-    }
+	/**
+	 * Returns a configuration key for the current BE User.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		$result = '';
+		if ($this->getBackendUser() && !empty($this->getBackendUser()->uc[$key])) {
+			$result = $this->getBackendUser()->uc[$key];
+		}
+		return $result;
+	}
 
-    /**
-     * Set a configuration for the current BE User.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return void
-     */
-    public function set($key, $value)
-    {
-        if ($this->getBackendUser()) {
-            $this->getBackendUser()->uc[$key] = $value;
-            $this->getBackendUser()->writeUC();
-        }
-    }
+	/**
+	 * Set a configuration for the current BE User.
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 * @return void
+	 */
+	public function set($key, $value)
+	{
+		if ($this->getBackendUser()) {
+			$this->getBackendUser()->uc[$key] = $value;
+			$this->getBackendUser()->writeUC();
+		}
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }

Classes/Service/FileReferenceService.php

Indentation +69 added lines, -69 removed lines

@@ -22,82 +22,82 @@
  */
 class FileReferenceService implements SingletonInterface
 {
-    /**
-     * @var array
-     */
-    protected static $instances = [];
+	/**
+	 * @var array
+	 */
+	protected static $instances = [];
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Vidi\Service\FileReferenceService|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Service\FileReferenceService::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Vidi\Service\FileReferenceService|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Service\FileReferenceService::class);
+	}
 
-    /**
-     * @param Content $object
-     * @param string $propertyName
-     * @return File[]
-     */
-    public function findReferencedBy($propertyName, Content $object)
-    {
-        if (!isset(self::$instances[$object->getUid()][$propertyName])) {
-            // Initialize instances value
-            if (!isset(self::$instances[$object->getUid()])) {
-                self::$instances[$object->getUid()] = [];
-            }
+	/**
+	 * @param Content $object
+	 * @param string $propertyName
+	 * @return File[]
+	 */
+	public function findReferencedBy($propertyName, Content $object)
+	{
+		if (!isset(self::$instances[$object->getUid()][$propertyName])) {
+			// Initialize instances value
+			if (!isset(self::$instances[$object->getUid()])) {
+				self::$instances[$object->getUid()] = [];
+			}
 
-            $fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
-            $field = Tca::table($object->getDataType())->field($fieldName);
-            if ($field->getForeignTable() === 'sys_file_reference') {
-                $files = $this->findByFileReference($propertyName, $object);
-                self::$instances[$object->getUid()][$propertyName] = $files;
-            } else {
-                // @todo the standard way of handling file references is by "sys_file_reference". Let see if there is other use cases...
-            }
-        }
+			$fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
+			$field = Tca::table($object->getDataType())->field($fieldName);
+			if ($field->getForeignTable() === 'sys_file_reference') {
+				$files = $this->findByFileReference($propertyName, $object);
+				self::$instances[$object->getUid()][$propertyName] = $files;
+			} else {
+				// @todo the standard way of handling file references is by "sys_file_reference". Let see if there is other use cases...
+			}
+		}
 
-        return self::$instances[$object->getUid()][$propertyName];
-    }
+		return self::$instances[$object->getUid()][$propertyName];
+	}
 
-    /**
-     * Fetch the files given an object assuming
-     *
-     * @param $propertyName
-     * @param Content $object
-     * @return File[]
-     */
-    protected function findByFileReference($propertyName, Content $object)
-    {
-        $fileField = 'uid_local';
-        $tableName = 'sys_file_reference';
+	/**
+	 * Fetch the files given an object assuming
+	 *
+	 * @param $propertyName
+	 * @param Content $object
+	 * @return File[]
+	 */
+	protected function findByFileReference($propertyName, Content $object)
+	{
+		$fileField = 'uid_local';
+		$tableName = 'sys_file_reference';
 
-        $rows = $this->getDataService()->getRecords(
-            $tableName,
-            [
-                'tablenames' => $object->getDataType(),
-                'fieldname'=> GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName),
-                'uid_foreign'=> $object->getUid(),
-            ]
-        );
+		$rows = $this->getDataService()->getRecords(
+			$tableName,
+			[
+				'tablenames' => $object->getDataType(),
+				'fieldname'=> GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName),
+				'uid_foreign'=> $object->getUid(),
+			]
+		);
 
-        // Build array of Files
-        $files = [];
-        foreach ($rows as $row) {
-            $files[] = GeneralUtility::makeInstance(ResourceFactory::class)->getFileObject($row[$fileField]);
-        }
+		// Build array of Files
+		$files = [];
+		foreach ($rows as $row) {
+			$files[] = GeneralUtility::makeInstance(ResourceFactory::class)->getFileObject($row[$fileField]);
+		}
 
-        return $files;
-    }
+		return $files;
+	}
 
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 }

Classes/Service/ContentService.php

Indentation +117 added lines, -117 removed lines

@@ -22,121 +22,121 @@
  */
 class ContentService
 {
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var Content[]
-     */
-    protected $objects = [];
-
-    /**
-     * @var int
-     */
-    protected $numberOfObjects = 0;
-
-    /**
-     * Constructor
-     *
-     * @param string $dataType
-     */
-    public function __construct($dataType = '')
-    {
-        if (empty($dataType)) {
-            $dataType = $this->getModuleLoader()->getDataType();
-        }
-        $this->dataType = $dataType;
-    }
-
-    /**
-     * Fetch the files given an object assuming
-     *
-     * @param Matcher $matcher
-     * @param Order $order The order
-     * @param int $limit
-     * @param int $offset
-     * @return $this
-     */
-    public function findBy(Matcher $matcher, Order $order = null, $limit = null, $offset = null)
-    {
-        // Query the repository.
-        $objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order, $limit, $offset);
-        $signalResult = $this->emitAfterFindContentObjectsSignal($objects, $matcher, $order, $limit, $offset);
-
-        // Reset objects variable after possible signal / slot processing.
-        $this->objects = $signalResult->getContentObjects();
-
-        // Count number of content objects.
-        if ($signalResult->getHasBeenProcessed()) {
-            $this->numberOfObjects = $signalResult->getNumberOfObjects();
-        } else {
-            $this->numberOfObjects = ContentRepositoryFactory::getInstance($this->dataType)->countBy($matcher);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Signal that is called after the content objects have been found.
-     *
-     * @param array $contentObjects
-     * @param Matcher $matcher
-     * @param Order $order
-     * @param int $limit
-     * @param int $offset
-     * @return AfterFindContentObjectsSignalArguments
-     */
-    protected function emitAfterFindContentObjectsSignal($contentObjects, Matcher $matcher, Order $order = null, $limit = 0, $offset = 0)
-    {
-        /** @var AfterFindContentObjectsSignalArguments $signalArguments */
-        $signalArguments = GeneralUtility::makeInstance(AfterFindContentObjectsSignalArguments::class);
-        $signalArguments->setDataType($this->dataType)
-            ->setContentObjects($contentObjects)
-            ->setMatcher($matcher)
-            ->setOrder($order)
-            ->setLimit($limit)
-            ->setOffset($offset)
-            ->setHasBeenProcessed(false);
-
-        $signalResult = $this->getSignalSlotDispatcher()->dispatch(ContentService::class, 'afterFindContentObjects', array($signalArguments));
-        return $signalResult[0];
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    /**
-     * Get the SignalSlot dispatcher.
-     *
-     * @return Dispatcher|object
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
-
-    /**
-     * @return Content[]
-     */
-    public function getObjects()
-    {
-        return $this->objects;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfObjects()
-    {
-        return $this->numberOfObjects;
-    }
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var Content[]
+	 */
+	protected $objects = [];
+
+	/**
+	 * @var int
+	 */
+	protected $numberOfObjects = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $dataType
+	 */
+	public function __construct($dataType = '')
+	{
+		if (empty($dataType)) {
+			$dataType = $this->getModuleLoader()->getDataType();
+		}
+		$this->dataType = $dataType;
+	}
+
+	/**
+	 * Fetch the files given an object assuming
+	 *
+	 * @param Matcher $matcher
+	 * @param Order $order The order
+	 * @param int $limit
+	 * @param int $offset
+	 * @return $this
+	 */
+	public function findBy(Matcher $matcher, Order $order = null, $limit = null, $offset = null)
+	{
+		// Query the repository.
+		$objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order, $limit, $offset);
+		$signalResult = $this->emitAfterFindContentObjectsSignal($objects, $matcher, $order, $limit, $offset);
+
+		// Reset objects variable after possible signal / slot processing.
+		$this->objects = $signalResult->getContentObjects();
+
+		// Count number of content objects.
+		if ($signalResult->getHasBeenProcessed()) {
+			$this->numberOfObjects = $signalResult->getNumberOfObjects();
+		} else {
+			$this->numberOfObjects = ContentRepositoryFactory::getInstance($this->dataType)->countBy($matcher);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Signal that is called after the content objects have been found.
+	 *
+	 * @param array $contentObjects
+	 * @param Matcher $matcher
+	 * @param Order $order
+	 * @param int $limit
+	 * @param int $offset
+	 * @return AfterFindContentObjectsSignalArguments
+	 */
+	protected function emitAfterFindContentObjectsSignal($contentObjects, Matcher $matcher, Order $order = null, $limit = 0, $offset = 0)
+	{
+		/** @var AfterFindContentObjectsSignalArguments $signalArguments */
+		$signalArguments = GeneralUtility::makeInstance(AfterFindContentObjectsSignalArguments::class);
+		$signalArguments->setDataType($this->dataType)
+			->setContentObjects($contentObjects)
+			->setMatcher($matcher)
+			->setOrder($order)
+			->setLimit($limit)
+			->setOffset($offset)
+			->setHasBeenProcessed(false);
+
+		$signalResult = $this->getSignalSlotDispatcher()->dispatch(ContentService::class, 'afterFindContentObjects', array($signalArguments));
+		return $signalResult[0];
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher.
+	 *
+	 * @return Dispatcher|object
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
+
+	/**
+	 * @return Content[]
+	 */
+	public function getObjects()
+	{
+		return $this->objects;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfObjects()
+	{
+		return $this->numberOfObjects;
+	}
 }

Classes/Service/SpreadSheetService.php

Indentation +141 added lines, -141 removed lines

@@ -21,145 +21,145 @@
  */
 class SpreadSheetService
 {
-    public const XmlHeader = "<?xml version=\"1.0\" encoding=\"%s\"?\>\n<Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:html=\"http://www.w3.org/TR/REC-html40\">";
-    public const XmlFooter = "</Workbook>";
-
-    /**
-     * @var string
-     */
-    protected $encoding = 'UTF-8'; // encoding type to specify in file.
-    // Note that you're on your own for making sure your data is actually encoded to this encoding
-
-    /**
-     * @var string
-     */
-    protected $title = 'Sheet1'; // title for Worksheet
-
-    /**
-     * @var string
-     */
-    protected $buffer = '';
-
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->addToBuffer($this->generateHeader());
-    }
-
-    /**
-     * @param array $row
-     */
-    public function addRow($row)
-    {
-        $this->addToBuffer($this->generateRow($row));
-    }
-
-    /**
-     * @return mixed
-     */
-    public function toString()
-    {
-        $this->addToBuffer($this->generateFooter());
-        return $this->buffer;
-    }
-
-    /**
-     * @param $data
-     */
-    protected function addToBuffer($data)
-    {
-        $this->buffer .= $data;
-    }
-
-    /**
-     * @return string
-     */
-    protected function generateHeader()
-    {
-        // workbook header
-        $output = stripslashes(sprintf(self::XmlHeader, $this->encoding)) . "\n";
-
-        // Set up styles
-        $output .= "<Styles>\n";
-        $output .= "<Style ss:ID=\"sDT\"><NumberFormat ss:Format=\"Short Date\"/></Style>\n";
-        $output .= "</Styles>\n";
-
-        // worksheet header
-        $output .= sprintf("<Worksheet ss:Name=\"%s\">\n    <Table>\n", htmlentities($this->title));
-
-        return $output;
-    }
-
-    protected function generateFooter()
-    {
-        $output = '';
-
-        // worksheet footer
-        $output .= "    </Table>\n</Worksheet>\n";
-
-        // workbook footer
-        $output .= self::XmlFooter;
-
-        return $output;
-    }
-
-    /**
-     * @param $row
-     * @return string
-     */
-    protected function generateRow($row)
-    {
-        $output = '';
-        $output .= "        <Row>\n";
-        foreach ($row as $v) {
-            $output .= $this->generateCell($v);
-        }
-        $output .= "        </Row>\n";
-        return $output;
-    }
-
-    /**
-     * @param $item
-     * @return string
-     */
-    protected function generateCell($item)
-    {
-        $output = '';
-        $style = '';
-
-        // Tell Excel to treat as a number. Note that Excel only stores roughly 15 digits, so keep
-        // as text if number is longer than that.
-        if (preg_match("/^-?\d+(?:[.,]\d+)?$/", $item) && (strlen($item) < 15)) {
-            $type = 'Number';
-        }
-        // Sniff for valid dates; should look something like 2010-07-14 or 7/14/2010 etc. Can
-        // also have an optional time after the date.
-        //
-        // Note we want to be very strict in what we consider a date. There is the possibility
-        // of really screwing up the data if we try to reformat a string that was not actually
-        // intended to represent a date.
-        elseif (preg_match("/^(\d{1,2}|\d{4})[\/\-]\d{1,2}[\/\-](\d{1,2}|\d{4})([^\d].+)?$/", $item) &&
-            ($timestamp = strtotime($item)) &&
-            ($timestamp > 0) &&
-            ($timestamp < strtotime('+500 years'))
-        ) {
-            $type = 'DateTime';
-            $item = strftime("%Y-%m-%dT%H:%M:%S", $timestamp);
-            $style = 'sDT'; // defined in header; tells excel to format date for display
-        } else {
-            $type = 'String';
-        }
-
-        $item = str_replace('&#039;', '&apos;', htmlspecialchars($item, ENT_QUOTES));
-        $item = str_replace("\n", '&#13;', $item);
-        $output .= "            ";
-        $output .= $style ? "<Cell ss:StyleID=\"$style\">" : "<Cell>";
-        $output .= sprintf("<Data ss:Type=\"%s\">%s</Data>", $type, $item);
-        $output .= "</Cell>\n";
-
-        return $output;
-    }
+	public const XmlHeader = "<?xml version=\"1.0\" encoding=\"%s\"?\>\n<Workbook xmlns=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\" xmlns:ss=\"urn:schemas-microsoft-com:office:spreadsheet\" xmlns:html=\"http://www.w3.org/TR/REC-html40\">";
+	public const XmlFooter = "</Workbook>";
+
+	/**
+	 * @var string
+	 */
+	protected $encoding = 'UTF-8'; // encoding type to specify in file.
+	// Note that you're on your own for making sure your data is actually encoded to this encoding
+
+	/**
+	 * @var string
+	 */
+	protected $title = 'Sheet1'; // title for Worksheet
+
+	/**
+	 * @var string
+	 */
+	protected $buffer = '';
+
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->addToBuffer($this->generateHeader());
+	}
+
+	/**
+	 * @param array $row
+	 */
+	public function addRow($row)
+	{
+		$this->addToBuffer($this->generateRow($row));
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function toString()
+	{
+		$this->addToBuffer($this->generateFooter());
+		return $this->buffer;
+	}
+
+	/**
+	 * @param $data
+	 */
+	protected function addToBuffer($data)
+	{
+		$this->buffer .= $data;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function generateHeader()
+	{
+		// workbook header
+		$output = stripslashes(sprintf(self::XmlHeader, $this->encoding)) . "\n";
+
+		// Set up styles
+		$output .= "<Styles>\n";
+		$output .= "<Style ss:ID=\"sDT\"><NumberFormat ss:Format=\"Short Date\"/></Style>\n";
+		$output .= "</Styles>\n";
+
+		// worksheet header
+		$output .= sprintf("<Worksheet ss:Name=\"%s\">\n    <Table>\n", htmlentities($this->title));
+
+		return $output;
+	}
+
+	protected function generateFooter()
+	{
+		$output = '';
+
+		// worksheet footer
+		$output .= "    </Table>\n</Worksheet>\n";
+
+		// workbook footer
+		$output .= self::XmlFooter;
+
+		return $output;
+	}
+
+	/**
+	 * @param $row
+	 * @return string
+	 */
+	protected function generateRow($row)
+	{
+		$output = '';
+		$output .= "        <Row>\n";
+		foreach ($row as $v) {
+			$output .= $this->generateCell($v);
+		}
+		$output .= "        </Row>\n";
+		return $output;
+	}
+
+	/**
+	 * @param $item
+	 * @return string
+	 */
+	protected function generateCell($item)
+	{
+		$output = '';
+		$style = '';
+
+		// Tell Excel to treat as a number. Note that Excel only stores roughly 15 digits, so keep
+		// as text if number is longer than that.
+		if (preg_match("/^-?\d+(?:[.,]\d+)?$/", $item) && (strlen($item) < 15)) {
+			$type = 'Number';
+		}
+		// Sniff for valid dates; should look something like 2010-07-14 or 7/14/2010 etc. Can
+		// also have an optional time after the date.
+		//
+		// Note we want to be very strict in what we consider a date. There is the possibility
+		// of really screwing up the data if we try to reformat a string that was not actually
+		// intended to represent a date.
+		elseif (preg_match("/^(\d{1,2}|\d{4})[\/\-]\d{1,2}[\/\-](\d{1,2}|\d{4})([^\d].+)?$/", $item) &&
+			($timestamp = strtotime($item)) &&
+			($timestamp > 0) &&
+			($timestamp < strtotime('+500 years'))
+		) {
+			$type = 'DateTime';
+			$item = strftime("%Y-%m-%dT%H:%M:%S", $timestamp);
+			$style = 'sDT'; // defined in header; tells excel to format date for display
+		} else {
+			$type = 'String';
+		}
+
+		$item = str_replace('&#039;', '&apos;', htmlspecialchars($item, ENT_QUOTES));
+		$item = str_replace("\n", '&#13;', $item);
+		$output .= "            ";
+		$output .= $style ? "<Cell ss:StyleID=\"$style\">" : "<Cell>";
+		$output .= sprintf("<Data ss:Type=\"%s\">%s</Data>", $type, $item);
+		$output .= "</Cell>\n";
+
+		return $output;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
     protected function generateHeader()
     {
         // workbook header
-        $output = stripslashes(sprintf(self::XmlHeader, $this->encoding)) . "\n";
+        $output = stripslashes(sprintf(self::XmlHeader, $this->encoding))."\n";
 
         // Set up styles
         $output .= "<Styles>\n";

Classes/Persistence/OrderObjectFactory.php

Indentation +38 added lines, -38 removed lines

@@ -18,42 +18,42 @@
  */
 class OrderObjectFactory implements SingletonInterface
 {
-    /**
-     * Gets a singleton instance of this class.
-     *
-     * @return \Fab\Vidi\Persistence\OrderObjectFactory|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\OrderObjectFactory::class);
-    }
-
-    /**
-     * Returns an order object.
-     *
-     * @param string $dataType
-     * @return Order|object
-     */
-    public function getOrder($dataType = '')
-    {
-        // Default ordering
-        $order = Tca::table($dataType)->getDefaultOrderings();
-
-        // Retrieve a possible id of the column from the request
-        $orderings = GeneralUtility::_GP('order');
-
-        if (is_array($orderings) && isset($orderings[0])) {
-            $columnPosition = $orderings[0]['column'];
-            $direction = $orderings[0]['dir'];
-
-            if ($columnPosition > 0) {
-                $field = Tca::grid()->getFieldNameByPosition($columnPosition);
-
-                $order = array(
-                    $field => strtoupper($direction)
-                );
-            }
-        }
-        return GeneralUtility::makeInstance(Order::class, $order);
-    }
+	/**
+	 * Gets a singleton instance of this class.
+	 *
+	 * @return \Fab\Vidi\Persistence\OrderObjectFactory|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Persistence\OrderObjectFactory::class);
+	}
+
+	/**
+	 * Returns an order object.
+	 *
+	 * @param string $dataType
+	 * @return Order|object
+	 */
+	public function getOrder($dataType = '')
+	{
+		// Default ordering
+		$order = Tca::table($dataType)->getDefaultOrderings();
+
+		// Retrieve a possible id of the column from the request
+		$orderings = GeneralUtility::_GP('order');
+
+		if (is_array($orderings) && isset($orderings[0])) {
+			$columnPosition = $orderings[0]['column'];
+			$direction = $orderings[0]['dir'];
+
+			if ($columnPosition > 0) {
+				$field = Tca::grid()->getFieldNameByPosition($columnPosition);
+
+				$order = array(
+					$field => strtoupper($direction)
+				);
+			}
+		}
+		return GeneralUtility::makeInstance(Order::class, $order);
+	}
 }

Classes/Persistence/Pager.php

Indentation +164 added lines, -164 removed lines

@@ -16,168 +16,168 @@
  */
 class Pager
 {
-    /**
-     * Total amount of entries
-     *
-     * @var integer
-     */
-    protected $count;
-
-    /**
-     * Current offset
-     *
-     * @var integer
-     */
-    protected $offset;
-
-    /**
-     * Current page index
-     *
-     * @var integer
-     */
-    protected $page;
-
-    /**
-     * Number of items per page
-     *
-     * @var integer
-     */
-    protected $limit = 10;
-
-    /**
-     * Constructs a new Pager
-     */
-    public function __construct()
-    {
-        $this->page = 1;
-    }
-
-    /**
-     * Returns the total amount of entries
-     *
-     * @return int
-     */
-    public function getCount()
-    {
-        return $this->count;
-    }
-
-    /**
-     * Sets the total amount of entries
-     *
-     * @param int $count
-     */
-    public function setCount($count)
-    {
-        $this->count = $count;
-    }
-
-    /**
-     * Returns the current page index
-     *
-     * @return int
-     */
-    public function getPage()
-    {
-        return $this->page;
-    }
-
-    /**
-     * Sets the current page index
-     *
-     * @param int $page
-     */
-    public function setPage($page)
-    {
-        $this->page = $page;
-    }
-
-    /**
-     * Returns the current limit index
-     *
-     * @return int
-     */
-    public function getLimit()
-    {
-        return $this->limit;
-    }
-
-    /**
-     * Sets the current limit index
-     *
-     * @param int $limit
-     */
-    public function setLimit($limit)
-    {
-        $this->limit = $limit;
-    }
-
-    /**
-     * @return Array Items to display
-     */
-    public function getDisplayItems()
-    {
-        $last = $this->getLastPage();
-        if ($last == 1) {
-            return null;
-        }
-        $values = array();
-        for ($i = 1; $i <= $last; $i++) {
-            $values[] = array('key' => $i, 'value' => $i);
-        }
-        return $values;
-    }
-
-    /**
-     * @return int The last page index
-     */
-    public function getLastPage()
-    {
-        $last = intval($this->count / $this->limit);
-        if ($this->count % $this->limit > 0) {
-            $last++;
-        }
-        return $last;
-    }
-
-    /**
-     * @return int The previous page index. Minimum value is 1
-     */
-    public function getPreviousPage()
-    {
-        $prev = $this->page - 1;
-        if ($prev < 1) {
-            $prev = 1;
-        }
-        return $prev;
-    }
-
-    /**
-     * @return int The next page index. Maximum valus is the last page
-     */
-    public function getNextPage()
-    {
-        $next = $this->page + 1;
-        $last = $this->getLastPage();
-        if ($next > $last) {
-            $next = $last;
-        }
-        return $next;
-    }
-
-    /**
-     * @return int
-     */
-    public function getOffset()
-    {
-        return $this->offset;
-    }
-
-    /**
-     * @param int $offset
-     */
-    public function setOffset($offset)
-    {
-        $this->offset = $offset;
-    }
+	/**
+	 * Total amount of entries
+	 *
+	 * @var integer
+	 */
+	protected $count;
+
+	/**
+	 * Current offset
+	 *
+	 * @var integer
+	 */
+	protected $offset;
+
+	/**
+	 * Current page index
+	 *
+	 * @var integer
+	 */
+	protected $page;
+
+	/**
+	 * Number of items per page
+	 *
+	 * @var integer
+	 */
+	protected $limit = 10;
+
+	/**
+	 * Constructs a new Pager
+	 */
+	public function __construct()
+	{
+		$this->page = 1;
+	}
+
+	/**
+	 * Returns the total amount of entries
+	 *
+	 * @return int
+	 */
+	public function getCount()
+	{
+		return $this->count;
+	}
+
+	/**
+	 * Sets the total amount of entries
+	 *
+	 * @param int $count
+	 */
+	public function setCount($count)
+	{
+		$this->count = $count;
+	}
+
+	/**
+	 * Returns the current page index
+	 *
+	 * @return int
+	 */
+	public function getPage()
+	{
+		return $this->page;
+	}
+
+	/**
+	 * Sets the current page index
+	 *
+	 * @param int $page
+	 */
+	public function setPage($page)
+	{
+		$this->page = $page;
+	}
+
+	/**
+	 * Returns the current limit index
+	 *
+	 * @return int
+	 */
+	public function getLimit()
+	{
+		return $this->limit;
+	}
+
+	/**
+	 * Sets the current limit index
+	 *
+	 * @param int $limit
+	 */
+	public function setLimit($limit)
+	{
+		$this->limit = $limit;
+	}
+
+	/**
+	 * @return Array Items to display
+	 */
+	public function getDisplayItems()
+	{
+		$last = $this->getLastPage();
+		if ($last == 1) {
+			return null;
+		}
+		$values = array();
+		for ($i = 1; $i <= $last; $i++) {
+			$values[] = array('key' => $i, 'value' => $i);
+		}
+		return $values;
+	}
+
+	/**
+	 * @return int The last page index
+	 */
+	public function getLastPage()
+	{
+		$last = intval($this->count / $this->limit);
+		if ($this->count % $this->limit > 0) {
+			$last++;
+		}
+		return $last;
+	}
+
+	/**
+	 * @return int The previous page index. Minimum value is 1
+	 */
+	public function getPreviousPage()
+	{
+		$prev = $this->page - 1;
+		if ($prev < 1) {
+			$prev = 1;
+		}
+		return $prev;
+	}
+
+	/**
+	 * @return int The next page index. Maximum valus is the last page
+	 */
+	public function getNextPage()
+	{
+		$next = $this->page + 1;
+		$last = $this->getLastPage();
+		if ($next > $last) {
+			$next = $last;
+		}
+		return $next;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getOffset()
+	{
+		return $this->offset;
+	}
+
+	/**
+	 * @param int $offset
+	 */
+	public function setOffset($offset)
+	{
+		$this->offset = $offset;
+	}
 }

Classes/Persistence/Order.php

Indentation +38 added lines, -38 removed lines

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

Classes/Persistence/ResultSetStorage.php

Indentation +25 added lines, -25 removed lines

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