PSR-2 and phpdoc update