Make it impossible to return null in getOrCreateBucket() (#31)

Unleash · Oct 15, 2021 · fadba29 · fadba29
1 parent cc9cf67
commit fadba29
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Metrics/DefaultMetricsHandler.php b/src/Metrics/DefaultMetricsHandler.php
@@ -22,7 +22,7 @@ public function handleMetrics(Feature $feature, bool $successful, Variant $varia
             return;
         }
 
-        $bucket = $this->getOrCreateBucket($feature);
+        $bucket = $this->getOrCreateBucket();
         $bucket->addToggle(new MetricsBucketToggle($feature, $successful, $variant));
         if ($this->shouldSend($bucket)) {
             $this->send($bucket);
@@ -31,14 +31,18 @@ public function handleMetrics(Feature $feature, bool $successful, Variant $varia
         }
     }
 
-    private function getOrCreateBucket(Feature $feature): MetricsBucket
+    private function getOrCreateBucket(): MetricsBucket
     {
         $cache = $this->configuration->getCache();
+
+        $bucket = null;
         if ($cache->has(CacheKey::METRICS_BUCKET)) {
-            return $cache->get(CacheKey::METRICS_BUCKET);
+            $bucket = $cache->get(CacheKey::METRICS_BUCKET);
         }
 
-        return new MetricsBucket(new DateTimeImmutable());
+        $bucket ??= new MetricsBucket(new DateTimeImmutable());
+
+        return $bucket;
     }
 
     private function shouldSend(MetricsBucket $bucket): bool