From 4ff318b463403d592100de6d775e8b67b8290e29 Mon Sep 17 00:00:00 2001
From: Liam Morland <lkmorlan@uwaterloo.ca>
Date: Wed, 30 Mar 2022 10:33:43 -0400
Subject: [PATCH] Issue #3272475: Remove special handling for old versions of
Drupal
---
tests/src/Functional/FillPdfUploadTestBase.php | 16 ++--------------
tests/src/Functional/PdfPopulationTest.php | 6 ------
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/tests/src/Functional/FillPdfUploadTestBase.php b/tests/src/Functional/FillPdfUploadTestBase.php
index ebf1b09..5873b4b 100644
--- a/tests/src/Functional/FillPdfUploadTestBase.php
+++ b/tests/src/Functional/FillPdfUploadTestBase.php
@@ -110,13 +110,7 @@ abstract class FillPdfUploadTestBase extends FillPdfTestBase {
/** @var \Drupal\file\FileInterface $new_file */
$new_file = File::load($this->getLastFileId());
$new_filename = $new_file->getFilename();
- if (version_compare(\Drupal::VERSION, '8.8.0', '<')) {
- // @todo REMOVE when Drupal 8.7.x is no longer supported.
- $this->assertFileExists($new_file);
- }
- else {
- $this->assertFileExists($new_file->getFileUri());
- }
+ $this->assertFileExists($new_file->getFileUri());
$this->assertLessThan((int) $new_file->id(), $previous_file_id);
// If the same file was previously uploaded, it should have a "_0" appendix.
@@ -136,13 +130,7 @@ abstract class FillPdfUploadTestBase extends FillPdfTestBase {
// Now remove the PDF file again. The temporary file should now be
// removed both from the disk and the database.
$this->drupalPostForm(NULL, NULL, self::OP_REMOVE);
- if (version_compare(\Drupal::VERSION, '8.8.0', '<')) {
- // @todo REMOVE when Drupal 8.7.x is no longer supported.
- $this->assertFileNotExists($new_file);
- }
- else {
- $this->assertFileNotExists($new_file->getFileUri());
- }
+ $this->assertFileNotExists($new_file->getFileUri());
// @todo Simplify once Core bug gets fixed.
// @see https://www.drupal.org/project/drupal/issues/3043127
$this->assertFileEntryNotExists($new_file, NULL);
diff --git a/tests/src/Functional/PdfPopulationTest.php b/tests/src/Functional/PdfPopulationTest.php
index 3a1c1bf..5ed13b4 100644
--- a/tests/src/Functional/PdfPopulationTest.php
+++ b/tests/src/Functional/PdfPopulationTest.php
@@ -9,12 +9,6 @@ use Drupal\fillpdf_test\Plugin\PdfBackend\TestPdfBackend;
use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
use Drupal\user\Entity\Role;
-// When 8.7.x is fully EOL, this can be removed.
-if (!trait_exists('\Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait')) {
- class_alias('\Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait', '\Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait');
-}
-
-
/**
* Tests Core entity population and image stamping.
*
--
GitLab