Merge pull request #3826 from Laravel-Backpack/one-more-check-in-column-auto-infer

If possible relation method requires parameters, it's not a relation method.

Author: tabacitu

src/app/Library/CrudPanel/CrudPanel.php

@@ -488,4 +488,22 @@ private function getRelatedEntries($model, $relationString)
 
         return $results;
     }
+
+    /**
+     * Check if the method in the given model has any parameters.
+     *
+     * @param  object  $model
+     * @param  string  $method
+     * @return bool
+     */
+    private function modelMethodHasParameters($model, $method)
+    {
+        $reflectClassMethod = new \ReflectionMethod(get_class($model), $method);
+
+        if ($reflectClassMethod->getNumberOfParameters() > 0) {
+            return true;
+        }
+
+        return false;
+    }
 }

src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php

@@ -146,15 +146,19 @@ protected function makeSureColumnHasEntity($column)
             // if the first part of the string exists as method,
             // it is a relationship
             if (method_exists($this->model, $possibleMethodName)) {
-                $column['entity'] = $column['name'];
+
+                // if it has parameters it's not a relation method.
+                $column['entity'] = $this->modelMethodHasParameters($this->model, $possibleMethodName) ? false : $column['name'];
 
                 return $column;
             }
         }
 
         // if there's a method on the model with this name
         if (method_exists($this->model, $column['name'])) {
-            $column['entity'] = $column['name'];
+
+            // if it has parameters it's not a relation method.
+            $column['entity'] = $this->modelMethodHasParameters($this->model, $column['name']) ? false : $column['name'];
 
             return $column;
         }
@@ -165,7 +169,9 @@ protected function makeSureColumnHasEntity($column)
             $possibleMethodName = Str::replaceLast('_id', '', $column['name']);
 
             if (method_exists($this->model, $possibleMethodName)) {
-                $column['entity'] = $possibleMethodName;
+
+                // if it has parameters it's not a relation method.
+                $column['entity'] = $this->modelMethodHasParameters($this->model, $possibleMethodName) ? false : $possibleMethodName;
 
                 return $column;
             }