Group resolvers by class

Author: iamgergo

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -415,7 +415,7 @@ public function getRelationValue($key)
         // If the "attribute" exists as a method on the model, we will just assume
         // it is a relationship and will load and return results from the query
         // and hydrate the relationship's value on the "relationships" array.
-        if (method_exists($this, $key) || isset(static::$relationResolvers[$key])) {
+        if (method_exists($this, $key) || (static::$relationResolvers[static::class][$key] ?? null)) {
             return $this->getRelationshipFromMethod($key);
         }
     }

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -61,7 +61,7 @@ trait HasRelationships
      */
     public static function resolveRelationUsing($name, Closure $callback)
     {
-        static::$relationResolvers[$name] = $callback;
+        static::$relationResolvers[static::class][$name] = $callback;
     }
 
     /**

src/Illuminate/Database/Eloquent/Model.php

@@ -1725,8 +1725,8 @@ public function __call($method, $parameters)
             return $this->$method(...$parameters);
         }
 
-        if (isset(static::$relationResolvers[$method])) {
-            return static::$relationResolvers[$method]($this);
+        if ($resolver = static::$relationResolvers[static::class][$method] ?? null) {
+            return $resolver($this);
         }
 
         return $this->forwardCallTo($this->newQuery(), $method, $parameters);