Update types in PHPDoc.
Update phpdoc.
Update PHPDoc.
Update PHPDoc.
Fix PHPDoc.
Revert third party modifications.
Merge pull request #745 from Tithugues/phpdoc

Phpdoc update