ADD Laravel 10 compatibility (#17)

Author: Riccardo Dalla Via

.github/workflows/run-tests.yml

@@ -13,12 +13,19 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1, 8.0]
-        laravel: [9.*]
+        php: [8.2, 8.1, 8.0]
+        laravel: [10.*, 9.*]
         stability: [prefer-lowest, prefer-stable]
         include:
+          - laravel: 10.*
+            testbench: 8.*
+            carbon: ^2.63
           - laravel: 9.*
             testbench: 7.*
+            carbon: ^2.63
+        exclude:
+          - laravel: 10.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
@@ -40,7 +47,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          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: Execute tests

composer.json

@@ -3,7 +3,8 @@
     "description": "Laravel Searchable",
     "keywords": [
         "maize-tech",
-        "laravel-searchable"
+        "laravel",
+        "searchable"
     ],
     "homepage": "https://github.com/maize-tech/laravel-searchable",
     "license": "MIT",
@@ -17,15 +18,14 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/database": "^9.0",
-        "illuminate/support": "^9.0",
-        "spatie/laravel-package-tools": "^1.9.2"
+        "illuminate/database": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0",
+        "spatie/laravel-package-tools": "^1.14.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "phpunit/phpunit": "^9.5",
-        "spatie/laravel-ray": "^1.26",
         "vimeo/psalm": "^4.20"
     },
     "autoload": {

src/Utils/AttributeUtil.php

@@ -7,6 +7,7 @@
 use Illuminate\Database\Query\Grammars\PostgresGrammar;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Schema;
+use ReflectionMethod;
 
 class AttributeUtil
 {
@@ -81,7 +82,17 @@ public static function isJsonAttribute(Model $model, $attribute): bool
     public static function formatAttribute(Model $model, $attribute): string
     {
         if ($attribute instanceof Expression) {
-            return $attribute->getValue();
+            $reflectionMethod = new ReflectionMethod(Expression::class, 'getValue');
+
+            if ($reflectionMethod->getNumberOfParameters() === 1) {
+                $grammar = $model::query()->getQuery()->getGrammar();
+
+                /**  @psalm-suppress TooManyArguments */
+                return strval($attribute->getValue($grammar));
+            }
+
+            /**  @psalm-suppress TooFewArguments */
+            return strval($attribute->getValue());
         }
 
         $attributeName = self::formatAttributeName($model, $attribute);

tests/Utils/AttributeUtilTest.php

@@ -157,7 +157,7 @@ public function it_should_return_the_expression_if_an_expression_attribute_is_gi
 
         $result = AttributeUtil::formatAttribute($model, $attribute);
 
-        $this->assertEquals($attribute, $result);
+        $this->assertEquals($result, "CONCAT(first_name, ' ', last_name)");
     }
 
     /** @test */