diff --git a/fillpdf.links.task.yml b/fillpdf.links.task.yml
index a401620235478b6bd1702c03e1c8249da7628826..ee502ad30ef72ba0828c81abca36f66418a83440 100644
--- a/fillpdf.links.task.yml
+++ b/fillpdf.links.task.yml
@@ -9,4 +9,3 @@ fillpdf.settings:
   route_name: fillpdf.settings
   base_route: fillpdf.forms_admin
   weight: 30
-
diff --git a/modules/fillpdf_legacy/fillpdf_legacy.module b/modules/fillpdf_legacy/fillpdf_legacy.module
index 30540d26eff3ec44c4ed27047e763e383e8db01b..abb6c3624cd911cb001cf08021409fb198db6f68 100644
--- a/modules/fillpdf_legacy/fillpdf_legacy.module
+++ b/modules/fillpdf_legacy/fillpdf_legacy.module
@@ -2,6 +2,7 @@
 
 /**
  * @file
+ * Legacy functionality and plugins.
  */
 
 use Drupal\Core\Form\FormStateInterface;
diff --git a/modules/fillpdf_legacy/src/Plugin/BackendService/LocalServerBackendService.php b/modules/fillpdf_legacy/src/Plugin/BackendService/LocalServerBackendService.php
index d66723849972ef396e6fe01905696b2c5cf29f36..95bfdb084345bb51422fb105842d233427d67d59 100644
--- a/modules/fillpdf_legacy/src/Plugin/BackendService/LocalServerBackendService.php
+++ b/modules/fillpdf_legacy/src/Plugin/BackendService/LocalServerBackendService.php
@@ -4,7 +4,6 @@ namespace Drupal\fillpdf_legacy\Plugin\BackendService;
 
 use Drupal\Core\File\FileSystem;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\fillpdf\Plugin\BackendServiceBase;
 use Drupal\fillpdf\Plugin\PdfBackendManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/modules/fillpdf_legacy/tests/Kernel/LegacyBackendTest.php b/modules/fillpdf_legacy/tests/Kernel/LegacyBackendTest.php
