Skip to content

Commit 1413982

Browse files
authored
Merge pull request #2367 from WordPress/feature/docs-update-readme-contributing-et-al-3.0.0
Update documentation (README, CONTRIBUTING) for release of WordPressCS 3.0.0
2 parents 185308a + 71dc238 commit 1413982

File tree

5 files changed

+192
-201
lines changed

5 files changed

+192
-201
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Exclude these files from release archives.
33
# This will also make them unavailable when using Composer with `--prefer-dist`.
4-
# If you develop for WPCS using Composer, use `--prefer-source`.
4+
# If you develop for WordPressCS using Composer, use `--prefer-source`.
55
# https://blog.madewithlove.be/post/gitattributes/
66
#
77
/.gitattributes export-ignore

.github/CONTRIBUTING.md

Lines changed: 66 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,20 @@ Bug reports containing a minimal code sample which can be used to reproduce the
1111

1212
## Upstream Issues
1313

14-
Since WPCS employs many sniffs that are part of PHPCS, sometimes an issue will be caused by a bug in PHPCS and not in WPCS itself. If the error message in question doesn't come from a sniff whose name starts with `WordPress`, the issue is probably a bug in PHPCS itself, and should be [reported there](https://github.com/squizlabs/PHP_CodeSniffer/issues).
14+
Since WordPressCS employs many sniffs that are part of PHP_CodeSniffer itself or PHPCSExtra, sometimes an issue will be caused by a bug in PHPCS or PHPCSExtra and not in WordPressCS itself.
15+
If the error message in question doesn't come from a sniff whose name starts with `WordPress`, the issue is probably a bug in PHPCS or PHPCSExtra.
16+
17+
* Bugs for sniffs starting with `Generic`, `PEAR`, `PSR1`, `PSR2`, `PSR12`, `Squiz` or `Zend` should be [reported to PHPCS](https://github.com/squizlabs/PHP_CodeSniffer/issues).
18+
* Bugs for sniffs starting with `Modernize`, `NormalizedArrays` or `Universal` should be [reported to PHPCSExtra](https://github.com/PHPCSStandards/PHPCSExtra/issues).
1519

1620
# Contributing patches and new features
1721

1822
## Branches
1923

2024
Ongoing development will be done in the `develop` branch with merges to `main` once considered stable.
2125

22-
To contribute an improvement to this project, fork the repo and open a pull request to the `develop` branch. Alternatively, if you have push access to this repo, create a feature branch prefixed by `feature/` and then open an intra-repo PR from that branch to `develop`.
23-
24-
Once a commit is made to `develop`, a PR should be opened from `develop` to `main` and named "Next release". This PR will provide collaborators with a forum to discuss the upcoming stable release.
26+
To contribute an improvement to this project, fork the repo, run `composer install`, make your changes to the code, run the unit tests and code style checks by running `composer check-all`, and if all is good, open a pull request to the `develop` branch.
27+
Alternatively, if you have push access to this repo, create a feature branch prefixed by `feature/` and then open an intra-repo PR from that branch to `develop`.
2528

2629
# Considerations when writing sniffs
2730

@@ -37,90 +40,82 @@ When you introduce new `public` sniff properties, or your sniff extends a class
3740
## Pre-requisites
3841
* WordPress-Coding-Standards
3942
* PHP_CodeSniffer 3.7.2 or higher
43+
* PHPCSUtils 1.0.8 or higher
44+
* PHPCSExtra 1.1.0 or higher
4045
* PHPUnit 4.x, 5.x, 6.x or 7.x
4146

42-
The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test suite for unit testing the sniffs.
43-
44-
Presuming you have installed `PHP_CodeSniffer` and the WordPress-Coding-Standards as [noted in the README](https://github.com/WordPress/WordPress-Coding-Standards#how-to-use-this), all you need now is `PHPUnit`.
45-
46-
> N.B.: If you installed WPCS using Composer, make sure you used `--prefer-source` or run `composer install --prefer-source` now to make sure the unit tests are available.
47-
> Other than that, you're all set already as Composer will have installed PHPUnit for you.
48-
49-
If you already have PHPUnit installed on your system: Congrats, you're all set.
50-
51-
## Installing PHPUnit
47+
The WordPress Coding Standards use the `PHP_CodeSniffer` native unit test framework for unit testing the sniffs.
5248

53-
N.B.: _If you used Composer to install the WordPress Coding Standards, you can skip this step._
49+
## Getting ready to test
5450

55-
You can either navigate to the directory where the `PHP_CodeSniffer` repo is checked out and do `composer install` to install the `dev` dependencies or you can [install PHPUnit](https://phpunit.readthedocs.io/en/7.4/installation.html) as a PHAR file.
51+
Presuming you have cloned WordPressCS for development, to run the unit tests you need to make sure you have run `composer install` from the root directory of your WordPressCS git clone.
5652

57-
You may want to add the directory where PHPUnit is installed to a `PATH` environment variable for your operating system to make the command available everywhere on your system.
53+
## Custom develop setups
5854

59-
## Before running the unit tests
60-
61-
N.B.: _If you used Composer to install the WordPress Coding Standards, you can skip this step._
62-
63-
For the unit tests to work, you need to make sure PHPUnit can find your `PHP_CodeSniffer` install.
64-
65-
The easiest way to do this is to add a `phpunit.xml` file to the root of your WPCS installation and set a `PHPCS_DIR` environment variable from within this file.
66-
Copy the existing `phpunit.xml.dist` file and add the below `<env>` directive within the `<php>` section. Make sure to adjust the path to reflect your local setup.
67-
```xml
68-
<php>
69-
<env name="PHPCS_DIR" value="/path/to/PHP_CodeSniffer/"/>
70-
</php>
71-
```
55+
If you are developing with a stand-alone PHP_CodeSniffer (git clone) installation and want to use that git clone to test WordPressCS, there are three extra things you need to do:
56+
1. Install [PHPCSUtils](https://github.com/PHPCSStandards/PHPCSUtils).
57+
If you are using a git clone of PHPCS, you may want to `git clone` PHPCSUtils as well.
58+
2. Register PHPCSUtils with your stand-alone PHP_CodeSniffer installation by running the following commands:
59+
```bash
60+
phpcs --config-show
61+
```
62+
Copy the value from "installed_paths" and add the path to your local install of PHPCSUtils to it (and the path to WordPressCS if it's not registered with PHPCS yet).
63+
Now use the adjusted value to run:
64+
```bash
65+
phpcs --config-set installed_paths /path/1,/path/2,/path/3
66+
```
67+
3. Make sure PHPUnit can find your `PHP_CodeSniffer` install.
68+
The most straight-forward way to do this is to add a `phpunit.xml` file to the root of your WordPressCS installation and set a `PHPCS_DIR` environment variable from within this file.
69+
Copy the existing `phpunit.xml.dist` file and add the below `<env>` directive within the `<php>` section. Make sure to adjust the path to reflect your local setup.
70+
```xml
71+
<php>
72+
<env name="PHPCS_DIR" value="/path/to/PHP_CodeSniffer/"/>
73+
</php>
74+
```
7275
7376
## Running the unit tests
7477
75-
* If you didn't install WPCS using Composer, make sure you have registered the directory in which you installed WPCS with PHPCS using:
76-
```sh
77-
phpcs --config-set installed_paths path/to/WPCS
78-
```
79-
* Navigate to the directory in which you installed WPCS.
80-
* To run the unit tests:
81-
```sh
82-
phpunit --filter WordPress --bootstrap="/path/to/PHP_CodeSniffer/tests/bootstrap.php" /path/to/PHP_CodeSniffer/tests/AllTests.php
78+
From the root of your WordPressCS install, run the unit tests like so:
79+
```bash
80+
composer run-tests
8381
84-
# Or if you've installed WPCS with Composer:
85-
composer run-tests
86-
```
82+
# Or if you want to use a globally installed version of PHPUnit:
83+
phpunit --filter WordPress /path/to/PHP_CodeSniffer/tests/AllTests.php
84+
```
8785
8886
Expected output:
8987
```
90-
PHPUnit 7.5.0 by Sebastian Bergmann and contributors.
88+
PHPUnit 7.5.20 by Sebastian Bergmann and contributors.
9189
92-
Runtime: PHP 7.2.13
93-
Configuration: /WordPressCS/phpunit.xml
90+
Runtime: PHP 7.4.33
91+
Configuration: /WordPressCS/phpunit.xml.dist
9492
95-
........................................................ 56 / 56 (100%)
93+
......................................................... 57 / 57 (100%)
9694
97-
152 sniff test files generated 487 unique error codes; 52 were fixable (10.68%)
95+
201 sniff test files generated 744 unique error codes; 50 were fixable (6%)
9896
99-
Time: 21.36 seconds, Memory: 22.00MB
97+
Time: 10.19 seconds, Memory: 40.00 MB
10098
101-
OK (56 tests, 0 assertions)
99+
OK (57 tests, 0 assertions)
102100
```
103101
104-
[![asciicast](https://asciinema.org/a/98078.png)](https://asciinema.org/a/98078)
105-
106102
## Unit Testing conventions
107103
108104
If you look inside the `WordPress/Tests` subdirectory, you'll see the structure mimics the `WordPress/Sniffs` subdirectory structure. For example, the `WordPress/Sniffs/PHP/POSIXFunctionsSniff.php` sniff has its unit test class defined in `WordPress/Tests/PHP/POSIXFunctionsUnitTest.php` which checks the `WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc` test case file. See the file naming convention?
109105

110106
Lets take a look at what's inside `POSIXFunctionsUnitTest.php`:
111107
112108
```php
113-
...
114109
namespace WordPressCS\WordPress\Tests\PHP;
115110
116111
use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
117112
118-
class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
113+
final class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
119114
120115
/**
121116
* Returns the lines where errors should occur.
122117
*
123-
* @return array <int line number> => <int number of errors>
118+
* @return array<int, int> Key is the line number, value is the number of expected errors.
124119
*/
125120
public function getErrorList() {
126121
return array(
@@ -132,17 +127,18 @@ class POSIXFunctionsUnitTest extends AbstractSniffUnitTest {
132127
24 => 1,
133128
26 => 1,
134129
);
135-
136130
}
137-
...
131+
132+
...
133+
}
138134
```
139135
140-
Also note the class name convention. The method `getErrorList()` MUST return an array of line numbers indicating errors (when running `phpcs`) found in `WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc`.
141-
If you run:
136+
Also note the class name convention. The method `getErrorList()` MUST return an array of line numbers indicating errors (when running `phpcs`) found in `WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc`. Similarly, the `getWarningList()` method must return an array of line numbers with the number of expected warnings.
137+
138+
If you run the following from the root directory of your WordPressCS clone:
142139
143140
```sh
144-
$ cd /path-to-cloned/phpcs
145-
$ ./bin/phpcs --standard=Wordpress -s /path/to/WordPress/Tests/PHP/POSIXFunctionsUnitTest.inc --sniffs=WordPress.PHP.POSIXFunctions
141+
$ "vendor/bin/phpcs" --standard=Wordpress -s ./Tests/PHP/POSIXFunctionsUnitTest.inc --sniffs=WordPress.PHP.POSIXFunctions
146142
...
147143
--------------------------------------------------------------------------------
148144
FOUND 7 ERRORS AFFECTING 7 LINES
@@ -153,28 +149,28 @@ FOUND 7 ERRORS AFFECTING 7 LINES
153149
16 | ERROR | eregi() has been deprecated since PHP 5.3 and removed in PHP 7.0,
154150
| | please use preg_match() instead.
155151
| | (WordPress.PHP.POSIXFunctions.ereg_eregi)
156-
18 | ERROR | ereg_replace() has been deprecated since PHP 5.3 and removed in PHP
157-
| | 7.0, please use preg_replace() instead.
152+
18 | ERROR | ereg_replace() has been deprecated since PHP 5.3 and removed in
153+
| | PHP 7.0, please use preg_replace() instead.
158154
| | (WordPress.PHP.POSIXFunctions.ereg_replace_ereg_replace)
159-
20 | ERROR | eregi_replace() has been deprecated since PHP 5.3 and removed in PHP
160-
| | 7.0, please use preg_replace() instead.
155+
20 | ERROR | eregi_replace() has been deprecated since PHP 5.3 and removed in
156+
| | PHP 7.0, please use preg_replace() instead.
161157
| | (WordPress.PHP.POSIXFunctions.ereg_replace_eregi_replace)
162158
22 | ERROR | split() has been deprecated since PHP 5.3 and removed in PHP 7.0,
163159
| | please use explode(), str_split() or preg_split() instead.
164160
| | (WordPress.PHP.POSIXFunctions.split_split)
165-
24 | ERROR | spliti() has been deprecated since PHP 5.3 and removed in PHP 7.0,
166-
| | please use explode(), str_split() or preg_split() instead.
167-
| | (WordPress.PHP.POSIXFunctions.split_spliti)
168-
26 | ERROR | sql_regcase() has been deprecated since PHP 5.3 and removed in PHP
169-
| | 7.0, please use preg_match() instead.
161+
24 | ERROR | spliti() has been deprecated since PHP 5.3 and removed in PHP
162+
| | 7.0, please use explode(), str_split() or preg_split()
163+
| | instead. (WordPress.PHP.POSIXFunctions.split_spliti)
164+
26 | ERROR | sql_regcase() has been deprecated since PHP 5.3 and removed in
165+
| | PHP 7.0, please use preg_match() instead.
170166
| | (WordPress.PHP.POSIXFunctions.ereg_sql_regcase)
171167
--------------------------------------------------------------------------------
172-
....
168+
...
173169
```
174170
You'll see the line number and number of ERRORs we need to return in the `getErrorList()` method.
175171

176172
The `--sniffs=...` directive limits the output to the sniff you are testing.
177173

178174
## Code Standards for this project
179175

180-
The sniffs and test files - not test _case_ files! - for WPCS should be written such that they pass the `WordPress-Extra` and the `WordPress-Docs` code standards using the custom ruleset as found in `/.phpcs.xml.dist`.
176+
The sniffs and test files - not test _case_ files! - for WordPressCS should be written such that they pass the `WordPress-Extra` and the `WordPress-Docs` code standards using the custom ruleset as found in `/.phpcs.xml.dist`.

.phpcs.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<!-- Linting is done in a separate CI job, no need to duplicate it. -->
5252
<exclude name="Generic.PHP.Syntax"/>
5353

54-
<!-- WPCS still has a PHP 5.4 minimum. -->
54+
<!-- WordPressCS still has a PHP 5.4 minimum. -->
5555
<exclude name="Modernize.FunctionCalls.Dirname"/>
5656
</rule>
5757

0 commit comments

Comments
 (0)