Skip to content

Commit 9d6ac22

Browse files
authored
Merge pull request #169 from Spomky-Labs/revert-167-features/new-pipeline
Revert "New pipeline + ECS + Rector"
2 parents 63e4610 + 28d9ec3 commit 9d6ac22

32 files changed

+336
-642
lines changed

.editorconfig

Lines changed: 0 additions & 29 deletions
This file was deleted.

.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
/.github export-ignore
44
/doc export-ignore
55
/tests export-ignore
6-
/.editorconfig export-ignore
76
/.gitattributes export-ignore
87
/.gitignore export-ignore
98
/CODE_OF_CONDUCT.md export-ignore
10-
/deptrac.yaml export-ignore
119
/ecs.php export-ignore
1210
/infection.json.dist export-ignore
1311
/Makefile export-ignore
1412
/phpstan.neon export-ignore
1513
/phpunit.xml.dist export-ignore
14+
/README.md export-ignore
1615
/rector.php export-ignore
16+
/SECURITY.md export-ignore

.github/CONTRIBUTING.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,17 @@ Few rules to ease code reviews and merges:
1111
- You MUST write (or update) unit tests when bugs are fixed or features are added.
1212
- You SHOULD write documentation.
1313

14-
We use [Git-Flow](http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/) to automate our git branching
15-
workflow.
14+
To contribute use [Pull Requests](https://help.github.com/articles/using-pull-requests), please, write commit messages that make sense, and rebase your branch before submitting your PR.
1615

17-
To contribute use [Pull Requests](https://help.github.com/articles/using-pull-requests), please, write commit messages
18-
that make sense, and rebase your branch before submitting your PR.
19-
20-
May be asked to squash your commits too. This is used to "clean" your Pull Request before merging it, avoiding commits
21-
such as fix tests, fix 2, fix 3, etc.
16+
May be asked to squash your commits too. This is used to "clean" your Pull Request before merging it, avoiding commits such as fix tests, fix 2, fix 3, etc.
2217

2318
Run test suite
2419
------------
2520

2621
* install composer: `curl -s http://getcomposer.org/installer | php`
2722
* install dependencies: `php composer.phar install`
2823
* run tests: `vendor/bin/phpunit`
24+
* check and fix coding standards:
25+
* `vendor/bin/phpstan analyse`
26+
* `vendor/bin/rector process`
27+
* `vendor/bin/ecs check --fix`
Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,43 @@
11
name: 🐛 Bug Report
22
description: ⚠️ NEVER report security issues, email security AT spomky-labs.com instead
33
labels: Bug
4+
45
body:
5-
- type: input
6-
id: affected-versions
7-
attributes:
8-
label: Version(s) affected
9-
placeholder: x.y.z
10-
validations:
11-
required: true
12-
- type: textarea
13-
id: description
14-
attributes:
15-
label: Description
16-
description: A clear and concise description of the problem
17-
validations:
18-
required: true
19-
- type: textarea
20-
id: how-to-reproduce
21-
attributes:
22-
label: How to reproduce
23-
description: |
24-
⚠️ This is the most important part of the report ⚠️
25-
Without a way to easily reproduce your issue, there is little chance we will be able to help you and work on a fix.
26-
Please, take the time to show us some code and/or config that is needed for others to reproduce the problem easily.
27-
Most of the time, creating a "bug reproducer" is the best way to help us and increases the chances someone
28-
will have a look at it.
29-
validations:
30-
required: true
31-
- type: textarea
32-
id: possible-solution
33-
attributes:
34-
label: Possible Solution
35-
description: |
36-
Optional: only if you have suggestions on a fix/reason for the bug
37-
Don't hesitate to create a pull request with your solution, it helps get faster feedback.
38-
- type: textarea
39-
id: additional-context
40-
attributes:
41-
label: Additional Context
42-
description: "Optional: any other context about the problem: log messages, screenshots, etc."
6+
- type: input
7+
id: affected-versions
8+
attributes:
9+
label: Version(s) affected
10+
placeholder: x.y.z
11+
validations:
12+
required: true
13+
- type: textarea
14+
id: description
15+
attributes:
16+
label: Description
17+
description: A clear and concise description of the problem
18+
validations:
19+
required: true
20+
- type: textarea
21+
id: how-to-reproduce
22+
attributes:
23+
label: How to reproduce
24+
description: |
25+
⚠️ This is the most important part of the report ⚠️
26+
Without a way to easily reproduce your issue, there is little chance we will be able to help you and work on a fix.
27+
Please, take the time to show us some code and/or config that is needed for others to reproduce the problem easily.
28+
Most of the time, creating a "bug reproducer" is the best way to help us and increases the chances someone
29+
will have a look at it.
30+
validations:
31+
required: true
32+
- type: textarea
33+
id: possible-solution
34+
attributes:
35+
label: Possible Solution
36+
description: |
37+
Optional: only if you have suggestions on a fix/reason for the bug
38+
Don't hesitate to create a pull request with your solution, it helps get faster feedback.
39+
- type: textarea
40+
id: additional-context
41+
attributes:
42+
label: Additional Context
43+
description: "Optional: any other context about the problem: log messages, screenshots, etc."
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
name: 🚀 Feature Request
22
description: RFC and ideas for new features and improvements
33
body:
4-
- type: textarea
5-
id: description
6-
attributes:
7-
label: Description
8-
description: A clear and concise description of the new feature
9-
validations:
10-
required: true
11-
- type: textarea
12-
id: example
13-
attributes:
14-
label: Example
15-
description: |
16-
A simple example of the new feature in action (include PHP code, YAML config, etc.)
17-
If the new feature changes an existing feature, include a simple before/after comparison.
4+
- type: textarea
5+
id: description
6+
attributes:
7+
label: Description
8+
description: A clear and concise description of the new feature
9+
validations:
10+
required: true
11+
- type: textarea
12+
id: example
13+
attributes:
14+
label: Example
15+
description: |
16+
A simple example of the new feature in action (include PHP code, YAML config, etc.)
17+
If the new feature changes an existing feature, include a simple before/after comparison.
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: 📖 Documentation Issue
22
description: To report typo or obsolete section in the documentation
33
body:
4-
- type: textarea
5-
id: description
6-
attributes:
7-
label: Description
8-
description: A clear and concise description of the error you found in the documentation
9-
validations:
10-
required: true
4+
- type: textarea
5+
id: description
6+
attributes:
7+
label: Description
8+
description: A clear and concise description of the error you found in the documentation
9+
validations:
10+
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Support Question
4-
url: https://spomky-labs.com/contact/
5-
about:|
6-
We use GitHub issues only to discuss about bugs and new features.
7-
For this kind of questions about using the framework or third-party bundles,
8-
please email us contact AT spomky-labs.com for quoting
3+
- name: Support Question
4+
url: https://spomky-labs.com/contact/
5+
about: We use GitHub issues only to discuss about bugs and new features. For this kind of questions about using the library, please use Stackoverflow (or similar) or send a quote request at https://spomky-labs.com/contact/

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
Target branch:
2-
Resolves issue # <!-- #-prefixed issue number(s), if any -->
3-
4-
<!-- replace space with "x" in square brackets: [x] -->
5-
- [ ] It is a Bug fix
6-
- [ ] It is a New feature
7-
- [ ] Breaks BC
8-
- [ ] Includes Deprecations
9-
1+
| Q | A
2+
| ------------- | ---
3+
| Branch? | <!-- see below -->
4+
| Bug fix? | yes/no
5+
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
6+
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
7+
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
8+
| License | MIT
109
<!--
11-
Fill in this template according to the PR you're about to submit.
12-
Replace this comment by a description of what your PR is solving.
10+
Replace this notice by a short README for your feature/bugfix. This will help people
11+
understand your PR and can be used as a start for the documentation.
1312
14-
Please consider the following requirement:
15-
* Modification of existing tests should be avoided unless deemed necessary.
16-
* You MUST never open a PR related to a security issue. Contact Spomky in private at https://gitter.im/Spomky/
17-
-->
13+
Additionally:
14+
- Always add tests and ensure they pass.
15+
- Never break backward compatibility (unless you are working on the next major release branch).
16+
- Bug fixes must be submitted against the lowest maintained branch where they apply
17+
(lowest branches are regularly merged to upper ones so they get the fixes too.)
18+
- Features and deprecations must be submitted against the last major branch (e.g. 1.x).
19+
-->

.github/dependabot.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "composer"
4-
directory: "/"
5-
schedule:
6-
interval: "weekly"
7-
day: "friday"
8-
versioning-strategy: "widen"
9-
open-pull-requests-limit: 20
10-
allow:
11-
- dependency-type: all
12-
labels: [ "Dependencies" ]
13-
14-
- package-ecosystem: "github-actions"
15-
directory: "/"
16-
schedule:
17-
interval: "monthly"
18-
open-pull-requests-limit: 20
19-
labels: [ "Dependencies" ]
3+
- package-ecosystem: composer
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
time: "11:00"
8+
open-pull-requests-limit: 10

.github/stale.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
daysUntilStale: 30
1+
daysUntilStale: 60
22
daysUntilClose: 7
33
staleLabel: wontfix
44
markComment: >
5-
This issue has been automatically marked as stale because it has not had
6-
recent activity. It will be closed if no further activity occurs. Thank you
7-
for your contributions.
5+
Ce problème a été automatiquement marqué comme périmé car il n'a pas eu
6+
d’activité récente. Il sera fermé dans 7 jours si aucune autre activité ne se produit. Merci
7+
pour votre contribution.
88
closeComment: false

0 commit comments

Comments
 (0)