Merge pull request #321 from opentok/dev

Security Patch Update

Author: SecondeJK

src/OpenTok/Util/Validators.php

@@ -423,8 +423,12 @@ public static function validateDTMFDigits(string $digits): void
     // Helpers
 
     // credit: http://stackoverflow.com/a/173479
-    protected static function isAssoc($arr)
+    public static function isAssoc($arr): bool
     {
+        if (array() === $arr) {
+            return false;
+        }
+
         return array_keys($arr) !== range(0, count($arr) - 1);
     }
 

tests/OpenTokTest/Validators/ValidatorsTest.php

@@ -23,6 +23,30 @@ public function testWillPassCorrectPayload(): void
         Validators::validateForceMuteAllOptions($options);
     }
 
+    public function testIsAssocWithValidArray(): void
+    {
+        $haystack = [
+            'one' => '1',
+            'two' => '2',
+            'three' => '3',
+            'four' => '4'
+        ];
+
+        $this->assertTrue(Validators::isAssoc($haystack));
+    }
+
+    public function testIsAssocWithInvalidArray(): void
+    {
+        $haystack = [
+            'one',
+            'two',
+            'three',
+            'four'
+        ];
+
+        $this->assertFalse(Validators::isAssoc($haystack));
+    }
+
     public function testWillFailWhenStreamIdsAreNotCorrect(): void
     {
         $this->expectException(InvalidArgumentException::class);