Refactor

src/Fieldtypes/Relationship.php

@@ -330,6 +330,6 @@ protected function applyIndexQueryScopes($query, $params)
         collect(Arr::wrap($this->config('query_scopes')))
             ->map(fn ($handle) => Scope::find($handle))
             ->filter()
-            ->each(fn ($class) => app($class)->apply($query, $params));
+            ->each(fn ($scope) => $scope->apply($query, $params));
     }
 }

src/Http/Controllers/CP/Assets/BrowserController.php

@@ -118,6 +118,6 @@ protected function applyQueryScopes($query, $params)
         collect(Arr::wrap($params['queryScopes'] ?? null))
             ->map(fn ($handle) => Scope::find($handle))
             ->filter()
-            ->each(fn ($class) => app($class)->apply($query, $params));
+            ->each(fn ($scope) => $scope->apply($query, $params));
     }
 }

src/Query/Scopes/ScopeRepository.php

@@ -17,11 +17,25 @@ public function all()
 
     public function find($key, $context = [])
     {
-        if ($scope = app('statamic.scopes')->get($key)) {
-            if (! in_array($scope->handle(), $this->removed)) {
-                return app($scope)?->context($context);
-            }
+        if (in_array($key, $this->removed)) {
+            return;
         }
+
+        if (! $scope = app('statamic.scopes')->get($key)) {
+            return;
+        }
+
+        $scope = app($scope);
+
+        if (! $scope) {
+            return;
+        }
+
+        if (! method_exists($scope, 'context')) {
+            return $scope;
+        }
+
+        return $scope->context($context);
     }
 
     public function filters($key, $context = [])

src/Tags/Concerns/QueriesScopes.php

@@ -14,8 +14,7 @@ public function queryScopes($query)
                 return Scope::find($handle);
             })
             ->filter()
-            ->each(function ($class) use ($query) {
-                $scope = app($class);
+            ->each(function ($scope) use ($query) {
                 $scope->apply($query, $this->params);
             });
     }