Merge branch '4.4'

* 4.4:
  ensure compatibility with type resolver 0.5
  [WebProfilerBundle] Clean time.js

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.js

@@ -223,7 +223,7 @@ class Legend {
         this.createCategory = this.createCategory.bind(this);
 
         this.categories = [];
-        this.theme.getDefaultCategories().forEach(this.createCategory)
+        this.theme.getDefaultCategories().forEach(this.createCategory);
     }
 
     add(category) {
@@ -260,23 +260,6 @@ class Legend {
         return this.categories.find(element => element.value === category) || this.createCategory(category);
     }
 
-    getClassname(category) {
-        return this.classnames[category] || '';
-    }
-
-    getSectionClassname() {
-        return this.classnames.section;
-    }
-
-    getDefaultClassname() {
-        return this.classnames.default;
-    }
-
-    getStandardClassenames() {
-        return Array.from(Object.values(this.classnames))
-            .filter(className => className !== this.getSectionClassname());
-    }
-
     emit(name) {
         this.element.dispatchEvent(new Event(name));
     }

src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php

@@ -64,6 +64,11 @@ final class PhpDocTypeHelper
                 continue;
             }
 
+            if ($type instanceof Nullable) {
+                $nullable = true;
+                $type = $type->getActualType();
+            }
+
             $varTypes[] = $type;
         }