Fix regression, in API\API::doesSuggestedValuesCallbackNeedData() handle methods and free functions.

1 files changed, 13 insertions, 3 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index 3bc1b3baef..72411c21be 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -592,9 +592,19 @@ class API extends \Piwik\Plugin\API
 
     private function doesSuggestedValuesCallbackNeedData($suggestedValuesCallback)
     {
-        $methodMetadata = new \ReflectionFunction($suggestedValuesCallback);
-        $parametersCount = $methodMetadata->getNumberOfParameters();
-        return $parametersCount >= 3;
+        if (is_string($suggestedValuesCallback)
+            && strpos($suggestedValuesCallback, '::') !== false
+        ) {
+            $suggestedValuesCallback = explode('::', $suggestedValuesCallback);
+        }
+
+        if (is_array($suggestedValuesCallback)) {
+            $methodMetadata = new \ReflectionMethod($suggestedValuesCallback[0], $suggestedValuesCallback[1]);
+        } else {
+            $methodMetadata = new \ReflectionFunction($suggestedValuesCallback);
+        }
+
+        return $methodMetadata->getNumberOfParameters() >= 3;
     }
 }