And add a bit more typing to some classes + psalm issues Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Vitor Mattos <vitor@php.rio>