index e7213274ea7033cebf61f7c69d9404c06b393f6d..1deebf901f0ac5cee5ece94c5fdbf164a14a0b9d 100644
--- a/modules/fillpdf_legacy/tests/Kernel/LegacyBackendTest.php
+++ b/modules/fillpdf_legacy/tests/Kernel/LegacyBackendTest.php
@@ -13,10 +13,13 @@ use Drupal\Tests\fillpdf\Kernel\FillPdfKernelTestBase;
  */
 class LegacyBackendTest extends FillPdfKernelTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   public static $modules = ['fillpdf_legacy'];
 
   /**
-   *
+   * Tests the legacy test backend.
    */
   public function testTestBackend() {
     $backend_manager = $this->container->get('plugin.manager.fillpdf.pdf_backend');
diff --git a/src/Component/Utility/FillPdf.php b/src/Component/Utility/FillPdf.php
index 1233e4220c3dd94e7a885a8b1475fa2d24921acb..c8863a4b889e2f048549781ae59faef50e8e013c 100644
--- a/src/Component/Utility/FillPdf.php
+++ b/src/Component/Utility/FillPdf.php
@@ -83,7 +83,7 @@ class FillPdf {
    */
   public static function buildFileUri($scheme, $path) {
     $uri = $scheme . '://' . $path;
-    /** @var StreamWrapperManagerInterface $streamWrapperManager */
+    /** @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $streamWrapperManager */
     $streamWrapperManager = \Drupal::service('stream_wrapper_manager');
     // @todo: Remove once Drupal 8.7 is no longer supported.
     if (!method_exists(StreamWrapperManagerInterface::class, 'normalizeUri')) {
diff --git a/src/EntityHelperInterface.php b/src/EntityHelperInterface.php
index 078d12cf069ceb1de761200fcc41da9627e3213c..5b259c3e60a06ab6889916bd2007d603bb67393f 100644
--- a/src/EntityHelperInterface.php
+++ b/src/EntityHelperInterface.php
@@ -6,7 +6,7 @@ namespace Drupal\fillpdf;
  * Interface EntityHelperInterface.
  *
  * @package Drupal\fillpdf
- * @deprecated in FillPDF 8.x-4.7 and is removed from FillPDF 8.x-5.0. Applies
+ * @deprecated in fillpdf:8.x-4.7 and is removed from fillpdf:8.x-5.0. Applies
  * to this interface and the 'fillpdf.entity_helper' service.
  * @see https://www.drupal.org/project/fillpdf/issues/3046257
  */
diff --git a/src/FillPdfAdminFormHelperInterface.php b/src/FillPdfAdminFormHelperInterface.php
index 36ad10a48a553519f1e8a6cfc85f4526e1c25f72..bcf42b8af24ae01733e0751d4e2a3c27f89dbf94 100644
--- a/src/FillPdfAdminFormHelperInterface.php
+++ b/src/FillPdfAdminFormHelperInterface.php
@@ -43,7 +43,10 @@ interface FillPdfAdminFormHelperInterface {
   public function getFormsByTemplateScheme($scheme);
 
   /**
+   * Returns the help text for FillPDF replacements.
+   *
    * @return \Drupal\Core\StringTranslation\TranslatableMarkup
+   *   The help text.
    */
   public static function getReplacementsDescription();
 
diff --git a/src/FillPdfFileContextAccessControlHandler.php b/src/FillPdfFileContextAccessControlHandler.php
index 28e21f01cdc7c6d1dd9baff1bdbb9703539801cc..e91bece7e141440c48984f226a2998a10af62141 100644
--- a/src/FillPdfFileContextAccessControlHandler.php
+++ b/src/FillPdfFileContextAccessControlHandler.php
@@ -18,22 +18,28 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 class FillPdfFileContextAccessControlHandler extends EntityAccessControlHandler implements EntityHandlerInterface {
 
   /**
+   * The access helper.
+   *
    * @var \Drupal\fillpdf\FillPdfAccessHelperInterface
    */
   protected $accessHelper;
 
   /**
+   * The link manipulator.
+   *
    * @var FillPdfLinkManipulatorInterface
    */
   protected $linkManipulator;
 
   /**
+   * The FillPDF context manager.
+   *
    * @var FillPdfContextManagerInterface
    */
   protected $contextManager;
 
   /**
-   *
+   * {@inheritdoc}
    */
   public function __construct(EntityTypeInterface $entity_type, FillPdfAccessHelperInterface $access_helper, FillPdfLinkManipulatorInterface $link_manipulator, FillPdfContextManagerInterface $context_manager) {
     parent::__construct($entity_type);
@@ -44,7 +50,7 @@ class FillPdfFileContextAccessControlHandler extends EntityAccessControlHandler
   }
 
   /**
-   *
+   * {@inheritdoc}
    */
   public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
     return new static($entity_type, $container->get('fillpdf.access_helper'), $container->get('fillpdf.link_manipulator'), $container->get('fillpdf.context_manager'));
diff --git a/src/Form/FillPdfFormConfirmFormBase.php b/src/Form/FillPdfFormConfirmFormBase.php
index 2c67334bca9c88514b1d1be4b5220e12636fedc7..df7b98f6fdff57181461e7e98fb73bb653146d5e 100644
--- a/src/Form/FillPdfFormConfirmFormBase.php
+++ b/src/Form/FillPdfFormConfirmFormBase.php
@@ -12,19 +12,6 @@ use Drupal\Core\Form\FormStateInterface;
  */
 abstract class FillPdfFormConfirmFormBase extends ContentEntityConfirmFormBase {
 
-  /**
-   * Gets the FillPdfForm.
-   *
-   * The FillPdfForm entity used for populating form element defaults.
-   *
-   * @return \Drupal\fillpdf\FillPdfFormInterface
-   *   The current FillPdfForm entity.
-   */
-  public function getEntity() {
-    // This wrapper is here to add a proper typehint to EntityForm::getEntity().
-    return parent::getEntity();
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index d4d97e8ca7c622f28cce84526e678fb05a8197a1..c03efdc45f0819a165cc93d74bb77a3b9eed61cc 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -282,7 +282,7 @@ class FillPdfFormForm extends ContentEntityForm {
       '#type' => 'item',
       '#title' => $this->t('Sample PDF'),
       '#description' => $this->t('@link<br />If you have set a custom path on this PDF, the sample will be saved there silently.', [
-      '@link' => Link::fromTextAndUrl(
+        '@link' => Link::fromTextAndUrl(
         $this->t('See which fields are which in this PDF.'),
         $this->linkManipulator->generateLink([
           'fid' => $fid,
diff --git a/src/InputHelper.php b/src/InputHelper.php
index 11c86c899516a7bfce300ccc96d8e0ed1c0b0df6..0a11f4bc4a9d4287e5caee754e82c8553f4164b8 100644
--- a/src/InputHelper.php
+++ b/src/InputHelper.php
@@ -125,7 +125,7 @@ class InputHelper implements InputHelperInterface {
    * @see \Drupal\file\FileInterface
    */
   protected function saveFileUpload(FileInterface $file) {
-    @trigger_error('InputHelper::saveFileUpload() is deprecated in fillpdf:8.x-4.7 and is removed from fillpdf:8.x-5.0. Use \Drupal\file\FileInterface::setPermanent() and \Drupal\file\FileInterface::save() instead. See https://www.drupal.org/project/fillpdf/issues/3055123.', E_USER_DEPRECATED);
+    @trigger_error('InputHelper::saveFileUpload() is deprecated in fillpdf:8.x-4.7 and is removed from fillpdf:8.x-5.0. Use \Drupal\file\FileInterface::setPermanent() and \Drupal\file\FileInterface::save() instead. See https://www.drupal.org/project/fillpdf/issues/3055123', E_USER_DEPRECATED);
     $file->setPermanent();
     $file->save();
   }
diff --git a/src/Plugin/FillPdfActionPluginBase.php b/src/Plugin/FillPdfActionPluginBase.php
index 8ae90d363b876604b23e59c3c47fb217ddde05eb..18ee104e2a09d5d391672fbab2431ce5a867570f 100644
--- a/src/Plugin/FillPdfActionPluginBase.php
+++ b/src/Plugin/FillPdfActionPluginBase.php
@@ -37,7 +37,7 @@ abstract class FillPdfActionPluginBase extends PluginBase implements FillPdfActi
    * @see \Drupal\Component\Plugin\ConfigurableInterface::getConfiguration()
    */
   public function getConfiguration() {
-    @trigger_error('FillPdfActionPluginInterface::getConfiguration() is deprecated in fillpdf:8.x-4.8 and is removed from fillpdf:8.x-5.0. Custom FillPdfActionPlugins may extend ConfigurableInterface instead. See https://www.drupal.org/project/fillpdf/issues/3058862.', E_USER_DEPRECATED);
+    @trigger_error('FillPdfActionPluginInterface::getConfiguration() is deprecated in fillpdf:8.x-4.8 and is removed from fillpdf:8.x-5.0. Custom FillPdfActionPlugins may extend ConfigurableInterface instead. See https://www.drupal.org/project/fillpdf/issues/3058862', E_USER_DEPRECATED);
     return $this->configuration;
   }
 
diff --git a/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php b/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php
index b3f6023af577fff802d321f06497fe9c310d9629..d2ad931e21df6c7c77f4ed1b6dca752e95201aff 100644
--- a/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php
+++ b/src/Plugin/PdfBackend/FillPdfServicePdfBackend.php
@@ -17,7 +17,8 @@ use Drupal\fillpdf\Plugin\PdfBackendBase;
  *   id = "fillpdf_service",
  *   label = @Translation("FillPDF Service"),
  *   description = @Translation(
- *     "No technical prerequisites. Sign up for <a href=':url'>FillPDF Service</a>.",
+ *     "No technical prerequisites.
+ *      Sign up for <a href=':url'>FillPDF Service</a>.",
  *     arguments = {
  *       ":url" = "https://fillpdf.io"
  *     }
diff --git a/src/Plugin/PdfBackend/PdftkPdfBackend.php b/src/Plugin/PdfBackend/PdftkPdfBackend.php
index dfbcafd82a7198d1a3a4a218d4ff8cbb044c884e..da5083664c9352f29ba60694dd4336e944c46508 100644
--- a/src/Plugin/PdfBackend/PdftkPdfBackend.php
+++ b/src/Plugin/PdfBackend/PdftkPdfBackend.php
@@ -24,7 +24,8 @@ use Drupal\Core\File\FileSystemInterface;
  *   id = "pdftk",
  *   label = @Translation("pdftk"),
  *   description = @Translation(
- *     "Locally installed pdftk. You will need a VPS or a dedicated server to install pdftk, see <a href=':url'>documentation</a>.",
+ *     "Locally installed pdftk. You will need a VPS or a dedicated server to
+ *     install pdftk, see <a href=':url'>documentation</a>.",
  *     arguments = {
  *       ":url" = "https://www.drupal.org/docs/8/modules/fillpdf"
  *     }
diff --git a/src/Service/FillPdfAdminFormHelper.php b/src/Service/FillPdfAdminFormHelper.php
index 1ea6096d566cb97d60dd4edb5b6602a9bd5e414e..7859d03482a07072b8cd6200391bc80030bfb5fa 100644
--- a/src/Service/FillPdfAdminFormHelper.php
+++ b/src/Service/FillPdfAdminFormHelper.php
@@ -127,6 +127,8 @@ class FillPdfAdminFormHelper implements FillPdfAdminFormHelperInterface {
    *
    * @deprecated in fillpdf:8.x-4.9 and is removed from fillpdf:8.x-5.0. Use the
    *   PdfBackend plugin's own methods.
+   *
+   * @see https://www.drupal.org/node/3060086
    * @see \Drupal\fillpdf\Plugin\PdfBackend\PdftkPdfBackend
    */
   public function getPdftkPath() {
diff --git a/src/Service/FillPdfContextManager.php b/src/Service/FillPdfContextManager.php
index 35a3f5163fab4682d25ab3f6633e9e1bb92bbe8a..fc2700019b1f1988fd9c326f1f23964b02f19278 100644
--- a/src/Service/FillPdfContextManager.php
+++ b/src/Service/FillPdfContextManager.php
@@ -6,21 +6,19 @@ use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\fillpdf\FillPdfContextManagerInterface;
 
 /**
- *
+ * Helper class to load entities from a FillPDF context array.
  */
 class FillPdfContextManager implements FillPdfContextManagerInterface {
 
   /**
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   *
    * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
    */
   protected $entityTypeManager;
 
   /**
-   * Constructs FillPdfContextManager.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   * {@inheritdoc}
    */
   public function __construct(EntityTypeManagerInterface $entity_type_manager) {
     $this->entityTypeManager = $entity_type_manager;
diff --git a/tests/modules/fillpdf_test/src/Plugin/BackendService/Test.php b/tests/modules/fillpdf_test/src/Plugin/BackendService/Test.php
index 7ccc724c075d5ea62e33bb6ce2d205c2e993ffe8..78f34784f71846c593abb4645a1a9abdbbc53f31 100644
--- a/tests/modules/fillpdf_test/src/Plugin/BackendService/Test.php
+++ b/tests/modules/fillpdf_test/src/Plugin/BackendService/Test.php
@@ -8,6 +8,8 @@ use Drupal\fillpdf\Plugin\BackendServiceBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
+ * Backend used in tests.
+ *
  * @BackendService(
  *   id = "test",
  *   label = @Translation("FillPDF Test Backend Service"),
diff --git a/tests/modules/fillpdf_test/src/Plugin/FillPdfBackend/TestFillPdfBackend.php b/tests/modules/fillpdf_test/src/Plugin/FillPdfBackend/TestFillPdfBackend.php
index c6e68d920f33437f57ec2bb021484aa777209178..f5326241c1509780d66a71a3631ec95cf1c4d08a 100644
--- a/tests/modules/fillpdf_test/src/Plugin/FillPdfBackend/TestFillPdfBackend.php
+++ b/tests/modules/fillpdf_test/src/Plugin/FillPdfBackend/TestFillPdfBackend.php
@@ -9,6 +9,8 @@ use Drupal\fillpdf\FillPdfFormInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
+ * Backend used in tests.
+ *
  * @Plugin(
  *   id = "test",
  *   label = @Translation("Pass-through plugin for testing")
diff --git a/tests/src/Functional/FillPdfFormDeleteFormTest.php b/tests/src/Functional/FillPdfFormDeleteFormTest.php
index 8387fc097f5e19b4680cbfbdfd0ff16a790be5a3..4512237e97b97cae99f4dd43cbcbf17b5cabc0b3 100644
--- a/tests/src/Functional/FillPdfFormDeleteFormTest.php
+++ b/tests/src/Functional/FillPdfFormDeleteFormTest.php
@@ -16,7 +16,14 @@ class FillPdfFormDeleteFormTest extends BrowserTestBase {
 
   use TestFillPdfTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   static public $modules = ['fillpdf_test'];
+
+  /**
+   * {@inheritdoc}
+   */
   protected $defaultTheme = 'stark';
 
   /**
diff --git a/tests/src/Functional/FillPdfFormDuplicateFormTest.php b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
index 4365952108e7d36bb89dcd56c27907b7b16d53d8..b78a000b0bbf95419ea4a09a8a333733bff503de 100644
--- a/tests/src/Functional/FillPdfFormDuplicateFormTest.php
+++ b/tests/src/Functional/FillPdfFormDuplicateFormTest.php
@@ -16,7 +16,14 @@ class FillPdfFormDuplicateFormTest extends BrowserTestBase {
 
   use TestFillPdfTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   static public $modules = ['fillpdf_test'];
+
+  /**
+   * {@inheritdoc}
+   */
   protected $defaultTheme = 'stark';
 
   /**
diff --git a/tests/src/Functional/FillPdfFormImportFormTest.php b/tests/src/Functional/FillPdfFormImportFormTest.php
index 65510fd10c97c63c31c777aeaa60fa01c9a89d60..2d25e9998d67bfba306bd9bb852745670cb8fab6 100644
--- a/tests/src/Functional/FillPdfFormImportFormTest.php
+++ b/tests/src/Functional/FillPdfFormImportFormTest.php
@@ -14,7 +14,14 @@ class FillPdfFormImportFormTest extends BrowserTestBase {
 
   use TestFillPdfTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   static public $modules = ['fillpdf_test'];
+
+  /**
+   * {@inheritdoc}
+   */
   protected $defaultTheme = 'stark';
 
   /**
diff --git a/tests/src/Functional/FillPdfSettingsFormTest.php b/tests/src/Functional/FillPdfSettingsFormTest.php
index bfe84bdd71a9c4610bc027c37e09effb0bca6058..7ac85dfb5b3e0c7c25f1b9127b5159d3a0ade395 100644
--- a/tests/src/Functional/FillPdfSettingsFormTest.php
+++ b/tests/src/Functional/FillPdfSettingsFormTest.php
@@ -11,6 +11,10 @@ use Drupal\Tests\fillpdf\Traits\TestFillPdfTrait;
  * @group fillpdf
  */
 class FillPdfSettingsFormTest extends BrowserTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
   public static $modules = ['fillpdf_test', 'file_test'];
 
   use TestFillPdfTrait;
diff --git a/tests/src/Functional/FillPdfTestBase.php b/tests/src/Functional/FillPdfTestBase.php
index 6d61533e79a26f0e58a84e2b77851cc0bcd02f4a..060a8992df1c8399b79b3a9c5714705bcb0cbf72 100644
--- a/tests/src/Functional/FillPdfTestBase.php
+++ b/tests/src/Functional/FillPdfTestBase.php
@@ -16,7 +16,7 @@ abstract class FillPdfTestBase extends FileFieldTestBase {
   use TestImageFieldTrait;
 
   /**
-   * @var string
+   * {@inheritdoc}
    */
   protected $defaultTheme = 'stark';
 
diff --git a/tests/src/Functional/LinkManipulatorTest.php b/tests/src/Functional/LinkManipulatorTest.php
index e682ff1cb188e6c7c16d3f5c79b523f595af20b2..8ed402745b5286e56d65be9ef2468d95baf2513f 100644
--- a/tests/src/Functional/LinkManipulatorTest.php
+++ b/tests/src/Functional/LinkManipulatorTest.php
@@ -17,7 +17,14 @@ class LinkManipulatorTest extends BrowserTestBase {
 
   use TestFillPdfTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   static public $modules = ['fillpdf_test'];
+
+  /**
+   * {@inheritdoc}
+   */
   protected $defaultTheme = 'stark';
 
   /**
diff --git a/tests/src/Functional/PdfParseTest.php b/tests/src/Functional/PdfParseTest.php
index 1b6ac1763d28a0eb2201bf8209ee4dea852f8069..b2fa8fb636fb2bdb3e189dd3b782560b5f47fca6 100644
--- a/tests/src/Functional/PdfParseTest.php
+++ b/tests/src/Functional/PdfParseTest.php
@@ -125,10 +125,16 @@ class PdfParseTest extends FillPdfTestBase {
   }
 
   /**
+   * Get expected field count per backend.
+   *
    * Different backends process different types of fields. This method is used
    * by ::backendTest() to assert against the correct value.
    *
-   * @param $backend
+   * @param string $backend
+   *   The backend.
+   *
+   * @return int
+   *   The expected field count.
    */
   protected function getExpectedFieldCount($backend) {
     // NOTE: Other bugs led me to believe this was the case, but it's kind of a
diff --git a/tests/src/Functional/UninstallTest.php b/tests/src/Functional/UninstallTest.php
index 703a8a2dadf85b7340b3d02c5920df0bb3af3669..17bb0ffef5b0f888a52bf7f04a822dfb0f2f5570 100644
--- a/tests/src/Functional/UninstallTest.php
+++ b/tests/src/Functional/UninstallTest.php
@@ -15,7 +15,14 @@ class UninstallTest extends BrowserTestBase {
 
   use TestFillPdfTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   static public $modules = ['fillpdf_test'];
+
+  /**
+   * {@inheritdoc}
+   */
   protected $defaultTheme = 'stark';
 
   /**
diff --git a/tests/src/Traits/TestImageFieldTrait.php b/tests/src/Traits/TestImageFieldTrait.php
index 376a0523ffd2986a335b90d10ef7dea916fe2ef4..655e736ea37caf4cd4cb19b6ba5d5075777d230c 100644
--- a/tests/src/Traits/TestImageFieldTrait.php
+++ b/tests/src/Traits/TestImageFieldTrait.php
@@ -67,23 +67,23 @@ trait TestImageFieldTrait {
    * This is our own version of ImageFieldTestBase::createImageField()
    * only that it supports fieldable entity types other than nodes.
    *
-   * @param  string  $field_name
+   * @param string $field_name
    *   The name of the new field (all lowercase), exclude the "field_" prefix.
-   * @param  string  $entity_type
+   * @param string $entity_type
    *   The entity type this field will be added to.
-   * @param  string  $bundle
+   * @param string $bundle
    *   The bundle this field will be added to.
-   * @param  array  $storage_settings
+   * @param array $storage_settings
    *   (optional) A list of field storage settings that will be added to the
    *   defaults.
-   * @param  array  $field_settings
+   * @param array $field_settings
    *   (optional) A list of instance settings that will be added to the instance
    *   defaults.
-   * @param  array  $widget_settings
+   * @param array $widget_settings
    *   (optional) Widget settings to be added to the widget defaults.
-   * @param  array  $formatter_settings
+   * @param array $formatter_settings
    *   (optional) Formatter settings to be added to the formatter defaults.
-   * @param  string  $description
+   * @param string $description
    *   (optional) A description for the field. Defaults to ''.
    *
    * @return \Drupal\field\Entity\FieldConfig
diff --git a/tests/src/Unit/FieldMapping/ImageFieldMappingTest.php b/tests/src/Unit/FieldMapping/ImageFieldMappingTest.php
index de580ae35e09859881b9da6aa765e964e54d3338..9a7b61ff2627f53764df8deab337b9dbd9908fee 100644
--- a/tests/src/Unit/FieldMapping/ImageFieldMappingTest.php
+++ b/tests/src/Unit/FieldMapping/ImageFieldMappingTest.php
@@ -6,15 +6,17 @@ use Drupal\fillpdf\FieldMapping\ImageFieldMapping;
 use Drupal\Tests\UnitTestCase;
 
 /**
+ * Test the ImageFieldMapping class.
+ *
  * @group fillpdf
  * @covers \Drupal\fillpdf\FieldMapping\ImageFieldMapping
  */
 class ImageFieldMappingTest extends UnitTestCase {
 
   /**
-   *
+   * Test the constructor.
    */
-  public function test__construct() {
+  public function testConstruct() {
     // Test valid and invalid instantiations.
     $image_field_mapping = new ImageFieldMapping('Dummy image', 'jpg');
     self::assertInstanceOf(ImageFieldMapping::class, $image_field_mapping);
@@ -24,7 +26,7 @@ class ImageFieldMappingTest extends UnitTestCase {
   }
 
   /**
-   *
+   * Test the getExtension() method.
    */
   public function testGetExtension() {
     $image_field_mapping = new ImageFieldMapping('Dummy image', 'jpg');
diff --git a/tests/src/Unit/FieldMapping/TextFieldMappingTest.php b/tests/src/Unit/FieldMapping/TextFieldMappingTest.php
index 5c3ac1316956123e225bae075349a203959223a5..50b9226748a96be42bc9f1f371233753b24f1ba2 100644
--- a/tests/src/Unit/FieldMapping/TextFieldMappingTest.php
+++ b/tests/src/Unit/FieldMapping/TextFieldMappingTest.php
@@ -6,22 +6,24 @@ use Drupal\fillpdf\FieldMapping\TextFieldMapping;
 use Drupal\Tests\UnitTestCase;
 
 /**
+ * Tests the TextFieldMapping class.
+ *
  * @group fillpdf
  * @covers \Drupal\fillpdf\FieldMapping\TextFieldMapping
  */
 class TextFieldMappingTest extends UnitTestCase {
 
   /**
-   *
+   * Tests the constructor.
    */
-  public function test__construct() {
+  public function testConstruct() {
     // Test valid and invalid instantiations.
     $text_field_mapping = new TextFieldMapping('Dummy text');
     self::assertInstanceOf(TextFieldMapping::class, $text_field_mapping, 'Instantiation works.');
   }
 
   /**
-   *
+   * Tests the getData() method.
    */
   public function testGetData() {
     $text_field_mapping = new TextFieldMapping('Dummy text');