Skip to content

Commit 85c00a0

Browse files
lotyplotyp
authored
Merge pull request #404 from wayofdev/develop
2 parents 14f824c + dfbd11f commit 85c00a0

Some content is hidden

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

60 files changed

+557
-546
lines changed

‎.env.example

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
# More info in repository docs: https://github.com/wayofdev/docker-shared-services
88
SHARED_SERVICES_NAMESPACE=${SHARED_SERVICES_NAMESPACE}
99

10-
# Should be same with downloaded and configured docker-project-services
11-
# Default: wod
12-
# More info in repository docs: https://github.com/wayofdev/docker-project-services
13-
PROJECT_SERVICES_NAMESPACE=${PROJECT_SERVICES_NAMESPACE}
14-
1510
# https://docs.docker.com/compose/reference/envvars/#compose_project_name
1611
# With custom namespace provided, it will be used to prefix all services
1712
# in Docker network for current project
@@ -50,6 +45,7 @@ MEMCACHED_HOST=127.0.0.1
5045
REDIS_HOST=127.0.0.1
5146
REDIS_PASSWORD=null
5247
REDIS_PORT=6379
48+
REDIS_FORWARD_PORT=16379
5349

5450
MAIL_MAILER=smtp
5551
MAIL_HOST=mailpit

