Merge with 2.x

Author: ManukMinasyan

.github/workflows/run-tests.yml

@@ -0,0 +1,51 @@
+name: run-tests
+
+on:
+  push:
+    branches: [2.x]
+  pull_request:
+    branches: [2.x]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [8.4]
+        laravel: [12.*]
+        stability: [prefer-stable]
+        include:
+          - laravel: 12.*
+            testbench: 9.*
+            carbon: 2.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: xdebug
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: List Installed Dependencies
+        run: composer show -D
+
+      - name: Execute tests
+        run: vendor/bin/pest --ci

README.md

@@ -6,6 +6,7 @@
   <a href="https://laravel.com/docs/12.x"><img src="https://img.shields.io/badge/Laravel-12.x-FF2D20?style=for-the-badge&logo=laravel" alt="Laravel 12"></a>
   <a href="https://php.net"><img src="https://img.shields.io/badge/PHP-8.3-777BB4?style=for-the-badge&logo=php" alt="PHP 8.3"></a>
   <a href="https://github.com/Relaticle/custom-fields/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-AGPL--3.0-blue.svg?style=for-the-badge" alt="License"></a>
+  <a href="https://github.com/relaticle/custom-fields/actions"><img src="https://img.shields.io/github/actions/workflow/status/relaticle/custom-fields/run-tests.yml?branch=2.x&style=for-the-badge&label=tests)" alt="License"></a>
 </p>
 
 A powerful Laravel/Filament plugin for adding dynamic custom fields to any Eloquent model without database migrations.

src/CustomFields.php

@@ -154,20 +154,23 @@ public static function useSectionModel(string $model): static
     }
 
     /**
-     * Register a custom tenant resolver.
+     * Register a custom tenant resolver callback.
+     *
+     * This allows developers to provide their own tenant resolution logic
+     * when they extend the CustomField models with custom tenant handling.
+     *
+     * The resolver will be called whenever the package needs to determine
+     * the current tenant context (validation, queries, scopes, etc.).
+     *
+     * Example:
+     * ```
+     * CustomFields::resolveTenantUsing(fn() => auth()->user()?->company_id);
+     * ```
      *
      * @param  Closure(): (int|string|null)  $callback
      */
     public static function resolveTenantUsing(Closure $callback): void
     {
         TenantContextService::setTenantResolver($callback);
     }
-
-    /**
-     * Clear the custom tenant resolver.
-     */
-    public static function clearTenantResolver(): void
-    {
-        TenantContextService::clearTenantResolver();
-    }
 }