Minor refactoring for site settings for extra HTTP header

Author: DevDavido

MeasurableSettings.php

@@ -199,7 +199,7 @@ private function makeExtraHttpHeaderKeySetting()
                 'Cookie' => Piwik::translate('PerformanceAudit_Settings_ExtraHttpHeaderKey_Cookie'),
             ];
             $field->validate = function ($value) use ($self, $field) {
-                if ($self->getSetting('has_extra_http_header')->getValue()) {
+                if ($self->hasExtraHttpHeader()) {
                     if (empty($value)) {
                         throw new ValidatorException(Piwik::translate('General_ValidatorErrorEmptyValue'));
                     }
@@ -227,7 +227,7 @@ private function makeExtraHttpHeaderValueSetting()
             $field->condition = 'is_enabled && has_extra_http_header';
             $field->uiControl = FieldConfig::UI_CONTROL_TEXT;
             $field->validate = function ($value) use ($self, $field) {
-                if ($self->getSetting('has_extra_http_header')->getValue()) {
+                if ($self->hasExtraHttpHeader()) {
                     if (empty($value)) {
                         throw new ValidatorException(Piwik::translate('General_ValidatorErrorEmptyValue'));
                     }
@@ -288,4 +288,14 @@ public function hasGroupedUrls()
     {
         return $this->getSetting('has_grouped_urls')->getValue();
     }
+
+    /**
+     * Returns if site has extra HTTP header for site.
+     *
+     * @return bool
+     */
+    public function hasExtraHttpHeader()
+    {
+        return $this->getSetting('has_extra_http_header')->getValue();
+    }
 }

Tasks.php

@@ -279,7 +279,7 @@ private static function getLighthouse(int $idSite)
             if ($siteSettings->hasExtendedTimeout()) {
                 self::$lighthouse[$idSite]->setTimeout(300);
             }
-            if ($siteSettings->getSetting('has_extra_http_header')->getValue()) {
+            if ($siteSettings->hasExtraHttpHeader()) {
                 self::$lighthouse[$idSite]->setHeaders([
                     $siteSettings->getSetting('extra_http_header_key')->getValue() => $siteSettings->getSetting('extra_http_header_value')->getValue()
                 ]);