Skip to content

Commit

Permalink
Merge pull request #396 from wayofdev/feat/laravel-11
Browse files Browse the repository at this point in the history
  • Loading branch information
lotyp committed Jun 11, 2024
2 parents 4414a30 + 3330474 commit 67f58e1
Show file tree
Hide file tree
Showing 28 changed files with 520 additions and 387 deletions.
5 changes: 0 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
# More info in repository docs: https://github.com/wayofdev/docker-shared-services
SHARED_SERVICES_NAMESPACE=${SHARED_SERVICES_NAMESPACE}

# Should be same with downloaded and configured docker-project-services
# Default: wod
# More info in repository docs: https://github.com/wayofdev/docker-project-services
PROJECT_SERVICES_NAMESPACE=${PROJECT_SERVICES_NAMESPACE}

# https://docs.docker.com/compose/reference/envvars/#compose_project_name
# With custom namespace provided, it will be used to prefix all services
# in Docker network for current project
Expand Down
2 changes: 1 addition & 1 deletion .markdownlint.json → .github/.markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://github.com/raw/DavidAnson/markdownlint/v0.34.0/schema/markdownlint-config-schema.json",
"$schema": "https://github.com/raw/DavidAnson/markdownlint/main/schema/markdownlint-config-schema.json",
"line-length": false,
"no-inline-html": false,
"first-line-h1": false,
Expand Down
1 change: 1 addition & 0 deletions .github/.release-please-config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://github.com/raw/googleapis/release-please/main/schemas/config.json",
"release-type": "php",
"packages": {
".": {
Expand Down
2 changes: 1 addition & 1 deletion .github/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "2.1.0"
".": "2.2.0"
}
12 changes: 0 additions & 12 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@ Thank you for helping keep `wayofdev/laravel-starter-tpl` and its users safe. We

<br>

## 🙋‍♂️ Supported Versions

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:

| Version | Supported |
|---------|--------------------|
| 2.x | :white_check_mark: |

Please ensure that you are using one of these supported versions before reporting a security issue.

<br>

## 🚨 Reporting a Vulnerability

We take all security bugs in `wayofdev/laravel-starter-tpl` seriously. Please follow the instructions below to report security vulnerabilities.
Expand Down
5 changes: 4 additions & 1 deletion renovate.json → .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:base"],
"extends": [
"config:base",
":semanticCommitTypeAll(deps)"
],
"prHourlyLimit": 0,
"automerge": true,
"platformAutomerge": true,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/apply-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ name: 🏷️ Add labels

jobs:
label:
uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@v3.1.0
uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@v3.1.1
with:
os: ubuntu-latest
secrets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-merge-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: 🤞 Auto merge release

jobs:
auto-merge:
uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@v3.1.0
uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@v3.1.1
with:
os: ubuntu-latest
pull-request-number: ${{ github.event.pull_request.number }}
Expand Down
101 changes: 0 additions & 101 deletions .github/workflows/ci.yml.dist

This file was deleted.

11 changes: 9 additions & 2 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ jobs:
commit-linting:
timeout-minutes: 4
runs-on: ubuntu-latest
concurrency:
cancel-in-progress: true
group: commit-linting-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
permissions:
contents: read
pull-requests: read
Expand All @@ -28,12 +31,15 @@ jobs:
with:
configFile: ${{ github.workspace }}/.github/.commitlint.config.mjs
failOnWarnings: false
failOnErrors: false
failOnErrors: true
helpURL: 'https://github.com/conventional-changelog/commitlint/#what-is-commitlint'

yaml-linting:
timeout-minutes: 4
runs-on: ubuntu-latest
concurrency:
cancel-in-progress: true
group: yaml-linting-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
permissions:
contents: read
pull-requests: read
Expand Down Expand Up @@ -61,6 +67,7 @@ jobs:
- name: 🧐 Lint Markdown files
uses: DavidAnson/markdownlint-cli2-action@v16.0.0
with:
config: '.github/.markdownlint.json'
globs: |
**/*.md
!CHANGELOG.md
Expand Down Expand Up @@ -158,7 +165,7 @@ jobs:
uses: shivammathur/setup-php@2.30.4
with:
php-version: ${{ matrix.php-version }}
extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql
extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql, decimal
ini-values: error_reporting=E_ALL
coverage: none

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-arch-diagram.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ permissions: read-all

jobs:
codesee:
uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@master
uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@v3.1.1
with:
os: ubuntu-latest
continue-on-error: true
Expand Down
86 changes: 86 additions & 0 deletions .github/workflows/dependency-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
---

on: # yamllint disable-line rule:truthy
pull_request:
branches:
- master
- develop
paths:
- 'app/config/**'
- 'app/src/**'
- 'app/tests/**'
- 'app/.php-cs-fixer.dist.php'
- 'app/composer.json'
- 'app/composer.lock'
- 'app/composer-require-checker.json'

name: 🔐 Dependency analysis

env:
# Disable docker support in Makefile
APP_RUNNER: 'cd app &&'

jobs:
dependency-analysis:
timeout-minutes: 4
runs-on: ${{ matrix.os }}
concurrency:
cancel-in-progress: true
group: dependency-analysis-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
strategy:
fail-fast: true
matrix:
os:
- ubuntu-latest
php-version:
- '8.3'
dependencies:
- locked

steps:
- name: 📦 Check out the codebase
uses: actions/checkout@v4.1.6

- name: 🛠️ Setup PHP
uses: shivammathur/setup-php@2.30.4
with:
php-version: ${{ matrix.php-version }}
extensions: none, ctype, dom, json, mbstring, simplexml, tokenizer, xml, xmlwriter, pdo, curl, fileinfo, pdo_mysql
ini-values: error_reporting=E_ALL
coverage: none
tools: phive

- name: 🛠️ Setup problem matchers
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"

- name: 🤖 Validate composer.json and composer.lock
run: make validate-composer

- name: 🔍 Get composer cache directory
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
with:
working-directory: app

- name: ♻️ Restore cached dependencies installed with composer
uses: actions/cache@v4.0.2
with:
path: ${{ env.COMPOSER_CACHE_DIR }}
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-

- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
with:
working-directory: app
dependencies: ${{ matrix.dependencies }}

- name: 📥 Install dependencies with phive
working-directory: app
env:
PHIVE_HOME: .phive
run: phive install --trust-gpg-keys 0xC00543248C87FB13,0x033E5F8D801A2F8D,0x47436587D82C4A39
shell: bash

- name: 🔬 Run maglnet/composer-require-checker
working-directory: app
run: .phive/composer-require-checker check --ansi --config-file="$(pwd)/composer-require-checker.json" --verbose
4 changes: 2 additions & 2 deletions .github/workflows/deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: make validate-composer

- name: 🔍 Get composer cache directory
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
with:
working-directory: app

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

- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
uses: wayofdev/gh-actions/actions/composer/install@v3.1.0
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
with:
working-directory: app
dependencies: ${{ matrix.dependencies }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: make validate-composer

- name: 🔍 Get composer cache directory
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
with:
working-directory: app

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

- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
uses: wayofdev/gh-actions/actions/composer/install@v3.1.0
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
with:
working-directory: app
dependencies: ${{ matrix.dependencies }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: make validate-composer

- name: 🔍 Get composer cache directory
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.0
uses: wayofdev/gh-actions/actions/composer/get-cache-directory@v3.1.1
with:
working-directory: app

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

- name: 📥 Install "${{ matrix.dependencies }}" dependencies with composer
uses: wayofdev/gh-actions/actions/composer/install@v3.1.0
uses: wayofdev/gh-actions/actions/composer/install@v3.1.1
with:
working-directory: app
dependencies: ${{ matrix.dependencies }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
shellcheck:
uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@v3.1.0
uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@v3.1.1
with:
os: ubuntu-latest
severity: warning
Expand Down
Loading

0 comments on commit 67f58e1

Please sign in to comment.