Skip to content

Commit

Permalink
Merge 3e0f805 into 1045f8c
Browse files Browse the repository at this point in the history
  • Loading branch information
manuee committed Oct 24, 2018
2 parents 1045f8c + 3e0f805 commit 7cc37db
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Configure the plugin in your composer.json file using for example:
],
"locations": [
"app/modules",
"app/profiles",
"app/profiles"
],
"output-dir": "NOT-PUBLIC-FOLDER"
}
Expand All @@ -35,6 +35,19 @@ You can also use the command `composer merge-yaml` to run the merge process.

Use the option `--config` to specify a config.json file to override the config defined in the `composer.json`: `composer merge-yaml --config=config.json`.

The content of the configuration file passed in needs to be in this format:
```
{
"files": [
"database.sanitize"
],
"locations": [
"app/modules",
"app/profiles"
],
"output-dir": "NOT-PUBLIC-FOLDER"
}
```

## Automated Tests and Code Sniffer
This repository is integrated with [Travis CI](https://travis-ci.com/EdisonLabs/merge-yaml) to perform tests and detect PHP standards violations.

0 comments on commit 7cc37db

Please sign in to comment.