Add support for Symfony 5

Dockerfile

@@ -0,0 +1,13 @@
+FROM php:cli-alpine
+
+WORKDIR /app
+
+CMD tail -f /dev/null
+
+COPY --from=composer:1.10.5 /usr/bin/composer /usr/bin/composer
+
+ENV BROWSCAP_DIR /usr/local/etc/php/browsecap
+
+ADD http://browscap.org/stream?q=Lite_PHP_BrowsCapINI $BROWSCAP_DIR/browscap.ini
+RUN echo "browscap='$BROWSCAP_DIR/browscap.ini'" >> /usr/local/etc/php/conf.d/browsecap.ini && \
+    chmod 755 -R $BROWSCAP_DIR

SubscribedProcessor/BrowserDataAppending.php

@@ -7,7 +7,7 @@
 use Dziki\MonologSentryBundle\UserAgent\ParserInterface;
 use Dziki\MonologSentryBundle\UserAgent\UserAgent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 class BrowserDataAppending implements EventSubscriberInterface
@@ -44,10 +44,10 @@ public function __invoke(array $record): array
         return $record;
     }
 
-    public function onKernelRequest(GetResponseEvent $event): void
+    public function onKernelRequest(RequestEvent $event): void
     {
         /** @var string $userAgent */
-        $userAgent = $event->getRequest()->headers->get('User-Agent', '', true);
+        $userAgent = $event->getRequest()->headers->get('User-Agent', '');
 
         $this->userAgent = $this->parser->parse($userAgent);
     }

Tests/Functional/MonologSentryExtensionTest.php

@@ -12,7 +12,7 @@
 use Dziki\MonologSentryBundle\UserAgent\NativeParser;
 use Dziki\MonologSentryBundle\UserAgent\PhpUserAgentParser;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
-use Symfony\Component\Cache\Simple\ArrayCache;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
@@ -60,7 +60,7 @@ public function checkIfServicesDefinedAndPrivate(): void
             ],
         ];
 
-        $this->registerService(TokenStorageInterface::class, new TokenStorage());
+        $this->registerService(TokenStorageInterface::class, TokenStorage::class);
         $this->compile();
 
         $this->assertServicesDefinedAndPrivate($defaultServices);
@@ -77,7 +77,7 @@ private function assertServicesDefinedAndPrivate($defaultServices): void
                     $this->fail(sprintf('Service "%s" (%s) should be private', \get_class($service), $defaultService));
                 }
             } catch (ServiceNotFoundException $exception) {
-                $this->assertContains($defaultService, $exception->getMessage());
+                $this->assertStringContainsString($defaultService, $exception->getMessage());
             }
         }
     }
@@ -138,7 +138,7 @@ public function checkIfCachedParserServiceDefinedAndPrivate(): void
             ],
         ];
 
-        $this->registerService('app.cache.simple', new ArrayCache());
+        $this->registerService('app.cache.simple', ArrayAdapter::class);
         $this->compile();
 
         $this->assertServicesDefinedAndPrivate($defaultServices);

Tests/Functional/config.yaml

@@ -49,7 +49,6 @@ monolog:
       handler: sentry
     sentry:
       type:    raven
-      class:   Dziki\MonologSentryBundle\Handler\Raven
       dsn:     http://test-hash@some-sentry.com/some-id
       level:   notice
       release: 0.0.0.1-dev

Tests/Functional/config_with_cache.yaml

@@ -6,4 +6,8 @@ monolog_sentry:
 
 services:
   simple_array_cache:
-    class: 'Symfony\Component\Cache\Simple\ArrayCache'
+    class: 'Symfony\Component\Cache\Psr16Cache'
+    arguments:
+      - '@simple_array_symfony_cache'
+  simple_array_symfony_cache:
+    class: 'Symfony\Component\Cache\Adapter\ArrayAdapter'

Tests/Unit/DependencyInjection/Compiler/MonologHandlerOverridePassTest.php

@@ -56,14 +56,14 @@ public function changeClassDefinitionForAllAndOnlyRavenHandlerServices()
                 $this->assertSame(
                     Raven::class,
                     $containerBuilder
-                        ->getDefinition($id)
+                        ->getDefinition((string) $id)
                         ->getClass()
                 );
             } else {
                 $this->assertSame(
                     $class,
                     $containerBuilder
-                        ->getDefinition($id)
+                        ->getDefinition((string) $id)
                         ->getClass()
                 );
             }

