Refactor callables tests

Author: Jean85

test/DependencyInjection/SentryExtensionTest.php

@@ -155,7 +155,7 @@ public function testBeforeSendUsingServiceDefinition(): void
     {
         $container = $this->getContainer([
             'options' => [
-                    'before_send' => '@before_send',
+                    'before_send' => '@callable_mock',
                 ],
         ]);
 
@@ -168,13 +168,13 @@ public function testBeforeSendUsingServiceDefinition(): void
             'before_send closure has not been replaced, is the default one'
         );
         $this->assertEquals(
-            CallbackMock::createBeforeSendCallback(),
+            CallbackMock::createCallback(),
             $beforeSendCallback
         );
     }
 
     /**
-     * @dataProvider beforeSendDataProvider
+     * @dataProvider scalarCallableDataProvider
      */
     public function testBeforeSendUsingScalarCallable($scalarCallable): void
     {
@@ -198,15 +198,6 @@ public function testBeforeSendUsingScalarCallable($scalarCallable): void
         );
     }
 
-    public function beforeSendDataProvider(): array
-    {
-        return [
-            [[CallbackMock::class, 'beforeSend']],
-            [CallbackMock::class . '::beforeSend'],
-            [__NAMESPACE__ . '\mockBeforeSend'],
-        ];
-    }
-
     public function testBeforeSendWithInvalidServiceReference(): void
     {
         $container = $this->getContainer([
@@ -224,13 +215,10 @@ public function testBeforeBreadcrumbUsingServiceDefinition(): void
     {
         $container = $this->getContainer([
             'options' => [
-                    'before_breadcrumb' => '@before_breadcrumb',
+                    'before_breadcrumb' => '@callable_mock',
                 ],
         ]);
 
-        $container->set('before_breadcrumb', function (Event $event) {
-        });
-
         $beforeBreadcrumbCallback = $this->getOptionsFrom($container)->getBeforeBreadcrumbCallback();
         $this->assertIsCallable($beforeBreadcrumbCallback);
         $defaultOptions = $this->getOptionsFrom($this->getContainer());
@@ -240,13 +228,13 @@ public function testBeforeBreadcrumbUsingServiceDefinition(): void
             'before_breadcrumb closure has not been replaced, is the default one'
         );
         $this->assertEquals(
-            CallbackMock::createBeforeBreadcrumbCallback(),
+            CallbackMock::createCallback(),
             $beforeBreadcrumbCallback
         );
     }
 
     /**
-     * @dataProvider beforeBreadcrumbDataProvider
+     * @dataProvider scalarCallableDataProvider
      */
     public function testBeforeBreadcrumbUsingScalarCallable($scalarCallable): void
     {
@@ -256,9 +244,6 @@ public function testBeforeBreadcrumbUsingScalarCallable($scalarCallable): void
                 ],
         ]);
 
-        $container->set('before_breadcrumb', function (Event $event) {
-        });
-
         $beforeBreadcrumbCallback = $this->getOptionsFrom($container)->getBeforeBreadcrumbCallback();
         $this->assertIsCallable($beforeBreadcrumbCallback);
         $defaultOptions = $this->getOptionsFrom($this->getContainer());
@@ -273,12 +258,12 @@ public function testBeforeBreadcrumbUsingScalarCallable($scalarCallable): void
         );
     }
 
-    public function beforeBreadcrumbDataProvider(): array
+    public function scalarCallableDataProvider(): array
     {
         return [
-            [[CallbackMock::class, 'beforeBreadcrumb']],
-            [CallbackMock::class . '::beforeBreadcrumb'],
-            [__NAMESPACE__ . '\mockBeforeBreadcrumb'],
+            [[CallbackMock::class, 'callback']],
+            [CallbackMock::class . '::callback'],
+            [__NAMESPACE__ . '\mockBeforeSend'],
         ];
     }
 
@@ -318,12 +303,8 @@ private function getContainer(array $configuration = []): Container
         $containerBuilder->setAlias(self::CONSOLE_LISTENER_TEST_PUBLIC_ALIAS, new Alias(ConsoleListener::class, true));
 
         $beforeSend = new Definition('callable');
-        $beforeSend->setFactory([CallbackMock::class, 'createBeforeSendCallback']);
-        $containerBuilder->setDefinition('before_send', $beforeSend);
-
-        $beforeBreadcrumb = new Definition('callable');
-        $beforeBreadcrumb->setFactory([CallbackMock::class, 'createBeforeBreadcrumbCallback']);
-        $containerBuilder->setDefinition('before_breadcrumb', $beforeBreadcrumb);
+        $beforeSend->setFactory([CallbackMock::class, 'createCallback']);
+        $containerBuilder->setDefinition('callable_mock', $beforeSend);
 
         $extension = new SentryExtension();
         $extension->load(['sentry' => $configuration], $containerBuilder);
@@ -356,23 +337,13 @@ function mockBeforeBreadcrumb(Breadcrumb $breadcrumb): ?Breadcrumb
 
 class CallbackMock
 {
-    public static function beforeSend(Event $event): ?Event
-    {
-        return null;
-    }
-
-    public static function createBeforeSendCallback(): callable
-    {
-        return [new self(), 'beforeSend'];
-    }
-
-    public static function beforeBreadcrumb(Breadcrumb $breadcrumb): ?Breadcrumb
+    public static function callback()
     {
         return null;
     }
 
-    public static function createBeforeBreadcrumbCallback(): callable
+    public static function createCallback(): callable
     {
-        return [new self(), 'beforeBreadcrumb'];
+        return [new self(), 'callback'];
     }
 }