Merge pull request #87 from wayofdev/develop

chore: develop into master
wayofdev · Jun 15, 2023 · 283ccb6 · 283ccb6
2 parents 299db4d + b44b705
commit 283ccb6
Show file tree

Hide file tree

Showing 58 changed files with 1,916 additions and 864 deletions.
diff --git a/.env.example b/.env.example
@@ -33,7 +33,7 @@ LOG_LEVEL=debug
 
 DB_CONNECTION=pgsql
 DB_HOST=127.0.0.1
-DB_PORT=3306
+DB_PORT=5432
 DB_DATABASE=wod
 DB_USERNAME=wod
 DB_PASSWORD=password

diff --git a/.github/workflows/label.yml → .github/workflows/apply-labels.yml b/.github/workflows/label.yml → .github/workflows/apply-labels.yml
@@ -1,8 +1,10 @@
+---
+
 # This workflow will triage pull requests and apply a label based on the
 # paths that are modified in the pull request.
 #
 # To use this workflow, you will need to set up a .github/labeler.yml
-# file with configuration.  For more information, see:
+# file with configuration. For more information, see:
 # https://github.com/actions/labeler/blob/master/README.md
 
 on:  # yamllint disable-line rule:truthy
@@ -12,11 +14,10 @@ name: 🏷️ Add labels
 
 jobs:
   label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🏷️ Apply labels
-        uses: actions/labeler@v4
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@master
+    with:
+      os: ubuntu-latest
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
 
 ...
diff --git a/.github/workflows/auto-merge-release.yaml b/.github/workflows/auto-merge-release.yaml
@@ -13,15 +13,14 @@ name: 🤞 Auto merge release
 
 jobs:
   auto-merge:
-    if: github.actor == 'lotyp' && startsWith(github.head_ref, 'release-please--')
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🤞 Auto-merge pull request
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          pull-request-number: ${{ github.event.pull_request.number }}
-          merge-method: merge
-          # to trigger other workflows, pass PAT token instead of GITHUB_TOKEN
-          token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@master
+    with:
+      os: ubuntu-latest
+      pull-request-number: ${{ github.event.pull_request.number }}
+      actor: lotyp
+      merge-method: merge
+    secrets:
+      # to trigger other workflows, pass PAT token instead of GITHUB_TOKEN
+      token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
 
 ...
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: true
       matrix:
         os: ["ubuntu-22.04"]
-        php: ["8.1", "8.2"]
+        php: ["8.2"]
 
     steps:
       - name: 📦 Check out the codebase
@@ -29,7 +29,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, fileinfo, xdebug
+          extensions: curl, mbstring, zip, fileinfo, xdebug, decimal
           ini-values: error_reporting=E_ALL
           tools: composer:v2
           coverage: xdebug
@@ -46,6 +46,13 @@ jobs:
           path: vendor
           key: vendor-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}
 
+      - name: ♻️ Restore cached .build directory
+        id: cached-build-dir
+        uses: actions/cache@v3
+        with:
+          path: .build
+          key: build-${{ runner.os }}-${{ hashFiles('**/composer.lock') }}-${{ matrix.php }}
+
       - name: 📥 Install backend dependencies
         if: steps.cached-composer-dependencies.outputs.cache-hit != 'true'
         run: composer install
@@ -70,12 +77,10 @@ jobs:
         run: php artisan storage:link
 
       - name: 🔍 Run coding standards task
-        run: |
-          composer run cs:diff
+        run: composer run cs:diff
 
       - name: 🔍 Run static analysis using phpstan
-        run: |
-          composer run stan
+        run: composer run stan
         env:
           PHPSTAN_OUTPUT_FORMAT: github
 

diff --git a/.github/workflows/codesee-arch-diagram.yml → .github/workflows/create-arch-diagram.yml b/.github/workflows/codesee-arch-diagram.yml → .github/workflows/create-arch-diagram.yml
@@ -1,8 +1,9 @@
 ---
+
 # This workflow was added by CodeSee. Learn more at https://codesee.io/
 # This is v2.0 of this workflow file
 
