fabarea / vidi

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

Classes/Service/ClipboardService.php

Indentation +71 added lines, -71 removed lines

@@ -19,83 +19,83 @@
  */
 class ClipboardService implements SingletonInterface
 {
-    /**
-     * Get the Matcher object of the clipboard.
-     *
-     * @return Matcher
-     */
-    public function getMatcher()
-    {
-        $matcher = $this->getBackendUser()->getModuleData($this->getDataKey());
-        if (!$matcher) {
-            /** @var $matcher Matcher */
-            $matcher = GeneralUtility::makeInstance(Matcher::class);
-        }
-        return $matcher;
-    }
+	/**
+	 * Get the Matcher object of the clipboard.
+	 *
+	 * @return Matcher
+	 */
+	public function getMatcher()
+	{
+		$matcher = $this->getBackendUser()->getModuleData($this->getDataKey());
+		if (!$matcher) {
+			/** @var $matcher Matcher */
+			$matcher = GeneralUtility::makeInstance(Matcher::class);
+		}
+		return $matcher;
+	}
 
-    /**
-     * Tell whether the clipboard has items or not.
-     *
-     * @return bool
-     */
-    public function hasItems()
-    {
-        $matcher = $this->getMatcher();
+	/**
+	 * Tell whether the clipboard has items or not.
+	 *
+	 * @return bool
+	 */
+	public function hasItems()
+	{
+		$matcher = $this->getMatcher();
 
-        $inCriteria = $matcher->getIn();
-        $likeCriteria = $matcher->getLike();
-        $searchTerm = $matcher->getSearchTerm();
+		$inCriteria = $matcher->getIn();
+		$likeCriteria = $matcher->getLike();
+		$searchTerm = $matcher->getSearchTerm();
 
-        $hasItems = !empty($inCriteria) || !empty($likeCriteria) || !empty($searchTerm);
-        return $hasItems;
-    }
+		$hasItems = !empty($inCriteria) || !empty($likeCriteria) || !empty($searchTerm);
+		return $hasItems;
+	}
 
-    /**
-     * Save data into the clipboard.
-     *
-     * @param Matcher $matches
-     */
-    public function save(Matcher $matches)
-    {
-        $this->getBackendUser()->pushModuleData($this->getDataKey(), $matches);
-    }
+	/**
+	 * Save data into the clipboard.
+	 *
+	 * @param Matcher $matches
+	 */
+	public function save(Matcher $matches)
+	{
+		$this->getBackendUser()->pushModuleData($this->getDataKey(), $matches);
+	}
 
-    /**
-     * Completely empty the clipboard for a data type.
-     *
-     * @return void
-     */
-    public function flush()
-    {
-        $this->getBackendUser()->pushModuleData($this->getDataKey(), null);
-    }
+	/**
+	 * Completely empty the clipboard for a data type.
+	 *
+	 * @return void
+	 */
+	public function flush()
+	{
+		$this->getBackendUser()->pushModuleData($this->getDataKey(), null);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getDataKey()
-    {
-        return 'vidi_clipboard_' . $this->getModuleLoader()->getDataType();
-    }
+	/**
+	 * @return string
+	 */
+	protected function getDataKey()
+	{
+		return 'vidi_clipboard_' . $this->getModuleLoader()->getDataType();
+	}
 
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
-    /**
-     * 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/Converter/Field.php

Indentation +77 added lines, -77 removed lines

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

Classes/Converter/Property.php

Indentation +93 added lines, -93 removed lines

@@ -17,97 +17,97 @@
  */
 class Property
 {
-    /**
-     * @var string
-     */
-    protected static $currentProperty;
-
-    /**
-     * @var string
-     */
-    protected static $currentTable;
-
-    /**
-     * @var array
-     */
-    protected $storage = [];
-
-    /**
-     * @param string $propertyName
-     * @return $this
-     * @throws \InvalidArgumentException
-     */
-    public static function name($propertyName)
-    {
-        self::$currentProperty = $propertyName;
-        self::$currentTable = ''; // reset the table name value.
-        return GeneralUtility::makeInstance(self::class);
-    }
-
-    /**
-     * @param string|Content $tableNameOrContentObject
-     * @return $this
-     */
-    public function of($tableNameOrContentObject)
-    {
-        // Resolve the table name.
-        self::$currentTable = $tableNameOrContentObject instanceof Content ?
-            $tableNameOrContentObject->getDataType() :
-            $tableNameOrContentObject;
-        return $this;
-    }
-
-    public function toFieldName()
-    {
-        $propertyName = $this->getPropertyName();
-        $tableName = $this->getTableName();
-
-        if (empty($this->storage[$tableName][$propertyName])) {
-            if (!array_key_exists($tableName, $this->storage)) {
-                $this->storage[$tableName] = [];
-            }
-
-            // Default case
-            $fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
-
-            // Special case in case the field name does not follow the conventions "field_name" => "fieldName"
-            // There is the chance to make some mapping
-            if (!empty($GLOBALS['TCA'][$tableName]['vidi']['mappings'])) {
-                $key = array_search($propertyName, $GLOBALS['TCA'][$tableName]['vidi']['mappings']);
-                if ($key !== false) {
-                    $fieldName = $key;
-                }
-            }
-
-            $this->storage[$tableName][$propertyName] = $fieldName;
-        }
-
-        return $this->storage[$tableName][$propertyName];
-    }
-
-    /**
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getPropertyName()
-    {
-        $propertyName = self::$currentProperty;
-        if (empty($propertyName)) {
-            throw new \RuntimeException('I could not find a field name value.', 1403203290);
-        }
-        return $propertyName;
-    }
-
-    /**
-     * @return string
-     * @throws \RuntimeException
-     */
-    protected function getTableName()
-    {
-        $tableName = self::$currentTable;
-        if (empty($tableName)) {
-            throw new \RuntimeException('I could not find a table name value.', 1403203291);
-        }
-        return $tableName;
-    }
+	/**
+	 * @var string
+	 */
+	protected static $currentProperty;
+
+	/**
+	 * @var string
+	 */
+	protected static $currentTable;
+
+	/**
+	 * @var array
+	 */
+	protected $storage = [];
+
+	/**
+	 * @param string $propertyName
+	 * @return $this
+	 * @throws \InvalidArgumentException
+	 */
+	public static function name($propertyName)
+	{
+		self::$currentProperty = $propertyName;
+		self::$currentTable = ''; // reset the table name value.
+		return GeneralUtility::makeInstance(self::class);
+	}
+
+	/**
+	 * @param string|Content $tableNameOrContentObject
+	 * @return $this
+	 */
+	public function of($tableNameOrContentObject)
+	{
+		// Resolve the table name.
+		self::$currentTable = $tableNameOrContentObject instanceof Content ?
+			$tableNameOrContentObject->getDataType() :
+			$tableNameOrContentObject;
+		return $this;
+	}
+
+	public function toFieldName()
+	{
+		$propertyName = $this->getPropertyName();
+		$tableName = $this->getTableName();
+
+		if (empty($this->storage[$tableName][$propertyName])) {
+			if (!array_key_exists($tableName, $this->storage)) {
+				$this->storage[$tableName] = [];
+			}
+
+			// Default case
+			$fieldName = GeneralUtility::camelCaseToLowerCaseUnderscored($propertyName);
+
+			// Special case in case the field name does not follow the conventions "field_name" => "fieldName"
+			// There is the chance to make some mapping
+			if (!empty($GLOBALS['TCA'][$tableName]['vidi']['mappings'])) {
+				$key = array_search($propertyName, $GLOBALS['TCA'][$tableName]['vidi']['mappings']);
+				if ($key !== false) {
+					$fieldName = $key;
+				}
+			}
+
+			$this->storage[$tableName][$propertyName] = $fieldName;
+		}
+
+		return $this->storage[$tableName][$propertyName];
+	}
+
+	/**
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getPropertyName()
+	{
+		$propertyName = self::$currentProperty;
+		if (empty($propertyName)) {
+			throw new \RuntimeException('I could not find a field name value.', 1403203290);
+		}
+		return $propertyName;
+	}
+
+	/**
+	 * @return string
+	 * @throws \RuntimeException
+	 */
+	protected function getTableName()
+	{
+		$tableName = self::$currentTable;
+		if (empty($tableName)) {
+			throw new \RuntimeException('I could not find a table name value.', 1403203291);
+		}
+		return $tableName;
+	}
 }

Classes/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/Matcher.php

Indentation +495 added lines, -495 removed lines

@@ -14,499 +14,499 @@
  */
 class Matcher
 {
-    /**
-     * The logical OR
-     */
-    public const LOGICAL_OR = 'logicalOr';
-
-    /**
-     * The logical AND
-     */
-    public const LOGICAL_AND = 'logicalAnd';
-
-    /**
-     * @var string
-     */
-    protected $dataType = '';
-
-    /**
-     * @var string
-     */
-    protected $searchTerm = '';
-
-    /**
-     * @var array
-     */
-    protected $supportedOperators = [
-        '=' => 'equals',
-        '!=' => 'notEquals',
-        'in' => 'in',
-        'like' => 'like',
-        '>' => 'greaterThan',
-        '>=' => 'greaterThanOrEqual',
-        '<' => 'lessThan',
-        '<=' => 'lessThanOrEqual',
-    ];
-
-    /**
-     * @var array
-     */
-    protected $equals = [];
-
-    /**
-     * @var array
-     */
-    protected $notEquals = [];
-
-    /**
-     * @var array
-     */
-    protected $greaterThan = [];
-
-    /**
-     * @var array
-     */
-    protected $greaterThanOrEqual = [];
-
-    /**
-     * @var array
-     */
-    protected $lessThan = [];
-
-    /**
-     * @var array
-     */
-    protected $lessThanOrEqual = [];
-
-    /**
-     * @var array
-     */
-    protected $in = [];
-
-    /**
-     * @var array
-     */
-    protected $like = [];
-
-    /**
-     * @var array
-     */
-    protected $matches = [];
-
-    /**
-     * @var string
-     */
-    protected $defaultLogicalSeparator = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForEquals = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForGreaterThan = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForGreaterThanOrEqual = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForLessThan = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForLessThanOrEqual = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForIn = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForLike = self::LOGICAL_AND;
-
-    /**
-     * @var string
-     */
-    protected $logicalSeparatorForSearchTerm = self::LOGICAL_OR;
-
-    /**
-     * Constructs a new Matcher
-     *
-     * @param array $matches associative [$field => $value]
-     * @param string $dataType which corresponds to an entry of the TCA (table name).
-     */
-    public function __construct($matches = [], $dataType = '')
-    {
-        $this->dataType = $dataType;
-        $this->matches = $matches;
-    }
-
-    /**
-     * @param string $searchTerm
-     * @return \Fab\Vidi\Persistence\Matcher
-     */
-    public function setSearchTerm($searchTerm): Matcher
-    {
-        $this->searchTerm = $searchTerm;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSearchTerm(): string
-    {
-        return $this->searchTerm;
-    }
-
-    /**
-     * @return array
-     */
-    public function getEquals(): array
-    {
-        return $this->equals;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function equals($fieldNameAndPath, $operand): self
-    {
-        $this->equals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getNotEquals(): array
-    {
-        return $this->notEquals;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function notEquals($fieldNameAndPath, $operand): self
-    {
-        $this->notEquals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getGreaterThan(): array
-    {
-        return $this->greaterThan;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function greaterThan($fieldNameAndPath, $operand): self
-    {
-        $this->greaterThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getGreaterThanOrEqual(): array
-    {
-        return $this->greaterThanOrEqual;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function greaterThanOrEqual($fieldNameAndPath, $operand): self
-    {
-        $this->greaterThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLessThan(): array
-    {
-        return $this->lessThan;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function lessThan($fieldNameAndPath, $operand): self
-    {
-        $this->lessThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLessThanOrEqual(): array
-    {
-        return $this->lessThanOrEqual;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function lessThanOrEqual($fieldNameAndPath, $operand): self
-    {
-        $this->lessThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getLike(): array
-    {
-        return $this->like;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @return $this
-     */
-    public function in($fieldNameAndPath, $operand): self
-    {
-        $this->in[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getIn(): array
-    {
-        return $this->in;
-    }
-
-    /**
-     * @param $fieldNameAndPath
-     * @param $operand
-     * @param bool $addWildCard
-     * @return $this
-     */
-    public function like($fieldNameAndPath, $operand, $addWildCard = true): self
-    {
-        $wildCardSymbol = $addWildCard ? '%' : '';
-        $this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultLogicalSeparator(): string
-    {
-        return $this->defaultLogicalSeparator;
-    }
-
-    /**
-     * @param string $defaultLogicalSeparator
-     * @return $this
-     */
-    public function setDefaultLogicalSeparator($defaultLogicalSeparator): self
-    {
-        $this->defaultLogicalSeparator = $defaultLogicalSeparator;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForEquals(): string
-    {
-        return $this->logicalSeparatorForEquals;
-    }
-
-    /**
-     * @param string $logicalSeparatorForEquals
-     * @return $this
-     */
-    public function setLogicalSeparatorForEquals($logicalSeparatorForEquals): self
-    {
-        $this->logicalSeparatorForEquals = $logicalSeparatorForEquals;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForGreaterThan(): string
-    {
-        return $this->logicalSeparatorForGreaterThan;
-    }
-
-    /**
-     * @param string $logicalSeparatorForGreaterThan
-     * @return $this
-     */
-    public function setLogicalSeparatorForGreaterThan($logicalSeparatorForGreaterThan): self
-    {
-        $this->logicalSeparatorForGreaterThan = $logicalSeparatorForGreaterThan;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForGreaterThanOrEqual(): string
-    {
-        return $this->logicalSeparatorForGreaterThanOrEqual;
-    }
-
-    /**
-     * @param string $logicalSeparatorForGreaterThanOrEqual
-     * @return $this
-     */
-    public function setLogicalSeparatorForGreaterThanOrEqual($logicalSeparatorForGreaterThanOrEqual): self
-    {
-        $this->logicalSeparatorForGreaterThanOrEqual = $logicalSeparatorForGreaterThanOrEqual;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLessThan(): string
-    {
-        return $this->logicalSeparatorForLessThan;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLessThan
-     * @return $this
-     */
-    public function setLogicalSeparatorForLessThan($logicalSeparatorForLessThan): self
-    {
-        $this->logicalSeparatorForLessThan = $logicalSeparatorForLessThan;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLessThanOrEqual(): string
-    {
-        return $this->logicalSeparatorForLessThanOrEqual;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLessThanOrEqual
-     * @return $this
-     */
-    public function setLogicalSeparatorForLessThanOrEqual($logicalSeparatorForLessThanOrEqual): self
-    {
-        $this->logicalSeparatorForLessThanOrEqual = $logicalSeparatorForLessThanOrEqual;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForIn(): string
-    {
-        return $this->logicalSeparatorForIn;
-    }
-
-    /**
-     * @param string $logicalSeparatorForIn
-     * @return $this
-     */
-    public function setLogicalSeparatorForIn($logicalSeparatorForIn): self
-    {
-        $this->logicalSeparatorForIn = $logicalSeparatorForIn;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForLike(): string
-    {
-        return $this->logicalSeparatorForLike;
-    }
-
-    /**
-     * @param string $logicalSeparatorForLike
-     * @return $this
-     */
-    public function setLogicalSeparatorForLike($logicalSeparatorForLike): self
-    {
-        $this->logicalSeparatorForLike = $logicalSeparatorForLike;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLogicalSeparatorForSearchTerm(): string
-    {
-        return $this->logicalSeparatorForSearchTerm;
-    }
-
-    /**
-     * @param string $logicalSeparatorForSearchTerm
-     * @return $this
-     */
-    public function setLogicalSeparatorForSearchTerm($logicalSeparatorForSearchTerm): self
-    {
-        $this->logicalSeparatorForSearchTerm = $logicalSeparatorForSearchTerm;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getSupportedOperators(): array
-    {
-        return $this->supportedOperators;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType(): string
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType): self
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
+	/**
+	 * The logical OR
+	 */
+	public const LOGICAL_OR = 'logicalOr';
+
+	/**
+	 * The logical AND
+	 */
+	public const LOGICAL_AND = 'logicalAnd';
+
+	/**
+	 * @var string
+	 */
+	protected $dataType = '';
+
+	/**
+	 * @var string
+	 */
+	protected $searchTerm = '';
+
+	/**
+	 * @var array
+	 */
+	protected $supportedOperators = [
+		'=' => 'equals',
+		'!=' => 'notEquals',
+		'in' => 'in',
+		'like' => 'like',
+		'>' => 'greaterThan',
+		'>=' => 'greaterThanOrEqual',
+		'<' => 'lessThan',
+		'<=' => 'lessThanOrEqual',
+	];
+
+	/**
+	 * @var array
+	 */
+	protected $equals = [];
+
+	/**
+	 * @var array
+	 */
+	protected $notEquals = [];
+
+	/**
+	 * @var array
+	 */
+	protected $greaterThan = [];
+
+	/**
+	 * @var array
+	 */
+	protected $greaterThanOrEqual = [];
+
+	/**
+	 * @var array
+	 */
+	protected $lessThan = [];
+
+	/**
+	 * @var array
+	 */
+	protected $lessThanOrEqual = [];
+
+	/**
+	 * @var array
+	 */
+	protected $in = [];
+
+	/**
+	 * @var array
+	 */
+	protected $like = [];
+
+	/**
+	 * @var array
+	 */
+	protected $matches = [];
+
+	/**
+	 * @var string
+	 */
+	protected $defaultLogicalSeparator = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForEquals = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForGreaterThan = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForGreaterThanOrEqual = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForLessThan = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForLessThanOrEqual = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForIn = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForLike = self::LOGICAL_AND;
+
+	/**
+	 * @var string
+	 */
+	protected $logicalSeparatorForSearchTerm = self::LOGICAL_OR;
+
+	/**
+	 * Constructs a new Matcher
+	 *
+	 * @param array $matches associative [$field => $value]
+	 * @param string $dataType which corresponds to an entry of the TCA (table name).
+	 */
+	public function __construct($matches = [], $dataType = '')
+	{
+		$this->dataType = $dataType;
+		$this->matches = $matches;
+	}
+
+	/**
+	 * @param string $searchTerm
+	 * @return \Fab\Vidi\Persistence\Matcher
+	 */
+	public function setSearchTerm($searchTerm): Matcher
+	{
+		$this->searchTerm = $searchTerm;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSearchTerm(): string
+	{
+		return $this->searchTerm;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getEquals(): array
+	{
+		return $this->equals;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function equals($fieldNameAndPath, $operand): self
+	{
+		$this->equals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getNotEquals(): array
+	{
+		return $this->notEquals;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function notEquals($fieldNameAndPath, $operand): self
+	{
+		$this->notEquals[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getGreaterThan(): array
+	{
+		return $this->greaterThan;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function greaterThan($fieldNameAndPath, $operand): self
+	{
+		$this->greaterThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getGreaterThanOrEqual(): array
+	{
+		return $this->greaterThanOrEqual;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function greaterThanOrEqual($fieldNameAndPath, $operand): self
+	{
+		$this->greaterThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLessThan(): array
+	{
+		return $this->lessThan;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function lessThan($fieldNameAndPath, $operand): self
+	{
+		$this->lessThan[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLessThanOrEqual(): array
+	{
+		return $this->lessThanOrEqual;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function lessThanOrEqual($fieldNameAndPath, $operand): self
+	{
+		$this->lessThanOrEqual[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLike(): array
+	{
+		return $this->like;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @return $this
+	 */
+	public function in($fieldNameAndPath, $operand): self
+	{
+		$this->in[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $operand];
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getIn(): array
+	{
+		return $this->in;
+	}
+
+	/**
+	 * @param $fieldNameAndPath
+	 * @param $operand
+	 * @param bool $addWildCard
+	 * @return $this
+	 */
+	public function like($fieldNameAndPath, $operand, $addWildCard = true): self
+	{
+		$wildCardSymbol = $addWildCard ? '%' : '';
+		$this->like[] = ['fieldNameAndPath' => $fieldNameAndPath, 'operand' => $wildCardSymbol . $operand . $wildCardSymbol];
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultLogicalSeparator(): string
+	{
+		return $this->defaultLogicalSeparator;
+	}
+
+	/**
+	 * @param string $defaultLogicalSeparator
+	 * @return $this
+	 */
+	public function setDefaultLogicalSeparator($defaultLogicalSeparator): self
+	{
+		$this->defaultLogicalSeparator = $defaultLogicalSeparator;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForEquals(): string
+	{
+		return $this->logicalSeparatorForEquals;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForEquals
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForEquals($logicalSeparatorForEquals): self
+	{
+		$this->logicalSeparatorForEquals = $logicalSeparatorForEquals;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForGreaterThan(): string
+	{
+		return $this->logicalSeparatorForGreaterThan;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForGreaterThan
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForGreaterThan($logicalSeparatorForGreaterThan): self
+	{
+		$this->logicalSeparatorForGreaterThan = $logicalSeparatorForGreaterThan;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForGreaterThanOrEqual(): string
+	{
+		return $this->logicalSeparatorForGreaterThanOrEqual;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForGreaterThanOrEqual
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForGreaterThanOrEqual($logicalSeparatorForGreaterThanOrEqual): self
+	{
+		$this->logicalSeparatorForGreaterThanOrEqual = $logicalSeparatorForGreaterThanOrEqual;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLessThan(): string
+	{
+		return $this->logicalSeparatorForLessThan;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLessThan
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLessThan($logicalSeparatorForLessThan): self
+	{
+		$this->logicalSeparatorForLessThan = $logicalSeparatorForLessThan;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLessThanOrEqual(): string
+	{
+		return $this->logicalSeparatorForLessThanOrEqual;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLessThanOrEqual
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLessThanOrEqual($logicalSeparatorForLessThanOrEqual): self
+	{
+		$this->logicalSeparatorForLessThanOrEqual = $logicalSeparatorForLessThanOrEqual;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForIn(): string
+	{
+		return $this->logicalSeparatorForIn;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForIn
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForIn($logicalSeparatorForIn): self
+	{
+		$this->logicalSeparatorForIn = $logicalSeparatorForIn;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForLike(): string
+	{
+		return $this->logicalSeparatorForLike;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForLike
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForLike($logicalSeparatorForLike): self
+	{
+		$this->logicalSeparatorForLike = $logicalSeparatorForLike;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLogicalSeparatorForSearchTerm(): string
+	{
+		return $this->logicalSeparatorForSearchTerm;
+	}
+
+	/**
+	 * @param string $logicalSeparatorForSearchTerm
+	 * @return $this
+	 */
+	public function setLogicalSeparatorForSearchTerm($logicalSeparatorForSearchTerm): self
+	{
+		$this->logicalSeparatorForSearchTerm = $logicalSeparatorForSearchTerm;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSupportedOperators(): array
+	{
+		return $this->supportedOperators;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType(): string
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType): self
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
 }

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