Apply kawf changes to upstream in single diff

Fix 'Creation of dynamic property' deprecation warnings in lib/Text/Diff

Fix 'Creation of dynamic property' deprecation warnings in lib/Text/Diff

Fix php warning