Merge pull request #547 from aseure/aseure/APO-286

APO-286: Prevent default settings from enabling Auto Minify due to deprecation
cloudflare · Aug 7, 2024 · 0b99c0a · 0b99c0a
2 parents 58db13b + 8880a9e
commit 0b99c0a
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 48 deletions.
diff --git a/compiled.js b/compiled.js
diff --git a/lang/de.js b/lang/de.js
@@ -58,11 +58,6 @@
     "container.dnsRecordEditor.thead.value": "Wert",
     "container.dnsRecordEditor.thead.ttl": "TTL",
     "container.dnsRecordEditor.thead.status": "Status",
-    "container.minifyCard.title": "Automatisch herabsetzen",
-    "container.minifyCard.description": "Dateigröße des Quelltexts auf Ihrer Webseite verringern.",
-    "container.minifyCard.css": "CSS",
-    "container.minifyCard.html": "HTML",
-    "container.minifyCard.javascript": "JavaScript",
     "container.purgeCacheCard.button": "Alles löschen",
     "container.purgeCacheCard.title": "Cache löschen",
     "container.purgeCacheCard.description": "Löchen Sie gecachte Dateien, um Cloudflare zu zwingen, eine neue frische Version dieser Dateien von Ihrem Webserver zu holen.",

diff --git a/lang/en.js b/lang/en.js
diff --git a/lang/es.js b/lang/es.js
@@ -58,11 +58,6 @@
     "container.dnsRecordEditor.thead.value": "Valor",
     "container.dnsRecordEditor.thead.ttl": "TTL",
     "container.dnsRecordEditor.thead.status": "Estado",
-    "container.minifyCard.title": "Autominificar",
-    "container.minifyCard.description": "Reduce el tamaño del archivo del código fuente de tu sitio web.",
-    "container.minifyCard.css": "CSS",
-    "container.minifyCard.html": "HTML",
-    "container.minifyCard.javascript": "JavaScript",
     "container.purgeCacheCard.button": "Borrar todo",
     "container.purgeCacheCard.title": "Borrar caché",
     "container.purgeCacheCard.description": "Borra los archivos en caché para forzar a Cloudflare a buscar una versión actualizada de dichos archivos de tu servidor web.",

diff --git a/lang/fr.js b/lang/fr.js
@@ -58,11 +58,6 @@
     "container.dnsRecordEditor.thead.value": "Valeur",
     "container.dnsRecordEditor.thead.ttl": "TTL",
     "container.dnsRecordEditor.thead.status": "Statut",
-    "container.minifyCard.title": "Auto Réduction",
-    "container.minifyCard.description": "Réduit la taille du fichier source de votre site web.",
-    "container.minifyCard.css": "CSS",
-    "container.minifyCard.html": "HTML",
-    "container.minifyCard.javascript": "JavaScript",
     "container.purgeCacheCard.button": "Tout vider",
     "container.purgeCacheCard.title": "Vider le cache",
     "container.purgeCacheCard.description": "Supprime les fichiers en cache pour forcer Cloudflare à récupérer une version récente de ces fichiers sur votre serveur web.",

diff --git a/lang/it.js b/lang/it.js
@@ -58,11 +58,6 @@
     "container.dnsRecordEditor.thead.value": "Valore",
     "container.dnsRecordEditor.thead.ttl": "TTL",
     "container.dnsRecordEditor.thead.status": "Stato",
-    "container.minifyCard.title": "Compressione Automatica",
-    "container.minifyCard.description": "Riduci la dimensione del file del codice sorgente sul tuo sito web.",
-    "container.minifyCard.css": "CSS",
-    "container.minifyCard.html": "HTML",
-    "container.minifyCard.javascript": "JavaScript",
     "container.purgeCacheCard.button": "Cancella Tutto",
     "container.purgeCacheCard.title": "Svuota Cache",
     "container.purgeCacheCard.description": "Cancella i file nella cache per forzare Cloudflare a recuperare una versione aggiornata di tali file dal tuo web server.",

diff --git a/lang/nl.js b/lang/nl.js
@@ -58,11 +58,6 @@
     "container.dnsRecordEditor.thead.value": "waarde",
     "container.dnsRecordEditor.thead.ttl": "TTL",
     "container.dnsRecordEditor.thead.status":  "status",
-    "container.minifyCard.title": "Auto Minimaliseren",
-    "container.minifyCard.description": "Reduceer de documentgrootte of de broncode op uw website.",
-    "container.minifyCard.css": "CSS",
-    "container.minifyCard.html": "HTML",
-    "container.minifyCard.javascript": "JavaScript",
     "container.purgeCacheCard.button": "Verwijder alles",
     "container.purgeCacheCard.title": "Cache legen",
     "container.purgeCacheCard.description": "Verwijder cached documenten om Cloudflare te dwingen om een nieuwe versie te maken van de files op uw web server." ,

diff --git a/lang/pt.js b/lang/pt.js
@@ -58,11 +58,6 @@
     "container.dnsRecordEditor.thead.value": "Valor",
     "container.dnsRecordEditor.thead.ttl": "TTL",
     "container.dnsRecordEditor.thead.status": "Status",
-    "container.minifyCard.title": "Reduzir Automaticamente",
-    "container.minifyCard.description": "Reduzir o tamanho do ficheiro do código fonte da sua página.",
-    "container.minifyCard.css": "CSS",
-    "container.minifyCard.html": "HTML",
-    "container.minifyCard.javascript": "JavaScript",
     "container.purgeCacheCard.button": "Limpar Tudo",
     "container.purgeCacheCard.title": "Limpar a Cache",
     "container.purgeCacheCard.description": "Limpe os ficheiros da cache para forçar a Cloudflare a procurar novas versões destes ficheiros no seu servidor.",

diff --git a/src/Test/WordPress/PluginActionsTest.php b/src/Test/WordPress/PluginActionsTest.php
@@ -69,7 +69,7 @@ public function testReturnApplyDefaultSettingsWithZoneWithPlanBIZ()
         );
         $this->mockWordPressClientAPI->method('responseOk')->willReturn(true);
         $this->mockWordPressClientAPI->method('changeZoneSettings')->willReturn(true);
-        $this->mockWordPressClientAPI->expects($this->exactly(16))->method('changeZoneSettings');
+        $this->mockWordPressClientAPI->expects($this->exactly(15))->method('changeZoneSettings');
 
         $this->pluginActions->applyDefaultSettings();
     }
@@ -89,7 +89,7 @@ public function testReturnApplyDefaultSettingsWithZoneWithFreePlan()
         );
         $this->mockWordPressClientAPI->method('responseOk')->willReturn(true);
         $this->mockWordPressClientAPI->method('changeZoneSettings')->willReturn(true);
-        $this->mockWordPressClientAPI->expects($this->exactly(14))->method('changeZoneSettings');
+        $this->mockWordPressClientAPI->expects($this->exactly(13))->method('changeZoneSettings');
 
         $this->pluginActions->applyDefaultSettings();
     }

diff --git a/src/WordPress/PluginActions.php b/src/WordPress/PluginActions.php
@@ -99,11 +99,6 @@ public function applyDefaultSettings()
             throw new ZoneSettingFailException();
         }
 
-        $result &= $this->clientAPI->changeZoneSettings($zoneId, 'minify', array('value' => array('css' => 'on', 'html' => 'on', 'js' => 'on')));
-        if (!$result) {
-            throw new ZoneSettingFailException();
-        }
-
         $result &= $this->clientAPI->changeZoneSettings($zoneId, 'browser_cache_ttl', array('value' => 14400));
         if (!$result) {
             throw new ZoneSettingFailException();