Merge "Fix some PhpStorm warnings in AuthManager"