fabarea / vidi

Classes/DataHandler/CoreDataHandler.php

Doc Comments +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
      *
      * @param Content $content
      * @param string $target
-     * @return bool
+     * @return boolean|null
      */
     public function processCopy(Content $content, $target)
     {

Indentation +135 added lines, -135 removed lines

@@ -18,140 +18,140 @@
 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 \TYPO3\CMS\Core\DataHandling\DataHandler
-     */
-    protected function getDataHandler()
-    {
-        if (!$this->dataHandler) {
-            $this->dataHandler = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\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 \TYPO3\CMS\Core\DataHandling\DataHandler
+	 */
+	protected function getDataHandler()
+	{
+		if (!$this->dataHandler) {
+			$this->dataHandler = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+		}
+		return $this->dataHandler;
+	}
 
 }

Classes/Domain/Model/Content.php

Doc Comments +1 added lines, -1 removed lines

@@ -385,7 +385,7 @@
     /**
      * Return the properties of this object.
      *
-     * @return array
+     * @return string[]
      */
     public function toFields()
     {

Indentation +445 added lines, -445 removed lines

@@ -23,450 +23,450 @@
 class Content implements \ArrayAccess
 {
 
-    /**
-     * @var int
-     */
-    protected $uid;
-
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * Constructor for a Content object.
-     *
-     * @param string $dataType will basically correspond to a table name, e.g fe_users, tt_content, ...
-     * @param array $contentData
-     * @return \Fab\Vidi\Domain\Model\Content
-     * @throws \InvalidArgumentException
-     * @throws \Fab\Vidi\Exception\NotExistingClassException
-     */
-    public function __construct($dataType, array $contentData = array())
-    {
-
-        $this->dataType = $dataType;
-        $this->uid = empty($contentData['uid']) ? null : (int)$contentData['uid'];
-
-        /** @var \Fab\Vidi\Tca\TableService $table */
-        $table = Tca::table($dataType);
-
-        // Initialize the array containing the allowed fields to be filled-in.
-        $fields = array('pid');
-
-        // If a creation time stamp has been defined for this data type.
-        if ($table->getTimeCreationField()) {
-            $fields[] = $table->getTimeCreationField();
-        }
-
-        // If an update time stamp has been defined for this data type.
-        if ($table->getTimeModificationField()) {
-            $fields[] = $table->getTimeModificationField();
-        }
-
-        // Merge the other fields allowed for this data type.
-        $fields = array_merge($fields, $table->getFields());
-
-        // Fetch excluded fields from the grid.
-        if ($this->isBackendMode()) {
-            $fields = $this->filterForConfiguration($fields);
-            $fields = $this->filterForBackendUser($fields);
-        }
-
-        // Get column to be displayed
-        foreach ($fields as $fieldName) {
-            if (array_key_exists($fieldName, $contentData)) {
-                $propertyName = Field::name($fieldName)->of($dataType)->toPropertyName();
-                $this->$propertyName = $contentData[$fieldName];
-            }
-        }
-    }
-
-    /**
-     * Dispatches magic methods (findBy[Property]())
-     *
-     * @param string $methodName The name of the magic method
-     * @param string $arguments The arguments of the magic method
-     * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnsupportedMethodException
-     * @return mixed
-     * @api
-     */
-    public function __call($methodName, $arguments)
-    {
-        $value = null;
-        if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
-
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-            $field = Tca::table($this->dataType)->field($fieldName);
-
-            $value = $this->$propertyName;
-
-            // true means it is a relation and it is not yet resolved.
-            if ($this->hasRelation($propertyName) && is_scalar($this->$propertyName)) {
-                $value = $this->resolveRelation($propertyName);
-            } elseif ($field->getType() === FieldType::RADIO || $field->getType() === FieldType::SELECT) {
-
-                // Attempt to convert the value into a label for radio and select fields.
-                $label = Tca::table($this->getDataType())->field($fieldName)->getLabelForItem($value);
-                if ($label) {
-                    $value = $label;
-                }
-            }
-
-        } elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
-            $this->$propertyName = $arguments[0];
-        }
-        return $value;
-    }
-
-    /**
-     * Tell whether the property has a relation.
-     *
-     * @param string $propertyName
-     * @return bool
-     */
-    protected function hasRelation($propertyName)
-    {
-        $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-        return Tca::table($this->dataType)->field($fieldName)->hasRelation();
-    }
-
-    /**
-     * Try to "resolve" the property whether it has a relation.
-     * If the property has not relation it simply returns the same value.
-     *
-     * @throws \RuntimeException
-     * @param string $propertyName
-     * @return mixed
-     */
-    protected function resolveRelation($propertyName)
-    {
-
-        // Convert property name to field name and get the foreign data type.
-        $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-        $foreignDataType = Tca::table($this->dataType)->field($fieldName)->relationDataType();
-
-        // Get the foreign repository instance form the factory
-        /** @var \Fab\Vidi\Domain\Repository\ContentRepository $foreignContentRepository */
-        $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType, $fieldName);
-
-        if (Tca::table($this->dataType)->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
-
-            // Fetch values from repository
-            $values = GeneralUtility::trimExplode(',', $this->$propertyName);
-            $this->$propertyName = $foreignContentRepository->findIn('uid', $values);
-        } elseif (Tca::table($this->dataType)->field($fieldName)->hasMany()) {
-            // Include relation many-to-many and one-to-many
-            // Tca::table($this->dataType)->field($fieldName)->hasRelationOneToMany()
-            // Tca::table($this->dataType)->field($fieldName)->hasRelationManyToMany()
-
-            $foreignFieldName = Tca::table($this->dataType)->field($fieldName)->getForeignField();
-            if (empty($foreignFieldName)) {
-                $message = sprintf('Missing "foreign_field" key for field "%s" in table "%s".',
-                    $fieldName,
-                    $this->dataType
-                );
-                throw new \RuntimeException($message, 1376149186);
-            }
-
-            // Fetch values from repository.
-            $foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
-            $findByProperty = 'findBy' . ucfirst($foreignPropertyName);
-
-            // Date picker (type == group) are special fields because property path must contain the table name
-            // to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
-            $propertyValue = $this->uid;
-            if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
-                $propertyValue = $this->dataType . '.' . $this->uid;
-            }
-
-            $this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
-
-        } elseif (Tca::table($this->dataType)->field($fieldName)->hasOne()) {
-
-            $fieldConfiguration = Tca::table($this->dataType)->field($fieldName)->getConfiguration();
-
-            // First case, we are on the "good side" of the relation, just query the repository
-            if (empty($fieldConfiguration['foreign_field'])) {
-                $this->$propertyName = $foreignContentRepository->findByUid($this->$propertyName);
-            } else {
-                // Second case, we are the "bad side" of the relation, query the foreign repository
-                // e.g. in case of one-to-one relation.
-
-                // We must query the opposite side to get the identifier of the foreign object.
-                $foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
-                $foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
-                $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
-                $find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
-
-                /** @var Content $foreignObject */
-                $this->$propertyName = $foreignContentRepository->$find($this->getUid());
-            }
-
-        }
-        return $this->$propertyName;
-    }
-
-    /**
-     * @return int
-     */
-    public function getUid()
-    {
-        return $this->uid;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDataType()
-    {
-        return $this->dataType;
-    }
-
-    /**
-     * Whether a offset exists
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-     * @param mixed $offset
-     * @return boolean true on success or false on failure.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function offsetExists($offset)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        return isset($this->$offset);
-    }
-
-    /**
-     * Offset to retrieve
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetget.php
-     * @param mixed $offset
-     * @return mixed Can return all value types.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function offsetGet($offset)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        $getter = 'get' . ucfirst($offset);
-        return $this->$getter();
-    }
-
-    /**
-     * Offset to set
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetset.php
-     * @param mixed $offset
-     * @param mixed $value
-     * @return $this
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function offsetSet($offset, $value)
-    {
-        $offset = Field::name($offset)->of($this)->toPropertyName();
-        $setter = 'set' . ucfirst($offset);
-        $this->$setter($value);
-        return $this;
-    }
-
-    /**
-     * Offset to unset
-     *
-     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-     * @param mixed $offset
-     * @throws NotImplementedException
-     * @return void
-     */
-    public function offsetUnset($offset)
-    {
-        $message = 'Un-setting value for Array object is not supported';
-        throw new NotImplementedException($message, 1376132306);
-    }
-
-    /**
-     * Convert this to array
-     *
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function toArray()
-    {
-        $result['uid'] = $this->uid;
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-            $result[$fieldName] = $value;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert this object to an array containing the resolved values.
-     *
-     * @param bool $resolveRelations
-     * @return array
-     * @throws \Exception
-     */
-    public function toValues($resolveRelations = true)
-    {
-        $result['uid'] = $this->uid;
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $fieldName = Property::name($propertyName)->of($this)->toFieldName();
-
-            $result[$fieldName] = $value;
-            if ($resolveRelations) {
-                $field = Tca::table($this->dataType)->field($fieldName);
-
-                $resolvedValue = '';
-                if ($field->getType() === FieldType::FILE) {
-
-                    if ($field->hasMany()) {
-                        $files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
-
-                        $resolvedValue = [];
-                        foreach ($files as $file) {
-                            $resolvedValue[] = $file->getIdentifier();
-                        }
-                    } else {
-                        $files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
-                        if (!empty($files)) {
-                            $resolvedValue = current($files)->getIdentifier();
-                        }
-                    }
-
-                    // Reset value
-                    $result[$fieldName] = $resolvedValue;
-
-                } elseif (Tca::table($this->dataType)->field($fieldName)->hasRelation()) {
-                    $objects = $this[$fieldName];
-                    if (is_array($objects)) {
-                        $resolvedValue = [];
-                        foreach ($objects as $object) {
-                            /** @var $object Content */
-                            $labelField = Tca::table($object->getDataType())->getLabelField();
-                            $resolvedValue[] = $object[$labelField];
-                        }
-                    } elseif ($objects instanceof Content) {
-                        $labelField = Tca::table($objects->getDataType())->getLabelField();
-                        $resolvedValue = $objects[$labelField];
-                    }
-
-                    // Reset value
-                    $result[$fieldName] = $resolvedValue;
-                }
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Return the properties of this object.
-     *
-     * @return array
-     */
-    public function toProperties()
-    {
-        $result[] = 'uid';
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $result[] = $propertyName;
-        }
-        return $result;
-    }
-
-    /**
-     * Return the properties of this object.
-     *
-     * @return array
-     */
-    public function toFields()
-    {
-        $result[] = 'uid';
-        $propertiesAndValues = json_decode(json_encode($this), true);
-
-        foreach ($propertiesAndValues as $propertyName => $value) {
-            $result[] = Property::name($propertyName)->of($this)->toFieldName();
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        $labelField = Tca::table($this->dataType)->getLabelField();
-        return $this[$labelField];
-    }
-
-    /**
-     * Remove fields according to BE User permission.
-     *
-     * @param $fields
-     * @return array
-     * @throws \Exception
-     */
-    protected function filterForBackendUser($fields)
-    {
-        if (!$this->getBackendUser()->isAdmin()) {
-            foreach ($fields as $key => $fieldName) {
-                if (Tca::table($this->dataType)->hasField($fieldName) && !Tca::table($this->dataType)->field($fieldName)->hasAccess()) {
-                    unset($fields[$key]);
-                }
-            }
-        }
-        return $fields;
-    }
-
-    /**
-     * Remove fields according to Grid configuration.
-     *
-     * @param $fields
-     * @return array
-     */
-    protected function filterForConfiguration($fields)
-    {
-
-        $excludedFields = Tca::grid($this->dataType)->getExcludedFields();
-        foreach ($fields as $key => $field) {
-            if (in_array($field, $excludedFields)) {
-                unset($fields[$key]);
-            }
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Returns whether the current mode is Backend
-     *
-     * @return bool
-     */
-    protected function isBackendMode()
-    {
-        return TYPO3_MODE === 'BE';
-    }
+	/**
+	 * @var int
+	 */
+	protected $uid;
+
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * Constructor for a Content object.
+	 *
+	 * @param string $dataType will basically correspond to a table name, e.g fe_users, tt_content, ...
+	 * @param array $contentData
+	 * @return \Fab\Vidi\Domain\Model\Content
+	 * @throws \InvalidArgumentException
+	 * @throws \Fab\Vidi\Exception\NotExistingClassException
+	 */
+	public function __construct($dataType, array $contentData = array())
+	{
+
+		$this->dataType = $dataType;
+		$this->uid = empty($contentData['uid']) ? null : (int)$contentData['uid'];
+
+		/** @var \Fab\Vidi\Tca\TableService $table */
+		$table = Tca::table($dataType);
+
+		// Initialize the array containing the allowed fields to be filled-in.
+		$fields = array('pid');
+
+		// If a creation time stamp has been defined for this data type.
+		if ($table->getTimeCreationField()) {
+			$fields[] = $table->getTimeCreationField();
+		}
+
+		// If an update time stamp has been defined for this data type.
+		if ($table->getTimeModificationField()) {
+			$fields[] = $table->getTimeModificationField();
+		}
+
+		// Merge the other fields allowed for this data type.
+		$fields = array_merge($fields, $table->getFields());
+
+		// Fetch excluded fields from the grid.
+		if ($this->isBackendMode()) {
+			$fields = $this->filterForConfiguration($fields);
+			$fields = $this->filterForBackendUser($fields);
+		}
+
+		// Get column to be displayed
+		foreach ($fields as $fieldName) {
+			if (array_key_exists($fieldName, $contentData)) {
+				$propertyName = Field::name($fieldName)->of($dataType)->toPropertyName();
+				$this->$propertyName = $contentData[$fieldName];
+			}
+		}
+	}
+
+	/**
+	 * Dispatches magic methods (findBy[Property]())
+	 *
+	 * @param string $methodName The name of the magic method
+	 * @param string $arguments The arguments of the magic method
+	 * @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\UnsupportedMethodException
+	 * @return mixed
+	 * @api
+	 */
+	public function __call($methodName, $arguments)
+	{
+		$value = null;
+		if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
+			$propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+			$field = Tca::table($this->dataType)->field($fieldName);
+
+			$value = $this->$propertyName;
+
+			// true means it is a relation and it is not yet resolved.
+			if ($this->hasRelation($propertyName) && is_scalar($this->$propertyName)) {
+				$value = $this->resolveRelation($propertyName);
+			} elseif ($field->getType() === FieldType::RADIO || $field->getType() === FieldType::SELECT) {
+
+				// Attempt to convert the value into a label for radio and select fields.
+				$label = Tca::table($this->getDataType())->field($fieldName)->getLabelForItem($value);
+				if ($label) {
+					$value = $label;
+				}
+			}
+
+		} elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
+			$propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+			$this->$propertyName = $arguments[0];
+		}
+		return $value;
+	}
+
+	/**
+	 * Tell whether the property has a relation.
+	 *
+	 * @param string $propertyName
+	 * @return bool
+	 */
+	protected function hasRelation($propertyName)
+	{
+		$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+		return Tca::table($this->dataType)->field($fieldName)->hasRelation();
+	}
+
+	/**
+	 * Try to "resolve" the property whether it has a relation.
+	 * If the property has not relation it simply returns the same value.
+	 *
+	 * @throws \RuntimeException
+	 * @param string $propertyName
+	 * @return mixed
+	 */
+	protected function resolveRelation($propertyName)
+	{
+
+		// Convert property name to field name and get the foreign data type.
+		$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+		$foreignDataType = Tca::table($this->dataType)->field($fieldName)->relationDataType();
+
+		// Get the foreign repository instance form the factory
+		/** @var \Fab\Vidi\Domain\Repository\ContentRepository $foreignContentRepository */
+		$foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType, $fieldName);
+
+		if (Tca::table($this->dataType)->field($fieldName)->hasRelationWithCommaSeparatedValues()) {
+
+			// Fetch values from repository
+			$values = GeneralUtility::trimExplode(',', $this->$propertyName);
+			$this->$propertyName = $foreignContentRepository->findIn('uid', $values);
+		} elseif (Tca::table($this->dataType)->field($fieldName)->hasMany()) {
+			// Include relation many-to-many and one-to-many
+			// Tca::table($this->dataType)->field($fieldName)->hasRelationOneToMany()
+			// Tca::table($this->dataType)->field($fieldName)->hasRelationManyToMany()
+
+			$foreignFieldName = Tca::table($this->dataType)->field($fieldName)->getForeignField();
+			if (empty($foreignFieldName)) {
+				$message = sprintf('Missing "foreign_field" key for field "%s" in table "%s".',
+					$fieldName,
+					$this->dataType
+				);
+				throw new \RuntimeException($message, 1376149186);
+			}
+
+			// Fetch values from repository.
+			$foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
+			$findByProperty = 'findBy' . ucfirst($foreignPropertyName);
+
+			// Date picker (type == group) are special fields because property path must contain the table name
+			// to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
+			$propertyValue = $this->uid;
+			if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
+				$propertyValue = $this->dataType . '.' . $this->uid;
+			}
+
+			$this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
+
+		} elseif (Tca::table($this->dataType)->field($fieldName)->hasOne()) {
+
+			$fieldConfiguration = Tca::table($this->dataType)->field($fieldName)->getConfiguration();
+
+			// First case, we are on the "good side" of the relation, just query the repository
+			if (empty($fieldConfiguration['foreign_field'])) {
+				$this->$propertyName = $foreignContentRepository->findByUid($this->$propertyName);
+			} else {
+				// Second case, we are the "bad side" of the relation, query the foreign repository
+				// e.g. in case of one-to-one relation.
+
+				// We must query the opposite side to get the identifier of the foreign object.
+				$foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
+				$foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
+				$foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
+				$find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
+
+				/** @var Content $foreignObject */
+				$this->$propertyName = $foreignContentRepository->$find($this->getUid());
+			}
+
+		}
+		return $this->$propertyName;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getUid()
+	{
+		return $this->uid;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDataType()
+	{
+		return $this->dataType;
+	}
+
+	/**
+	 * Whether a offset exists
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+	 * @param mixed $offset
+	 * @return boolean true on success or false on failure.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function offsetExists($offset)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		return isset($this->$offset);
+	}
+
+	/**
+	 * Offset to retrieve
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
+	 * @param mixed $offset
+	 * @return mixed Can return all value types.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function offsetGet($offset)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		$getter = 'get' . ucfirst($offset);
+		return $this->$getter();
+	}
+
+	/**
+	 * Offset to set
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
+	 * @param mixed $offset
+	 * @param mixed $value
+	 * @return $this
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function offsetSet($offset, $value)
+	{
+		$offset = Field::name($offset)->of($this)->toPropertyName();
+		$setter = 'set' . ucfirst($offset);
+		$this->$setter($value);
+		return $this;
+	}
+
+	/**
+	 * Offset to unset
+	 *
+	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+	 * @param mixed $offset
+	 * @throws NotImplementedException
+	 * @return void
+	 */
+	public function offsetUnset($offset)
+	{
+		$message = 'Un-setting value for Array object is not supported';
+		throw new NotImplementedException($message, 1376132306);
+	}
+
+	/**
+	 * Convert this to array
+	 *
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function toArray()
+	{
+		$result['uid'] = $this->uid;
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+			$result[$fieldName] = $value;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Convert this object to an array containing the resolved values.
+	 *
+	 * @param bool $resolveRelations
+	 * @return array
+	 * @throws \Exception
+	 */
+	public function toValues($resolveRelations = true)
+	{
+		$result['uid'] = $this->uid;
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$fieldName = Property::name($propertyName)->of($this)->toFieldName();
+
+			$result[$fieldName] = $value;
+			if ($resolveRelations) {
+				$field = Tca::table($this->dataType)->field($fieldName);
+
+				$resolvedValue = '';
+				if ($field->getType() === FieldType::FILE) {
+
+					if ($field->hasMany()) {
+						$files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
+
+						$resolvedValue = [];
+						foreach ($files as $file) {
+							$resolvedValue[] = $file->getIdentifier();
+						}
+					} else {
+						$files = FileReferenceService::getInstance()->findReferencedBy($propertyName, $this);
+						if (!empty($files)) {
+							$resolvedValue = current($files)->getIdentifier();
+						}
+					}
+
+					// Reset value
+					$result[$fieldName] = $resolvedValue;
+
+				} elseif (Tca::table($this->dataType)->field($fieldName)->hasRelation()) {
+					$objects = $this[$fieldName];
+					if (is_array($objects)) {
+						$resolvedValue = [];
+						foreach ($objects as $object) {
+							/** @var $object Content */
+							$labelField = Tca::table($object->getDataType())->getLabelField();
+							$resolvedValue[] = $object[$labelField];
+						}
+					} elseif ($objects instanceof Content) {
+						$labelField = Tca::table($objects->getDataType())->getLabelField();
+						$resolvedValue = $objects[$labelField];
+					}
+
+					// Reset value
+					$result[$fieldName] = $resolvedValue;
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Return the properties of this object.
+	 *
+	 * @return array
+	 */
+	public function toProperties()
+	{
+		$result[] = 'uid';
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$result[] = $propertyName;
+		}
+		return $result;
+	}
+
+	/**
+	 * Return the properties of this object.
+	 *
+	 * @return array
+	 */
+	public function toFields()
+	{
+		$result[] = 'uid';
+		$propertiesAndValues = json_decode(json_encode($this), true);
+
+		foreach ($propertiesAndValues as $propertyName => $value) {
+			$result[] = Property::name($propertyName)->of($this)->toFieldName();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		$labelField = Tca::table($this->dataType)->getLabelField();
+		return $this[$labelField];
+	}
+
+	/**
+	 * Remove fields according to BE User permission.
+	 *
+	 * @param $fields
+	 * @return array
+	 * @throws \Exception
+	 */
+	protected function filterForBackendUser($fields)
+	{
+		if (!$this->getBackendUser()->isAdmin()) {
+			foreach ($fields as $key => $fieldName) {
+				if (Tca::table($this->dataType)->hasField($fieldName) && !Tca::table($this->dataType)->field($fieldName)->hasAccess()) {
+					unset($fields[$key]);
+				}
+			}
+		}
+		return $fields;
+	}
+
+	/**
+	 * Remove fields according to Grid configuration.
+	 *
+	 * @param $fields
+	 * @return array
+	 */
+	protected function filterForConfiguration($fields)
+	{
+
+		$excludedFields = Tca::grid($this->dataType)->getExcludedFields();
+		foreach ($fields as $key => $field) {
+			if (in_array($field, $excludedFields)) {
+				unset($fields[$key]);
+			}
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Returns whether the current mode is Backend
+	 *
+	 * @return bool
+	 */
+	protected function isBackendMode()
+	{
+		return TYPO3_MODE === 'BE';
+	}
 
 }

Spacing +7 added lines, -7 removed lines

@@ -95,7 +95,7 @@ 
     {
         $value = null;
         if (substr($methodName, 0, 3) === 'get' && strlen($methodName) > 4) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)).substr(substr($methodName, 3), 1);
 
             $fieldName = Property::name($propertyName)->of($this)->toFieldName();
             $field = Tca::table($this->dataType)->field($fieldName);
@@ -115,7 +115,7 @@ 
             }
 
         } elseif (substr($methodName, 0, 3) === 'set' && strlen($methodName) > 4 && isset($arguments[0])) {
-            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)) . substr(substr($methodName, 3), 1);
+            $propertyName = strtolower(substr(substr($methodName, 3), 0, 1)).substr(substr($methodName, 3), 1);
             $this->$propertyName = $arguments[0];
         }
         return $value;
@@ -173,13 +173,13 @@ 
 
             // Fetch values from repository.
             $foreignPropertyName = Field::name($foreignFieldName)->of($this)->toPropertyName();
-            $findByProperty = 'findBy' . ucfirst($foreignPropertyName);
+            $findByProperty = 'findBy'.ucfirst($foreignPropertyName);
 
             // Date picker (type == group) are special fields because property path must contain the table name
             // to determine the relation type. Example for sys_category, property path will look like "items.sys_file"
             $propertyValue = $this->uid;
             if (Tca::table($foreignDataType)->field($foreignFieldName)->isGroup()) {
-                $propertyValue = $this->dataType . '.' . $this->uid;
+                $propertyValue = $this->dataType.'.'.$this->uid;
             }
 
             $this->$propertyName = $foreignContentRepository->$findByProperty($propertyValue);
@@ -199,7 +199,7 @@ 
                 $foreignDataType = Tca::table($this->dataType)->field($fieldName)->getForeignTable();
                 $foreignField = Tca::table($this->dataType)->field($fieldName)->getForeignField();
                 $foreignContentRepository = ContentRepositoryFactory::getInstance($foreignDataType);
-                $find = 'findOneBy' . GeneralUtility::underscoredToUpperCamelCase($foreignField);
+                $find = 'findOneBy'.GeneralUtility::underscoredToUpperCamelCase($foreignField);
 
                 /** @var Content $foreignObject */
                 $this->$propertyName = $foreignContentRepository->$find($this->getUid());
@@ -252,7 +252,7 @@ 
     public function offsetGet($offset)
     {
         $offset = Field::name($offset)->of($this)->toPropertyName();
-        $getter = 'get' . ucfirst($offset);
+        $getter = 'get'.ucfirst($offset);
         return $this->$getter();
     }
 
@@ -269,7 +269,7 @@ 
     public function offsetSet($offset, $value)
     {
         $offset = Field::name($offset)->of($this)->toPropertyName();
-        $setter = 'set' . ucfirst($offset);
+        $setter = 'set'.ucfirst($offset);
         $this->$setter($value);
         return $this;
     }

Classes/Grid/GridAnalyserService.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
      *
      * @param string $tableName
      * @param string $fieldName
-     * @return array
+     * @return string[]
      */
     protected function checkRelationManyToMany($tableName, $fieldName)
     {
@@ -115,7 +115,7 @@ 
      * @param string $tableName
      * @param string $fieldName
      * @param string $relationType
-     * @return array
+     * @return string[]
      */
     protected function checkRelationOf($tableName, $fieldName, $relationType)
     {

Indentation +102 added lines, -102 removed lines

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

Classes/Processor/ContentObjectProcessor.php

Doc Comments +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 
     /**
      * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
+     * @return ProcessContentDataSignalArguments[]
      */
     public function processRelations(ProcessContentDataSignalArguments $signalArguments)
     {
@@ -50,7 +50,7 @@ 
 
     /**
      * @param \Fab\Vidi\Domain\Model\Content $object
-     * @param $fieldNameAndPath
+     * @param string $fieldNameAndPath
      * @param array $contentData
      * @param string $savingBehavior
      * @return array

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
                 $relatedValues = $this->getRelatedValues($object, $fieldNameAndPath, $fieldName);
 
                 foreach ($values as $value) {
-                    $appendOrRemove = $savingBehavior . 'Relations';
+                    $appendOrRemove = $savingBehavior.'Relations';
                     $relatedValues = $this->$appendOrRemove($value, $relatedValues);
                 }
 

Indentation +117 added lines, -117 removed lines

@@ -22,121 +22,121 @@
 class ContentObjectProcessor implements SingletonInterface
 {
 
-    /**
-     * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
-     */
-    public function processRelations(ProcessContentDataSignalArguments $signalArguments)
-    {
-
-        $contentObject = $signalArguments->getContentObject();
-        $fieldNameAndPath = $signalArguments->getFieldNameAndPath();
-        $contentData = $signalArguments->getContentData();
-        $savingBehavior = $signalArguments->getSavingBehavior();
-
-        if ($savingBehavior !== SavingBehavior::REPLACE) {
-            $contentData = $this->appendOrRemoveRelations($contentObject, $fieldNameAndPath, $contentData, $savingBehavior);
-            $signalArguments->setContentData($contentData);
-        }
-
-        return array($signalArguments);
-    }
-
-    /**
-     * @param \Fab\Vidi\Domain\Model\Content $object
-     * @param $fieldNameAndPath
-     * @param array $contentData
-     * @param string $savingBehavior
-     * @return array
-     */
-    protected function appendOrRemoveRelations(Content $object, $fieldNameAndPath, array $contentData, $savingBehavior)
-    {
-
-        foreach ($contentData as $fieldName => $values) {
-
-            $resolvedObject = $this->getContentObjectResolver()->getObject($object, $fieldNameAndPath);
-
-            if (Tca::table($resolvedObject)->field($fieldName)->hasMany()) {
-
-                // true means CSV values must be converted to array.
-                if (!is_array($values)) {
-                    $values = GeneralUtility::trimExplode(',', $values);
-                }
-                $relatedValues = $this->getRelatedValues($object, $fieldNameAndPath, $fieldName);
-
-                foreach ($values as $value) {
-                    $appendOrRemove = $savingBehavior . 'Relations';
-                    $relatedValues = $this->$appendOrRemove($value, $relatedValues);
-                }
-
-                $contentData[$fieldName] = $relatedValues;
-            }
-        }
-        return $contentData;
-    }
-
-    /**
-     * @param $value
-     * @param array $relatedValues
-     * @return array
-     */
-    protected function appendRelations($value, array $relatedValues)
-    {
-        if (!in_array($value, $relatedValues)) {
-            $relatedValues[] = $value;
-        }
-        return $relatedValues;
-    }
-
-    /**
-     * @param $value
-     * @param array $relatedValues
-     * @return array
-     */
-    protected function removeRelations($value, array $relatedValues)
-    {
-        if (in_array($value, $relatedValues)) {
-            $key = array_search($value, $relatedValues);
-            unset($relatedValues[$key]);
-        }
-        return $relatedValues;
-    }
-
-    /**
-     * @param \Fab\Vidi\Domain\Model\Content $object
-     * @param string $fieldNameAndPath
-     * @param string $fieldName
-     * @return array
-     */
-    protected function getRelatedValues(Content $object, $fieldNameAndPath, $fieldName)
-    {
-
-        $values = [];
-        $relatedContentObjects = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, $fieldName);
-
-        if (is_array($relatedContentObjects)) {
-            /** @var Content $relatedContentObject */
-            foreach ($relatedContentObjects as $relatedContentObject) {
-                $values[] = $relatedContentObject->getUid();
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\ContentObjectResolver|object
-     */
-    protected function getContentObjectResolver()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\ContentObjectResolver::class);
-    }
-
-    /**
-     * @return \Fab\Vidi\Resolver\FieldPathResolver|object
-     */
-    protected function getFieldPathResolver()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\FieldPathResolver::class);
-    }
+	/**
+	 * @param ProcessContentDataSignalArguments $signalArguments
+	 * @return array
+	 */
+	public function processRelations(ProcessContentDataSignalArguments $signalArguments)
+	{
+
+		$contentObject = $signalArguments->getContentObject();
+		$fieldNameAndPath = $signalArguments->getFieldNameAndPath();
+		$contentData = $signalArguments->getContentData();
+		$savingBehavior = $signalArguments->getSavingBehavior();
+
+		if ($savingBehavior !== SavingBehavior::REPLACE) {
+			$contentData = $this->appendOrRemoveRelations($contentObject, $fieldNameAndPath, $contentData, $savingBehavior);
+			$signalArguments->setContentData($contentData);
+		}
+
+		return array($signalArguments);
+	}
+
+	/**
+	 * @param \Fab\Vidi\Domain\Model\Content $object
+	 * @param $fieldNameAndPath
+	 * @param array $contentData
+	 * @param string $savingBehavior
+	 * @return array
+	 */
+	protected function appendOrRemoveRelations(Content $object, $fieldNameAndPath, array $contentData, $savingBehavior)
+	{
+
+		foreach ($contentData as $fieldName => $values) {
+
+			$resolvedObject = $this->getContentObjectResolver()->getObject($object, $fieldNameAndPath);
+
+			if (Tca::table($resolvedObject)->field($fieldName)->hasMany()) {
+
+				// true means CSV values must be converted to array.
+				if (!is_array($values)) {
+					$values = GeneralUtility::trimExplode(',', $values);
+				}
+				$relatedValues = $this->getRelatedValues($object, $fieldNameAndPath, $fieldName);
+
+				foreach ($values as $value) {
+					$appendOrRemove = $savingBehavior . 'Relations';
+					$relatedValues = $this->$appendOrRemove($value, $relatedValues);
+				}
+
+				$contentData[$fieldName] = $relatedValues;
+			}
+		}
+		return $contentData;
+	}
+
+	/**
+	 * @param $value
+	 * @param array $relatedValues
+	 * @return array
+	 */
+	protected function appendRelations($value, array $relatedValues)
+	{
+		if (!in_array($value, $relatedValues)) {
+			$relatedValues[] = $value;
+		}
+		return $relatedValues;
+	}
+
+	/**
+	 * @param $value
+	 * @param array $relatedValues
+	 * @return array
+	 */
+	protected function removeRelations($value, array $relatedValues)
+	{
+		if (in_array($value, $relatedValues)) {
+			$key = array_search($value, $relatedValues);
+			unset($relatedValues[$key]);
+		}
+		return $relatedValues;
+	}
+
+	/**
+	 * @param \Fab\Vidi\Domain\Model\Content $object
+	 * @param string $fieldNameAndPath
+	 * @param string $fieldName
+	 * @return array
+	 */
+	protected function getRelatedValues(Content $object, $fieldNameAndPath, $fieldName)
+	{
+
+		$values = [];
+		$relatedContentObjects = $this->getContentObjectResolver()->getValue($object, $fieldNameAndPath, $fieldName);
+
+		if (is_array($relatedContentObjects)) {
+			/** @var Content $relatedContentObject */
+			foreach ($relatedContentObjects as $relatedContentObject) {
+				$values[] = $relatedContentObject->getUid();
+			}
+		}
+
+		return $values;
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\ContentObjectResolver|object
+	 */
+	protected function getContentObjectResolver()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\ContentObjectResolver::class);
+	}
+
+	/**
+	 * @return \Fab\Vidi\Resolver\FieldPathResolver|object
+	 */
+	protected function getFieldPathResolver()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Resolver\FieldPathResolver::class);
+	}
 }

