Update phpdocs for better chaining

Following the PSR-5 Proposal, chained methods should use `return $this`.
New instances should use `return static`. This way, when classes are
extended, they refer to the correct class.
Merge branch '4.2'