Merge pull request #404 from wayofdev/develop

wayofdev · Jun 11, 2024 · 85c00a0 · 85c00a0
2 parents 14f824c + dfbd11f
commit 85c00a0
Show file tree

Hide file tree

Showing 60 changed files with 557 additions and 546 deletions.
diff --git a/.env.example b/.env.example
@@ -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
@@ -50,6 +45,7 @@ MEMCACHED_HOST=127.0.0.1
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+REDIS_FORWARD_PORT=16379
 
 MAIL_MAILER=smtp
 MAIL_HOST=mailpit

diff --git a/.markdownlint.json → .github/.markdownlint.json b/.markdownlint.json → .github/.markdownlint.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/v0.34.0/schema/markdownlint-config-schema.json",
+    "$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint/main/schema/markdownlint-config-schema.json",
     "line-length": false,
     "no-inline-html": false,
     "first-line-h1": false,

diff --git a/.github/.release-please-config.json b/.github/.release-please-config.json
@@ -1,4 +1,5 @@
 {
+    "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
     "release-type": "php",
     "packages": {
         ".": {

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -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.

diff --git a/renovate.json → .github/renovate.json b/renovate.json → .github/renovate.json
@@ -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,

diff --git a/.github/workflows/apply-labels.yml b/.github/workflows/apply-labels.yml
@@ -14,7 +14,7 @@ name: 🏷️ Add labels
 
 jobs:
   label:
-    uses: wayofdev/gh-actions/.github/workflows/[email protected].0
+    uses: wayofdev/gh-actions/.github/workflows/[email protected].1
     with:
       os: ubuntu-latest
     secrets:

diff --git a/.github/workflows/auto-merge-release.yml b/.github/workflows/auto-merge-release.yml
@@ -13,7 +13,7 @@ name: 🤞 Auto merge release
 
 jobs:
   auto-merge:
-    uses: wayofdev/gh-actions/.github/workflows/[email protected].0
+    uses: wayofdev/gh-actions/.github/workflows/[email protected].1
     with:
       os: ubuntu-latest
       pull-request-number: ${{ github.event.pull_request.number }}

diff --git a/.github/workflows/ci.yml.dist b/.github/workflows/ci.yml.dist
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -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
@@ -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
@@ -61,6 +67,7 @@ jobs:
       - name: 🧐 Lint Markdown files
         uses: DavidAnson/[email protected]
         with:
+          config: '.github/.markdownlint.json'
           globs: |
             **/*.md
             !CHANGELOG.md
@@ -158,7 +165,7 @@ jobs:
         uses: shivammathur/[email protected]
         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
 

diff --git a/.github/workflows/create-arch-diagram.yml.dist b/.github/workflows/create-arch-diagram.yml.dist
@@ -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

diff --git a/.github/workflows/dependency-analysis.yml b/.github/workflows/dependency-analysis.yml
@@ -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/[email protected]
+
+      - name: 🛠️ Setup PHP
+        uses: shivammathur/[email protected]
+        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/[email protected]
+        with:
+          working-directory: app
+
+      - name: ♻️ Restore cached dependencies installed with composer
+        uses: actions/[email protected]
+        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/[email protected]
+        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
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -51,7 +51,7 @@ jobs:
         run: make validate-composer
 
       - name: 🔍 Get composer cache directory
-        uses: wayofdev/gh-actions/actions/composer/[email protected].0
+        uses: wayofdev/gh-actions/actions/composer/[email protected].1
         with:
           working-directory: app
 
@@ -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/[email protected].0
+        uses: wayofdev/gh-actions/actions/composer/[email protected].1
         with:
           working-directory: app
           dependencies: ${{ matrix.dependencies }}

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -51,7 +51,7 @@ jobs:
         run: make validate-composer
 
       - name: 🔍 Get composer cache directory
-        uses: wayofdev/gh-actions/actions/composer/[email protected].0
+        uses: wayofdev/gh-actions/actions/composer/[email protected].1
         with:
           working-directory: app
 
@@ -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/[email protected].0
+        uses: wayofdev/gh-actions/actions/composer/[email protected].1
         with:
           working-directory: app
           dependencies: ${{ matrix.dependencies }}

diff --git a/.github/workflows/security-analysis.yml b/.github/workflows/security-analysis.yml
@@ -47,7 +47,7 @@ jobs:
         run: make validate-composer
 
       - name: 🔍 Get composer cache directory
-        uses: wayofdev/gh-actions/actions/composer/[email protected].0
+        uses: wayofdev/gh-actions/actions/composer/[email protected].1
         with:
           working-directory: app
 
@@ -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/[email protected].0
+        uses: wayofdev/gh-actions/actions/composer/[email protected].1
         with:
           working-directory: app
           dependencies: ${{ matrix.dependencies }}

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -10,7 +10,7 @@ permissions:
 
 jobs:
   shellcheck:
-    uses: wayofdev/gh-actions/.github/workflows/[email protected].0
+    uses: wayofdev/gh-actions/.github/workflows/[email protected].1
     with:
       os: ubuntu-latest
       severity: warning