Merge pull request #112 from marcteyssier/2.0

fix bug on null type

Author: moufmouf

src-dev/views/instances/defaultRenderer.js

@@ -897,6 +897,10 @@ MoufDefaultRenderer = (function () {
 		var first = true;
 		var types = moufTypes.getTypes();
 		_.each(types, function(type) {
+			// Do not display null type
+			if(type == 'null') {
+				return;
+			}
 			var selected = false;
 			if (type == currentType) {
 				selected = true;
@@ -1396,4 +1400,4 @@ MoufDefaultRenderer = (function () {
 	}
 })();
 
-})();
+})();

src/Mouf/MoufManager.php

@@ -2152,11 +2152,15 @@ private function walkConstructorLoop($instanceName, array $path) {
     	        if($constructorArg['parametertype'] == 'object') {
     	            if(is_array($constructorArg['value'])) {
     	                foreach ($constructorArg['value'] as $subInstanceName) {
-    	                    $this->walkConstructorLoop($subInstanceName, $path);
+    	                    if($subInstanceName !== null) {
+    	                        $this->walkConstructorLoop($subInstanceName, $path);
+    	                    }
     	                }
     	            }
     	            else {
-    	                $this->walkConstructorLoop($constructorArg['value'], $path);
+    	            	if($constructorArg['value'] !== null) {
+    	                    $this->walkConstructorLoop($constructorArg['value'], $path);
+    	            	}
     	            }
     	        }
     	    }

src/Mouf/Reflection/TypeDescriptor.php

@@ -233,7 +233,7 @@ public function resolveType($useMap, $namespace) {
 	 */
 	public function isPrimitiveType() {
 		$lowerVarType = strtolower($this->type);
-		return in_array($lowerVarType, array('string', 'char', 'bool', 'boolean', 'int', 'integer', 'double', 'float', 'real', 'mixed', 'number'));
+		return in_array($lowerVarType, array('string', 'char', 'bool', 'boolean', 'int', 'integer', 'double', 'float', 'real', 'mixed', 'number', 'null'));
 	}
 
 	/**
@@ -332,4 +332,4 @@ private static function getNthTokenWithoutWhitespace($tokens, $i) {
 		}
 		return null;
 	}
-}
+}