If 'format' option exists in Forrest request, it takes precedence. Do…

…n't set formatter if correct one is already set. (#271)
omniphx · Oct 6, 2020 · 03bc2ac · 03bc2ac
1 parent 8c4ff5c
commit 03bc2ac
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Omniphx/Forrest/Client.php b/src/Omniphx/Forrest/Client.php
@@ -194,8 +194,10 @@ public function setCredentials($credentials) {
 
     private function handleRequest()
     {
-        if ($this->options['format'] !== $this->settings['defaults']['format']) {
+        if (isset($this->options['format'])) {
             $this->setFormatter($this->options['format']);
+        } else {
+            $this->setFormatter($this->settings['defaults']['format']);
         }
 
         if (isset($this->options['headers'])) {
@@ -763,11 +765,11 @@ protected function storeVersion()
      */
     protected function setFormatter($formatter)
     {
-        if ($formatter === 'json') {
+        if ($formatter === 'json' && strpos(get_class($this->formatter), 'JSONFormatter') === false) {
             $this->formatter = new JSONFormatter($this->tokenRepo, $this->settings);
-        } else if ($formatter === 'xml') {
+        } else if ($formatter === 'xml' && strpos(get_class($this->formatter), 'XMLFormatter') === false) {
             $this->formatter = new XMLFormatter($this->tokenRepo, $this->settings);
-        } else if ($formatter === 'none') {
+        } else if ($formatter === 'none' && strpos(get_class($this->formatter), 'BaseFormatter') === false) {
             $this->formatter = new BaseFormatter($this->tokenRepo, $this->settings);
         }
     }