Clean up impossible test conditions and fix broken CI (#787)

Author: ste93cry

phpstan-baseline.neon

@@ -96,7 +96,7 @@ parameters:
 			path: src/DependencyInjection/SentryExtension.php
 
 		-
-			message: "#^Parameter \\#2 \\$callback of function array_filter expects callable\\(mixed\\)\\: mixed, Closure\\(string\\)\\: bool given\\.$#"
+			message: "#^Parameter \\#2 \\$callback of function array_filter expects \\(callable\\(mixed\\)\\: mixed\\)\\|null, Closure\\(string\\)\\: bool given\\.$#"
 			count: 1
 			path: src/DependencyInjection/SentryExtension.php
 

tests/End2End/App/Kernel.php

@@ -48,6 +48,10 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
             $loader->load(__DIR__ . '/deprecations_for_6.yml');
         }
 
+        if (self::VERSION_ID >= 60400) {
+            $loader->load(__DIR__ . '/deprecations_for_64.yml');
+        }
+
         if (interface_exists(MessageBusInterface::class) && self::VERSION_ID >= 40300) {
             $loader->load(__DIR__ . '/messenger.yml');
         }

tests/End2End/App/config.yml

@@ -13,6 +13,9 @@ framework:
   router: { resource: "%routing_config_dir%/routing.yml" }
   secret: secret
   test: ~
+  annotations: false
+  php_errors:
+    log: true
 
 services:
   test.hub:

tests/End2End/App/deprecations_for_64.yml

@@ -0,0 +1,2 @@
+framework:
+  handle_all_throwables: true

tests/Integration/RequestFetcherTest.php

@@ -2,9 +2,8 @@
 
 declare(strict_types=1);
 
-namespace Sentry\SentryBundle\Test\Integration;
+namespace Sentry\SentryBundle\Tests\Integration;
 
-use GuzzleHttp\Psr7\ServerRequest;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -37,24 +36,36 @@ protected function setUp(): void
         $this->requestFetcher = new RequestFetcher($this->requestStack, $this->httpMessageFactory);
     }
 
-    /**
-     * @dataProvider fetchRequestDataProvider
-     */
-    public function testFetchRequest(?Request $request, ?ServerRequestInterface $expectedRequest): void
+    public function testFetchRequest(): void
     {
+        $request = Request::create('https://www.example.com');
+        $expectedRequest = $this->createMock(ServerRequestInterface::class);
+
         $this->requestStack->expects($this->once())
             ->method('getCurrentRequest')
             ->willReturn($request);
 
-        $this->httpMessageFactory->expects(null !== $expectedRequest ? $this->once() : $this->never())
+        $this->httpMessageFactory->expects($this->once())
             ->method('createRequest')
             ->with($request)
             ->willReturn($expectedRequest);
 
         $this->assertSame($expectedRequest, $this->requestFetcher->fetchRequest());
     }
 
-    public function testFetchRequestFailsSilently(): void
+    public function testFetchRequestReturnsNullIfTheRequestStackIsEmpty(): void
+    {
+        $this->requestStack->expects($this->once())
+            ->method('getCurrentRequest')
+            ->willReturn(null);
+
+        $this->httpMessageFactory->expects($this->never())
+            ->method('createRequest');
+
+        $this->assertNull($this->requestFetcher->fetchRequest());
+    }
+
+    public function testFetchRequestReturnsNullIfTheRequestFactoryThrowsAnException(): void
     {
         $this->requestStack->expects($this->once())
             ->method('getCurrentRequest')
@@ -66,20 +77,4 @@ public function testFetchRequestFailsSilently(): void
 
         $this->assertNull($this->requestFetcher->fetchRequest());
     }
-
-    /**
-     * @return \Generator<array{Request|null,ServerRequest|null}>
-     */
-    public function fetchRequestDataProvider(): \Generator
-    {
-        yield [
-            null,
-            null,
-        ];
-
-        yield [
-            Request::create('http://www.example.com'),
-            new ServerRequest('GET', 'http://www.example.com'),
-        ];
-    }
 }