Merge pull request #3 from lacodix/feat/github-actions

feat(function): added withGlobalOrScopes

composer.json

@@ -70,6 +70,7 @@
     "extra": {
         "laravel": {
             "providers": [
+                "Lacodix\\LaravelGlobalOrScope\\LaravelGlobalOrScopeServiceProvider"
             ]
         }
     },

src/LaravelGlobalOrScopeServiceProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Lacodix\LaravelGlobalOrScope;
+
+use Illuminate\Database\Eloquent\Builder;
+use Lacodix\LaravelGlobalOrScope\Scopes\OrScope;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
+
+class LaravelGlobalOrScopeServiceProvider extends PackageServiceProvider
+{
+    public function configurePackage(Package $package): void
+    {
+        $package->name('laravel-global-or-scope');
+    }
+
+    public function boot(): void
+    {
+        parent::boot();
+
+        Builder::macro(
+            'withGlobalOrScopes',
+            // @phpstan-ignore-next-line
+            fn (array $scopes = null) => $this->withGlobalScope(md5(serialize($scopes)), new OrScope($scopes))
+        );
+    }
+}

src/Scopes/OrScope.php

@@ -44,29 +44,11 @@ public function apply(Builder $builder, Model $model): Builder
      */
     public function extend(Builder $builder): void
     {
-        $this->addWithGlobalOrScope($builder);
-        $this->addWithGlobalOrScopes($builder);
         $this->addWithoutGlobalOrScope($builder);
         $this->addWithoutGlobalOrScopes($builder);
         $this->addRemovedOrScopes($builder);
     }
 
-    /**
-     * @param  Builder<Model>  $builder
-     */
-    protected function addWithGlobalOrScope(Builder $builder): void
-    {
-        $builder->macro('withGlobalOrScope', function (Builder $builder, $identifier, $scope) {
-            $this->scopes[$identifier] = $scope;
-
-            if (method_exists($scope, 'extend')) {
-                $scope->extend($builder);
-            }
-
-            return $builder;
-        });
-    }
-
     /**
      * @param  Builder<Model>  $builder
      */

tests/TestCase.php

@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Testing\Concerns\InteractsWithViews;
 use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Support\Str;
+use Lacodix\LaravelGlobalOrScope\LaravelGlobalOrScopeServiceProvider;
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
@@ -53,6 +54,19 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Get package providers.
+     *
+     * @param  \Illuminate\Foundation\Application  $app
+     * @return array<int, class-string<\Illuminate\Support\ServiceProvider>>
+     */
+    protected function getPackageProviders($app)
+    {
+        return [
+            LaravelGlobalOrScopeServiceProvider::class,
+        ];
+    }
+
     /**
      * Define environment setup.
      *

tests/Unit/GlobalOrScopesTest.php

@@ -19,6 +19,13 @@
     $this->assertEquals([0], $query->getBindings());
 });
 
+test('QueryGlobalOrScopeIsApplied', function () {
+    $model = new EloquentQueryGlobalOrScopesTestModel;
+    $query = $model->newQuery()->withGlobalOrScopes([new ActiveScope, new ConfirmedScope]);
+    $this->assertSame('select * from "table" where (("active" = ?) or ("confirmed" = ?))', $query->toSql());
+    $this->assertEquals([1,0], $query->getBindings());
+});
+
 test('ClassNameGlobalOrScopeIsApplied', function () {
     $model = new EloquentClassNameGlobalOrScopesTestModel;
     $query = $model->newQuery();
@@ -105,6 +112,17 @@
     $this->assertEquals(['bar', 1, 0, 'baz', 1, 0], $query->getBindings());
 });
 
+class EloquentQueryGlobalOrScopesTestModel extends Model
+{
+    use GlobalOrScope;
+
+    protected $table = 'table';
+
+    public static function booting(): void
+    {
+        static::clearGlobalOrScope();
+    }
+}
 
 class EloquentGlobalOrScopesTestModel extends Model
 {