ref: replace symfony options resolver with custom resolver

composer.json

@@ -27,8 +27,7 @@
         "ext-mbstring": "*",
         "ext-curl": "*",
         "guzzlehttp/psr7": "^1.8.4|^2.1.1",
-        "psr/log": "^1.0|^2.0|^3.0",
-        "symfony/options-resolver": "^4.4.30|^5.0.11|^6.0|^7.0"
+        "psr/log": "^1.0|^2.0|^3.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.4",

phpstan-baseline.neon

@@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: src/Dsn.php
 
-		-
-			message: "#^Property Sentry\\\\Integration\\\\RequestIntegration\\:\\:\\$options \\(array\\{pii_sanitize_headers\\: array\\<string\\>\\}\\) does not accept array\\.$#"
-			count: 1
-			path: src/Integration/RequestIntegration.php
-
 		-
 			message: "#^Parameter \\#2 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#"
 			count: 1

src/CheckInStatus.php

@@ -7,7 +7,7 @@
 /**
  * This enum represents all the possible status of a check in.
  */
-final class CheckInStatus implements \Stringable
+final class CheckInStatus
 {
     /**
      * @var string The value of the enum instance

src/Dsn.php

@@ -10,7 +10,7 @@
  *
  * @author Stefano Arlandini <[email protected]>
  */
-final class Dsn implements \Stringable
+final class Dsn
 {
     /**
      * @var string Regex to match the organization ID in the host.

src/Event.php

@@ -802,7 +802,7 @@ public function setExceptions(array $exceptions): self
     {
         foreach ($exceptions as $exception) {
             if (!$exception instanceof ExceptionDataBag) {
-                throw new \UnexpectedValueException(\sprintf('Expected an instance of the "%s" class. Got: "%s".', ExceptionDataBag::class, get_debug_type($exception)));
+                throw new \UnexpectedValueException(\sprintf('Expected an instance of the "%s" class. Got: "%s".', ExceptionDataBag::class, \gettype($exception)));
             }
         }
 

src/EventHint.php

@@ -56,19 +56,19 @@ public static function fromArray(array $hintData): self
         $extra = $hintData['extra'] ?? [];
 
         if ($exception !== null && !$exception instanceof \Throwable) {
-            throw new \InvalidArgumentException(\sprintf('The value of the "exception" field must be an instance of a class implementing the "%s" interface. Got: "%s".', \Throwable::class, get_debug_type($exception)));
+            throw new \InvalidArgumentException(\sprintf('The value of the "exception" field must be an instance of a class implementing the "%s" interface. Got: "%s".', \Throwable::class, \gettype($exception)));
         }
 
         if ($mechanism !== null && !$mechanism instanceof ExceptionMechanism) {
-            throw new \InvalidArgumentException(\sprintf('The value of the "mechanism" field must be an instance of the "%s" class. Got: "%s".', ExceptionMechanism::class, get_debug_type($mechanism)));
+            throw new \InvalidArgumentException(\sprintf('The value of the "mechanism" field must be an instance of the "%s" class. Got: "%s".', ExceptionMechanism::class, \gettype($mechanism)));
         }
 
         if ($stacktrace !== null && !$stacktrace instanceof Stacktrace) {
-            throw new \InvalidArgumentException(\sprintf('The value of the "stacktrace" field must be an instance of the "%s" class. Got: "%s".', Stacktrace::class, get_debug_type($stacktrace)));
+            throw new \InvalidArgumentException(\sprintf('The value of the "stacktrace" field must be an instance of the "%s" class. Got: "%s".', Stacktrace::class, \gettype($stacktrace)));
         }
 
         if (!\is_array($extra)) {
-            throw new \InvalidArgumentException(\sprintf('The value of the "extra" field must be an array. Got: "%s".', get_debug_type($extra)));
+            throw new \InvalidArgumentException(\sprintf('The value of the "extra" field must be an array. Got: "%s".', \gettype($extra)));
         }
 
         $hint->exception = $exception;

src/EventId.php

@@ -11,7 +11,7 @@
  *
  * @author Stefano Arlandini <[email protected]>
  */
-final class EventId implements \Stringable
+final class EventId
 {
     /**
      * @var string The ID

src/EventType.php

@@ -10,7 +10,7 @@
  *
  * @author Stefano Arlandini <[email protected]>
  */
-final class EventType implements \Stringable
+final class EventType
 {
     /**
      * @var string The value of the enum instance

src/FrameBuilder.php

@@ -179,7 +179,7 @@ private function getFunctionArguments(array $backtraceFrame): array
                 } else {
                     $reflectionFunction = new \ReflectionMethod($backtraceFrame['class'], '__call');
                 }
-            } elseif ($backtraceFrame['function'] !== '__lambda_func' && !str_starts_with($backtraceFrame['function'], '{closure') && \function_exists($backtraceFrame['function'])) {
+            } elseif ($backtraceFrame['function'] !== '__lambda_func' && strpos($backtraceFrame['function'], '{closure') !== 0 && \function_exists($backtraceFrame['function'])) {
                 $reflectionFunction = new \ReflectionFunction($backtraceFrame['function']);
             }
         } catch (\ReflectionException $e) {

src/Integration/IntegrationRegistry.php

@@ -123,7 +123,7 @@ private function getIntegrationsToSetup(Options $options): array
             $integrations = $userIntegrations($defaultIntegrations);
 
             if (!\is_array($integrations)) {
-                throw new \UnexpectedValueException(\sprintf('Expected the callback set for the "integrations" option to return a list of integrations. Got: "%s".', get_debug_type($integrations)));
+                throw new \UnexpectedValueException(\sprintf('Expected the callback set for the "integrations" option to return a list of integrations. Got: "%s".', \gettype($integrations)));
             }
         }
 

src/Integration/RequestIntegration.php

@@ -9,12 +9,11 @@
 use Sentry\Event;
 use Sentry\Exception\JsonException;
 use Sentry\Options;
+use Sentry\SentryOptionResolver;
 use Sentry\SentrySdk;
 use Sentry\State\Scope;
 use Sentry\UserDataBag;
 use Sentry\Util\JSON;
-use Symfony\Component\OptionsResolver\Options as SymfonyOptions;
-use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * This integration collects information from the request and attaches them to
@@ -68,10 +67,6 @@ final class RequestIntegration implements IntegrationInterface
 
     /**
      * @var array<string, mixed> The options
-     *
-     * @psalm-var array{
-     *     pii_sanitize_headers: string[]
-     * }
      */
     private $options;
 
@@ -80,14 +75,10 @@ final class RequestIntegration implements IntegrationInterface
      *
      * @param RequestFetcherInterface|null $requestFetcher PSR-7 request fetcher
      * @param array<string, mixed>         $options        The options
-     *
-     * @psalm-param array{
-     *     pii_sanitize_headers?: string[]
-     * } $options
      */
     public function __construct(?RequestFetcherInterface $requestFetcher = null, array $options = [])
     {
-        $resolver = new OptionsResolver();
+        $resolver = new SentryOptionResolver();
 
         $this->configureOptions($resolver);
 
@@ -178,6 +169,10 @@ private function sanitizeHeaders(array $headers): array
             // Cast the header name into a string, to avoid errors on numeric headers
             $name = (string) $name;
 
+            if (!\is_array($this->options['pii_sanitize_headers'])) {
+                break;
+            }
+
             if (!\in_array(strtolower($name), $this->options['pii_sanitize_headers'], true)) {
                 continue;
             }
@@ -298,14 +293,14 @@ private function isRequestBodySizeWithinReadBounds(int $requestBodySize, string
     /**
      * Configures the options of the client.
      *
-     * @param OptionsResolver $resolver The resolver for the options
+     * @param SentryOptionResolver $resolver The resolver for the options
      */
-    private function configureOptions(OptionsResolver $resolver): void
+    private function configureOptions(SentryOptionResolver $resolver): void
     {
-        $resolver->setDefault('pii_sanitize_headers', self::DEFAULT_SENSITIVE_HEADERS);
         $resolver->setAllowedTypes('pii_sanitize_headers', 'string[]');
-        $resolver->setNormalizer('pii_sanitize_headers', static function (SymfonyOptions $options, array $value): array {
+        $resolver->setNormalizer('pii_sanitize_headers', static function (array $value): array {
             return array_map('strtolower', $value);
         });
+        $resolver->setDefault('pii_sanitize_headers', self::DEFAULT_SENSITIVE_HEADERS);
     }
 }

src/MonitorScheduleUnit.php

@@ -4,7 +4,7 @@
 
 namespace Sentry;
 
-final class MonitorScheduleUnit implements \Stringable
+final class MonitorScheduleUnit
 {
     /**
      * @var string The value of the enum instance