Allow @psalm-type and @psalm-import-type to be used in extends/implem…

…ents (#5205)

* Fix #4240 - allow type aliases to be used as type parameters

* Fix issues that phpcs found

* Fix #4240 - stop type aliases being everywhere in the same file

* Fix #4240- re-add stuff that was deleted unnecessarily