wip

Author: cleptric

phpstan-baseline.neon

@@ -7,7 +7,7 @@ parameters:
 
 		-
 			message: "#^Offset 'host' does not exist on array\\{scheme\\: 'http'\\|'https', host\\?\\: string, port\\?\\: int\\<0, 65535\\>, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\.$#"
-			count: 1
+			count: 2
 			path: src/Dsn.php
 
 		-
@@ -200,6 +200,11 @@ parameters:
 			count: 1
 			path: src/Options.php
 
+		-
+			message: "#^Method Sentry\\\\Options\\:\\:getOrgId\\(\\) should return int\\|null but returns mixed\\.$#"
+			count: 1
+			path: src/Options.php
+
 		-
 			message: "#^Method Sentry\\\\Options\\:\\:getPrefixes\\(\\) should return array\\<string\\> but returns mixed\\.$#"
 			count: 1

src/Dsn.php

@@ -12,7 +12,6 @@
  */
 final class Dsn implements \Stringable
 {
-
     /**
      * @var string Regex to match the organization ID in the host.
      *             This only applies to Sentry SaaS DSNs that contain the organization ID.
@@ -50,7 +49,7 @@ final class Dsn implements \Stringable
     private $path;
 
     /**
-     * @var int
+     * @var int|null
      */
     private $orgId;
 
@@ -63,7 +62,7 @@ final class Dsn implements \Stringable
      * @param string $projectId The ID of the resource to access
      * @param string $path      The specific resource that the web client wants to access
      * @param string $publicKey The public key to authenticate the SDK
-     * @param int $orgId
+     * @param ?int   $orgId     The org ID
      */
     private function __construct(string $scheme, string $host, int $port, string $projectId, string $path, string $publicKey, ?int $orgId = null)
     {
@@ -110,7 +109,7 @@ public static function createFromString(string $value): self
 
         $orgId = null;
         if (preg_match(self::SENTRY_ORG_ID_REGEX, $parsedDsn['host'], $matches) == 1) {
-            $orgId = $matches[1];
+            $orgId = (int) $matches[1];
         }
 
         return new self(

src/Options.php

@@ -436,12 +436,12 @@ public function getDsn(): ?Dsn
         return $this->options['dsn'];
     }
 
-    public function getOrg(): ?int
+    public function getOrgId(): ?int
     {
         return $this->options['org_id'];
     }
 
-    public function setOrg(int $orgId): self
+    public function setOrgId(int $orgId): self
     {
         $options = array_merge($this->options, ['org_id' => $orgId]);
 
@@ -662,20 +662,6 @@ public function setTracePropagationTargets(array $tracePropagationTargets): self
         return $this;
     }
 
-    public function isStrictTracePropagationEnabled(): bool
-    {
-        return $this->options['strict_trace_propagation'];
-    }
-
-    public function setStrictTracePropagationEnabled(bool $enabled): self
-    {
-        $options = array_merge($this->options, ['strict_trace_propagation' => $enabled]);
-
-        $this->options = $this->resolver->resolve($options);
-
-        return $this;
-    }
-
     /**
      * Gets a list of default tags for events.
      *
@@ -1194,7 +1180,6 @@ private function configureOptions(OptionsResolver $resolver): void
                 return null;
             },
             'trace_propagation_targets' => null,
-            'strict_trace_propagation' => false,
             'tags' => [],
             'error_types' => null,
             'max_breadcrumbs' => self::DEFAULT_MAX_BREADCRUMBS,
@@ -1243,7 +1228,6 @@ private function configureOptions(OptionsResolver $resolver): void
         $resolver->setAllowedTypes('ignore_exceptions', 'string[]');
         $resolver->setAllowedTypes('ignore_transactions', 'string[]');
         $resolver->setAllowedTypes('trace_propagation_targets', ['null', 'string[]']);
-        $resolver->setAllowedTypes('strict_trace_propagation', ['null', 'bool']);
         $resolver->setAllowedTypes('tags', 'string[]');
         $resolver->setAllowedTypes('error_types', ['null', 'int']);
         $resolver->setAllowedTypes('max_breadcrumbs', 'int');

src/Tracing/DynamicSamplingContext.php

@@ -173,7 +173,7 @@ public static function fromTransaction(Transaction $transaction, HubInterface $h
                 $samplingContext->set('public_key', $options->getDsn()->getPublicKey());
             }
             if ($options->getDsn() !== null && $options->getDsn()->getOrgId() !== null) {
-                $samplingContext->set('org_id', $options->getDsn()->getOrgId());
+                $samplingContext->set('org_id', (string) $options->getDsn()->getOrgId());
             }
 
             if ($options->getRelease() !== null) {