-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from Spomky-Labs/3.0.x-merge-up-into-3.1.x_QtJ…
…dkRjD Merge release 3.0.4 into 3.1.x
- Loading branch information
Showing
46 changed files
with
809 additions
and
654 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,64 @@ | ||
| # https://EditorConfig.org | ||
| # EditorConfig helps developers define and maintain consistent | ||
| # coding styles between different editors and IDEs | ||
| # editorconfig.org | ||
|
|
||
| root = true | ||
|
|
||
| [*] | ||
| # Change these settings to your own preference | ||
| indent_style = space | ||
| # Reduce tab size on GitHub | ||
| indent_size = 4 | ||
|
|
||
| # We recommend you to keep these unchanged | ||
| end_of_line = lf | ||
| charset = utf-8 | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
| block_comment_start = /* | ||
| block_comment = * | ||
| block_comment_end = */ | ||
|
|
||
| [{*.yml,*.yaml}] | ||
| [*.{js,html,ts,tsx}] | ||
| indent_size = 2 | ||
|
|
||
| [*.json] | ||
| indent_size = 2 | ||
|
|
||
| [*.md] | ||
| trim_trailing_whitespace = false | ||
|
|
||
| [*.sh] | ||
| indent_style = tab | ||
|
|
||
| [*.xml{,.dist}] | ||
| indent_style = space | ||
| indent_size = 4 | ||
|
|
||
| [*.{yaml,yml}] | ||
| trim_trailing_whitespace = false | ||
|
|
||
| [.github/workflows/*.yml] | ||
| indent_size = 2 | ||
|
|
||
| [deptrac.yaml] | ||
| indent_size = 2 | ||
|
|
||
| [.gitmodules] | ||
| indent_style = tab | ||
|
|
||
| [.php_cs{,.dist}] | ||
| indent_style = space | ||
| indent_size = 4 | ||
|
|
||
| [composer.json] | ||
| indent_size = 4 | ||
|
|
||
| [{,docker-}compose{,.*}.{yaml,yml}] | ||
| indent_style = space | ||
| indent_size = 2 | ||
|
|
||
| [{,*.*}Dockerfile] | ||
| indent_style = tab | ||
|
|
||
| [{,*.*}Caddyfile] | ||
| indent_style = tab | ||
|
|
||
| [Makefile] | ||
| indent_style = tab |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| name: 🚀 Feature Request | ||
| description: RFC and ideas for new features and improvements | ||
| body: | ||
| - type: textarea | ||
| - type: textarea | ||
| id: description | ||
| attributes: | ||
| label: Description | ||
| description: A clear and concise description of the new feature | ||
| label: Description | ||
| description: A clear and concise description of the new feature | ||
| validations: | ||
| required: true | ||
| - type: textarea | ||
| required: true | ||
| - type: textarea | ||
| id: example | ||
| attributes: | ||
| label: Example | ||
| description: | | ||
| A simple example of the new feature in action (include PHP code, YAML config, etc.) | ||
| If the new feature changes an existing feature, include a simple before/after comparison. | ||
| label: Example | ||
| description: | | ||
| A simple example of the new feature in action (include PHP code, YAML config, etc.) | ||
| If the new feature changes an existing feature, include a simple before/after comparison. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| name: 📖 Documentation Issue | ||
| description: To report typo or obsolete section in the documentation | ||
| body: | ||
| - type: textarea | ||
| - type: textarea | ||
| id: description | ||
| attributes: | ||
| label: Description | ||
| description: A clear and concise description of the error you found in the documentation | ||
| label: Description | ||
| description: A clear and concise description of the error you found in the documentation | ||
| validations: | ||
| required: true | ||
| required: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Support Question | ||
| - name: Support Question | ||
| url: https://spomky-labs.com/contact/ | ||
| about: | | ||
| We use GitHub issues only to discuss about bugs and new features. | ||
| For this kind of questions about using the framework or third-party bundles, | ||
| please email us contact AT spomky-labs.com for quoting | ||
| We use GitHub issues only to discuss about bugs and new features. | ||
| For this kind of questions about using the framework or third-party bundles, | ||
| please email us contact AT spomky-labs.com for quoting |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "composer" | ||
| - package-ecosystem: "composer" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| day: "friday" | ||
| interval: "weekly" | ||
| day: "friday" | ||
| versioning-strategy: "widen" | ||
| open-pull-requests-limit: 20 | ||
| allow: | ||
| - dependency-type: all | ||
| - dependency-type: all | ||
| labels: [ "Dependencies" ] | ||
|
|
||
| - package-ecosystem: "github-actions" | ||
| - package-ecosystem: "github-actions" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "monthly" | ||
| interval: "monthly" | ||
| open-pull-requests-limit: 20 | ||
| labels: [ "Dependencies" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,12 +9,12 @@ on: | |
|
|
||
| jobs: | ||
| release: | ||
| name: "GIT tag, release & create merge-up PR" | ||
| name: "Release" | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: "Checkout" | ||
| uses: "actions/checkout@v3" | ||
| uses: "actions/checkout@v4" | ||
|
|
||
| - name: "Release" | ||
| uses: "laminas/[email protected]" | ||
|
|
@@ -27,6 +27,16 @@ jobs: | |
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| merge-up: | ||
| name: "Create Merge-Up Pull Request" | ||
| runs-on: ubuntu-latest | ||
| if: ${{ always() }} | ||
| needs: "release" | ||
|
|
||
| steps: | ||
| - name: "Checkout" | ||
| uses: "actions/checkout@v4" | ||
|
|
||
| - name: "Create Merge-Up Pull Request" | ||
| uses: "laminas/[email protected]" | ||
| with: | ||
|
|
@@ -38,6 +48,16 @@ jobs: | |
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| switch: | ||
| name: "Create and/or Switch to new Release Branch" | ||
| runs-on: ubuntu-latest | ||
| if: ${{ always() }} | ||
| needs: "merge-up" | ||
|
|
||
| steps: | ||
| - name: "Checkout" | ||
| uses: "actions/checkout@v4" | ||
|
|
||
| - name: "Create and/or Switch to new Release Branch" | ||
| uses: "laminas/[email protected]" | ||
| with: | ||
|
|
@@ -49,6 +69,18 @@ jobs: | |
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| bump: | ||
| name: "Bump Changelog Version On Originating Release Branch" | ||
| runs-on: ubuntu-latest | ||
| if: ${{ always() }} | ||
| needs: "switch" | ||
|
|
||
| steps: | ||
| - name: "Checkout" | ||
| uses: "actions/checkout@v4" | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: "Bump Changelog Version On Originating Release Branch" | ||
| uses: "laminas/[email protected]" | ||
| with: | ||
|
|
@@ -60,6 +92,16 @@ jobs: | |
| "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }} | ||
| "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }} | ||
|
|
||
| milestones: | ||
| name: "Create new milestones" | ||
| runs-on: ubuntu-latest | ||
| if: ${{ always() }} | ||
| needs: "bump" | ||
|
|
||
| steps: | ||
| - name: "Checkout" | ||
| uses: "actions/checkout@v4" | ||
|
|
||
| - name: "Create new milestones" | ||
| uses: "laminas/[email protected]" | ||
| with: | ||
|
|
||
Oops, something went wrong.