[~TASK] Extbase: Refactored Dispatcher. Moved initialization of cache and reflection...

[Packages/TYPO3.CMS.git] / typo3 / sysext / extbase / Classes / MVC / Controller / Argument.php

diff --git a/typo3/sysext/extbase/Classes/MVC/Controller/Argument.php b/typo3/sysext/extbase/Classes/MVC/Controller/Argument.php
index 8da877e..3483ba9 100644 (file)
--- a/typo3/sysext/extbase/Classes/MVC/Controller/Argument.php
+++ b/typo3/sysext/extbase/Classes/MVC/Controller/Argument.php
@@ -66,7 +66,7 @@ class Tx_Extbase_MVC_Controller_Argument {
         * Data type of this argument's value
         * @var string
         */
-       protected $dataType = 'Text';
+       protected $dataType = NULL;
 
        /**
         * If the data type is an object, the class schema of the data type class is resolved
@@ -104,6 +104,19 @@ class Tx_Extbase_MVC_Controller_Argument {
         */
        protected $uid = NULL;
 
+       const ORIGIN_CLIENT = 0;
+       const ORIGIN_PERSISTENCE = 1;
+       const ORIGIN_PERSISTENCE_AND_MODIFIED = 2;
+       const ORIGIN_NEWLY_CREATED = 3;
+
+       /**
+        * The origin of the argument value. This is only meaningful after argument mapping.
+        *
+        * One of the ORIGIN_* constants above
+        * @var integer
+        */
+       protected $origin = 0;
+
        /**
         * Constructs this controller argument
         *
@@ -112,13 +125,23 @@ class Tx_Extbase_MVC_Controller_Argument {
         * @throws InvalidArgumentException if $name is not a string or empty
         * @api
         */
-       public function __construct($name, $dataType = 'Text') {
+       public function __construct($name, $dataType) {
+               if (!is_string($name)) throw new InvalidArgumentException('$name must be of type string, ' . gettype($name) . ' given.', 1187951688);
+               if (strlen($name) === 0) throw new InvalidArgumentException('$name must be a non-empty string, ' . strlen($name) . ' characters given.', 1232551853);
+               $this->name = $name;
+               $this->dataType = $dataType;
+       }
+       
+       /**
+        * Initializes this object
+        *
+        * @return void
+        */
+       public function initializeObject() {
                $this->reflectionService = t3lib_div::makeInstance('Tx_Extbase_Reflection_Service');
                $this->propertyMapper = t3lib_div::makeInstance('Tx_Extbase_Property_Mapper');
                $this->propertyMapper->injectReflectionService($this->reflectionService);
-               if (!is_string($name) || strlen($name) < 1) throw new InvalidArgumentException('$name must be of type string, ' . gettype($name) . ' given.', 1187951688);
-               $this->name = $name;
-               $this->setDataType($dataType);
+               $this->dataTypeClassSchema = $this->reflectionService->getClassSchema($this->dataType);
        }
 
        /**
@@ -184,7 +207,6 @@ class Tx_Extbase_MVC_Controller_Argument {
         */
        public function setDataType($dataType) {
                $this->dataType = $dataType;
-               $this->dataTypeClassSchema = $this->reflectionService->getClassSchema($this->dataType);
                return $this;
        }
 
@@ -281,6 +303,16 @@ class Tx_Extbase_MVC_Controller_Argument {
                return $this->validator;
        }
 
+       /**
+        * Get the origin of the argument value. This is only meaningful after argument mapping.
+        *
+        * @return integer one of the ORIGIN_* constants
+        * @author Sebastian Kurfürst <sebastian@typo3.org>
+        */
+       public function getOrigin() {
+               return $this->origin;
+       }
+
        /**
         * Sets the value of this argument.
         *
@@ -313,21 +345,28 @@ class Tx_Extbase_MVC_Controller_Argument {
                }
                $transformedValue = NULL;
                if ($this->dataTypeClassSchema !== NULL) {
-                       // It is an Entity or ValueObject.
+                       // The target object is an Entity or ValueObject.
                        if (is_numeric($value)) {
+                               $this->origin = self::ORIGIN_PERSISTENCE;
                                $transformedValue = $this->findObjectByUid($value);
                        } elseif (is_array($value)) {
+                               $this->origin = self::ORIGIN_PERSISTENCE_AND_MODIFIED;
                                $transformedValue = $this->propertyMapper->map(array_keys($value), $value, $this->dataType);
                        }
                } else {
                        if (!is_array($value)) {
                                throw new Tx_Extbase_MVC_Exception_InvalidArgumentValue('The value was a simple type, so we could not map it to an object. Maybe the @entity or @valueobject annotations are missing?', 1251730701);
                        }
+                       $this->origin = self::ORIGIN_NEWLY_CREATED;
                        $transformedValue = $this->propertyMapper->map(array_keys($value), $value, $this->dataType);
                }
 
                if (!($transformedValue instanceof $this->dataType)) {
-                       throw new Tx_Extbase_MVC_Exception_InvalidArgumentValue('The value must be of type "' . $this->dataType . '", but was of type "' . get_class($transformedValue) . '".', 1251730701);
+                       if (is_object($transformedValue)) {
+                               throw new Tx_Extbase_MVC_Exception_InvalidArgumentValue('The value must be of type "' . $this->dataType . '", but was of type "' . get_class($transformedValue) . '".', 1251730701);
+                       } else {
+                               throw new Tx_Extbase_MVC_Exception_InvalidArgumentValue('The value must be of type "' . $this->dataType . '", but was of type "' . gettype($transformedValue) . '".', 1251730702);
+                       }
                }
                return $transformedValue;
        }