diff --git a/core/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php
index 4e44c3a..487aef8 100644
--- a/core/modules/field_ui/field_ui.api.php
+++ b/core/modules/field_ui/field_ui.api.php
@@ -17,7 +17,7 @@
  *   The instantiated field formatter plugin.
  * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
  *   The field definition.
- * @param $view_mode
+ * @param string $view_mode
  *   The entity view mode.
  * @param array $form
  *   The (entire) configuration form array.
@@ -27,7 +27,7 @@
  * @return array
  *   Returns the form array to be built.
  *
- * @see \Drupal\field_ui\DisplayOverView.
+ * @see \Drupal\field_ui\DisplayOverView
  */
 function hook_field_formatter_third_party_settings_form(\Drupal\Core\Field\FormatterInterface $plugin, \Drupal\Core\Field\FieldDefinitionInterface $field_definition, $view_mode, $form, \Drupal\Core\Form\FormStateInterface $form_state) {
   $element = array();
@@ -50,7 +50,7 @@ function hook_field_formatter_third_party_settings_form(\Drupal\Core\Field\Forma
  *   The instantiated field widget plugin.
  * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
  *   The field definition.
- * @param $form_mode
+ * @param string $form_mode
  *   The entity form mode.
  * @param array $form
  *   The (entire) configuration form array.
@@ -60,7 +60,7 @@ function hook_field_formatter_third_party_settings_form(\Drupal\Core\Field\Forma
  * @return array
  *   Returns the form array to be built.
  *
- * @see \Drupal\field_ui\FormDisplayOverView.
+ * @see \Drupal\field_ui\FormDisplayOverView
  */
 function hook_field_widget_third_party_settings_form(\Drupal\Core\Field\WidgetInterface $plugin, \Drupal\Core\Field\FieldDefinitionInterface $field_definition, $form_mode, $form, \Drupal\Core\Form\FormStateInterface $form_state) {
   $element = array();
@@ -81,13 +81,13 @@ function hook_field_widget_third_party_settings_form(\Drupal\Core\Field\WidgetIn
  *
  * @param array $summary
  *   An array of summary messages.
- * @param $context
+ * @param array $context
  *   An associative array with the following elements:
  *   - formatter: The formatter object.
  *   - field_definition: The field definition.
  *   - view_mode: The view mode being configured.
  *
- * @see \Drupal\field_ui\DisplayOverView.
+ * @see \Drupal\field_ui\DisplayOverView
  */
 function hook_field_formatter_settings_summary_alter(&$summary, $context) {
   // Append a message to the summary when an instance of foo_formatter has
@@ -110,7 +110,7 @@ function hook_field_formatter_settings_summary_alter(&$summary, $context) {
  *   - field_definition: The field definition.
  *   - form_mode: The form mode being configured.
  *
- * @see \Drupal\field_ui\FormDisplayOverView.
+ * @see \Drupal\field_ui\FormDisplayOverView
  */
 function hook_field_widget_settings_summary_alter(&$summary, $context) {
   // Append a message to the summary when an instance of foo_widget has
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 14f3276..fecb355 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -191,7 +191,7 @@ function field_ui_view_mode_delete(EntityViewModeInterface $view_mode) {
 /**
  * Returns HTML for Field UI overview tables.
  *
- * @param $variables
+ * @param array $variables
  *   An associative array containing:
  *   - elements: An associative array containing a Form API structure to be
  *     rendered as a table.
diff --git a/core/modules/field_ui/src/EntityDisplayModeListBuilder.php b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
index 2a13eff..7fb01e4 100644
--- a/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
+++ b/core/modules/field_ui/src/EntityDisplayModeListBuilder.php
@@ -135,7 +135,7 @@ public function render() {
   /**
    * Filters entities based on their controllers.
    *
-   * @param $entity_type
+   * @param string $entity_type
    *   The entity type of the entity that needs to be validated.
    *
    * @return bool
diff --git a/core/modules/field_ui/src/EntityFormModeListBuilder.php b/core/modules/field_ui/src/EntityFormModeListBuilder.php
index 8515265..867264e 100644
--- a/core/modules/field_ui/src/EntityFormModeListBuilder.php
+++ b/core/modules/field_ui/src/EntityFormModeListBuilder.php
@@ -15,13 +15,7 @@
 class EntityFormModeListBuilder extends EntityDisplayModeListBuilder {
 
   /**
-   * Filters entities based on their controllers.
-   *
-   * @param $entity_type
-   *   The entity type of the entity that needs to be validated.
-   *
-   * @return bool
-   *   TRUE if the entity has any forms, FALSE otherwise.
+   * {@inheritdoc}
    */
   protected function isValidEntity($entity_type) {
     return $this->entityTypes[$entity_type]->hasFormClasses();
diff --git a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
index edc4309..827875f 100644
--- a/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
+++ b/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @fie
+ * @file
  * Contains \Drupal\field_ui\Plugin\Derivative\FieldUiLocalAction.
  */
 
@@ -23,7 +23,7 @@ class FieldUiLocalAction extends DeriverBase implements ContainerDeriverInterfac
   use StringTranslationTrait;
 
   /**
-   * The entity manager
+   * The entity manager.
    *
    * @var \Drupal\Core\Entity\EntityManagerInterface
    */
diff --git a/core/modules/field_ui/src/Tests/ManageDisplayTest.php b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
index 1adf1ae..3ed07b2 100644
--- a/core/modules/field_ui/src/Tests/ManageDisplayTest.php
+++ b/core/modules/field_ui/src/Tests/ManageDisplayTest.php
@@ -389,14 +389,14 @@ function testNoFieldsDisplayOverview() {
    *
    * @param EntityInterface $node
    *   The node.
-   * @param $view_mode
+   * @param string $view_mode
    *   The view mode in which the node should be displayed.
-   * @param $text
+   * @param string $text
    *   Plain text to look for.
-   * @param $message
+   * @param string $message
    *   Message to display.
    *
-   * @return
+   * @return bool
    *   TRUE on pass, FALSE on fail.
    */
   function assertNodeViewText(EntityInterface $node, $view_mode, $text, $message) {
@@ -408,13 +408,14 @@ function assertNodeViewText(EntityInterface $node, $view_mode, $text, $message)
    *
    * @param EntityInterface $node
    *   The node.
-   * @param $view_mode
+   * @param string $view_mode
    *   The view mode in which the node should be displayed.
-   * @param $text
+   * @param string $text
    *   Plain text to look for.
-   * @param $message
+   * @param string $message
    *   Message to display.
-   * @return
+   *
+   * @return bool
    *   TRUE on pass, FALSE on fail.
    */
   function assertNodeViewNoText(EntityInterface $node, $view_mode, $text, $message) {
@@ -429,16 +430,16 @@ function assertNodeViewNoText(EntityInterface $node, $view_mode, $text, $message
    *
    * @param EntityInterface $node
    *   The node.
-   * @param $view_mode
+   * @param string $view_mode
    *   The view mode in which the node should be displayed.
-   * @param $text
+   * @param string $text
    *   Plain text to look for.
-   * @param $message
+   * @param string $message
    *   Message to display.
-   * @param $not_exists
+   * @param bool $not_exists
    *   TRUE if this text should not exist, FALSE if it should.
    *
-   * @return
+   * @return bool
    *   TRUE on pass, FALSE on fail.
    */
   function assertNodeViewTextHelper(EntityInterface $node, $view_mode, $text, $message, $not_exists) {
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 1a42ce5..7116f88 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -297,14 +297,14 @@ protected function addPersistentFieldStorage() {
   /**
    * Asserts field settings are as expected.
    *
-   * @param $bundle
+   * @param string $bundle
    *   The bundle name for the field.
-   * @param $field_name
+   * @param string $field_name
    *   The field name for the field.
-   * @param $string
+   * @param string $string
    *   The settings text.
-   * @param $entity_type
-   *   The entity type for the field.
+   * @param string $entity_type
+   *   (optional) The entity type for the field. Defaults to 'node'.
    */
   function assertFieldSettings($bundle, $field_name, $string = 'dummy test string', $entity_type = 'node') {
     // Assert field storage settings.