wip

Author: luisdalmolin

src/PowerJoinClause.php

@@ -287,7 +287,13 @@ public function __call($name, $arguments)
             return;
         }
 
-        if ($this->hasLaravelScopeAttribute($name) || method_exists($this->getModel(), 'scope'.ucfirst($name))) {
+        if (method_exists($this->getModel(), 'scope'.ucfirst($name))) {
+            $scope = 'scope'.ucfirst($name);
+
+            return $this->getModel()->{$scope}($this, ...$arguments);
+        }
+
+        if ($this->hasLaravelScopeAttribute($name) && version_compare(app()->version(), '12.0.0', '>=')) {
             return $this->getModel()->callNamedScope($name, array_merge([$this], $arguments));
         }
 

tests/LaravelScopeAttributeTest.php

@@ -14,6 +14,10 @@ class LaravelScopeAttributeTest extends TestCase
      */
     public function it_can_use_laravel_scope_attribute_in_join_relationship_callback()
     {
+        if (version_compare(app()->version(), '12.0.0', '<')) {
+            $this->markTestSkipped('Laravel 12+ is required for this test');
+        }
+
         // Create test data
         $denmark = Country::create(['name' => 'Denmark', 'iso' => 'DK']);
         $usa = Country::create(['name' => 'United States', 'iso' => 'US']);