Skip to content

Commit 0b99c0a

Browse files
author
Anthony Seure
authored
Merge pull request #547 from aseure/aseure/APO-286
APO-286: Prevent default settings from enabling Auto Minify due to deprecation
2 parents 58db13b + 8880a9e commit 0b99c0a

File tree

10 files changed

+7
-48
lines changed

10 files changed

+7
-48
lines changed

compiled.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lang/de.js

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@
5858
"container.dnsRecordEditor.thead.value": "Wert",
5959
"container.dnsRecordEditor.thead.ttl": "TTL",
6060
"container.dnsRecordEditor.thead.status": "Status",
61-
"container.minifyCard.title": "Automatisch herabsetzen",
62-
"container.minifyCard.description": "Dateigröße des Quelltexts auf Ihrer Webseite verringern.",
63-
"container.minifyCard.css": "CSS",
64-
"container.minifyCard.html": "HTML",
65-
"container.minifyCard.javascript": "JavaScript",
6661
"container.purgeCacheCard.button": "Alles löschen",
6762
"container.purgeCacheCard.title": "Cache löschen",
6863
"container.purgeCacheCard.description": "Löchen Sie gecachte Dateien, um Cloudflare zu zwingen, eine neue frische Version dieser Dateien von Ihrem Webserver zu holen.",

lang/en.js

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lang/es.js

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@
5858
"container.dnsRecordEditor.thead.value": "Valor",
5959
"container.dnsRecordEditor.thead.ttl": "TTL",
6060
"container.dnsRecordEditor.thead.status": "Estado",
61-
"container.minifyCard.title": "Autominificar",
62-
"container.minifyCard.description": "Reduce el tamaño del archivo del código fuente de tu sitio web.",
63-
"container.minifyCard.css": "CSS",
64-
"container.minifyCard.html": "HTML",
65-
"container.minifyCard.javascript": "JavaScript",
6661
"container.purgeCacheCard.button": "Borrar todo",
6762
"container.purgeCacheCard.title": "Borrar caché",
6863
"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.",

lang/fr.js

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@
5858
"container.dnsRecordEditor.thead.value": "Valeur",
5959
"container.dnsRecordEditor.thead.ttl": "TTL",
6060
"container.dnsRecordEditor.thead.status": "Statut",
61-
"container.minifyCard.title": "Auto Réduction",
62-
"container.minifyCard.description": "Réduit la taille du fichier source de votre site web.",
63-
"container.minifyCard.css": "CSS",
64-
"container.minifyCard.html": "HTML",
65-
"container.minifyCard.javascript": "JavaScript",
6661
"container.purgeCacheCard.button": "Tout vider",
6762
"container.purgeCacheCard.title": "Vider le cache",
6863
"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.",

lang/it.js

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@
5858
"container.dnsRecordEditor.thead.value": "Valore",
5959
"container.dnsRecordEditor.thead.ttl": "TTL",
6060
"container.dnsRecordEditor.thead.status": "Stato",
61-
"container.minifyCard.title": "Compressione Automatica",
62-
"container.minifyCard.description": "Riduci la dimensione del file del codice sorgente sul tuo sito web.",
63-
"container.minifyCard.css": "CSS",
64-
"container.minifyCard.html": "HTML",
65-
"container.minifyCard.javascript": "JavaScript",
6661
"container.purgeCacheCard.button": "Cancella Tutto",
6762
"container.purgeCacheCard.title": "Svuota Cache",
6863
"container.purgeCacheCard.description": "Cancella i file nella cache per forzare Cloudflare a recuperare una versione aggiornata di tali file dal tuo web server.",

lang/nl.js

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@
5858
"container.dnsRecordEditor.thead.value": "waarde",
5959
"container.dnsRecordEditor.thead.ttl": "TTL",
6060
"container.dnsRecordEditor.thead.status": "status",
61-
"container.minifyCard.title": "Auto Minimaliseren",
62-
"container.minifyCard.description": "Reduceer de documentgrootte of de broncode op uw website.",
63-
"container.minifyCard.css": "CSS",
64-
"container.minifyCard.html": "HTML",
65-
"container.minifyCard.javascript": "JavaScript",
6661
"container.purgeCacheCard.button": "Verwijder alles",
6762
"container.purgeCacheCard.title": "Cache legen",
6863
"container.purgeCacheCard.description": "Verwijder cached documenten om Cloudflare te dwingen om een nieuwe versie te maken van de files op uw web server." ,

lang/pt.js

-5
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@
5858
"container.dnsRecordEditor.thead.value": "Valor",
5959
"container.dnsRecordEditor.thead.ttl": "TTL",
6060
"container.dnsRecordEditor.thead.status": "Status",
61-
"container.minifyCard.title": "Reduzir Automaticamente",
62-
"container.minifyCard.description": "Reduzir o tamanho do ficheiro do código fonte da sua página.",
63-
"container.minifyCard.css": "CSS",
64-
"container.minifyCard.html": "HTML",
65-
"container.minifyCard.javascript": "JavaScript",
6661
"container.purgeCacheCard.button": "Limpar Tudo",
6762
"container.purgeCacheCard.title": "Limpar a Cache",
6863
"container.purgeCacheCard.description": "Limpe os ficheiros da cache para forçar a Cloudflare a procurar novas versões destes ficheiros no seu servidor.",

src/Test/WordPress/PluginActionsTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function testReturnApplyDefaultSettingsWithZoneWithPlanBIZ()
6969
);
7070
$this->mockWordPressClientAPI->method('responseOk')->willReturn(true);
7171
$this->mockWordPressClientAPI->method('changeZoneSettings')->willReturn(true);
72-
$this->mockWordPressClientAPI->expects($this->exactly(16))->method('changeZoneSettings');
72+
$this->mockWordPressClientAPI->expects($this->exactly(15))->method('changeZoneSettings');
7373

7474
$this->pluginActions->applyDefaultSettings();
7575
}
@@ -89,7 +89,7 @@ public function testReturnApplyDefaultSettingsWithZoneWithFreePlan()
8989
);
9090
$this->mockWordPressClientAPI->method('responseOk')->willReturn(true);
9191
$this->mockWordPressClientAPI->method('changeZoneSettings')->willReturn(true);
92-
$this->mockWordPressClientAPI->expects($this->exactly(14))->method('changeZoneSettings');
92+
$this->mockWordPressClientAPI->expects($this->exactly(13))->method('changeZoneSettings');
9393

9494
$this->pluginActions->applyDefaultSettings();
9595
}

src/WordPress/PluginActions.php

-5
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@ public function applyDefaultSettings()
9999
throw new ZoneSettingFailException();
100100
}
101101

102-
$result &= $this->clientAPI->changeZoneSettings($zoneId, 'minify', array('value' => array('css' => 'on', 'html' => 'on', 'js' => 'on')));
103-
if (!$result) {
104-
throw new ZoneSettingFailException();
105-
}
106-
107102
$result &= $this->clientAPI->changeZoneSettings($zoneId, 'browser_cache_ttl', array('value' => 14400));
108103
if (!$result) {
109104
throw new ZoneSettingFailException();

0 commit comments

Comments
 (0)