Improvements in PhpCode extractor
resolved conflict in phpCode extractor