Skip to content

Commit d830cd4

Browse files
committed
Minor fixes and adjustments to the PHPCS 4.0 user upgrade guide
1 parent 950648a commit d830cd4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

wiki/Version-4.0-User-Upgrade-Guide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ To continue running code style and code quality checks on JS and/or CSS files, u
9797
There are two kinds of sniffs which are affected by this:
9898
1. Sniffs which are specific to JS/CSS and only target JS/CSS code.
9999
If you use JS/CSS specific sniffs from either PHP_CodeSniffer itself or from an external standard, remove references to these sniffs from your ruleset.
100-
2. "Mixed" sniffs, i.e. sniffs which target both PHP as well as JS and/or CSS code.
100+
2. "Mixed" sniffs, i.e., sniffs which target both PHP as well as JS and/or CSS code.
101101
If an external standard you include in your ruleset contains these type of "mixed" sniffs, contact the maintainer of that standard about making the sniff compatible with PHP_CodeSniffer 4.0.
102102

103103
PHP_CodeSniffer >= 3.13.0 will show you deprecation notices for these sniffs to help you find them.
@@ -321,7 +321,7 @@ What to update these to, depends on your use-case.
321321

322322
## Notable other changes and new features
323323

324-
### Progress, error and debug output is now send to STDERR
324+
### Progress, error and debug output is now sent to STDERR
325325

326326
This change should make it more straight-forward to pipe output from PHP_CodeSniffer to a file.
327327

@@ -352,7 +352,7 @@ Previously a ruleset could already "extend" an array property for a sniff set by
352352

353353
As of PHP_CodeSniffer 4.0, a ruleset can also "extend" the default value of an array property as set in the sniff itself.
354354

355-
The upside of this is, that if you want to default value + some extras, you no longer need to duplicate the default values from sniff array properties in your ruleset.
355+
The upside of this is that if you want the default value + some extras, you no longer need to duplicate the default value from a sniff array property in your ruleset.
356356
The downside is, of course, that if the default value of the property in the sniff changes, your scans may start failing without warning.
357357

358358
#### Upgrading

0 commit comments

Comments
 (0)