-on: # yamllint disable-line rule:truthy
+on:  # yamllint disable-line rule:truthy
   push:
     branches:
       - develop
@@ -18,10 +19,11 @@ permissions: read-all
 
 jobs:
   codesee:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: 💻 Analyze the repo with CodeSee
-        uses: Codesee-io/codesee-action@v2
-        with:
-          codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/create-arch-diagram.yml@master
+    with:
+      os: ubuntu-latest
+      continue-on-error: true
+    secrets:
+      codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }}
+
+...
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -1,5 +1,6 @@
 ---
 
+# https://github.com/wayofdev/gh-actions/blob/master/.github/workflows/create-release.yml
 # https://github.com/google-github-actions/release-please-action#release-types-supported
 
 on:  # yamllint disable-line rule:truthy
@@ -11,30 +12,12 @@ name: 📦 Create release
 
 jobs:
   release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🎉 Create release
-        uses: google-github-actions/release-please-action@v3
-        id: release
-        with:
-          token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
-          release-type: node
-          package-name: docker-node
-          default-branch: master
-          changelog-types: |
-            [
-              { "type": "feat", "section": "Features", "hidden": false },
-              { "type": "fix", "section": "Bug Fixes", "hidden": false },
-              { "type": "perf", "section": "Performance Improvements", "hidden": false },
-              { "type": "docs", "section": "Documentation", "hidden": false },
-              { "type": "chore", "section": "Miscellaneous", "hidden": false },
-              { "type": "style", "section": "Styles", "hidden": true },
-              { "type": "revert", "section": "Reverts", "hidden": true },
-              { "type": "deps", "section": "Dependencies", "hidden": true },
-              { "type": "refactor", "section": "Code Refactoring", "hidden": true },
-              { "type": "test", "section": "Tests", "hidden": true },
-              { "type": "build", "section": "Build System", "hidden": true },
-              { "type": "ci", "section": "Continuous Integration", "hidden": true }
-            ]
+    uses: wayofdev/gh-actions/.github/workflows/create-release.yml@master
+    with:
+      os: ubuntu-latest
+      branch: master
+      package-name: laravel-starter-tpl
+    secrets:
+      token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
 
 ...
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: true
       matrix:
         os: ["ubuntu-22.04"]
-        php: ["8.1"]
+        php: ["8.2"]
     environment:
       name: production
       url: https://prod.laravel-starter-tpl.wayof.dev
@@ -29,7 +29,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, fileinfo
+          extensions: curl, libxml, mbstring, zip, fileinfo, decimal
           ini-values: error_reporting=E_ALL
           tools: composer:v2
 

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: true
       matrix:
         os: ["ubuntu-22.04"]
-        php: ["8.1"]
+        php: ["8.2"]
     environment:
       name: staging
       url: https://staging.laravel-starter-tpl.wayof.dev