‎.markdownlint.json renamed to ‎.github/.markdownlint.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/v0.34.0/schema/markdownlint-config-schema.json",
2+
"$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/main/schema/markdownlint-config-schema.json",
33
"line-length": false,
44
"no-inline-html": false,
55
"first-line-h1": false,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
23
"release-type": "php",
34
"packages": {
45
".": {

‎.github/SECURITY.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ Thank you for helping keep `wayofdev/laravel-starter-tpl` and its users safe. We
44

55
<br>
66

7-
## 🙋‍♂️ Supported Versions
8-
9-
Only certain versions of `wayofdev/laravel-starter-tpl` are currently being maintained with security updates. Please use or upgrade to one of these supported versions:
10-
11-
| Version | Supported |
12-
|---------|--------------------|
13-
| 2.x | :white_check_mark: |
14-
15-
Please ensure that you are using one of these supported versions before reporting a security issue.
16-
17-
<br>
18-
197
## 🚨 Reporting a Vulnerability
208

219
We take all security bugs in `wayofdev/laravel-starter-tpl` seriously. Please follow the instructions below to report security vulnerabilities.

‎renovate.json renamed to ‎.github/renovate.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["config:base"],
3+
"extends": [
4+
"config:base",
5+
":semanticCommitTypeAll(deps)"
6+
],
47
"prHourlyLimit": 0,
58
"automerge": true,
69
"platformAutomerge": true,

‎.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@v3.1.0
17+
uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@v3.1.1
1818
with:
1919
os: ubuntu-latest
2020
secrets:

‎.github/workflows/auto-merge-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name: 🤞 Auto merge release
1313

1414
jobs:
1515
auto-merge:
16-
uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@v3.1.0
16+
uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@v3.1.1
1717
with:
1818
os: ubuntu-latest
1919
pull-request-number: ${{ github.event.pull_request.number }}

‎.github/workflows/ci.yml.dist

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

‎.github/workflows/coding-standards.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ jobs:
1616
commit-linting:
1717
timeout-minutes: 4
1818
runs-on: ubuntu-latest
19+
concurrency:
20+
cancel-in-progress: true
21+
group: commit-linting-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
1922
permissions:
2023
contents: read
2124
pull-requests: read
@@ -28,12 +31,15 @@ jobs:
2831
with:
2932
configFile: ${{ github.workspace }}/.github/.commitlint.config.mjs
3033
failOnWarnings: false
31-
failOnErrors: false
34+
failOnErrors: true
3235
helpURL: 'https://github.com/conventional-changelog/commitlint/#what-is-commitlint'
3336

3437
yaml-linting:
3538
timeout-minutes: 4
3639
runs-on: ubuntu-latest
40+
concurrency:
41+
cancel-in-progress: true
42+
group: yaml-linting-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
3743
permissions:
3844
contents: read
3945
pull-requests: read
@@ -61,6 +67,7 @@ jobs:
6167
- name: 🧐 Lint Markdown files
6268
uses: DavidAnson/markdownlint-cli2-action@v16.0.0
6369
with:
70+
config: '.github/.markdownlint.json'
6471
globs: |
6572
**/*.md
6673
!CHANGELOG.md
@@ -158,7 +165,7 @@ jobs:
158165
uses: shivammathur/setup-php@2.30.4
159166
with:
160167
php-version: ${{ matrix.php-version }}
161-
extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql
168+
extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql, decimal
162169
ini-values: error_reporting=E_ALL
163170
coverage: none
164171

‎.github/workflows/create-arch-diagram.yml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions: read-all
1919

2020
jobs:
2121
codesee:
22-
uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@master
22+
uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@v3.1.1
2323
with:
2424
os: ubuntu-latest
2525
continue-on-error: true

‎.github/workflows/dependency-analysis.yml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
---
2+
3+
on: # yamllint disable-line rule:truthy
4+
pull_request:
5+
branches:
6+
- master
7+
- develop
8+
paths:
9+
- 'app/config/**'
10+
- 'app/src/**'
11+
- 'app/tests/**'
12+
- 'app/.php-cs-fixer.dist.php'
13+
- 'app/composer.json'
14+
- 'app/composer.lock'
15+
- 'app/composer-require-checker.json'
16+
17+
name: 🔐 Dependency analysis
18+
19+
env:
20+
# Disable docker support in Makefile
21+
APP_RUNNER: 'cd app &&'
22+
23+
jobs:
24+
dependency-analysis:
25+
timeout-minutes: 4
26+
runs-on: ${{ matrix.os }}
27+
concurrency:
28+
cancel-in-progress: true
29+
group: dependency-analysis-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
30+
strategy:
31+
fail-fast: true
32+
matrix:
33+
os:
34+
- ubuntu-latest
35+
php-version:
36+
- '8.3'
37+
dependencies:
38+
- locked
39+
40+
steps:
41+
- name: 📦 Check out the codebase
42+
uses: actions/checkout@v4.1.6
43+
44+
- name: 🛠️ Setup PHP
45+
uses: shivammathur/setup-php@2.30.4
46+
with:
47+
php-version: ${{ matrix.php-version }}
48+
extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql
49+
ini-values: error_reporting=E_ALL
50+
coverage: none
51+
tools: phive
52+
53+
- name: 🛠️ Setup problem matchers
54+
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
55+
56+
- name: 🤖 Validate composer.json and composer.lock
57+
run: make validate-composer
58+
59+
- name: 🔍 Get composer cache directory
60+
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
61+
with:
62+
working-directory: app
63+
64+
- name: ♻️ Restore cached dependencies installed with composer
65+
uses: actions/cache@v4.0.2
66+
with:
67+
path: ${{ env.COMPOSER_CACHE_DIR }}
68+
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}
69+
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
70+
71+
- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
72+
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
73+
with:
74+
working-directory: app
75+
dependencies: ${{ matrix.dependencies }}
76+
77+
- name: 📥 Install dependencies with phive
78+
working-directory: app
79+
env:
80+
PHIVE_HOME: .phive
81+
run: phive install --trust-gpg-keys 0xC00543248C87FB13,0x033E5F8D801A2F8D,0x47436587D82C4A39
82+
shell: bash
83+
84+
- name: 🔬 Run maglnet/composer-require-checker
85+
working-directory: app
86+
run: .phive/composer-require-checker check --ansi --config-file="$(pwd)/composer-require-checker.json" --verbose

‎.github/workflows/deploy-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: make validate-composer
5252

5353
- name: 🔍 Get composer cache directory
54-
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0
54+
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
5555
with:
5656
working-directory: app
5757

@@ -63,7 +63,7 @@ jobs:
6363
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
6464

6565
- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
66-
uses: wayofdev/gh-actions/actions/composer/install@v3.1.0
66+
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
6767
with:
6868
working-directory: app
6969
dependencies: ${{ matrix.dependencies }}

‎.github/workflows/deploy-staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: make validate-composer
5252

5353
- name: 🔍 Get composer cache directory
54-
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0
54+
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
5555
with:
5656
working-directory: app
5757

@@ -63,7 +63,7 @@ jobs:
6363
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
6464

6565
- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
66-
uses: wayofdev/gh-actions/actions/composer/install@v3.1.0
66+
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
6767
with:
6868
working-directory: app
6969
dependencies: ${{ matrix.dependencies }}

‎.github/workflows/security-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: make validate-composer
4848

4949
- name: 🔍 Get composer cache directory
50-
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0
50+
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
5151
with:
5252
working-directory: app
5353

@@ -59,7 +59,7 @@ jobs:
5959
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
6060

6161
- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
62-
uses: wayofdev/gh-actions/actions/composer/install@v3.1.0
62+
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
6363
with:
6464
working-directory: app
6565
dependencies: ${{ matrix.dependencies }}

‎.github/workflows/shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
shellcheck:
13-
uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@v3.1.0
13+
uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@v3.1.1
1414
with:
1515
os: ubuntu-latest
1616
severity: warning

0 commit comments

Comments
 (0)