Updated composer dependency required by phpunit
Fix git weirdness
Improved the validation