Issue #3272475: Remove special handling for old versions of Drupal

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);

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.
  *