merge php specific changes
fix to syntax issues and drupal filetype