Refactor it a bit

provisions-group · May 17, 2020 · a036897 · a036897
1 parent 147b3e6
commit a036897
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/InstrumentationKey.php b/src/InstrumentationKey.php
@@ -20,7 +20,6 @@ public function __construct()
         $this->setInstrumentationKey();
     }
 
-
     /**
      * @throws InvalidMSInstrumentationKeyException
      *
@@ -56,12 +55,23 @@ protected function checkInstrumentationKeyValidity($instrumentationKey)
             return true;
         }
 
-        if (static::$alreadyThrown) {
+        if ($this->InvalidKeyExceptionWasNotThrown()) {
+            throw new InvalidMSInstrumentationKeyException(
+                "'{$instrumentationKey}' is not a valid Microsoft Application Insights instrumentation key."
+            );
+        }
+
+        return false;
+    }
+
+    protected function InvalidKeyExceptionWasNotThrown()
+    {
+        if (!static::$alreadyThrown) {
+            static::$alreadyThrown = true;
+
             return false;
         }
 
-        static::$alreadyThrown = true;
-
-        throw new InvalidMSInstrumentationKeyException("'{$instrumentationKey}' is not a valid Microsoft Application Insights instrumentation key.");
+        return true;
     }
 }