Fixed wrong type in phpdoc
Added is_callable to be sure
Merge remote-tracking branch 'origin/restructurization' into restructurization