More phpstan fixes

[sreichel]

Some fixes and merged #4290

[addison74]

@sreichel - The conflict needs to be fixed.

[fballiano]

I think these massive PRs should be accepted only if they don't add new lines to the baseline. we know nobody is testing these modifications and there are hundreds of changed files every day. not having new lines is at least a basic indicator that maybe the PR itself is not introducing problems.

@kiatng @colinmollenhour

[sreichel]

@fballiano i alredy wrote it somewhere else ... fixing one error may reveal more errors. Fixing one may lead to have to touch other files. There are no problems introduced, just baselined them to them later.

#4346 is to fix that 4 new lines added in this PR + some issues in that files.

[fballiano]

@fballiano i alredy wrote it somewhere else ... fixing one error may reveal more errors. Fixing one may lead to have to touch other files. There are no problems introduced, just baselined them to them later.

Instead of changing 100 files per day, if a change is introducing new baseline lines than it should be in a separate small PRs.

Changing 100+ files per day means nobody is testing anything.

[sreichel]

Normally no new lines are added!

Normally there is nothing to test, b/c its mostly doc-block-only changes.

I dont know what you are complaining about. 4 (!) errors have been added - in trade for 150 fixed.