From d9002c19d3aefa709f5933a2f72fcef35bcdbe7c Mon Sep 17 00:00:00 2001
From: Hardik Pandya <31408-Pandya-Hardik@users.noreply.drupalcode.org>
Date: Thu, 1 Jun 2023 01:43:13 +0000
Subject: [PATCH] Issue #3347444: Replace use of FileSystem with
FileSystemInterface
---
src/Plugin/PdfBackend/LocalServerPdfBackend.php | 2 +-
src/Plugin/PdfBackend/PdftkPdfBackend.php | 7 +++----
tests/src/Traits/TestFillPdfTrait.php | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/Plugin/PdfBackend/LocalServerPdfBackend.php b/src/Plugin/PdfBackend/LocalServerPdfBackend.php
index 3a09449..3882c84 100644
--- a/src/Plugin/PdfBackend/LocalServerPdfBackend.php
+++ b/src/Plugin/PdfBackend/LocalServerPdfBackend.php
@@ -28,7 +28,7 @@ class LocalServerPdfBackend extends PdfBackendBase implements ContainerFactoryPl
/**
* The file system.
*
- * @var \Drupal\Core\File\FileSystem
+ * @var \Drupal\Core\File\FileSystemInterface
*/
protected $fileSystem;
diff --git a/src/Plugin/PdfBackend/PdftkPdfBackend.php b/src/Plugin/PdfBackend/PdftkPdfBackend.php
index f9c4491..716e1af 100644
--- a/src/Plugin/PdfBackend/PdftkPdfBackend.php
+++ b/src/Plugin/PdfBackend/PdftkPdfBackend.php
@@ -3,7 +3,6 @@
namespace Drupal\fillpdf\Plugin\PdfBackend;
use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\File\FileSystem;
use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\file\FileInterface;
@@ -35,7 +34,7 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
/**
* The file system.
*
- * @var \Drupal\Core\File\FileSystem
+ * @var \Drupal\Core\File\FileSystemInterface
*/
protected $fileSystem;
@@ -62,14 +61,14 @@ class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginIn
* The plugin_id for the plugin instance.
* @param array $plugin_definition
* The plugin implementation definition.
- * @param \Drupal\Core\File\FileSystem $file_system
+ * @param \Drupal\Core\File\FileSystemInterface $file_system
* The file system.
* @param \Drupal\fillpdf\ShellManager $shell_manager
* The FillPDF shell manager.
* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
* The entity type manager.
*/
- public function __construct(array $configuration, $plugin_id, array $plugin_definition, FileSystem $file_system, ShellManager $shell_manager, EntityTypeManagerInterface $entity_type_manager) {
+ public function __construct(array $configuration, $plugin_id, array $plugin_definition, FileSystemInterface $file_system, ShellManager $shell_manager, EntityTypeManagerInterface $entity_type_manager) {
parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->fileSystem = $file_system;
$this->shellManager = $shell_manager;
diff --git a/tests/src/Traits/TestFillPdfTrait.php b/tests/src/Traits/TestFillPdfTrait.php
index 8b5e846..b00b726 100644
--- a/tests/src/Traits/TestFillPdfTrait.php
+++ b/tests/src/Traits/TestFillPdfTrait.php
@@ -146,7 +146,7 @@ trait TestFillPdfTrait {
* The absolute locale filepath or FALSE on failure.
*/
protected function getTestPdfPath($filename) {
- /** @var \Drupal\Core\File\FileSystem $file_system */
+ /** @var \Drupal\Core\File\FileSystemInterface $file_system */
$file_system = $this->container->get('file_system');
return $file_system->realpath(\Drupal::service('extension.list.module')->getPath('fillpdf') . '/tests/modules/fillpdf_test/files/' . $filename);
}
--
GitLab