Skip to content
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

Update phpcs script and dependent libs #572

Merged
merged 3 commits into from
Oct 24, 2018
Merged

Update phpcs script and dependent libs #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab381ef
Update phpcs script and dependant libs
joshcanhelp Oct 24, 2018
f8ff7d1
Whitespace changes
joshcanhelp Oct 24, 2018
87e5b5f
Stop phpunit logging
joshcanhelp Oct 24, 2018
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ wp-phptidy.php
/account_cleanup/vendor/
/vendor/
/rules/
.phpcs.xml
phpcs.xml
20 changes: 9 additions & 11 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"php": "^5.3 || ^7.0"
},
"require-dev": {
"phpcompatibility/php-compatibility": "^8.1",
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
"wp-coding-standards/wpcs": "^0.14.1",
"phpunit/phpunit": "^6.5.0"
"wp-coding-standards/wpcs": "^1",
"phpunit/phpunit": "^6.5.0",
"phpcompatibility/phpcompatibility-wp": "*"
},
"authors": [
{
Expand All @@ -30,15 +30,13 @@
},
"minimum-stability": "stable",
"scripts": {
"compat": "./vendor/bin/phpcs --standard=phpcs-compat-ruleset.xml .",
"phpcs": "./vendor/bin/phpcs --standard=phpcs-ruleset.xml -s .",
"compat": "vendor/bin/phpcs --standard=phpcs-compat-ruleset.xml .",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vendor/bin/phpcs => \"vendor/bin/phpcs\" (for consistency and cross-platform compat)

Also there are a few more of these in this same block lower down.

"phpcs": "\"vendor/bin/phpcs\"",
"phpcs-tests": "./vendor/bin/phpcs --standard=phpcs-test-ruleset.xml -s ./tests/",
"phpcs-path": "SHELL_INTERACTIVE=1 ./vendor/bin/phpcs --standard=phpcs-ruleset.xml -s",
"phpcbf": "./vendor/bin/phpcbf --standard=phpcs-ruleset.xml .",
"phpcbf": "\"vendor/bin/phpcbf\"",
"phpcbf-tests": "./vendor/bin/phpcbf --standard=phpcs-test-ruleset.xml -s ./tests/",
"phpcbf-path": "SHELL_INTERACTIVE=1 ./vendor/bin/phpcbf --standard=phpcs-ruleset.xml",
"sniffs": "./vendor/bin/phpcs --standard=phpcs-ruleset.xml -e",
"test": "SHELL_INTERACTIVE=1 ./vendor/bin/phpunit --coverage-text --verbose",
"test-ci": "./vendor/bin/phpunit --debug --verbose --coverage-clover=coverage.xml"
"sniffs": "vendor/bin/phpcs --standard=phpcs-ruleset.xml -e",
"test": "\"vendor/bin/phpunit\" --coverage-text",
"test-ci": "vendor/bin/phpunit --debug --coverage-clover=coverage.xml"
}
}
152 changes: 130 additions & 22 deletions composer.lock
View file
Open in desktop

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

Loading