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

feat(function): added withGlobalOrScope
lacodix · Feb 19, 2024 · 84751e6 · 84751e6
2 parents ec199ed + 602abd1
commit 84751e6
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/Scopes/OrScope.php b/src/Scopes/OrScope.php
@@ -44,11 +44,29 @@ 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
      */