Merge pull request #26 from BinarCode/2.4.3

2.4.3

Author: binaryk

.github/workflows/auto-release.yml

@@ -0,0 +1,23 @@
+name: Release
+
+on:
+  pull_request:
+    types: [ closed ]
+    branches:
+      - "main"
+
+jobs:
+  release:
+    name: Create release
+    if: github.event.pull_request.merged == true
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ncipollo/release-action@v1
+        with:
+          name: ${{ github.event.pull_request.title }}
+          tag: ${{ github.event.pull_request.title }}
+          body: ${{ github.event.pull_request.body }}
+          prerelease: false
+          token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          # uses the default GitHub actions app token

.github/workflows/psalm.yml

@@ -16,7 +16,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
+                  php-version: '8.1'
                   extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
                   coverage: none
 

src/Models/TenantScope.php

@@ -11,7 +11,9 @@ class TenantScope implements Scope
     public function apply(Builder $builder, Model $model)
     {
         $column = $model->qualifyColumn(config('tenantable.related_tenant_column'));
-        $tenantKey = tenant()->key();
+        $tenantKey = Tenant::check()
+            ? tenant()->key()
+            : null;
 
         if (config('tenantable.allow_nullable_tenant')) {
             $builder->where(function (Builder $query) use ($column, $tenantKey) {