From b83b489b4de527764e99d9f1440fe22776daab29 Mon Sep 17 00:00:00 2001
From: Bernd Oliver Suenderhauf <bos@suenderhauf.de>
Date: Sat, 1 Jun 2019 11:28:34 +0200
Subject: [PATCH] Issue #3058486 by Pancho: Replace deprecated
file_default_scheme() by using config
---
src/Form/FillPdfSettingsForm.php | 2 +-
tests/src/Functional/FillPdfSettingsFormTest.php | 2 +-
tests/src/Traits/TestFillPdfTrait.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Form/FillPdfSettingsForm.php b/src/Form/FillPdfSettingsForm.php
index e5d45a7..dbdb584 100644
--- a/src/Form/FillPdfSettingsForm.php
+++ b/src/Form/FillPdfSettingsForm.php
@@ -148,7 +148,7 @@ class FillPdfSettingsForm extends ConfigFormBase {
'#type' => 'details',
'#title' => $this->t('Advanced storage settings'),
];
- $file_default_scheme = file_default_scheme();
+ $file_default_scheme = $this->config('system.file')->get('default_scheme');
$template_scheme_options = $this->adminFormHelper->schemeOptions([
$file_default_scheme => $this->t('@scheme (site default)'),
]);
diff --git a/tests/src/Functional/FillPdfSettingsFormTest.php b/tests/src/Functional/FillPdfSettingsFormTest.php
index 341d4c0..8391ba0 100644
--- a/tests/src/Functional/FillPdfSettingsFormTest.php
+++ b/tests/src/Functional/FillPdfSettingsFormTest.php
@@ -116,7 +116,7 @@ class FillPdfSettingsFormTest extends BrowserTestBase {
// Verify that the site default scheme, which at this point is 'public', is
// preselected but not yet saved in config.
- $this->assertSession()->fieldValueEquals('template_scheme', file_default_scheme());
+ $this->assertSession()->fieldValueEquals('template_scheme', $this->config('system.file')->get('default_scheme'));
$this->assertEqual($this->config('fillpdf.settings')->get('template_scheme'), 'private');
}
diff --git a/tests/src/Traits/TestFillPdfTrait.php b/tests/src/Traits/TestFillPdfTrait.php
index 6dd64d9..52fa369 100644
--- a/tests/src/Traits/TestFillPdfTrait.php
+++ b/tests/src/Traits/TestFillPdfTrait.php
@@ -23,7 +23,7 @@ trait TestFillPdfTrait {
// Merge in defaults.
$configuration += [
'allowed_schemes' => ['public', 'private'],
- 'template_scheme' => file_default_scheme(),
+ 'template_scheme' => $this->config('system.file')->get('default_scheme'),
'backend' => 'test',
];
--
GitLab