cleanup more php completion code to share code for class, factory-service (resolves #74) and factory-class (resolves #73) in yaml / xml