Skip to content

Commit 832c680

Browse files
lotyplotyp
authored
Merge pull request #376 from wayofdev/develop
2 parents e3af628 + 02ce643 commit 832c680

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+5290
-4361
lines changed

‎.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ DB_PORT=5432
3737
DB_DATABASE=wod
3838
DB_USERNAME=wod
3939
DB_PASSWORD=password
40+
DB_FORWARD_PORT=5444
4041

4142
CACHE_DRIVER=file
4243
FILESYSTEM_DISK=local

‎.github/.release-please-config.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"release-type": "php",
3+
"packages": {
4+
".": {
5+
"package-name": "laravel-starter-tpl",
6+
"changelog-path": "/CHANGELOG.md"
7+
}
8+
},
9+
"include-component-in-tag": false,
10+
"changelog-sections": [
11+
{
12+
"type": "feat",
13+
"section": "Features",
14+
"hidden": false
15+
},
16+
{
17+
"type": "fix",
18+
"section": "Bug Fixes",
19+
"hidden": false
20+
},
21+
{
22+
"type": "perf",
23+
"section": "Performance Improvements",
24+
"hidden": false
25+
},
26+
{
27+
"type": "docs",
28+
"section": "Documentation",
29+
"hidden": false
30+
},
31+
{
32+
"type": "deps",
33+
"section": "Dependencies",
34+
"hidden": false
35+
},
36+
{
37+
"type": "refactor",
38+
"section": "Code Refactoring",
39+
"hidden": false
40+
},
41+
{
42+
"type": "test",
43+
"section": "Tests",
44+
"hidden": false
45+
},
46+
{
47+
"type": "ci",
48+
"section": "Continuous Integration",
49+
"hidden": false
50+
},
51+
{
52+
"type": "build",
53+
"section": "Build System",
54+
"hidden": true
55+
},
56+
{
57+
"type": "chore",
58+
"section": "Miscellaneous",
59+
"hidden": true
60+
},
61+
{
62+
"type": "style",
63+
"section": "Styles",
64+
"hidden": true
65+
},
66+
{
67+
"type": "revert",
68+
"section": "Reverts",
69+
"hidden": true
70+
}
71+
]
72+
}

‎.github/.release-please-manifest.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "1.6.0"
3+
}

‎.github/labeler.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@
33
# this file is for the labeler workflow job
44
# Documentation https://github.com/marketplace/actions/labeler
55

6+
"type: bug":
7+
- head-branch: ['^bug', '^fix', 'bug', 'fix']
8+
9+
"type: enhancement":
10+
- head-branch: ['^feature', '^feat', 'feature']
11+
612
"type: documentation":
7-
- assets/**/*
8-
- .github/*
9-
- ./*.md
13+
- changed-files:
14+
- any-glob-to-any-file: ['assets/**/*', '.github/*', './*.md']
1015

1116
"type: maintenance":
12-
- .github/workflows/*
13-
- app/tests/**/*
17+
- changed-files:
18+
- any-glob-to-any-file: ['app/tests/**/*', '.github/workflows/*']
1419

1520
...

‎.github/workflows/apply-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ name: 🏷️ Add labels
1414

1515
jobs:
1616
label:
17-
uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@master
17+
uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@v3.1.0
1818
with:
1919
os: ubuntu-latest
2020
secrets:

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: 📦 Check out the codebase
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: 🛠️ Setup PHP
2929
uses: shivammathur/setup-php@v2
@@ -41,14 +41,14 @@ jobs:
4141
4242
- name: ♻️ Restore cached backend dependencies
4343
id: cached-composer-dependencies
44-
uses: actions/cache@v3
44+
uses: actions/cache@v4
4545
with:
4646
path: vendor
4747
key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}
4848

4949
- name: ♻️ Restore cached .build directory
5050
id: cached-build-dir
51-
uses: actions/cache@v3
51+
uses: actions/cache@v4
5252
with:
5353
path: .build
5454
key: build-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}
@@ -91,7 +91,7 @@ jobs:
9191
XDEBUG_MODE: "coverage"
9292

9393
- name: 📤 Upload coverage results to Codecov.io
94-
uses: codecov/codecov-action@v3
94+
uses: codecov/codecov-action@v4
9595
with:
9696
token: ${{ secrets.CODECOV_TOKEN }}
9797
fail_ci_if_error: true

‎.github/workflows/create-release.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# https://github.com/wayofdev/gh-actions/blob/master/.github/workflows/create-release.yml
44
# https://github.com/google-github-actions/release-please-action#release-types-supported
5+
# https://github.com/googleapis/release-please/blob/main/docs/customizing.md
56

67
on: # yamllint disable-line rule:truthy
78
push:
@@ -12,12 +13,15 @@ name: 📦 Create release
1213

