Merge branch '4.4'
* 4.4: ensure compatibility with type resolver 0.5 [WebProfilerBundle] Clean time.js
This commit is contained in:
commit
53159ab21c
@ -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));
|
||||
}
|
||||
|
@ -64,6 +64,11 @@ final class PhpDocTypeHelper
|
||||
continue;
|
||||
}
|
||||
|
||||
if ($type instanceof Nullable) {
|
||||
$nullable = true;
|
||||
$type = $type->getActualType();
|
||||
}
|
||||
|
||||
$varTypes[] = $type;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user