Skip to content

Commit

Permalink
Merge branch 'master' of github.com:taskphp/cli
Browse files Browse the repository at this point in the history
Conflicts:
	composer.json
  • Loading branch information
mbfisher committed May 5, 2014
2 parents 341c05e + 14b0eff commit 29a1a8f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
6 changes: 6 additions & 0 deletions README.md
Expand Up @@ -37,3 +37,9 @@ $> chmod +x /usr/bin/task
...
```
Run at `./vendor/bin/task`.

Testing
=======

When running the package tests, make sure to use the local install of Task CLI and not
the global TaskPHP CLI install. e.g. './bin/task test'
7 changes: 7 additions & 0 deletions Taskfile
Expand Up @@ -12,6 +12,7 @@ $project->inject(function ($container) {
$container['fs'] = new Plugin\FilesystemPlugin;
$container['ps'] = new Plugin\ProcessPlugin;
$container['box'] = new Plugin\BoxPlugin;
$container['phpunit'] = new Plugin\PHPUnitPlugin;
});

$project->addTask('test', ['phpunit', function ($phpunit) {
Expand Down Expand Up @@ -47,4 +48,10 @@ $project->addTask('build.phar', ['box', function ($box) {
$box->command('build')->pipe($this->getOutput());
}]);

$project->addTask('test', ['phpunit', function ($phpunit) {
$phpunit->getCommand()
->setConfiguration($this->getProperty('config', 'phpunit.xml'))
->pipe($this->getOutput());
}]);

return $project;
1 change: 0 additions & 1 deletion composer.json
Expand Up @@ -14,7 +14,6 @@
"task/process": "~0.1",
"task/box": "~0.1",
"task/phpunit": "~0.1",
"kherge/box": "~2.0",
"satooshi/php-coveralls": "~0.6"
},
"bin": ["bin/task"],
Expand Down

0 comments on commit 29a1a8f

Please sign in to comment.