Merge pull request #15 from patrickkivits/feature-multiple-tokens-per-interest

Multiple tokens per interest

Author: Alymosul

lib/ExpoRegistrar.php

@@ -79,10 +79,20 @@ public function getInterests(array $interests): array
         $tokens = [];
 
         foreach ($interests as $interest) {
-            $token = $this->repository->retrieve($interest);
+            $retrieved = $this->repository->retrieve($interest);
 
-            if (!is_null($token)) {
-                $tokens[] = $token;
+            if (!is_null($retrieved)) {
+                if(is_string($retrieved)) {
+                    $tokens[] = $retrieved;
+                }
+
+                if(is_array($retrieved)) {
+                    foreach($retrieved as $token) {
+                        if(is_string($token)) {
+                            $tokens[] = $token;
+                        }
+                    }
+                }
             }
         }
 

lib/ExpoRepository.php

@@ -18,7 +18,7 @@ public function store($key, $value): bool;
      *
      * @param string $key
      *
-     * @return string|null
+     * @return array|string|null
      */
     public function retrieve(string $key);
 

lib/Repositories/ExpoFileDriver.php

@@ -32,7 +32,23 @@ public function store($key, $value): bool
             $storageInstance = $this->createFile();
         }
 
-        $storageInstance->{$key} = $value;
+        // Check for existing tokens
+        if(isset($storageInstance->{$key}))
+        {
+            // If there is a single token, make it an array so we can push the additional tokens in it
+            if(!is_array($storageInstance->{$key}))
+            {
+                $storageInstance->{$key} = [$storageInstance->{$key}];
+            }
+
+            // Add new token to existing key
+            array_push($storageInstance->{$key}, $value);
+        }
+        else
+        {
+            // First token for this key
+            $storageInstance->{$key} = [$value];
+        }
 
         $file = $this->updateRepository($storageInstance);
 
@@ -44,7 +60,7 @@ public function store($key, $value): bool
      *
      * @param string $key
      *
-     * @return string|null
+     * @return array|string|null
      */
     public function retrieve(string $key)
     {