Backports #18907 to QA_5_2.
This makes merging QA_5_2 into master easier.
Changes done using Rector.
- #18907
Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.net>
Running: composer run psalm -- --alter --issues=UnusedVariable
And removing the false positives I reported upstream
Signed-off-by: William Desportes <williamdes@wdes.fr>