Add all tests to class_serializers option

Author: Jean85

src/DependencyInjection/SentryExtension.php

@@ -14,7 +14,6 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -97,11 +96,22 @@ private function passConfigurationToOptions(ContainerBuilder $container, array $
         }
 
         if (\array_key_exists('before_send', $processedOptions)) {
-            $this->mapCallableValue($options, 'setBeforeSendCallback', $processedOptions['before_send']);
+            $beforeSendCallable = $this->valueToCallable($processedOptions['before_send']);
+            $options->addMethodCall('setBeforeSendCallback', [$beforeSendCallable]);
         }
 
         if (\array_key_exists('before_breadcrumb', $processedOptions)) {
-            $this->mapCallableValue($options, 'setBeforeBreadcrumbCallback', $processedOptions['before_breadcrumb']);
+            $beforeBreadcrumbCallable = $this->valueToCallable($processedOptions['before_breadcrumb']);
+            $options->addMethodCall('setBeforeBreadcrumbCallback', [$beforeBreadcrumbCallable]);
+        }
+
+        if (\array_key_exists('class_serializers', $processedOptions)) {
+            $classSerializers = [];
+            foreach ($processedOptions['class_serializers'] as $class => $serializer) {
+                $classSerializers[$class] = $this->valueToCallable($serializer);
+            }
+
+            $options->addMethodCall('setClassSerializers', [$classSerializers]);
         }
 
         if (\array_key_exists('integrations', $processedOptions)) {
@@ -114,20 +124,13 @@ private function passConfigurationToOptions(ContainerBuilder $container, array $
         }
     }
 
-    /**
-     * @param Definition $options
-     * @param string $method
-     * @param callable|string $optionValue
-     */
-    private function mapCallableValue(Definition $options, string $method, $optionValue): void
+    private function valueToCallable($value)
     {
-        if (is_string($optionValue) && 0 === strpos($optionValue, '@')) {
-            $beforeSend = new Reference(substr($optionValue, 1));
-        } else {
-            $beforeSend = $optionValue;
+        if (is_string($value) && 0 === strpos($value, '@')) {
+            return new Reference(substr($value, 1));
         }
 
-        $options->addMethodCall($method, [$beforeSend]);
+        return $value;
     }
 
     /**

test/BaseTestCase.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Sentry\SentryBundle\Test;
+
+use PHPUnit\Framework\TestCase;
+use Sentry\Options;
+use Sentry\SentryBundle\Test\DependencyInjection\ConfigurationTest;
+
+abstract class BaseTestCase extends TestCase
+{
+    protected function classSerializersAreSupported(): bool
+    {
+        try {
+            new Options(['class_serializers' => []]);
+
+            return true;
+        } catch (\Throwable $throwable) {
+            return false;
+        }
+    }
+
+    protected function getSupportedOptionsCount(): int
+    {
+        if ($this->classSerializersAreSupported()) {
+            return ConfigurationTest::SUPPORTED_SENTRY_OPTIONS_COUNT + 1;
+        }
+
+        return ConfigurationTest::SUPPORTED_SENTRY_OPTIONS_COUNT;
+    }
+}

test/DependencyInjection/ConfigurationTest.php

@@ -3,14 +3,14 @@
 namespace Sentry\SentryBundle\Test\DependencyInjection;
 
 use Jean85\PrettyVersions;
-use PHPUnit\Framework\TestCase;
 use Sentry\Options;
 use Sentry\SentryBundle\DependencyInjection\Configuration;
+use Sentry\SentryBundle\Test\BaseTestCase;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\HttpKernel\Kernel;
 
-class ConfigurationTest extends TestCase
+class ConfigurationTest extends BaseTestCase
 {
     public const SUPPORTED_SENTRY_OPTIONS_COUNT = 23;
 
@@ -204,24 +204,4 @@ private function processConfiguration(array $values): array
 
         return $processor->processConfiguration(new Configuration(), ['sentry' => $values]);
     }
-
-    private function classSerializersAreSupported(): bool
-    {
-        try {
-            new Options(['class_serializers' => []]);
-
-            return  true;
-        } catch (\Throwable $throwable) {
-            return  false;
-        }
-    }
-
-    private function getSupportedOptionsCount(): int
-    {
-        if ($this->classSerializersAreSupported()) {
-            return self::SUPPORTED_SENTRY_OPTIONS_COUNT + 1;
-        }
-
-        return self::SUPPORTED_SENTRY_OPTIONS_COUNT;
-    }
 }

test/DependencyInjection/SentryExtensionTest.php

@@ -3,12 +3,12 @@
 namespace Sentry\SentryBundle\Test\DependencyInjection;
 
 use Jean85\PrettyVersions;
-use PHPUnit\Framework\TestCase;
 use Sentry\Breadcrumb;
 use Sentry\Event;
 use Sentry\Integration\IntegrationInterface;
 use Sentry\Options;
 use Sentry\SentryBundle\DependencyInjection\SentryExtension;
+use Sentry\SentryBundle\Test\BaseTestCase;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -17,7 +17,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Kernel;
 
-class SentryExtensionTest extends TestCase
+class SentryExtensionTest extends BaseTestCase
 {
     private const OPTIONS_TEST_PUBLIC_ALIAS = 'sentry.options.public_alias';
 
@@ -34,7 +34,7 @@ public function testDataProviderIsMappingTheRightNumberOfOptions(): void
         }
 
         $this->assertCount(
-            $expectedCount,
+            $this->getSupportedOptionsCount(),
             $supportedOptions,
             'Provider for configuration options mismatch: ' . PHP_EOL . print_r($supportedOptions, true)
         );
@@ -138,6 +138,16 @@ public function optionsValueProvider(): array
             $options[] = ['capture_silenced_errors', true, 'shouldCaptureSilencedErrors'];
         }
 
+        if ($this->classSerializersAreSupported()) {
+            $options['class_serializer'] = [
+                'class_serializers',
+                [
+                    self::class => __NAMESPACE__ . '\mockClassSerializer',
+                ],
+                'getClassSerializers',
+            ];
+        }
+
         return $options;
     }
 
@@ -375,6 +385,11 @@ function mockBeforeBreadcrumb(Breadcrumb $breadcrumb): ?Breadcrumb
     return null;
 }
 
+function mockClassSerializer($object)
+{
+    return ['value' => 'serialized_class'];
+}
+
 class CallbackMock
 {
     public static function callback()