Issue #3471412: Use constructor property promotion

src/Plugin/FillPdfActionPlugin/FillPdfSaveAction.php

@@ -20,28 +20,24 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
  */
 class FillPdfSaveAction extends FillPdfActionPluginBase {
 
-  /**
-   * The FillPdf output handler.
-   *
-   * @var \Drupal\fillpdf\OutputHandler
-   */
-  protected $outputHandler;
-
   /**
    * Constructs a \Drupal\Component\Plugin\PluginBase object.
    *
-   * @param \Drupal\fillpdf\OutputHandler $output_handler
-   *   The FillPdf output handler.
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
    * @param string $plugin_id
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
+   * @param \Drupal\fillpdf\OutputHandler $outputHandler
+   *   The fillpdf.output_handler service.
    */
-  public function __construct(OutputHandler $output_handler, array $configuration, $plugin_id, $plugin_definition) {
-    $this->outputHandler = $output_handler;
-
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    $plugin_definition,
+    protected OutputHandler $outputHandler,
+  ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
   }
 
@@ -50,10 +46,10 @@ class FillPdfSaveAction extends FillPdfActionPluginBase {
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
-      $container->get('fillpdf.output_handler'),
       $configuration,
       $plugin_id,
-      $plugin_definition
+      $plugin_definition,
+      $container->get('fillpdf.output_handler'),
     );
   }
 

src/Plugin/PdfBackend/LocalServerPdfBackend.php

@@ -32,13 +32,6 @@ class LocalServerPdfBackend extends PdfBackendBase implements ContainerFactoryPl
    */
   protected $fileSystem;
 
-  /**
-   * The Guzzle http client.
-   *
-   * @var \GuzzleHttp\Client
-   */
-  protected $httpClient;
-
   /**
    * Constructs a LocalServerPdfBackend plugin object.
    *
@@ -48,12 +41,16 @@ class LocalServerPdfBackend extends PdfBackendBase implements ContainerFactoryPl
    *   The plugin_id for the plugin instance.
    * @param array $plugin_definition
    *   The plugin implementation definition.
-   * @param \GuzzleHttp\Client $http_client
+   * @param \GuzzleHttp\Client $httpClient
    *   The Guzzle http client.
    */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, Client $http_client) {
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    array $plugin_definition,
+    protected Client $httpClient,
+  ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->httpClient = $http_client;
   }
 
   /**

src/Plugin/PdfBackend/PdftkPdfBackend.php

@@ -32,27 +32,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  */
 class PdftkPdfBackend extends PdfBackendBase implements ContainerFactoryPluginInterface {
 
-  /**
-   * The file system.
-   *
-   * @var \Drupal\Core\File\FileSystemInterface
-   */
-  protected $fileSystem;
-
-  /**
-   * The FillPDF shell manager.
-   *
-   * @var \Drupal\fillpdf\ShellManager
-   */
-  protected $shellManager;
-
-  /**
-   * The entity type manager.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
   /**
    * Constructs a PdftkPdfBackend plugin object.
    *
@@ -62,18 +41,22 @@ 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\FileSystemInterface $file_system
+   * @param \Drupal\Core\File\FileSystemInterface $fileSystem
    *   The file system.
-   * @param \Drupal\fillpdf\ShellManager $shell_manager
+   * @param \Drupal\fillpdf\ShellManager $shellManager
    *   The FillPDF shell manager.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   The entity type manager.
    */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, FileSystemInterface $file_system, ShellManager $shell_manager, EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    array $plugin_definition,
+    protected FileSystemInterface $fileSystem,
+    protected ShellManager $shellManager,
+    protected EntityTypeManagerInterface $entityTypeManager,
+  ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->fileSystem = $file_system;
-    $this->shellManager = $shell_manager;
-    $this->entityTypeManager = $entity_type_manager;
   }
 
   /**

tests/modules/fillpdf_test/src/Plugin/PdfBackend/TestPdfBackend.php

@@ -25,13 +25,6 @@ class TestPdfBackend extends PdfBackendBase implements ContainerFactoryPluginInt
    */
   protected $configuration;
 
-  /**
-   * The state.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
   /**
    * Constructs a LocalFillPdfBackend plugin object.
    *
@@ -44,9 +37,13 @@ class TestPdfBackend extends PdfBackendBase implements ContainerFactoryPluginInt
    * @param \Drupal\Core\State\StateInterface $state
    *   The state.
    */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, StateInterface $state) {
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    array $plugin_definition,
+    protected StateInterface $state,
+  ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->state = $state;
   }
 
   /**