fixed php and added phpunit
merged HEAD~1 and HEAD