diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5ec6acbf79..1b6674b7b7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -79,7 +79,7 @@ To find bugs which need triage, look for issues and PRs with the and suggest closing the issue. Additionally, for older issues: -* Check whether an issue still exists or has been fixed in `master` since the issue was initially reported. +* Check whether an issue still exists or has been fixed since the issue was initially reported. * If it has been fixed, document (in a comment) which commit/PR was responsible for fixing the issue and suggest closing the ticket. @@ -245,7 +245,7 @@ When in doubt how to proceed with a ticket, feel free to leave a comment with sp 1. Fork/clone the repository. 2. Run `composer install`. -3. Create a new branch off the `master` branch to hold your patch. +3. Create a new branch off the `4.x` branch to hold your patch. If there is an open issue associated with your patch, including the issue number in the branch name is good practice. diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 3e9ee714e9..50fc72fe02 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -55,7 +55,7 @@ A clear and concise description of what you expected to happen. |-----------------------------|---------------------------------------------------------------------------- | | Operating System | (e.g., Windows 10, MacOS 10.15) | | PHP version | (e.g., 7.2, 8.1) | -| PHP_CodeSniffer version | (e.g., 3.7.2, master) | +| PHP_CodeSniffer version | (e.g., 3.13.4, 4.x) | | Standard | (e.g., PSR2, PSR12, Squiz, custom) | | Install type | (e.g. Composer (global/local), PHAR, git clone, other (please expand)) | @@ -68,4 +68,4 @@ Add any other context about the problem here. - [ ] I have searched the issue list and am not opening a duplicate issue. - [ ] I have read the [Contribution Guidelines](https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/HEAD/.github/CONTRIBUTING.md) and this is not a [support question](https://github.com/PHPCSStandards/PHP_CodeSniffer/discussions). - [ ] I confirm that this bug is a bug in PHP_CodeSniffer and not in one of the external standards. -- [ ] I have verified the issue still exists in the `master` branch of PHP_CodeSniffer. +- [ ] I have verified the issue still exists in the `4.x` branch of PHP_CodeSniffer. diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9d1b458c3b..9426200cbb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,7 +10,7 @@ updates: directory: "/" schedule: interval: "weekly" - target-branch: "master" + target-branch: "3.x" open-pull-requests-limit: 5 commit-message: prefix: "GH Actions:" diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ec1ca992ad..4376efe274 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,7 +1,11 @@ # Description diff --git a/.github/release-checklist.md b/.github/release-checklist.md index c84b469a59..84bb3394e9 100644 --- a/.github/release-checklist.md +++ b/.github/release-checklist.md @@ -77,7 +77,7 @@ Please consider [funding the PHP_CodeSniffer project](https://opencollective.com - [ ] Merge the changelog PR. For now, cherrypick the changelog to the 4.0 branch. -- [ ] Make sure all CI builds for `master` are green. +- [ ] Make sure all CI builds for the release branch are green. - [ ] Create a tag for the release & push it. - [ ] Make sure all CI builds are green. - [ ] Download the PHAR files from the GH Actions test build page. diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml index 2bb771f26c..6ef752e1e4 100644 --- a/.github/workflows/build-phar.yml +++ b/.github/workflows/build-phar.yml @@ -1,12 +1,12 @@ name: Build PHARs on: - # Run on pushes to master and on pull requests which touch files used when building the PHARs. + # Run on pushes to the main branches and on pull requests which touch files used when building the PHARs. # Prevent the build from running when there are only irrelevant changes. push: branches: - - master - - 4.0 + - 3.x + - 4.x paths: - '.github/workflows/build-phar.yml' - '.github/workflows/reusable-build-phar.yml' diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml index cba7c39a1f..1b1f297b76 100644 --- a/.github/workflows/end-to-end-tests.yml +++ b/.github/workflows/end-to-end-tests.yml @@ -1,12 +1,12 @@ name: E2E Tests on: - # Run on pushes to `master`/`4.0` and on all pull requests. + # Run on pushes to the main branches and on all pull requests. # Prevent the build from running when there are only irrelevant changes. push: branches: - - master - - 4.0 + - 3.x + - 4.x tags: - '**' paths-ignore: diff --git a/.github/workflows/happy-new-year.yml b/.github/workflows/happy-new-year.yml index 8708f034f7..0f0a9097de 100644 --- a/.github/workflows/happy-new-year.yml +++ b/.github/workflows/happy-new-year.yml @@ -35,7 +35,7 @@ jobs: - name: Set branches to use id: branches run: | - echo "BASE=master" >> "$GITHUB_OUTPUT" + echo "BASE=3.x" >> "$GITHUB_OUTPUT" echo "PR_BRANCH=feature/squiz-filecomment-update-copyright-year" >> "$GITHUB_OUTPUT" # Using "Tomorrow" to prevent accidentally getting last year if the server is not using UTC. diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml index 6eac6fc86b..f086fefd3e 100644 --- a/.github/workflows/label-merge-conflicts.yml +++ b/.github/workflows/label-merge-conflicts.yml @@ -4,8 +4,8 @@ on: # Check for new conflicts due to merges. push: branches: - - master - - 4.0 + - 3.x + - 4.x # Check conflicts in new PRs and for resolved conflicts due to an open PR being updated. pull_request_target: types: diff --git a/.github/workflows/label-new-prs.yml b/.github/workflows/label-new-prs.yml index 69b1ef1d97..8a083b6e3d 100644 --- a/.github/workflows/label-new-prs.yml +++ b/.github/workflows/label-new-prs.yml @@ -3,7 +3,7 @@ name: Label new PRs on: # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target # The `pull_request_target` event is used for "normal" PRs to label them when they are opened. - # This will use the `labeler.yml` file in the default (master) branch of the repo. + # This will use the `labeler.yml` file in the default branch of the repo. pull_request_target: types: - opened diff --git a/.github/workflows/quicktest.yml b/.github/workflows/quicktest.yml index 5bd0e9d22f..bfd1aaa870 100644 --- a/.github/workflows/quicktest.yml +++ b/.github/workflows/quicktest.yml @@ -1,11 +1,11 @@ name: Quicktest on: - # Run on pushes to all branches except for `master`/`4.0`. + # Run on pushes to all branches except the main branches. push: branches-ignore: - - master - - 4.0 + - 3.x + - 4.x paths-ignore: - '**.md' # Allow manually triggering the workflow. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 290c51b952..f91ebb45d8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,12 +1,12 @@ name: Test on: - # Run on pushes to `master`/`4.0` and on all pull requests. + # Run on pushes to the main branches and on all pull requests. # Prevent the build from running when there are only irrelevant changes. push: branches: - - master - - 4.0 + - 3.x + - 4.x tags: - '**' paths-ignore: diff --git a/README.md b/README.md index d9d7804b88..8278abe490 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@