Skip to content

Commit 8f4eb98

Browse files
authored
Merge pull request #449 from PHPCSStandards/feature/clean-up-markdown-files
Docs: clean up markdown files
2 parents dba1cc1 + 576ea06 commit 8f4eb98

File tree

6 files changed

+259
-127
lines changed

6 files changed

+259
-127
lines changed

.github/CONTRIBUTING.md

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
1-
Contributing
2-
-------------
1+
# Contributing
32

43
Thank you for your interest in contributing to PHP_CodeSniffer!
54

65

76
## Table of Contents
87

98
* [Reporting Bugs](#reporting-bugs)
10-
- [Reporting Security Issues](#reporting-security-issues)
11-
- [Support/Questions About Using PHP_CodeSniffer](#supportquestions-about-using-php_codesniffer)
9+
* [Reporting Security Issues](#reporting-security-issues)
10+
* [Support/Questions About Using PHP_CodeSniffer](#supportquestions-about-using-php_codesniffer)
1211
* [Contributing Without Writing Code](#contributing-without-writing-code)
13-
- [Bug Triage](#bug-triage)
14-
- [Testing Open Pull Requests](#testing-open-pull-requests)
15-
- [Writing sniff documentation](#writing-sniff-documentation)
16-
- [Other tasks](#other-tasks)
12+
* [Bug Triage](#bug-triage)
13+
* [Testing Open Pull Requests](#testing-open-pull-requests)
14+
* [Writing sniff documentation](#writing-sniff-documentation)
15+
* [Other tasks](#other-tasks)
1716
* [Contributing With Code](#contributing-with-code)
18-
- [Requesting/Submitting New Features](#requestingsubmitting-new-features)
19-
- [Getting started](#getting-started)
20-
- [While working on a patch](#while-working-on-a-patch)
21-
- [Writing tests](#writing-tests)
22-
- [Submitting your pull request](#submitting-your-pull-request)
17+
* [Requesting/Submitting New Features](#requestingsubmitting-new-features)
18+
* [Getting started](#getting-started)
19+
* [While working on a patch](#while-working-on-a-patch)
20+
* [Writing tests](#writing-tests)
21+
* [Submitting your pull request](#submitting-your-pull-request)
2322
* [Licensing](#licensing)
2423

2524

@@ -71,7 +70,7 @@ This includes checking whether the bug is something which should be fixed in **_
7170
To find bugs which need triage, look for issues and PRs with the
7271
["Status: triage"](https://github.com/PHPCSStandards/PHP_CodeSniffer/labels/Status%3A%20triage) label.
7372

74-
#### Typical bug triage tasks:
73+
#### Typical bug triage tasks
7574
* Verify whether the bug is reproducible with the given information.
7675
* Ask for additional information if it is not.
7776
* If you find the issue is reported to the wrong repo, ask the reporter to report it to the correct external standard repo
@@ -95,7 +94,7 @@ To get access to a PHPCS version which includes the patch from a pull request, y
9594
The PHAR files can be found on the summary page of the test workflow run for the PR.
9695
If the workflow has not been run (yet), the PHAR artifact may not be available (yet).
9796

98-
#### Typical test tasks:
97+
#### Typical test tasks
9998
* Verify that the patch solves the originally reported problem.
10099
* Verify that the tests added in the PR fail without the fix and pass with the fix.
101100
* For a fix for false negatives: verify that the correct error message(s) are thrown by the patched code.
@@ -168,10 +167,11 @@ This is an open invitation for interested parties to gather their thoughts about
168167
> Kind request: If you don't have something to add to the discussion, but do want to indicate a positive or negative opinion
169168
> on a topic, please add an emoji on the original post instead of leaving a comment.
170169
171-
> :bulb: On a subset of these issues - the ones which impact maintainers or integrators -, a list of known interested parties
172-
> will be pinged (cc-ed) to gather their thoughts on the topic.
173-
>
174-
> This list is public and
170+
On a subset of these issues - the ones which impact maintainers or integrators -, a list of known interested parties
171+
will be pinged (cc-ed) to gather their thoughts on the topic.
172+
173+
> [!TIP]
174+
> This cc-list list is public and
175175
> [maintained in a markdown file](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/.github/community-cc-list.md).
176176
>
177177
> To add or remove yourself to/from this list, submit a PR to the repo updating the `community-cc-list.md` file.
@@ -256,9 +256,9 @@ For example, for the sniff named `Generic.NamingConventions.ConstructorName`:
256256
* The sniff lives in the `src/Standards/Generic/Sniffs/NamingConventions/` directory.
257257
* The tests live in the `src/Standards/Generic/Tests/NamingConventions/` directory.
258258
* The tests consist of two files:
259-
- `src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc` which is the test _case_ file containing
259+
* `src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.inc` which is the test _case_ file containing
260260
code for the sniff to analyse.
261-
- `src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php` which is the test file, containing two methods,
261+
* `src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php` which is the test file, containing two methods,
262262
`getErrorList()` and `getWarningList()`, which should each return an array with as the keys the line number
263263
in the test _case_ file and as the values the number of errors or warnings which are expected on each line.
264264
Only lines on which errors/warnings are expected need to be included in the lists. All other lines will automatically
@@ -339,7 +339,7 @@ While not strictly required, it is greatly appreciated if you comply with the fo
339339

340340
* Prefix the commit short description with a hint as to what code is touched in the commit.
341341
Example: If you have a bug fix for the `Squiz.WhiteSpace.OperatorSpacing` sniff, it is a good idea to prefix
342-
the short description with `Squiz/OperatorSpacing: `.
342+
the short description with `Squiz/OperatorSpacing:`.
343343
Another example: if your PR addresses an issue with the Filter classes, prefix the short description
344344
with `Filters:` or `Filters/FilterName:`.
345345
Doing so will:

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ standard repository (not here).
1919
-->
2020

2121
## Describe the bug
22+
2223
A clear and concise description of what the bug is.
2324

2425
### Code sample
2526
```php
26-
echo "A short code snippet that can be used to reproduce the bug. Do NOT paste screenshots of code!";
27+
echo 'A short code snippet that can be used to reproduce the bug.';
28+
echo 'Do NOT paste screenshots of code!";
2729
```
2830

2931
### Custom ruleset
@@ -39,27 +41,29 @@ Steps to reproduce the behavior:
3941
1. Create a file called `test.php` with the code sample above...
4042
2. Run `phpcs test.php ...`
4143
3. See error message displayed
42-
```
44+
```text
4345
PHPCS output here
4446
```
4547

4648
## Expected behavior
49+
4750
A clear and concise description of what you expected to happen.
4851

4952
## Versions (please complete the following information)
5053

51-
| | |
52-
|-|-|
53-
| Operating System | [e.g., Windows 10, MacOS 10.15]
54-
| PHP version | [e.g., 7.2, 8.1]
55-
| PHP_CodeSniffer version | [e.g., 3.7.2, master]
56-
| Standard | [e.g., PSR2, PSR12, Squiz, custom]
57-
| Install type | [e.g. Composer (global/local), PHAR, git clone, other (please expand)]
54+
| | |
55+
|--------------------------|---------------------------------------------------------------------- |
56+
| Operating System | [e.g., Windows 10, MacOS 10.15] |
57+
| PHP version | [e.g., 7.2, 8.1] |
58+
| PHP_CodeSniffer version | [e.g., 3.7.2, master] |
59+
| Standard | [e.g., PSR2, PSR12, Squiz, custom] |
60+
| Install type | [e.g. Composer (global/local), PHAR, git clone, other (please expand)] |
5861

5962
## Additional context
63+
6064
Add any other context about the problem here.
6165

62-
## Please confirm:
66+
## Please confirm
6367

6468
- [ ] I have searched the issue list and am not opening a duplicate issue.
6569
- [ ] I confirm that this bug is a bug in PHP_CodeSniffer and not in one of the external standards.

.github/community-cc-list.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!--
2-
PHP_CodeSniffer Community CC List
1+
# PHP_CodeSniffer Community CC List
32

3+
<!--
44
This list will be used on select tickets to ping the wider PHP_CodeSniffer community for input.
55
66
If you want to be on this list, feel free to submit a PR to add yourself.

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Please target the `master` branch when submitting your pull request, unless your change **only** applies to PHPCS 4.x.
55
-->
66

7-
## Description
7+
# Description
88
<!--
99
What do you want to achieve with this PR? Why did you write this code? What problem does this PR solve?
1010
Describe your changes in detail and, if relevant, explain which choices you have made and why.
@@ -39,7 +39,7 @@ Fixes #
3939
- [ ] I grant the project the right to include and distribute the code under the BSD-3-Clause license (and I have the right to grant these rights).
4040
- [ ] I have added tests to cover my changes.
4141
- [ ] I have verified that the code complies with the projects coding standards.
42-
- [ ] [Required for new sniffs] I have added XML documentation for the sniff.
42+
- [ ] \[Required for new sniffs\] I have added XML documentation for the sniff.
4343

4444
<!--
4545
============================================================================================

0 commit comments

Comments
 (0)