Move http_header array_merge before condition #278

src/SiteConfig/ConfigBuilder.php

@@ -327,8 +327,11 @@ public function mergeConfig(SiteConfig $currentConfig, SiteConfig $newConfig)
         //      find_string: <other-img
         //      replace_string: <img
         // To fix that issue, we combine find & replace as key & value in one array, we merge them and then rebuild find & replace string in the current config
-        
+
         // merge http_header array from currentConfig into newConfig
+        // because final values override former values in case of named keys
+        $currentConfig->http_header = array_merge($newConfig->http_header, $currentConfig->http_header);
+
         if (count($currentConfig->find_string) !== count($currentConfig->replace_string)) {
             return $currentConfig;
         }
@@ -346,9 +349,6 @@ public function mergeConfig(SiteConfig $currentConfig, SiteConfig $newConfig)
             $currentConfig->replace_string[] = $replaceString;
         }
 
-        // because final values override former values in case of named keys
-        $currentConfig->http_header = array_merge($newConfig->http_header, $currentConfig->http_header);
-
         return $currentConfig;
     }