From db4154d7d162895f4d22c8bb526f9904c5e95388 Mon Sep 17 00:00:00 2001
From: Kevin Kaland <kevin@wizone.solutions>
Date: Tue, 28 Apr 2020 21:11:05 +0200
Subject: [PATCH] Issue #3114541 by wizonesolutions: Skip Webform tests in D9.

Also remove xmlrpc as a test dependency. It's not actually used in any
tests, at least not any run by the drupal.org testbot.
---
 composer.json                                 |  1 +
 fillpdf.info.yml                              |  3 +-
 src/Form/FillPdfFormForm.php                  | 35 +++++++------------
 .../Functional/PdfWebformPopulationTest.php   |  7 +++-
 4 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index 605f1fe..0007451 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,7 @@
     ],
     "minimum-stability": "dev",
     "require": {
+        "php": "^7.2",
         "drupal/core": "^8.8 || ^9",
         "drupal/token": "^1.0"
     },
diff --git a/fillpdf.info.yml b/fillpdf.info.yml
index bda41df..e547fe7 100644
--- a/fillpdf.info.yml
+++ b/fillpdf.info.yml
@@ -13,4 +13,5 @@ dependencies:
   - drupal:options
 test_dependencies:
   - webform:webform
-  - xmlrpc:xmlrpc
+  # xmlrpc does not have a Drupal 9 release yet.
+  # - xmlrpc:xmlrpc
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index c03efdc..49e0f2c 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -2,11 +2,14 @@
 
 namespace Drupal\fillpdf\Form;
 
+use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\file\Entity\File;
 use Drupal\fillpdf\Component\Utility\FillPdf;
@@ -16,7 +19,6 @@ use Drupal\fillpdf\InputHelperInterface;
 use Drupal\fillpdf\SerializerInterface;
 use Drupal\fillpdf\TokenResolverInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Link;
 
 /**
  * Form controller for the FillPDFForm edit form.
@@ -71,24 +73,7 @@ class FillPdfFormForm extends ContentEntityForm {
   protected $tokenResolver;
 
   /**
-   * Constructs a FillPdfFormForm object.
-   *
-   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
-   *   The entity repository service.
-   * @param \Drupal\fillpdf\FillPdfAdminFormHelperInterface $admin_form_helper
-   *   FillPdf admin form helper.
-   * @param \Drupal\fillpdf\FillPdfLinkManipulatorInterface $link_manipulator
-   *   FillPdf link manipulator.
-   * @param \Drupal\fillpdf\InputHelperInterface $input_helper
-   *   FillPdf link manipulator.
-   * @param \Drupal\fillpdf\SerializerInterface $fillpdf_serializer
-   *   FillPdf serializer.
-   * @param \Drupal\Core\File\FileSystemInterface $file_system
-   *   Helpers to operate on files and stream wrappers.
-   * @param \Drupal\Core\Entity\EntityTypeManager $entity_type_manager
-   *   The entity repository service.
-   * @param \Drupal\fillpdf\TokenResolverInterface $token_resolver
-   *   The FillPDF token resolver.
+   * {@inheritdoc}
    */
   public function __construct(
     EntityRepositoryInterface $entity_repository,
@@ -98,10 +83,14 @@ class FillPdfFormForm extends ContentEntityForm {
     SerializerInterface $fillpdf_serializer,
     FileSystemInterface $file_system,
     EntityTypeManager $entity_type_manager,
-    TokenResolverInterface $token_resolver
+    TokenResolverInterface $token_resolver,
+    EntityTypeBundleInfoInterface $entity_type_bundle_info,
+    TimeInterface $time
   ) {
     parent::__construct(
-      $entity_repository
+      $entity_repository,
+      $entity_type_bundle_info,
+      $time
     );
     $this->adminFormHelper = $admin_form_helper;
     $this->linkManipulator = $link_manipulator;
@@ -124,7 +113,9 @@ class FillPdfFormForm extends ContentEntityForm {
       $container->get('fillpdf.serializer'),
       $container->get('file_system'),
       $container->get('entity_type.manager'),
-      $container->get('fillpdf.token_resolver')
+      $container->get('fillpdf.token_resolver'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time')
     );
   }
 
diff --git a/tests/src/Functional/PdfWebformPopulationTest.php b/tests/src/Functional/PdfWebformPopulationTest.php
index 7d80a1e..b29d246 100644
--- a/tests/src/Functional/PdfWebformPopulationTest.php
+++ b/tests/src/Functional/PdfWebformPopulationTest.php
@@ -42,7 +42,12 @@ class PdfWebformPopulationTest extends FillPdfTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
+    // @todo: Stop skipping this test when Webform has Drupal 9 support.
+    if (version_compare('9.0.0', \Drupal::VERSION, '>=')) {
+      $this->markTestSkipped('Webform is not yet compatible with Drupal 9, so skipping these tests.');
+    }
+
     parent::setUp();
 
     // Add some roles to this user.
-- 
GitLab