Fix coding style

Signed-off-by: Marc Delisle <marc@infomarc.info>
Update PHPDoc.
Add return.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin