Re-added hotfix-phpdoc and feature-xxx changes

were lost in last merge for the `file schema-creator.php`