[WIP] update docblock : change @return $this/Classname to @return self