Updating phpdoc and exceptions