Fixed tokencollection

terminal42 · Feb 22, 2024 · b156e94 · b156e94
1 parent a48d62b
commit b156e94
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/NotificationCenter.php b/src/NotificationCenter.php
@@ -137,14 +137,18 @@ public function createTokenCollectionFromArray(array $rawTokens, string $notific
         }
 
         foreach (array_merge($flattenedTokens, $rawTokens) as $rawTokenName => $rawTokenValue) {
+            $addedByDefinition = false;
+
             foreach ($tokenDefinitions as $definition) {
                 if ($definition->matches($rawTokenName, $rawTokenValue)) {
-                    $token = $definition->createToken($rawTokenName, $rawTokenValue, $stamps);
-                } else {
-                    $token = Token::fromValue($rawTokenName, $rawTokenValue);
+                    $collection->add($definition->createToken($rawTokenName, $rawTokenValue, $stamps));
+                    $addedByDefinition = true;
+                    break;
                 }
+            }
 
-                $collection->add($token);
+            if (!$addedByDefinition) {
+                $collection->add(Token::fromValue($rawTokenName, $rawTokenValue));
             }
         }