Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Crizz0 committed Apr 25, 2019
2 parents 8b63f9e + 23a0a16 commit 027efbd
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ Add the TranslationValidator as a dependency:
}
}

Then add the `php translation.php` call you run locally to your `.travis.yml` file.
Then add a `php vendor/bin/translation.php` call to your `.travis.yml` file.

We use Travis-CI as a continous intergtation server and phpunit for our unit testing. See more information on the [phpBB development wiki](https://wiki.phpbb.com/Unit_Tests).
We use Travis-CI as a continuous integration server and phpunit for our unit testing. See more information on the [phpBB development wiki](https://wiki.phpbb.com/Unit_Tests).

To run the unit tests locally, use this command:

Expand Down
6 changes: 6 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
"require-dev": {
"phpunit/phpunit": "~5.7"
},
"bin": [
"translation.php"
],
"config": {
"bin-dir": "bin"
},
"autoload": {
"classmap": [
"src/",
Expand Down
42 changes: 21 additions & 21 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion translation.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
*/

require __DIR__ . '/vendor/autoload.php';
require 'vendor/autoload.php';

use Phpbb\TranslationValidator\Cli;

Expand Down

0 comments on commit 027efbd

Please sign in to comment.