@@ -29,7 +29,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, fileinfo
+          extensions: curl, libxml, mbstring, zip, fileinfo, decimal
           ini-values: error_reporting=E_ALL
           tools: composer:v2
 

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -10,17 +10,11 @@ permissions:
 
 jobs:
   shellcheck:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 📦 Check out the codebase
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: 🐞 Differential shell-check
-        uses: redhat-plumbers-in-action/differential-shellcheck@v4
-        with:
-          severity: warning
-          token: ${{ secrets.GITHUB_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@master
+    with:
+      os: ubuntu-latest
+      severity: warning
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
 
 ...
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: fix-encoding-pragma
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: 3.2.1
+    rev: 3.2.2
     hooks:
       - id: commitizen
         stages:

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ BUILDER_PARAMS ?= docker run --rm -i \
 	--env COMPOSER_AUTH="$(COMPOSER_AUTH)"
 
 BUILDER ?= $(BUILDER_PARAMS) $(SUPPORT_IMAGE)
-BUILDER_WIRED ?= $(BUILDER_PARAMS) --network $(COMPOSE_PROJECT_NAME)_default $(SUPPORT_IMAGE)
+BUILDER_WIRED ?= $(BUILDER_PARAMS) --network project.$(COMPOSE_PROJECT_NAME) $(SUPPORT_IMAGE)
 
 # Shorthand wait4x command, executed through build-deps
 WAITER ?= $(BUILDER_WIRED) wait4x
@@ -88,7 +88,7 @@ help: ## Show this menu
 # Default action
 # Defines default command when `make` is executed without additional parameters
 # ------------------------------------------------------------------------------------
-all: hooks key prepare up
+all: hooks install key prepare up
 .PHONY: all
 
 
@@ -124,7 +124,7 @@ prepare:
 # ------------------------------------------------------------------------------------
 up: # Creates and starts containers, defined in docker-compose and override file
 	$(DOCKER_COMPOSE) up --remove-orphans -d
-	$(DOCKER_COMPOSE) exec app wait4x tcp database:5432 -t 1m
+	$(DOCKER_COMPOSE) exec app wait4x postgresql 'postgres://${DB_USERNAME}:${DB_PASSWORD}@database:5432/${DB_DATABASE}?sslmode=disable' -t 1m
 .PHONY: up
 
 down: # Stops and removes containers of this project
@@ -178,6 +178,10 @@ lint-stan:
 	$(APP_COMPOSER) run-script stan
 .PHONY: lint-stan
 
+lint-deps:
+	$(APP_COMPOSER) run-script deptrac
+.PHONY: lint-deps
+
 test: ## Run project php-unit and pest tests
 	$(APP_COMPOSER) test
 .PHONY: test
@@ -186,6 +190,10 @@ test-cc: ## Run project php-unit and pest tests in coverage mode and build repor
 	$(APP_COMPOSER) test:cc
 .PHONY: test-cc
 
+api-docs: ## Generate openapi docs specification file
+	$(APP_EXEC) php artisan open-docs:generate
+.PHONY: api-docs
+
 
 # Composer Commands
 # ------------------------------------------------------------------------------------
@@ -197,11 +205,26 @@ update: ## Update composer dependencies
 	$(APP_COMPOSER) update $(package)
 .PHONY: update
 
+du: ## Dump composer autoload
+	$(APP_COMPOSER) dump-autoload
+.PHONY: du
+
 show: ## Shows information about installed composer packages
 	$(APP_COMPOSER) show
 .PHONY: show
 
 
+# Database Commands
+# ------------------------------------------------------------------------------------
+db-wipe: ## Wipe database
+	$(APP_EXEC) php artisan db:wipe
+.PHONY: db-wipe
+
+db-refresh: ## Delete migration files, wipe database, create new migrations, run them and seed database
+	$(APP_EXEC) php artisan migrate:fresh
+.PHONY: db-refresh
+
+
 # Deployer Commands
 # ------------------------------------------------------------------------------------
 dep-staging:

diff --git a/README.md b/README.md
@@ -4,7 +4,6 @@
 <img width="456" src="https://raw.githubusercontent.com/wayofdev/laravel-starter-tpl/master/assets/logo.gh-light-mode-only.png#gh-light-mode-only">
 <img width="456" src="https://raw.githubusercontent.com/wayofdev/laravel-starter-tpl/master/assets/logo.gh-dark-mode-only.png#gh-dark-mode-only">
 </div>
-
 <br>
 
 <br>
@@ -122,8 +121,9 @@ To use this repository, you need to meet the following requirements:
    ```bash
    $ make
 
-   # or run commands separatley
+   # or run commands separately
    $ make hooks
+   $ make install
    $ make key
    $ make prepare
    $ make up

diff --git a/app/bootstrap/app.php b/app/bootstrap/app.php
@@ -28,12 +28,12 @@
 
 $app->singleton(
     Illuminate\Contracts\Http\Kernel::class,
-    Laravel\Http\Kernel::class
+    Laravel\HttpKernel::class
 );
 
 $app->singleton(
     Illuminate\Contracts\Console\Kernel::class,
-    Laravel\Console\Kernel::class
+    Laravel\ConsoleKernel::class
 );
 
 $app->singleton(