diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8e54eab..29a4212 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -3,6 +3,3 @@ contact_links: - name: Security Vulnerabilities url: https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability about: Do not open a public issue for security vulnerabilities. Use GitHub Security Advisories in the affected repository. - - name: Questions and Discussions - url: https://github.com/orgs/php-forge/discussions - about: Use GitHub Discussions for questions, ideas, and general conversation. diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6ed6edb..8a935cc 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,102 +1,45 @@ # Code of Conduct -## Our Pledge +These projects are maintained by a small team in its spare time. We work with people who are here to build good +software, and we keep this document short so that it can actually be applied. -As contributors and maintainers of this project, and in order to keep community open and welcoming, we ask to -respect all community members. +## Expectations -## Our Standards +In every project space (issues, pull requests, discussions, reviews, commit comments and any chat linked from a +repository): -Examples of behavior that contributes to a positive environment for our community include: +- Be tolerant of opposing views. Technical disagreement is normal: argue the point, not the person. +- Keep your language and actions free of personal attacks and disparaging personal remarks. +- Assume good intentions when interpreting what other people write and do. +- Behavior that can reasonably be considered harassment is not tolerated, and neither is publishing someone's private + information without their permission. -- Demonstrating empathy and kindness toward other people -- Being respectful of differing opinions, viewpoints, and experiences -- Giving and gracefully accepting constructive feedback -- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience -- Focusing on what is best not just for us as individuals, but for the overall community - -Examples of unacceptable behavior by participants include: - -- The use of sexualized language or imagery, and sexual attention or advances of any kind -- Trolling, insulting or derogatory comments, and personal or political attacks -- Public or private harassment -- Publishing others' private information, such as a physical or email address, without their explicit permission -- Other conduct which could reasonably be considered inappropriate in a professional setting - -## Enforcement Responsibilities - -Core team members are responsible for clarifying and enforcing our standards of acceptable behavior and will take -appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Core team members have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, -issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for -moderation decisions when appropriate. +These expectations follow the four principles of the +[Ruby Community Conduct Guideline](https://www.ruby-lang.org/en/conduct/), which Rails also uses. ## Scope -This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing -the community in public spaces. Examples of representing a project or community include using an official email -address, posting via an official social media account, within project GitHub, official forum or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting core team members. All -complaints will be reviewed and investigated promptly and fairly. - -All core team members are obligated to respect the privacy and security of the reporter of any incident. - -## Enforcement Guidelines - -Core team members will follow these Community Impact Guidelines in determining the consequences for any action they -deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in -the community. - -**Consequence**: A private, written warning from core team members, providing clarity around the nature of the violation -and an explanation of why the behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series of actions. - -**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including -unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding -interactions in community spaces as well as external channels like social media. Violating these terms may lead to -a temporary or permanent ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified -period of time. No public or private interaction with the people involved, including unsolicited interaction with those -enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban. +This document covers the project spaces listed above. It does not govern what people say or do elsewhere. -### 4. Permanent Ban +## How it is applied -**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate -behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals. +The maintainers decide, case by case. There is no committee and there are no formal investigations. -**Consequence**: A permanent ban from any sort of public interaction within the community. +- Off-topic, hostile or repetitive comments may be edited, hidden or deleted, and conversations may be locked. +- Anyone who keeps disrupting a project space may be blocked from it, temporarily or permanently, with GitHub's + moderation tools. Abuse of GitHub itself is reported to GitHub. +- Maintainers explain a moderation decision when that helps, and correct it when they got it wrong. -## Attribution +Declining a contribution, closing an issue or disagreeing with a technical decision is not a conduct matter. -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at -[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. +## Reporting -Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC]. +GitHub is the only channel these projects have. There is no mailbox and no committee behind this document. -For answers to common questions about this code of conduct, see the FAQ at -[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at -[https://www.contributor-covenant.org/translations][translations]. +- If GitHub shows a **Report content** option on a comment, issue or pull request, use it: the report goes to the + repository administrators, not to the person reported. +- Conduct that breaks GitHub's own rules (harassment, threats, publishing private information, spam) can be + [reported to GitHub directly](https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam). -[homepage]: https://www.contributor-covenant.org -[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html -[Mozilla CoC]: https://github.com/mozilla/diversity -[FAQ]: https://www.contributor-covenant.org/faq -[translations]: https://www.contributor-covenant.org/translations +Reports about a maintainer go through the same routes. These projects have a single maintainer, so there is no +independent reviewer; we say so rather than pretend otherwise. diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index bdab80c..7ba42ca 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -3,10 +3,26 @@ - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Bugfix (non-breaking change that fixes an issue) - [ ] CI/build configuration +- [ ] Dependency update - [ ] Documentation update - [ ] New feature (non-breaking change that adds functionality) +- [ ] Performance improvement - [ ] Refactoring (no functional changes) +- [ ] Tests -## Related Issues +## Change - +Explain the problem and the resulting behavior. Include a before/after example when useful. + +## Validation + +List the checks performed and their results. Explain any relevant checks not run. + +## Compatibility + +Describe any behavior, configuration, dependency, or migration impact. +Write "None" when there is no compatibility impact. + +## Related issues + +Link relevant issues. Use closing keywords only when this PR fully resolves them.