merge Rest and bin/phpunit