Merge pull request #120 from GeneaLabs/master

Update to Laravel 9.

.github/workflows/test.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php_version: [7.2]
-        laravel_version: [5.5.*,6.*, 7.*, 8.*]
+        php_version: [7.4, 8.0, 8.1]
+        laravel_version: [8.*, 9.*]
 
     steps:
       - name: Checkout commit
         uses: actions/checkout@v2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php_version }}
 
@@ -28,9 +28,17 @@ jobs:
 
       - name: Run composer install
         run: composer install --no-interaction --no-suggest
-
-      - name: Install Laravel
-        run: composer update --no-interaction illuminate/database:^${{ matrix.laravel_version }}
+
+      - name: Run find-and-replace to replace * with 0
+        uses: mad9000/actions-find-and-replace-string@1
+        id: laravel_version_cleaned
+        with:
+          source: ${{ matrix.laravel_version }}
+          find: '*'
+          replace: '0'
 
+      - name: Install Laravel
+        run: composer update --no-interaction illuminate/database:^${{ steps.laravel_version_cleaned.outputs.value }}
+
       - name: Run PHPUnit
         run: ./vendor/bin/phpunit

composer.json

@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "illuminate/database": "^5.5|^6.0|^7.0|^8.0"
+        "illuminate/database": "^8.0|^9.0"
     },
     "require-dev": {
         "orchestra/testbench": "*",

src/EloquentJoinBuilder.php

@@ -283,6 +283,8 @@ private function applyClauseOnRelation(JoinClause $join, string $method, array $
                         $params[0][$relatedTableAlias.'.'.$k] = $param;
                         unset($params[0][$k]);
                     }
+                } elseif (is_callable($params[0])) {
+                    throw new InvalidRelationWhere();
                 } else {
                     $params[0] = $relatedTableAlias.'.'.$params[0];
                 }

tests/TestCase.php

@@ -120,6 +120,6 @@ protected function assertQueryMatches($expected, $actual)
             $expected = str_replace(['"'], '`', $expected);
         }
 
-        $this->assertRegExp($expected, $actual);
+        $this->assertMatchesRegularExpression($expected, $actual);
     }
 }