Integrate the php-matcher

Fixes #1