add config and detection for lower monolog bundle versions

Author: Litarnus

src/EventListener/BufferFlusher.php

@@ -44,29 +44,29 @@ public static function getSubscribedEvents(): array
         // Running with lower priority will make the ConsoleListener run before and create a new scope
         // with the new command name when running a symfony Command within another Command.
         return [
-            KernelEvents::TERMINATE => ['onKernelTerminate', 10],
-            ConsoleEvents::COMMAND => ['onConsoleCommand', 150],
-            ConsoleEvents::TERMINATE => ['onConsoleTerminate', 10],
-            ConsoleEvents::ERROR => ['onConsoleError', 10],
+            KernelEvents::TERMINATE => ['handleKernelTerminateEvent', 10],
+            ConsoleEvents::COMMAND => ['handleConsoleCommandEvent', 150],
+            ConsoleEvents::TERMINATE => ['handleConsoleTerminateEvent', 10],
+            ConsoleEvents::ERROR => ['handleConsoleErrorEvent', 10],
         ];
     }
 
-    public function onKernelTerminate(TerminateEvent $event): void
+    public function handleKernelTerminateEvent(TerminateEvent $event): void
     {
         $this->flushBuffers();
     }
 
-    public function onConsoleTerminate(ConsoleTerminateEvent $event): void
+    public function handleConsoleTerminateEvent(ConsoleTerminateEvent $event): void
     {
         $this->flushBuffers();
     }
 
-    public function onConsoleError(ConsoleErrorEvent $event): void
+    public function handleConsoleErrorEvent(ConsoleErrorEvent $event): void
     {
         $this->flushBuffers();
     }
 
-    public function onConsoleCommand(ConsoleCommandEvent $event): void
+    public function handleConsoleCommandEvent(ConsoleCommandEvent $event): void
     {
         $this->flushBuffers();
     }

tests/End2End/App/KernelForBufferTest.php

@@ -14,6 +14,30 @@ class KernelForBufferTest extends Kernel
 {
     public function registerContainerConfiguration(LoaderInterface $loader): void
     {
+        parent::registerContainerConfiguration($loader);
         $loader->load(__DIR__ . '/config_buffer_test.yml');
+
+        if (!$this->supportsHubId()) {
+            $loader->load(__DIR__ . '/config_buffer_test_php72.yml');
+        }
+    }
+
+    /**
+     * Monolog Bundle supports hub_id from version 3.5 onwards.
+     */
+    private function supportsHubId(): bool
+    {
+        try {
+            if (class_exists('Composer\InstalledVersions')) {
+                $version = \Composer\InstalledVersions::getVersion('symfony/monolog-bundle');
+                if ($version && version_compare($version, '3.5.0', '>=')) {
+                    return true;
+                }
+            }
+
+            return true;
+        } catch (\Exception $e) {
+            return false;
+        }
     }
 }

tests/End2End/App/config_buffer_test.yml

@@ -1,75 +1,39 @@
-sentry:
-  dsn: http://[email protected]/sentry/1
-  register_error_handler: false
-  tracing:
-    enabled: true
-  options:
-    capture_silenced_errors: false
-    error_types: E_ALL & ~E_USER_DEPRECATED
-    traces_sample_rate: 0
-    ignore_exceptions:
-      - 'Symfony\Component\HttpKernel\Exception\BadRequestHttpException'
-      - 'Symfony\Component\ErrorHandler\Error\FatalError'
-      - 'Symfony\Component\Debug\Exception\FatalErrorException'
-    ignore_transactions: 'GET tracing_ignored_transaction'
-    transport: 'Sentry\SentryBundle\Tests\End2End\StubTransport'
-
-
-framework:
-  router: { resource: "%routing_config_dir%/routing.yml" }
-  secret: secret
-  test: ~
-  annotations: false
-  php_errors:
-    log: true
-
 services:
-  test.hub:
-    alias: Sentry\State\HubInterface
-    public: true
-
-  Sentry\SentryBundle\Tests\End2End\StubTransport: ~
-
   Sentry\Monolog\BreadcrumbHandler:
     arguments:
       - '@Sentry\State\HubInterface'
       - !php/const Monolog\Logger::WARNING
 
-  Sentry\SentryBundle\Tests\End2End\App\Controller\MainController:
-    autowire: true
-    tags:
-      - controller.service_arguments
-
   Sentry\SentryBundle\Tests\End2End\App\Controller\BufferFlushController:
     autowire: true
     tags:
       - controller.service_arguments
 
   Sentry\SentryBundle\Tests\End2End\App\Command\MainCommand:
-    tags: [{ name: 'console.command', command: 'main-command' }]
+    tags: [ { name: 'console.command', command: 'main-command' } ]
 
   Sentry\SentryBundle\Tests\End2End\App\Command\BreadcrumbTestCommand:
     autowire: true
-    tags: [{ name: 'console.command', command: 'sentry:breadcrumb:test'}]
+    tags: [ { name: 'console.command', command: 'sentry:breadcrumb:test' } ]
 
   Sentry\SentryBundle\Tests\End2End\App\Command\DummyTestCommand:
     autowire: true
-    tags: [{ name: 'console.command', command: 'sentry:dummy:test'}]
+    tags: [ { name: 'console.command', command: 'sentry:dummy:test' } ]
 
   Sentry\SentryBundle\Tests\End2End\App\Command\SubcommandTestCommand:
     autowire: true
-    tags: [{ name: 'console.command', command: 'sentry:subcommand:test'}]
+    tags: [ { name: 'console.command', command: 'sentry:subcommand:test' } ]
 
   Sentry\SentryBundle\Tests\End2End\App\Command\CrashingSubcommandTestCommand:
     autowire: true
-    tags: [{ name: 'console.command', command: 'sentry:subcommand:crash'}]
+    tags: [ { name: 'console.command', command: 'sentry:subcommand:crash' } ]
 
 
 monolog:
   handlers:
     main:
-      type:  stream
-      path:  "%kernel.logs_dir%/%kernel.environment%.log"
+      type: stream
+      path: "%kernel.logs_dir%/%kernel.environment%.log"
       level: debug
     sentry:
       type: sentry

tests/End2End/App/config_buffer_test_php72.yml

@@ -0,0 +1,22 @@
+services:
+  app.sentry.handler:
+    class: Sentry\Monolog\Handler
+    arguments:
+      - '@Sentry\State\HubInterface'
+      - !php/const Monolog\Logger::WARNING
+
+monolog:
+  handlers:
+    sentry:
+      type: service
+      id: app.sentry.handler
+      level: warning
+    sentry_breadcrumbs:
+      type: service
+      name: sentry_breadcrumbs
+      id: Sentry\Monolog\BreadcrumbHandler
+    sentry_buffer:
+      type: buffer
+      handler: sentry
+      level: notice
+      buffer_size: 50

tests/End2End/BreadcrumbTestCommandTest.php

@@ -68,7 +68,7 @@ public function testBreadcrumbWithConsoleListener()
         $this->assertCount(2, $event->getBreadcrumbs());
         $this->assertEquals('breadcrumb 1 error', $event->getBreadcrumbs()[0]->getMessage());
         $this->assertCount(1, $event->getExceptions());
-        $this->assertEquals('Error thrown while running command "sentry:breadcrumb:test". Message: "Breadcrumb error"', $event->getMessage());
+        $this->assertStringStartsWith('Error thrown while running command', $event->getMessage());
     }
 
     /**