Skip to content

4.0 | Composer: set conflict directive #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

4.0 | Composer: set conflict directive #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b5e6e9
Config: minor documentation touch-up
jrfnl Dec 6, 2023
dc87f0f
4.0 | Composer: set conflict directive
jrfnl Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"require-dev": {
"phpunit/phpunit": "^8.0 || ^9.0"
},
"replace": {
"squizlabs/php_codesniffer": "> 2.0"
"conflict": {
"squizlabs/php_codesniffer": "*"
},
"bin": [
"bin/phpcs",
Expand Down
1 change: 1 addition & 0 deletions src/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
* @property bool $stdin Read content from STDIN instead of supplied files.
* @property string $stdinContent Content passed directly to PHPCS on STDIN.
* @property string $stdinPath The path to use for content passed on STDIN.
* @property bool $trackTime Whether or not to track sniff run time.
*
* @property array<string, string> $extensions File extensions that should be checked.
* E.g., array('php', 'inc');
Expand Down