Make phpunit_v6 branch work with PHPUnit 6!#13

petrkotek wants to merge 3 commits intosolanolabs:phpunit_v6solanolabs/solano-phpunit:phpunit_v6from

petrkotek:phpunit_v6_prpetrkotek/solano-phpunit:phpunit_v6_prCopy head branch name to clipboard