Fix Laravel 11 issues.

Author: timgws

composer.json

@@ -29,13 +29,13 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "illuminate/database": "^9.0||^8.0||^10.0"
+        "illuminate/database": "^9.0||^8.0||^10.0||^11.0"
     },
     "suggest": {
         "jenssegers/mongodb": "Use QueryBuilderParser with MongoDB"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5||^8.5||^7.0",
+        "phpunit/phpunit": "^9.5||^8.5||^7.0||^10.5",
         "mockery/mockery": "^1.3.1||^0.9.4"
     }
 }

src/QueryBuilderParser/JoinSupportingQueryBuilderParser.php

@@ -2,8 +2,9 @@
 
 namespace timgws;
 
-use Illuminate\Database\Query\Builder;
 use stdClass;
+use \Illuminate\Database\Query\Builder;
+use \Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use timgws\QBParseException;
 
 class JoinSupportingQueryBuilderParser extends QueryBuilderParser
@@ -42,15 +43,15 @@ public function __construct(array $fields = null, array $joinFields = null)
      * Make sure that all the correct fields are in the rule object then add the expression to
      * the query that was given by the user to the QueryBuilder.
      *
-     * @param Builder  $query
-     * @param stdClass $rule
-     * @param string   $queryCondition the condition that will be used in the query
+     * @param EloquentBuilder|Builder $query
+     * @param stdClass                $rule
+     * @param string                  $queryCondition the condition that will be used in the query
      *
      * @throws QBParseException
      *
-     * @return Builder
+     * @return EloquentBuilder|Builder
      */
-    protected function makeQuery(Builder $query, stdClass $rule, $queryCondition = 'AND')
+    protected function makeQuery(EloquentBuilder|Builder $query, stdClass $rule, $queryCondition = 'AND')
     {
         /*
          * Ensure that the value is correct for the rule, return query on exception
@@ -73,10 +74,10 @@ protected function makeQuery(Builder $query, stdClass $rule, $queryCondition = '
     /**
      * Build a subquery clause if there are join fields that have been specified.
      *
-     * @param Builder $query
+     * @param EloquentBuilder|Builder $query
      * @param stdClass $rule
      * @param string|null $value
-     * @return Builder the query builder object
+     * @return EloquentBuilder|Builder the query builder object
      */
     private function buildSubclauseQuery($query, $rule, $value, $condition)
     {
@@ -129,7 +130,7 @@ function(Builder $query) use ($subclause) {
      * @param Builder $query
      * @return Builder the query builder object
      */
-    private function buildSubclauseInnerQuery($subclause, Builder $query)
+    private function buildSubclauseInnerQuery($subclause, EloquentBuilder|Builder $query)
     {
         if ($subclause['require_array']) {
             return $this->buildRequireArrayQuery($subclause, $query);