1314
jobs:
1415
release:
15-
uses: wayofdev/gh-actions/.github/workflows/create-release.yml@master
16-
with:
17-
os: ubuntu-latest
18-
branch: master
19-
package-name: laravel-starter-tpl
20-
secrets:
21-
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: 🎉 Create release
19+
uses: googleapis/release-please-action@v4.1.1
20+
id: release
21+
with:
22+
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
23+
config-file: .github/.release-please-config.json
24+
manifest-file: .github/.release-please-manifest.json
25+
target-branch: master
2226

2327
...

‎.github/workflows/deploy-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: 📦 Check out the codebase
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727

@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: ♻️ Restore cached backend dependencies
3737
id: cached-composer-dependencies
38-
uses: actions/cache@v3
38+
uses: actions/cache@v4
3939
with:
4040
path: vendor
4141
key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}

‎.github/workflows/deploy-staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: 📦 Check out the codebase
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727

@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: ♻️ Restore cached backend dependencies
3737
id: cached-composer-dependencies
38-
uses: actions/cache@v3
38+
uses: actions/cache@v4
3939
with:
4040
path: vendor
4141
key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}

‎.github/workflows/sync-from-tpl.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
steps:
1717
- name: 📦 Check out the codebase
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
token: ${{ secrets.WORKFLOW_TOKEN }}
2121

2222
- name: ♻️ Sync changes from upstream template
23-
uses: AndreasAugustin/actions-template-sync@v0.8.0
23+
uses: AndreasAugustin/actions-template-sync@v2.1.0
2424
with:
2525
github_token: ${{ secrets.WORKFLOW_TOKEN }}
2626
source_repo_path: wayofdev/laravel-starter-tpl

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@
55
/.fleet
66
/.idea
77
/.vscode
8-
9-
/certs/*

‎.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.4.0
5+
rev: v4.6.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- id: check-added-large-files
1010
- id: fix-encoding-pragma
1111

1212
- repo: https://github.com/commitizen-tools/commitizen
13-
rev: 3.2.2
13+
rev: v3.27.0
1414
hooks:
1515
- id: commitizen
1616
stages:

‎LICENSE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
MIT License
1+
The MIT License (MIT)
22

3-
Copyright (c) 2021 @lotyp <lotyp7.woop@gmail.com>
3+
Copyright (c) 2021 "lotyp, Andrij Orlenko"<the@wayof.dev>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
99
copies of the Software, and to permit persons to whom the Software is
1010
furnished to do so, subject to the following conditions:
1111

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
1414

1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1616
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1717
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎app/composer.json

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
11
{
2-
"name": "laravel/laravel",
2+
"name": "wayofdev/laravel-starter-tpl",
33
"type": "project",
4-
"description": "The Laravel Framework.",
4+
"description": "Laravel backend application template for building APIs.",
55
"keywords": ["framework", "laravel"],
66
"license": "MIT",
77
"require": {
88
"php": "^8.2",
99
"ext-pdo": "*",
10-
"deployer/deployer": "^7.3",
11-
"guzzlehttp/guzzle": "^7.7",
12-
"laravel/framework": "^10.13",
13-
"laravel/tinker": "^2.8",
14-
"sentry/sentry-laravel": "^3.4",
15-
"spatie/laravel-query-builder": "^5.2",
16-
"spatie/laravel-route-attributes": "^1.18",
10+
"deployer/deployer": "^7.4",
11+
"guzzlehttp/guzzle": "^7.8",
12+
"laravel/framework": "^10.48",
13+
"laravel/tinker": "^2.9",
14+
"sentry/sentry-laravel": "^4.5",
15+
"spatie/laravel-fractal": "^6.2",
16+
"spatie/laravel-query-builder": "^5.8",
17+
"spatie/laravel-route-attributes": "^1.22",
1718
"wayofdev/laravel-open-docs": "^2.0"
1819
},
1920
"require-dev": {
20-
"ergebnis/composer-normalize": "^2.31",
21+
"ergebnis/composer-normalize": "^2.42",
2122
"fakerphp/faker": "^1.23",
2223
"mockery/mockery": "^1.6",
23-
"nunomaduro/collision": "^7.5",
24-
"nunomaduro/larastan": "^2.6",
25-
"pestphp/pest-plugin-laravel": "^2.0",
24+
"nunomaduro/collision": "^7.10",
25+
"larastan/larastan": "^2.9",
26+
"pestphp/pest-plugin-laravel": "^2.4",
2627
"phpstan/extension-installer": "^1.3",
27-
"phpstan/phpstan-deprecation-rules": "^1.1",
28-
"phpunit/phpunit": "^10.2",
28+
"phpstan/phpstan-deprecation-rules": "^1.2",
29+
"phpunit/phpunit": "^10.5",
2930
"roave/security-advisories": "dev-latest",
30-
"spatie/laravel-ignition": "^2.1",
31-
"wayofdev/cs-fixer-config": "^1.2"
31+
"spatie/laravel-ignition": "^2.7",
32+
"wayofdev/cs-fixer-config": "^1.4"
3233
},
3334
"autoload": {
3435
"psr-4": {

0 commit comments

Comments
 (0)