ref(client): replace nullable client with NoOpClient

src/Integration/ErrorListenerIntegration.php

@@ -35,14 +35,13 @@ public function setupOnce(): void
                         static function (\ErrorException $exception): void {
                             $currentHub = SentrySdk::getCurrentHub();
                             $integration = $currentHub->getIntegration(self::class);
-                            $client = $currentHub->getClient();
 
-                            // The client bound to the current hub, if any, could not have this
-                            // integration enabled. If this is the case, bail out
-                            if ($integration === null || $client === null) {
+                            if ($integration === null) {
                                 return;
                             }
 
+                            $client = $currentHub->getClient();
+
                             if ($exception instanceof SilencedErrorException && !$client->getOptions()->shouldCaptureSilencedErrors()) {
                                 return;
                             }

src/Integration/FatalErrorListenerIntegration.php

@@ -24,14 +24,13 @@ public function setupOnce(): void
         $errorHandler->addFatalErrorHandlerListener(static function (FatalErrorException $exception): void {
             $currentHub = SentrySdk::getCurrentHub();
             $integration = $currentHub->getIntegration(self::class);
-            $client = $currentHub->getClient();
 
-            // The client bound to the current hub, if any, could not have this
-            // integration enabled. If this is the case, bail out
-            if ($integration === null || $client === null) {
+            if ($integration === null) {
                 return;
             }
 
+            $client = $currentHub->getClient();
+
             if (!($client->getOptions()->getErrorTypes() & $exception->getSeverity())) {
                 return;
             }

src/Integration/FrameContextifierIntegration.php

@@ -43,10 +43,6 @@ public function setupOnce(): void
         Scope::addGlobalEventProcessor(static function (Event $event): Event {
             $client = SentrySdk::getCurrentHub()->getClient();
 
-            if ($client === null) {
-                return $event;
-            }
-
             $maxContextLines = $client->getOptions()->getContextLines();
             $integration = $client->getIntegration(self::class);
 

src/Integration/RequestIntegration.php

@@ -94,14 +94,13 @@ public function setupOnce(): void
         Scope::addGlobalEventProcessor(function (Event $event): Event {
             $currentHub = SentrySdk::getCurrentHub();
             $integration = $currentHub->getIntegration(self::class);
-            $client = $currentHub->getClient();
 
-            // The client bound to the current hub, if any, could not have this
-            // integration enabled. If this is the case, bail out
-            if ($integration === null || $client === null) {
+            if ($integration === null) {
                 return $event;
             }
 
+            $client = $currentHub->getClient();
+
             $this->processEvent($event, $client->getOptions());
 
             return $event;

src/Logs/LogsAggregator.php

@@ -40,11 +40,6 @@ public function add(
         $hub = SentrySdk::getCurrentHub();
         $client = $hub->getClient();
 
-        // There is no need to continue if there is no client
-        if ($client === null) {
-            return;
-        }
-
         $options = $client->getOptions();
         $sdkLogger = $options->getLogger();
 

src/NoOpClient.php

@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sentry;
+
+use Sentry\Integration\IntegrationInterface;
+use Sentry\Serializer\RepresentationSerializer;
+use Sentry\State\Scope;
+use Sentry\Transport\Result;
+use Sentry\Transport\ResultStatus;
+
+/**
+ * This client does not perform any operations, it acts as an interface compatible layer in order to
+ * simply workflows where previously the client was null.
+ * It also holds options which helps with situations where no options were available if the client was set to `null`.
+ */
+class NoOpClient implements ClientInterface
+{
+    /**
+     * @var array<string, mixed>
+     */
+    private $options;
+
+    /**
+     * @var Options
+     */
+    private $sentryOptions;
+
+    /**
+     * @var StacktraceBuilder|null
+     */
+    private $stacktraceBuilder;
+
+    /**
+     * @param array<string, mixed> $options
+     */
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    public function getOptions(): Options
+    {
+        if ($this->sentryOptions === null) {
+            $this->sentryOptions = new Options($this->options);
+        }
+
+        return $this->sentryOptions;
+    }
+
+    public function getCspReportUrl(): ?string
+    {
+        return null;
+    }
+
+    public function captureMessage(string $message, ?Severity $level = null, ?Scope $scope = null, ?EventHint $hint = null): ?EventId
+    {
+        return null;
+    }
+
+    public function captureException(\Throwable $exception, ?Scope $scope = null, ?EventHint $hint = null): ?EventId
+    {
+        return null;
+    }
+
+    public function captureLastError(?Scope $scope = null, ?EventHint $hint = null): ?EventId
+    {
+        return null;
+    }
+
+    public function captureEvent(Event $event, ?EventHint $hint = null, ?Scope $scope = null): ?EventId
+    {
+        return null;
+    }
+
+    public function getIntegration(string $className): ?IntegrationInterface
+    {
+        return null;
+    }
+
+    public function flush(?int $timeout = null): Result
+    {
+        return new Result(ResultStatus::skipped());
+    }
+
+    public function getStacktraceBuilder(): StacktraceBuilder
+    {
+        if ($this->stacktraceBuilder === null) {
+            $this->stacktraceBuilder = new StacktraceBuilder($this->sentryOptions, new RepresentationSerializer($this->sentryOptions));
+        }
+
+        return $this->stacktraceBuilder;
+    }
+}

src/SentrySdk.php

@@ -30,9 +30,12 @@ private function __construct()
      * Initializes the SDK by creating a new hub instance each time this method
      * gets called.
      */
-    public static function init(): HubInterface
+    public static function init(?ClientInterface $client = null): HubInterface
     {
-        self::$currentHub = new Hub();
+        if ($client === null) {
+            $client = new NoOpClient();
+        }
+        self::$currentHub = new Hub($client);
 
         return self::$currentHub;
     }
@@ -44,7 +47,7 @@ public static function init(): HubInterface
     public static function getCurrentHub(): HubInterface
     {
         if (self::$currentHub === null) {
-            self::$currentHub = new Hub();
+            self::$currentHub = new Hub(new NoOpClient());
         }
 
         return self::$currentHub;

src/State/Hub.php

@@ -4,7 +4,6 @@
 
 namespace Sentry\State;
 
-use Psr\Log\NullLogger;
 use Sentry\Attachment\Attachment;
 use Sentry\Breadcrumb;
 use Sentry\CheckIn;
@@ -15,6 +14,7 @@
 use Sentry\EventId;
 use Sentry\Integration\IntegrationInterface;
 use Sentry\MonitorConfig;
+use Sentry\NoOpClient;
 use Sentry\Severity;
 use Sentry\Tracing\SamplingContext;
 use Sentry\Tracing\Span;
@@ -39,18 +39,18 @@ class Hub implements HubInterface
     /**
      * Hub constructor.
      *
-     * @param ClientInterface|null $client The client bound to the hub
-     * @param Scope|null           $scope  The scope bound to the hub
+     * @param ClientInterface $client The client bound to the hub
+     * @param Scope|null      $scope  The scope bound to the hub
      */
-    public function __construct(?ClientInterface $client = null, ?Scope $scope = null)
+    public function __construct(ClientInterface $client, ?Scope $scope = null)
     {
         $this->stack[] = new Layer($client, $scope ?? new Scope());
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getClient(): ?ClientInterface
+    public function getClient(): ClientInterface
     {
         return $this->getStackTop()->getClient();
     }
@@ -123,55 +123,31 @@ public function bindClient(ClientInterface $client): void
      */
     public function captureMessage(string $message, ?Severity $level = null, ?EventHint $hint = null): ?EventId
     {
-        $client = $this->getClient();
-
-        if ($client !== null) {
-            return $this->lastEventId = $client->captureMessage($message, $level, $this->getScope(), $hint);
-        }
-
-        return null;
+        return $this->lastEventId = $this->getClient()->captureMessage($message, $level, $this->getScope(), $hint);
     }
 
     /**
      * {@inheritdoc}
      */
     public function captureException(\Throwable $exception, ?EventHint $hint = null): ?EventId
     {
-        $client = $this->getClient();
-
-        if ($client !== null) {
-            return $this->lastEventId = $client->captureException($exception, $this->getScope(), $hint);
-        }
-
-        return null;
+        return $this->lastEventId = $this->getClient()->captureException($exception, $this->getScope(), $hint);
     }
 
     /**
      * {@inheritdoc}
      */
     public function captureEvent(Event $event, ?EventHint $hint = null): ?EventId
     {
-        $client = $this->getClient();
-
-        if ($client !== null) {
-            return $this->lastEventId = $client->captureEvent($event, $hint, $this->getScope());
-        }
-
-        return null;
+        return $this->lastEventId = $this->getClient()->captureEvent($event, $hint, $this->getScope());
     }
 
     /**
      * {@inheritdoc}
      */
     public function captureLastError(?EventHint $hint = null): ?EventId
     {
-        $client = $this->getClient();
-
-        if ($client !== null) {
-            return $this->lastEventId = $client->captureLastError($this->getScope(), $hint);
-        }
-
-        return null;
+        return $this->lastEventId = $this->getClient()->captureLastError($this->getScope(), $hint);
     }
 
     /**
@@ -183,7 +159,7 @@ public function captureCheckIn(string $slug, CheckInStatus $status, $duration =
     {
         $client = $this->getClient();
 
-        if ($client === null) {
+        if ($client instanceof NoOpClient) {
             return null;
         }
 
@@ -211,7 +187,8 @@ public function addBreadcrumb(Breadcrumb $breadcrumb): bool
     {
         $client = $this->getClient();
 
-        if ($client === null) {
+        // No point in storing breadcrumbs if the client will never send them
+        if ($client instanceof NoOpClient) {
             return false;
         }
 
@@ -234,9 +211,8 @@ public function addBreadcrumb(Breadcrumb $breadcrumb): bool
 
     public function addAttachment(Attachment $attachment): bool
     {
-        $client = $this->getClient();
-
-        if ($client === null) {
+        // No point in storing attachments if the client will never send them
+        if ($this->getClient() instanceof NoOpClient) {
             return false;
         }
 
@@ -250,13 +226,7 @@ public function addAttachment(Attachment $attachment): bool
      */
     public function getIntegration(string $className): ?IntegrationInterface
     {
-        $client = $this->getClient();
-
-        if ($client !== null) {
-            return $client->getIntegration($className);
-        }
-
-        return null;
+        return $this->getClient()->getIntegration($className);
     }
 
     /**
@@ -267,11 +237,10 @@ public function getIntegration(string $className): ?IntegrationInterface
     public function startTransaction(TransactionContext $context, array $customSamplingContext = []): Transaction
     {
         $transaction = new Transaction($context, $this);
-        $client = $this->getClient();
-        $options = $client !== null ? $client->getOptions() : null;
-        $logger = $options !== null ? $options->getLoggerOrNullLogger() : new NullLogger();
+        $options = $this->getClient()->getOptions();
+        $logger = $options->getLoggerOrNullLogger();
 
-        if ($options === null || !$options->isTracingEnabled()) {
+        if (!$options->isTracingEnabled()) {
             $transaction->setSampled(false);
 
             $logger->warning(\sprintf('Transaction [%s] was started but tracing is not enabled.', (string) $transaction->getTraceId()), ['context' => $context]);

src/State/HubAdapter.php

@@ -53,7 +53,7 @@ public static function getInstance(): self
     /**
      * {@inheritdoc}
      */
-    public function getClient(): ?ClientInterface
+    public function getClient(): ClientInterface
     {
         return SentrySdk::getCurrentHub()->getClient();
     }

src/State/HubInterface.php

@@ -23,7 +23,7 @@ interface HubInterface
     /**
      * Gets the client bound to the top of the stack.
      */
-    public function getClient(): ?ClientInterface;
+    public function getClient(): ClientInterface;
 
     /**
      * Gets the ID of the last captured event.