Extbase MVC Framework - 11311_v2.patch - TYPO3 Forge

     	protected $objectManager;
     	/**
     	 * @var Tx_Extbase_Object_Container_Container
     	 */
     	protected $objectContainer;
     	/**
     	 * Injects the identity map
+    	 *
     	 * @param Tx_Extbase_Persistence_IdentityMap $identityMap
-...
+    	}
     	/**
     	 * Inject the object container
+    	 *
     	 * @param Tx_Extbase_Object_Container_Container $objectContainer
     	 * @return void
     	 */
     	public function injectObjectContainer(Tx_Extbase_Object_Container_Container $objectContainer) {
     		$this->objectContainer = $objectContainer;
+    	}
     	/**
     	 * Maps the given rows on objects
+    	 *
     	 * @param string $className The name of the class
-...
     		// Note: The class_implements() function also invokes autoload to assure that the interfaces
     		// and the class are loaded. Would end up with __PHP_Incomplete_Class without it.
     		if (!in_array('Tx_Extbase_DomainObject_DomainObjectInterface', class_implements($className))) throw new Tx_Extbase_Object_Exception_CannotReconstituteObject('Cannot create empty instance of the class "' . $className . '" because it does not implement the Tx_Extbase_DomainObject_DomainObjectInterface.', 1234386924);
     		$object = unserialize('O:' . strlen($className) . ':"' . $className . '":0:{};');
     		$object = $this->objectContainer->getEmptyObject($className);
     		return $object;
+    	}

     	protected $persistenceManager;
     	/**
     	 * @var Tx_Extbase_Object_ObjectManagerInterface
     	 */
     	protected $objectManager;
     	/**
     	 * @var Tx_Extbase_Persistence_QueryFactory
     	 */
     	protected $queryFactory;
-...
+    	}
     	/**
     	 * Injects the Object Manager
+    	 *
     	 * @param Tx_Extbase_Object_ObjectManagerInterface $objectManager
     	 * @return void
     	 */
     	public function injectObjectManager(Tx_Extbase_Object_ObjectManagerInterface $objectManager) {
     		$this->objectManager = $objectManager;
+    	}
     	/**
     	 * Maps the given properties to the target object and validates the properties according to the defined
     	 * validators. If the result object is not valid, the operation will be undone (the target object remains
     	 * unchanged) and this method returns FALSE.
-...
     				$propertyValue = NULL;
     			} else {
     				try {
     					$propertyValue = new $targetType($propertyValue);
     					$propertyValue = $this->objectManager->create($targetType, $propertyValue);
     				} catch (Exception $e) {
     					$propertyValue = NULL;
+    				}
-...
+    						}
+    					}
     				} else {
     					$newObject = new $targetType;
     					$newObject = $this->objectManager->create($targetType);
     					if ($this->map(array_keys($propertyValue), $propertyValue, $newObject)) {
     						$propertyValue = $newObject;
     					} else {

+    	}
     	/**
     	 * get an empty object
+    	 *
     	 * @param string $className
     	 * @return object
     	 */
     	public function getEmptyObject($className) {
     		$className = $this->getClassName($className);
     		$classInfo = $this->getClassInfo($className);
     		$object = unserialize('O:' . strlen($className) . ':"' . $className . '":0:{};');
     		if ($classInfo->hasInjectMethods()) {
     			$this->setterInjectionRegistry[]=array($object, $classInfo->getInjectMethods(), 0);
+    		}
     		$this->processSetterInjectionRegistry();
     		return $object;
+    	}
     	/**
     	 * register a classname that should be used if a dependency is required.
     	 * e.g. used to define default class for a interface
+    	 *
-...
     	 */
     	private function getClassInfo($className) {
     			// we also need to make sure that the cache is returning a vaild object
     			// in case something went wrong with unserialization etc..
     			// in case something went wrong with unserialization etc..
     		if (!$this->cache->has($className) || !is_object($this->cache->get($className))) {
     			$this->cache->set($className, $this->classInfoFactory->buildClassInfoFromClassName($className));
+    		}