Merge pull request #394 from wayofdev/feat/laravel-11

.github/workflows/coding-standards.yml

@@ -9,6 +9,7 @@ on:  # yamllint disable-line rule:truthy
 name: 🧹 Fix PHP coding standards
 
 env:
+  # Disable docker support in Makefile
   APP_RUNNER: 'cd app &&'
 
 jobs:

.github/workflows/deploy-release.yml

@@ -8,6 +8,7 @@ on:  # yamllint disable-line rule:truthy
 name: 🚀 Deploy to production
 
 env:
+  # Disable docker support in Makefile
   APP_RUNNER: 'cd app &&'
 
 concurrency: production

.github/workflows/deploy-staging.yml

@@ -8,6 +8,7 @@ on:  # yamllint disable-line rule:truthy
 name: 🚀 Deploy to staging
 
 env:
+  # Disable docker support in Makefile
   APP_RUNNER: 'cd app &&'
 
 concurrency: staging

.github/workflows/security-analysis.yml

@@ -0,0 +1,68 @@
+---
+
+on:  # yamllint disable-line rule:truthy
+  pull_request:
+    branches:
+      - master
+      - develop
+
+name: 🔐 Security analysis
+
+env:
+  # Disable docker support in Makefile
+  APP_RUNNER: 'cd app &&'
+
+jobs:
+  security-analysis:
+    timeout-minutes: 4
+    runs-on: ${{ matrix.os }}
+    concurrency:
+      cancel-in-progress: true
+      group: security-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
+          ini-values: error_reporting=E_ALL
+          coverage: none
+
+      - 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: 🐛 Check installed packages for security vulnerability advisories
+        run: make lint-audit

.github/workflows/static-analysis.yml

@@ -0,0 +1,79 @@
+---
+
+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/phpstan.neon.dist'
+      - 'app/phpstan-baseline.neon'
+      - 'app/psalm.xml'
+      - 'app/psalm-baseline.xml'
+
+name: 🔍 Static analysis
+
+env:
+  # Disable docker support in Makefile
+  APP_RUNNER: 'cd app &&'
+
+jobs:
+  stan:
+    timeout-minutes: 4
+    runs-on: ${{ matrix.os }}
+    concurrency:
+      cancel-in-progress: true
+      group: stan-${{ 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
+
+      - 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: 🔍 Run static analysis using phpstan/phpstan
+        run: make lint-stan-ci

Makefile

@@ -291,7 +291,7 @@ lint-composer: ## Normalize composer.json and composer.lock files
 .PHONY: lint-composer
 
 lint-audit: ## Runs security checks for composer dependencies
-	$(APP_COMPOSER) audit
+	$(APP_COMPOSER) audit --ansi
 .PHONY: lint-security
 
 validate-composer: ## Validates composer.json and composer.lock files

app/phpstan-baseline.neon

@@ -4,17 +4,6 @@ parameters:
 			message: "#^Method Domain\\\\Product\\\\Models\\\\Product\\:\\:category\\(\\) return type with generic class Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\BelongsTo does not specify its types\\: TRelatedModel, TChildModel$#"
 			count: 1
 			path: src/Domain/Product/Models/Product.php
-
-		-
-			message: "#^Class Support\\\\Filters\\\\FuzzyFilter implements generic interface Spatie\\\\QueryBuilder\\\\Filters\\\\Filter but does not specify its types\\: TModelClass$#"
-			count: 1
-			path: src/Support/Filters/FuzzyFilter.php
-
-		-
-			message: "#^Method Support\\\\Filters\\\\FuzzyFilter\\:\\:__invoke\\(\\) return type with generic class Illuminate\\\\Database\\\\Eloquent\\\\Builder does not specify its types\\: TModelClass$#"
-			count: 1
-			path: src/Support/Filters/FuzzyFilter.php
-
 		-
 			message: "#^Undefined variable\\: \\$this$#"
 			count: 1

app/src/Support/Filters/FuzzyFilter.php

@@ -5,8 +5,14 @@
 namespace Support\Filters;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Spatie\QueryBuilder\Filters\Filter;
 
+/**
+ * @template TModelClass of Model
+ *
+ * @implements Filter<TModelClass>
+ */
 class FuzzyFilter implements Filter
 {
     /**
@@ -19,6 +25,11 @@ public function __construct(string ...$fields)
         $this->fields = $fields;
     }
 
+    /**
+     * @param Builder<TModelClass> $query
+     *
+     * @return Builder<TModelClass>
+     */
     public function __invoke(Builder $query, mixed $value, string $property): Builder
     {
         $query->where(function (Builder $query) use ($value): void {