Handle string callable in case of non-static method

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix deprecation raised when serializing callable in certain circumstances (#821)
+
 ## 2.2.2 (2019-10-10)
 
 - Fix handling of fifth argument in the error handler (#892)

src/Serializer/AbstractSerializer.php

@@ -20,6 +20,7 @@
 
 namespace Sentry\Serializer;
 
+use Sentry\Exception\InvalidArgumentException;
 use Sentry\Options;
 
 /**
@@ -102,7 +103,7 @@ protected function serializeRecursively($value, int $_depth = 0)
             }
 
             if (\is_callable($value)) {
-                return $this->serializeCallable($value);
+                return $this->serializeCallableWithoutTypeHint($value);
             }
 
             if (\is_array($value)) {
@@ -250,7 +251,7 @@ protected function serializeValue($value)
         }
 
         if (\is_callable($value)) {
-            return $this->serializeCallable($value);
+            return $this->serializeCallableWithoutTypeHint($value);
         }
 
         if (\is_array($value)) {
@@ -261,7 +262,37 @@ protected function serializeValue($value)
     }
 
     /**
-     * @param callable $callable
+     * This method is provided as a non-BC upgrade of serializeCallable,
+     * since using the callable type raises a deprecation in some cases.
+     *
+     * @param callable|mixed $callable
+     *
+     * @return string
+     */
+    protected function serializeCallableWithoutTypeHint($callable): string
+    {
+        if (\is_string($callable) && !\function_exists($callable)) {
+            return $callable;
+        }
+
+        if (!\is_callable($callable)) {
+            throw new InvalidArgumentException(sprintf(
+                'Expecting callable, got %s',
+                \is_object($callable)
+                    ? \get_class($callable)
+                    : \gettype($callable)
+            ));
+        }
+
+        return $this->serializeCallable($callable);
+    }
+
+    /**
+     * Use serializeCallableWithoutTypeHint instead (no type in argument).
+     *
+     * @see https://github.com/getsentry/sentry-php/pull/821
+     *
+     * @param callable $callable callable type to be removed in 3.0, see #821
      *
      * @return string
      */
@@ -271,7 +302,7 @@ protected function serializeCallable(callable $callable): string
             if (\is_array($callable)) {
                 $reflection = new \ReflectionMethod($callable[0], $callable[1]);
                 $class = $reflection->getDeclaringClass();
-            } elseif ($callable instanceof \Closure || \is_string($callable)) {
+            } elseif ($callable instanceof \Closure || (\is_string($callable) && \function_exists($callable))) {
                 $reflection = new \ReflectionFunction($callable);
                 $class = null;
             } elseif (\is_object($callable) && method_exists($callable, '__invoke')) {

src/Stacktrace.php

@@ -310,8 +310,9 @@ protected function getFrameArgumentsValues(array $frame): array
         if (\is_string(array_keys($frame['args'])[0])) {
             $result = array_map([$this, 'serializeArgument'], $frame['args']);
         } else {
-            foreach (array_values($frame['args']) as $index => $argument) {
-                $result['param' . ($index + 1)] = $this->serializeArgument($argument);
+            $index = 0;
+            foreach (array_values($frame['args']) as $argument) {
+                $result['param' . (++$index)] = $this->serializeArgument($argument);
             }
         }
 

tests/Serializer/AbstractSerializerTest.php

@@ -455,13 +455,17 @@ public function serializableCallableProvider(): array
                 'callable' => $callableWithoutNamespaces,
                 'expected' => 'Lambda void {closure} [int|null param1_70ns]',
             ],
+            [
+                'callable' => __METHOD__,
+                'expected' => __METHOD__,
+            ],
         ];
     }
 
     /**
      * @dataProvider serializableCallableProvider
      */
-    public function testSerializeCallable(callable $callable, string $expected): void
+    public function testSerializeCallable($callable, string $expected): void
     {
         $serializer = $this->createSerializer();
         $actual = $this->invokeSerialization($serializer, $callable);