Fixed PHPdoc @param and @return, added @throws (as per PhpStorm). Did not change actual code.
Merge pull request #2023 from DanMan/phpdocfix

Updates to PHPDoc comments