From 32328453c6b6181bbe75795c0132f7e0f1dfa4c1 Mon Sep 17 00:00:00 2001
From: Project Update Bot <git@users.noreply.drupalcode.org>
Date: Fri, 18 Nov 2022 19:41:16 -0500
Subject: [PATCH] Issue #3297233 by Project Update Bot: Automated Drupal 10
compatibility fixes
---
src/Component/Utility/FillPdf.php | 2 +-
src/OutputHandler.php | 2 +-
src/Plugin/FillPdfActionPlugin/FillPdfRedirectAction.php | 2 +-
src/Plugin/PdfBackend/PdftkPdfBackend.php | 6 +++---
.../fillpdf_test/src/Plugin/PdfBackend/TestPdfBackend.php | 2 +-
tests/src/Functional/FillPdfFormDeleteFormTest.php | 2 +-
tests/src/Functional/FillPdfFormDuplicateFormTest.php | 2 +-
tests/src/Functional/FillPdfFormImportFormTest.php | 2 +-
tests/src/Functional/FillPdfSettingsFormTest.php | 2 +-
tests/src/Functional/FillPdfTestBase.php | 2 +-
tests/src/Functional/LinkManipulatorTest.php | 2 +-
tests/src/Functional/PdfPopulationTest.php | 2 +-
tests/src/Functional/PdfWebformPopulationTest.php | 2 +-
tests/src/Functional/UninstallTest.php | 2 +-
tests/src/Kernel/FillPdfKernelTestBase.php | 2 +-
tests/src/Traits/TestFillPdfTrait.php | 2 +-
16 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/Component/Utility/FillPdf.php b/src/Component/Utility/FillPdf.php
index f04fdc3..bb5bbc5 100644
--- a/src/Component/Utility/FillPdf.php
+++ b/src/Component/Utility/FillPdf.php
@@ -28,7 +28,7 @@ class FillPdf {
if (empty($pdftk_path)) {
$pdftk_path = 'pdftk';
}
- $process = new Process($pdftk_path . ' --version');
+ $process = new Process([$pdftk_path, '--version']);
$process->run();
// Check there's no error code and the --version output includes "pdftk".
diff --git a/src/OutputHandler.php b/src/OutputHandler.php
index a0282cf..a83e97f 100644
--- a/src/OutputHandler.php
+++ b/src/OutputHandler.php
@@ -98,7 +98,7 @@ class OutputHandler implements OutputHandlerInterface {
}
else {
// Full steam ahead!
- $saved_file = file_save_data($configuration['data'], "{$resolved_destination_path}/{$configuration['filename']}", FileSystemInterface::EXISTS_RENAME);
+ $saved_file = \Drupal::service('file.repository')->writeData($configuration['data'], "{$resolved_destination_path}/{$configuration['filename']}", FileSystemInterface::EXISTS_RENAME);
$this->rememberFileContext($saved_file, $configuration['context']);
}
diff --git a/src/Plugin/FillPdfActionPlugin/FillPdfRedirectAction.php b/src/Plugin/FillPdfActionPlugin/FillPdfRedirectAction.php
index 0cefc70..f8a7b19 100644
--- a/src/Plugin/FillPdfActionPlugin/FillPdfRedirectAction.php
+++ b/src/Plugin/FillPdfActionPlugin/FillPdfRedirectAction.php
@@ -31,7 +31,7 @@ class FillPdfRedirectAction extends FillPdfSaveAction {
*/
public function execute() {
$saved_file = $this->savePdf();
- $url = ($saved_file !== FALSE) ? file_create_url($saved_file->getFileUri()) : Url::fromRoute('<front>')->toString();
+ $url = ($saved_file !== FALSE) ? \Drupal::service('file_url_generator')->generateAbsoluteString($saved_file->getFileUri()) : Url::fromRoute('<front>')->toString();
return new RedirectResponse($url);
}
diff --git a/src/Plugin/PdfBackend/PdftkPdfBackend.php b/src/Plugin/PdfBackend/PdftkPdfBackend.php
index 5fe89cd..cae3f0e 100644
--- a/src/Plugin/PdfBackend/PdftkPdfBackend.php
+++ b/src/Plugin/PdfBackend/PdftkPdfBackend.php
@@ -93,7 +93,7 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
* {@inheritdoc}
*/
public function parseStream($pdf_content) {
- $template_file = file_save_data($pdf_content);
+ $template_file = \Drupal::service('file.repository')->writeData($pdf_content);
return $this->parseFile($template_file);
}
@@ -166,7 +166,7 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
* {@inheritdoc}
*/
public function mergeStream($pdf_content, array $field_mappings, array $context) {
- $template_file = file_save_data($pdf_content);
+ $template_file = \Drupal::service('file.repository')->writeData($pdf_content);
return $this->mergeFile($template_file, $field_mappings, $context);
}
@@ -186,7 +186,7 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
$xfdf_name = $template_uri . '.xfdf';
$xfdf = create_xfdf(basename($xfdf_name), $fields);
// Generate the file.
- $xfdf_file = file_save_data($xfdf, $xfdf_name, FileSystemInterface::EXISTS_RENAME);
+ $xfdf_file = \Drupal::service('file.repository')->writeData($xfdf, $xfdf_name, FileSystemInterface::EXISTS_RENAME);
// @todo Improve this approach when we turn $context into a value object.
if (!isset($context['fid'])) {
diff --git a/tests/modules/fillpdf_test/src/Plugin/PdfBackend/TestPdfBackend.php b/tests/modules/fillpdf_test/src/Plugin/PdfBackend/TestPdfBackend.php
index 1d1d05c..4cb4011 100644
--- a/tests/modules/fillpdf_test/src/Plugin/PdfBackend/TestPdfBackend.php
+++ b/tests/modules/fillpdf_test/src/Plugin/PdfBackend/TestPdfBackend.php
@@ -87,7 +87,7 @@ class TestPdfBackend extends PdfBackendBase implements ContainerFactoryPluginInt
*/
public function mergeStream($pdf_content, array $field_mappings, array $context) {
// Not really populated, but that isn't our job.
- $populated_pdf = file_get_contents(drupal_get_path('module', 'fillpdf_test') . '/files/fillpdf_test_v3.pdf');
+ $populated_pdf = file_get_contents(\Drupal::service('extension.list.module')->getPath('fillpdf_test') . '/files/fillpdf_test_v3.pdf');
$this->state->set('fillpdf_test.last_populated_metadata', [
'field_mapping' => $field_mappings,
diff --git a/tests/src/Functional/FillPdfFormDeleteFormTest.php b/tests/src/Functional/FillPdfFormDeleteFormTest.php
index a7cf7e5..e9d8fcc 100644
--- a/tests/src/Functional/FillPdfFormDeleteFormTest.php
+++ b/tests/src/Functional/FillPdfFormDeleteFormTest.php
@@ -19,7 +19,7 @@ class FillPdfFormDeleteFormTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- static public $modules = ['fillpdf_test'];
+ protected static $modules = ['fillpdf_test'];
/**
* {@inheritdoc}
diff --git a/tests/src/Functional/FillPdfFormDuplicateFormTest.php b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
index 4fa64b7..d81d739 100644
--- a/tests/src/Functional/FillPdfFormDuplicateFormTest.php
+++ b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
@@ -19,7 +19,7 @@ class FillPdfFormDuplicateFormTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- static public $modules = ['fillpdf_test'];
+ protected static $modules = ['fillpdf_test'];
/**
* {@inheritdoc}
diff --git a/tests/src/Functional/FillPdfFormImportFormTest.php b/tests/src/Functional/FillPdfFormImportFormTest.php
index e3e30bb..cf6ebb5 100644
--- a/tests/src/Functional/FillPdfFormImportFormTest.php
+++ b/tests/src/Functional/FillPdfFormImportFormTest.php
@@ -17,7 +17,7 @@ class FillPdfFormImportFormTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- static public $modules = ['fillpdf_test'];
+ protected static $modules = ['fillpdf_test'];
/**
* {@inheritdoc}
diff --git a/tests/src/Functional/FillPdfSettingsFormTest.php b/tests/src/Functional/FillPdfSettingsFormTest.php
index 990b44f..db222d7 100644
--- a/tests/src/Functional/FillPdfSettingsFormTest.php
+++ b/tests/src/Functional/FillPdfSettingsFormTest.php
@@ -15,7 +15,7 @@ class FillPdfSettingsFormTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- public static $modules = ['fillpdf_test', 'file_test'];
+ protected static $modules = ['fillpdf_test', 'file_test'];
use TestFillPdfTrait;
diff --git a/tests/src/Functional/FillPdfTestBase.php b/tests/src/Functional/FillPdfTestBase.php
index cfff89f..12f0a84 100644
--- a/tests/src/Functional/FillPdfTestBase.php
+++ b/tests/src/Functional/FillPdfTestBase.php
@@ -33,7 +33,7 @@ abstract class FillPdfTestBase extends FileFieldTestBase {
*
* @see \Drupal\Tests\BrowserTestBase::installDrupal()
*/
- public static $modules = ['image', 'fillpdf_test'];
+ protected static $modules = ['image', 'fillpdf_test'];
/**
* The FillPDF link manipulator service.
diff --git a/tests/src/Functional/LinkManipulatorTest.php b/tests/src/Functional/LinkManipulatorTest.php
index bf36b46..c07cd83 100644
--- a/tests/src/Functional/LinkManipulatorTest.php
+++ b/tests/src/Functional/LinkManipulatorTest.php
@@ -20,7 +20,7 @@ class LinkManipulatorTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- static public $modules = ['fillpdf_test'];
+ protected static $modules = ['fillpdf_test'];
/**
* {@inheritdoc}
diff --git a/tests/src/Functional/PdfPopulationTest.php b/tests/src/Functional/PdfPopulationTest.php
index 5ed13b4..c046936 100644
--- a/tests/src/Functional/PdfPopulationTest.php
+++ b/tests/src/Functional/PdfPopulationTest.php
@@ -28,7 +28,7 @@ class PdfPopulationTest extends FillPdfTestBase {
*
* @see \Drupal\Tests\BrowserTestBase::installDrupal()
*/
- public static $modules = ['filter', 'taxonomy'];
+ protected static $modules = ['filter', 'taxonomy'];
/**
* A test vocabulary.
diff --git a/tests/src/Functional/PdfWebformPopulationTest.php b/tests/src/Functional/PdfWebformPopulationTest.php
index 86825ee..8ad79b7 100644
--- a/tests/src/Functional/PdfWebformPopulationTest.php
+++ b/tests/src/Functional/PdfWebformPopulationTest.php
@@ -30,7 +30,7 @@ class PdfWebformPopulationTest extends FillPdfTestBase {
*
* @see \Drupal\Tests\BrowserTestBase::installDrupal()
*/
- public static $modules = ['webform', 'fillpdf_webform_test'];
+ protected static $modules = ['webform', 'fillpdf_webform_test'];
/**
* A test webform submission.
diff --git a/tests/src/Functional/UninstallTest.php b/tests/src/Functional/UninstallTest.php
index 24f2cba..70380d6 100644
--- a/tests/src/Functional/UninstallTest.php
+++ b/tests/src/Functional/UninstallTest.php
@@ -18,7 +18,7 @@ class UninstallTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- static public $modules = ['fillpdf_test'];
+ protected static $modules = ['fillpdf_test'];
/**
* {@inheritdoc}
diff --git a/tests/src/Kernel/FillPdfKernelTestBase.php b/tests/src/Kernel/FillPdfKernelTestBase.php
index 7430355..a70dd65 100644
--- a/tests/src/Kernel/FillPdfKernelTestBase.php
+++ b/tests/src/Kernel/FillPdfKernelTestBase.php
@@ -14,7 +14,7 @@ abstract class FillPdfKernelTestBase extends EntityKernelTestBase {
*
* @var array
*/
- public static $modules = [
+ protected static $modules = [
'file',
'link',
'token',
diff --git a/tests/src/Traits/TestFillPdfTrait.php b/tests/src/Traits/TestFillPdfTrait.php
index 3bfd4e7..f37909a 100644
--- a/tests/src/Traits/TestFillPdfTrait.php
+++ b/tests/src/Traits/TestFillPdfTrait.php
@@ -148,7 +148,7 @@ trait TestFillPdfTrait {
protected function getTestPdfPath($filename) {
/** @var \Drupal\Core\File\FileSystem $file_system */
$file_system = $this->container->get('file_system');
- return $file_system->realpath(drupal_get_path('module', 'fillpdf') . '/tests/modules/fillpdf_test/files/' . $filename);
+ return $file_system->realpath(\Drupal::service('extension.list.module')->getPath('fillpdf') . '/tests/modules/fillpdf_test/files/' . $filename);
}
/**
--
GitLab