8.2
Unnecessary cast, return, semicolon and comma
Merge branch '7.3' into 7.4
replace PHPUnit annotations with attributes