Classes/Processor/MarkerProcessor.php

Doc Comments +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
     /**
      * @param ProcessContentDataSignalArguments $signalArguments
-     * @return array
+     * @return ProcessContentDataSignalArguments[]
      */
     public function processMarkers(ProcessContentDataSignalArguments $signalArguments)
     {
@@ -72,7 +72,7 @@ 
      * @param string $updateValue
      * @param string $currentValue
      * @param int $counter
-     * @param $creationTime
+     * @param integer $creationTime
      * @return string
      */
     protected function replaceWellKnownMarkers($updateValue, $currentValue, $counter, $creationTime)

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             $replace = $structure[2];
 
             // Perhaps needs to be improved here if $search contains "/" precisely.
-            $updateValue = preg_replace('/' . $search . '/isU', $replace, $currentValue);
+            $updateValue = preg_replace('/'.$search.'/isU', $replace, $currentValue);
         }
         return $updateValue;
     }

Indentation +109 added lines, -109 removed lines

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

Classes/Service/ContentService.php

Doc Comments +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
     /**
      * Signal that is called after the content objects have been found.
      *
-     * @param array $contentObjects
+     * @param \Fab\Vidi\Domain\Model\Content[] $contentObjects
      * @param \Fab\Vidi\Persistence\Matcher $matcher
      * @param Order $order
      * @param int $limit

Indentation +121 added lines, -121 removed lines

@@ -23,126 +23,126 @@
 class ContentService
 {
 
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var \Fab\Vidi\Domain\Model\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 \Fab\Vidi\Persistence\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()
-    {
-        /** @var ObjectManager $objectManager */
-        $objectManager = GeneralUtility::makeInstance(ObjectManager::class);
-        return $objectManager->get(Dispatcher::class);
-    }
-
-    /**
-     * @return \Fab\Vidi\Domain\Model\Content[]
-     */
-    public function getObjects()
-    {
-        return $this->objects;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfObjects()
-    {
-        return $this->numberOfObjects;
-    }
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var \Fab\Vidi\Domain\Model\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 \Fab\Vidi\Persistence\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()
+	{
+		/** @var ObjectManager $objectManager */
+		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
+		return $objectManager->get(Dispatcher::class);
+	}
+
+	/**
+	 * @return \Fab\Vidi\Domain\Model\Content[]
+	 */
+	public function getObjects()
+	{
+		return $this->objects;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfObjects()
+	{
+		return $this->numberOfObjects;
+	}
 
 }

Classes/Persistence/Pager.php

Indentation +164 added lines, -164 removed lines

@@ -22,168 +22,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/Language/LocalizationStatus.php

Indentation +3 added lines, -3 removed lines

@@ -22,8 +22,8 @@
 class LocalizationStatus extends Enumeration
 {
 
-    const LOCALIZED = 'localized';
-    const NOT_YET_LOCALIZED = 'notYetLocalized';
-    const EMPTY_VALUE = 'emptyValue';
+	const LOCALIZED = 'localized';
+	const NOT_YET_LOCALIZED = 'notYetLocalized';
+	const EMPTY_VALUE = 'emptyValue';
 
 }

Classes/Behavior/SavingBehavior.php

Indentation +3 added lines, -3 removed lines

@@ -22,10 +22,10 @@
 class SavingBehavior extends Enumeration
 {
 
-    const REMOVE = 'remove';
+	const REMOVE = 'remove';
 
-    const APPEND = 'append';
+	const APPEND = 'append';
 
-    const REPLACE = 'replace';
+	const REPLACE = 'replace';
 
 }
\ No newline at end of file