Fixed text and logic

Vonage · Sep 12, 2024 · cb8c778 · cb8c778
1 parent a1fb169
commit cb8c778
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Voice/VoiceObjects/AdvancedMachineDetection.php b/src/Voice/VoiceObjects/AdvancedMachineDetection.php
@@ -74,7 +74,9 @@ protected function isValidTimeout(int $beepTimeout): bool
 
     public function fromArray(array $data): static
     {
-        $this->isArrayValid($data);
+        if (!$this->isArrayValid($data)) {
+            throw new \InvalidArgumentException('Invalid payload');
+        };
 
         $this->behaviour = $data['behaviour'];
         $this->mode = $data['mode'];
@@ -102,8 +104,12 @@ protected function isArrayValid(array $data): bool
             return false;
         }
 
-        return $this->isValidBehaviour($data['behaviour'])
-               || $this->isValidMode($data['mode'])
-               || $this->isValidTimeout($data['beep_timeout']);
+        if ($this->isValidBehaviour($data['behaviour'])
+               && $this->isValidMode($data['mode'])
+               && $this->isValidTimeout($data['beep_timeout'])) {
+            return true;
+        };
+
+        return false;
     }
 }
diff --git a/test/Voice/VoiceObjects/AdvancedMachineDetectionTest.php b/test/Voice/VoiceObjects/AdvancedMachineDetectionTest.php
@@ -42,7 +42,7 @@ public function testValidBeepTimeoutRange()
     public function testWillRenderDefault()
     {
         $amd = new AdvancedMachineDetection('hangup', 100, 'default');
-        $this->assertEquals('default', $amd->toArray()['default']);
+        $this->assertEquals('default', $amd->toArray()['mode']);
     }
 
     public function testToArray()