Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
undo Fixes to User.php
Merge pull request #172 from stwalkerster/scrutinizer-patch-1

Scrutinizer Auto-Fixes