Tests/Unit/Handler/RavenTest.php

@@ -45,7 +45,7 @@ public function testDebug()
         $handler->handle($record);
 
         $this->assertEquals($ravenClient::DEBUG, $ravenClient->lastData['level']);
-        $this->assertContains($record['message'], $ravenClient->lastData['message']);
+        $this->assertStringContainsString($record['message'], $ravenClient->lastData['message']);
     }
 
     protected function getHandler($ravenClient)
@@ -88,7 +88,7 @@ public function testWarning()
         $handler->handle($record);
 
         $this->assertEquals($ravenClient::WARNING, $ravenClient->lastData['level']);
-        $this->assertContains($record['message'], $ravenClient->lastData['message']);
+        $this->assertStringContainsString($record['message'], $ravenClient->lastData['message']);
     }
 
     public function testTag()
@@ -181,7 +181,7 @@ public function testUserContext()
 
         // check to see if its reset
         $handler->handle($recordWithNoContext);
-        $this->assertInternalType('array', $ravenClient->context->user);
+        $this->assertIsArray($ravenClient->context->user);
         $this->assertSame('test_user_id', $ravenClient->context->user['id']);
     }
 

Tests/Unit/SubscribedProcessor/BrowserDataAppendingTest.php

@@ -11,13 +11,14 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * @covers \Dziki\MonologSentryBundle\SubscribedProcessor\BrowserDataAppending
  *
- * @uses \Dziki\MonologSentryBundle\UserAgent\UserAgent
+ * @uses   \Dziki\MonologSentryBundle\UserAgent\UserAgent
  */
 class BrowserDataAppendingTest extends TestCase
 {
@@ -53,21 +54,14 @@ public function parseUserAgentOnRequest(): BrowserDataAppending
         $this->parser
             ->expects($this->once())
             ->method('parse')
-            ->willReturn(UserAgent::create('Firefox', '62.0', 'Linux'))
-        ;
+            ->willReturn(UserAgent::create('Firefox', '62.0', 'Linux'));
 
         $headersBag = new HeaderBag(
             ['User-Agent' => 'Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0']
         );
         $request = $this->createMock(Request::class);
         $request->headers = $headersBag;
-        /**
-         * @var GetResponseEvent|MockObject
-         */
-        $event = $this->createMock(GetResponseEvent::class);
-        $event->method('getRequest')
-              ->willReturn($request)
-        ;
+        $event = new RequestEvent($this->createMock(Kernel::class), $request, null);
 
         $browserDataAppendingProcessor->onKernelRequest($event);
 

composer.json

@@ -21,9 +21,10 @@
     "php": ">=7.1",
     "psr/simple-cache": "^1.0",
     "psr/simple-cache-implementation": "^1.0",
-    "symfony/dependency-injection": "^3.4|^4.1.12|^5.0",
+    "symfony/dependency-injection": "^4.2|^5.0",
     "symfony/monolog-bundle": "^3.3",
-    "symfony/monolog-bridge": "^3.4|^4.1|^5.0",
+    "monolog/monolog": "^1",
+    "symfony/monolog-bridge": "^4.2|^5.0",
     "sentry/sentry": "^1.9.1"
   },
   "conflict": {
@@ -35,7 +36,8 @@
     "nyholm/symfony-bundle-test": "^1.4",
     "matthiasnoback/symfony-dependency-injection-test": "dev-master",
     "donatj/phpuseragentparser": "^0.11",
-    "symfony/security-bundle": "^3.4|^4.1.12|^5.0"
+    "symfony/security-bundle": "^4.2|^5.0",
+    "symfony/string": "^5.0"
   },
   "suggest": {
     "donatj/phpuseragentparser": "Basic package for parsing User-Agent header, faster than native browscap",

docker-compose.yaml

@@ -0,0 +1,9 @@
+version: '3.7'
+
+services:
+    php:
+        user: "${DOCKER_COMPOSE_RUN_AS_USER:?You must define user:group for permissions handling}"
+        build: .
+        volumes:
+        - .:/app
+        - ~/.composer:/.composer