Add PHPUnit dependencies, and fix up composer.lock

[madmatt]

• Add phpunit/phpunit and phpunit/php-invoker to composer.json
• Add composer.lock to Git - this file should be committed so that composer install always installs the same dependencies