Fix scope application logic

Author: stevebauman

src/Query/Model/Builder.php

@@ -133,7 +133,17 @@ protected function callScope(callable $scope, array $parameters = []): static
     {
         array_unshift($parameters, $this);
 
-        return $scope(...array_values($parameters)) ?? $this;
+        $result = null;
+
+        $scopeFilter = $this->captureScopeFilters(function () use ($scope, $parameters, &$result) {
+            $result = $scope(...$parameters) ?? $this;
+        });
+
+        if ($scopeFilter) {
+            $this->query->addFilter($scopeFilter);
+        }
+
+        return $result;
     }
 
     /**
@@ -477,25 +487,49 @@ public function applyScopes(): static
             return $this;
         }
 
-        // Scopes should not be escapable, so we will wrap the
-        // application of the scopes within a nested query.
-        $this->where(function (self $query) {
-            foreach ($this->scopes as $identifier => $scope) {
-                if (isset($this->appliedScopes[$identifier])) {
-                    continue;
+        $builder = clone $this;
+
+        foreach ($this->scopes as $identifier => $scope) {
+            if (! isset($builder->scopes[$identifier])) {
+                continue;
+            }
+
+            if (isset($builder->appliedScopes[$identifier])) {
+                continue;
+            }
+
+            $builder->callScope(function (self $builder) use ($scope) {
+                if ($scope instanceof Closure) {
+                    $scope($builder);
                 }
 
                 if ($scope instanceof Scope) {
-                    $scope->apply($query, $this->getModel());
-                } else {
-                    $scope($this);
+                    $scope->apply($builder, $this->getModel());
                 }
+            });
 
-                $this->appliedScopes[$identifier] = $scope;
-            }
-        });
+            $builder->appliedScopes[$identifier] = $scope;
+        }
 
-        return $this;
+        return $builder;
+    }
+
+    /**
+     * Capture the filters applied while executing the callback.
+     */
+    protected function captureScopeFilters(Closure $callback): ?Filter
+    {
+        $originalFilter = $this->query->filter;
+
+        $this->query->filter = null;
+
+        try {
+            $callback();
+
+            return $this->query->filter;
+        } finally {
+            $this->query->filter = $originalFilter;
+        }
     }
 
     /**