Skip to content

Commit 9346ec0

Browse files
terabytesoftwterabytesoftw
committed
Merge branch 'main' into sync-to-main-23
2 parents 18927b6 + b86c8a1 commit 9346ec0

33 files changed

+811
-480
lines changed

‎.editorconfig‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,28 @@
1+
# editorconfig.org
2+
13
root = true
24

35
[*]
46
charset = utf-8
57
end_of_line = lf
68
insert_final_newline = true
7-
indent_style = spaces
9+
indent_style = space
810
indent_size = 4
911
trim_trailing_whitespace = true
1012

13+
[*.js]
14+
indent_size = 2
15+
1116
[*.md]
1217
trim_trailing_whitespace = false
1318

19+
[*.php]
20+
ij_php_space_before_short_closure_left_parenthesis = false
21+
ij_php_space_after_type_cast = true
22+
1423
[*.yml]
1524
indent_size = 2
25+
26+
[LICENSE*]
27+
indent_style = unset
28+
indent_size = unset

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# Code of Conduct
2+
3+
## Our Pledge
4+
5+
As contributors and maintainers of this project, and in order to keep community open and welcoming, we ask to
6+
respect all community members.
7+
8+
## Our Standards
9+
10+
Examples of behavior that contributes to a positive environment for our community include:
11+
12+
- Demonstrating empathy and kindness toward other people
13+
- Being respectful of differing opinions, viewpoints, and experiences
14+
- Giving and gracefully accepting constructive feedback
15+
- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
16+
- Focusing on what is best not just for us as individuals, but for the overall community
17+
18+
Examples of unacceptable behavior by participants include:
19+
20+
- The use of sexualized language or imagery, and sexual attention or advances of any kind
21+
- Trolling, insulting or derogatory comments, and personal or political attacks
22+
- Public or private harassment
23+
- Publishing others' private information, such as a physical or email address, without their explicit permission
24+
- Other conduct which could reasonably be considered inappropriate in a professional setting
25+
26+
## Enforcement Responsibilities
27+
28+
Core team members are responsible for clarifying and enforcing our standards of acceptable behavior and will take
29+
appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive,
30+
or harmful.
31+
32+
Core team members have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits,
33+
issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for
34+
moderation decisions when appropriate.
35+
36+
## Scope
37+
38+
This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing
39+
the community in public spaces. Examples of representing a project or community include using an official email
40+
address, posting via an official social media account, within project GitHub, official forum or acting as an appointed
41+
representative at an online or offline event.
42+
43+
## Enforcement
44+
45+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting core team members. All
46+
complaints will be reviewed and investigated promptly and fairly.
47+
48+
All core team members are obligated to respect the privacy and security of the reporter of any incident.
49+
50+
## Enforcement Guidelines
51+
52+
Core team members will follow these Community Impact Guidelines in determining the consequences for any action they
53+
deem in violation of this Code of Conduct:
54+
55+
### 1. Correction
56+
57+
**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in
58+
the community.
59+
60+
**Consequence**: A private, written warning from core team members, providing clarity around the nature of the violation
61+
and an explanation of why the behavior was inappropriate. A public apology may be requested.
62+
63+
### 2. Warning
64+
65+
**Community Impact**: A violation through a single incident or series of actions.
66+
67+
**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including
68+
unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding
69+
interactions in community spaces as well as external channels like social media. Violating these terms may lead to
70+
a temporary or permanent ban.
71+
72+
### 3. Temporary Ban
73+
74+
**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
75+
76+
**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified
77+
period of time. No public or private interaction with the people involved, including unsolicited interaction with those
78+
enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
79+
80+
### 4. Permanent Ban
81+
82+
**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate
83+
behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
84+
85+
**Consequence**: A permanent ban from any sort of public interaction within the community.
86+
87+
## Attribution
88+
89+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at
90+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
91+
92+
Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
93+
94+
For answers to common questions about this code of conduct, see the FAQ at
95+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
96+
[https://www.contributor-covenant.org/translations][translations].
97+
98+
[homepage]: https://www.contributor-covenant.org
99+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
100+
[Mozilla CoC]: https://github.com/mozilla/diversity
101+
[FAQ]: https://www.contributor-covenant.org/faq
102+
[translations]: https://www.contributor-covenant.org/translations

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
github: [terabytesoftw]

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
### What steps will reproduce the problem?
1+
# Issue Report
22

3-
### What is the expected result?
3+
## What steps will reproduce the problem?
44

5-
### What do you get instead?
5+
## What is the expected result?
66

7-
### Additional info
7+
## What do you get instead?
88

9-
| Q | A
10-
| ---------------- | ---
11-
| Version | 1.0.?
12-
| PHP version |
13-
| Operating system |
9+
## Additional info
10+
11+
| Q | A |
12+
| ---------------- | ----- |
13+
| Version | 1.0.? |
14+
| PHP version | |
15+
| Operating system | |

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
| Q | A
2-
| ------------ | ---
3-
| Is bugfix | ✔️/❌
4-
| New feature | ✔️/❌
5-
| Breaks BC | ✔️/❌
6-
| Fixed issues | comma-separated list of tickets # fixed by the PR, if any
1+
# Pull Request
2+
3+
| Q | A |
4+
| ------------ | ------------------------------------------------------------------ |
5+
| Is bugfix? | ✔️/❌ |
6+
| New feature? | ✔️/❌ |
7+
| Breaks BC? | ✔️/❌ |
8+
| Fixed issues | <!-- comma-separated list of tickets # fixed by the PR, if any --> |

‎.github/dependabot.yml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1+
---
12
version: 2
23
updates:
3-
# Maintain dependencies for GitHub Actions.
4-
- package-ecosystem: "github-actions"
5-
directory: "/"
6-
schedule:
7-
interval: "daily"
8-
# Too noisy. See https://github.community/t/increase-if-necessary-for-github-actions-in-dependabot/179581
9-
open-pull-requests-limit: 0
4+
# Maintain dependencies for GitHub Actions
5+
- package-ecosystem: "github-actions"
6+
directory: "/"
7+
schedule:
8+
interval: "daily"
109

11-
# Maintain dependencies for Composer
12-
- package-ecosystem: "composer"
13-
directory: "/"
14-
schedule:
15-
interval: "daily"
16-
versioning-strategy: increase-if-necessary
10+
# Maintain dependencies for Composer
11+
- package-ecosystem: "composer"
12+
directory: "/"
13+
schedule:
14+
interval: "daily"
15+
versioning-strategy: increase-if-necessary

‎.github/linters/actionlint.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
paths:
3+
.github/workflows/**/*.yml:
4+
ignore:
5+
- '"pull_request" section is alias node but mapping node is expected'
6+
- '"push" section is alias node but mapping node is expected'
7+
- "section is alias node but mapping node is expected"

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1+
---
12
on:
2-
pull_request:
3+
pull_request: &ignore-paths
34
paths-ignore:
4-
- 'docs/**'
5-
- 'README.md'
6-
- 'CHANGELOG.md'
7-
- '.gitignore'
8-
- '.gitattributes'
5+
- ".gitattributes"
6+
- ".gitignore"
7+
- "CHANGELOG.md"
8+
- "docs/**"
9+
- "README.md"
910

10-
push:
11-
paths-ignore:
12-
- 'docs/**'
13-
- 'README.md'
14-
- 'CHANGELOG.md'
15-
- '.gitignore'
16-
- '.gitattributes'
11+
push: *ignore-paths
1712

1813
name: build
1914

15+
permissions:
16+
contents: read
17+
2018
jobs:
2119
franken-php:
2220
runs-on: ubuntu-latest

‎.github/workflows/dependency-check.yml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1+
---
12
on:
2-
pull_request:
3+
pull_request: &ignore-paths
34
paths-ignore:
4-
- 'docs/**'
5-
- 'README.md'
6-
- 'CHANGELOG.md'
7-
- '.gitignore'
8-
- '.gitattributes'
5+
- ".gitattributes"
6+
- ".gitignore"
7+
- "CHANGELOG.md"
8+
- "docs/**"
9+
- "README.md"
910

10-
push:
11-
paths-ignore:
12-
- 'docs/**'
13-
- 'README.md'
14-
- 'CHANGELOG.md'
15-
- '.gitignore'
16-
- '.gitattributes'
11+
push: *ignore-paths
12+
13+
name: Composer require checker
1714

18-
name: dependency-check
15+
permissions:
16+
contents: read
17+
pull-requests: write
1918

2019
jobs:
2120
composer-require-checker:
22-
uses: php-forge/actions/.github/workflows/composer-require-checker.yml@main
21+
uses: yii2-framework/actions/.github/workflows/composer-require-checker.yml@main
2322
secrets:
2423
AUTH_TOKEN: ${{ secrets.AUTH_TOKEN }}

‎.github/workflows/ecs.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
1+
---
12
on:
2-
pull_request:
3+
pull_request: &ignore-paths
34
paths-ignore:
4-
- 'docs/**'
5-
- 'README.md'
6-
- 'CHANGELOG.md'
7-
- '.gitignore'
8-
- '.gitattributes'
5+
- ".gitattributes"
6+
- ".gitignore"
7+
- "CHANGELOG.md"
8+
- "docs/**"
9+
- "README.md"
910

10-
push:
11-
paths-ignore:
12-
- 'docs/**'
13-
- 'README.md'
14-
- 'CHANGELOG.md'
15-
- '.gitignore'
16-
- '.gitattributes'
11+
push: *ignore-paths
1712

1813
name: ecs
1914

15+
permissions:
16+
contents: read
17+
pull-requests: write
18+
2019
jobs:
2120
easy-coding-standard:
22-
uses: php-forge/actions/.github/workflows/ecs.yml@main
21+
uses: yii2-framework/actions/.github/workflows/ecs.yml@main
2322
with:
2423
extensions: mbstring

0 commit comments

Comments
 (0)