diff --git a/core/lib/Drupal/Component/Plugin/Definition/MergeablePluginDefinitionTrait.php b/core/lib/Drupal/Component/Plugin/Definition/MergeablePluginDefinitionTrait.php
index 8e42579..db3ba73 100644
--- a/core/lib/Drupal/Component/Plugin/Definition/MergeablePluginDefinitionTrait.php
+++ b/core/lib/Drupal/Component/Plugin/Definition/MergeablePluginDefinitionTrait.php
@@ -60,6 +60,7 @@ protected function doMergeOverrideDefinition(PluginDefinitionInterface $other_de
    * Validates whether another definition is compatible with this one.
    *
    * @throws \InvalidArgumentException
+   *   If the input definition is not compatible.
    */
   protected function validateMergeDefinition(PluginDefinitionInterface $other_definition) {
     if (!$this->isDefinitionCompatible($other_definition)) {
diff --git a/core/lib/Drupal/Component/Plugin/Definition/PluginContextDefinitionInterface.php b/core/lib/Drupal/Component/Plugin/Definition/PluginContextDefinitionInterface.php
index 8de9086..c164359 100644
--- a/core/lib/Drupal/Component/Plugin/Definition/PluginContextDefinitionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Definition/PluginContextDefinitionInterface.php
@@ -59,6 +59,7 @@ public function setContextDefinition($name, ContextDefinitionInterface $context_
    *   If the requested context does not exist.
    *
    * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface
+   *   The context definition.
    *
    * @see self::hasContextDefinition()
    */
diff --git a/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php b/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
index 43ad3c0..729bc3b 100644
--- a/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Definition/PluginDefinitionInterface.php
@@ -41,6 +41,7 @@ public function getId();
    * @return $this
    *
    * @throws \InvalidArgumentException
+   *   If the class is invalid.
    */
   public function setClass($class);
 
diff --git a/core/lib/Drupal/Component/Plugin/Definition/PluginDeriverDefinitionInterface.php b/core/lib/Drupal/Component/Plugin/Definition/PluginDeriverDefinitionInterface.php
index 2c442da..c6b8ee8 100644
--- a/core/lib/Drupal/Component/Plugin/Definition/PluginDeriverDefinitionInterface.php
+++ b/core/lib/Drupal/Component/Plugin/Definition/PluginDeriverDefinitionInterface.php
@@ -24,6 +24,7 @@
    * @return $this
    *
    * @throws \InvalidArgumentException
+   *   If the class is invalid.
    */
   public function setDeriverClass($class);
 
diff --git a/core/lib/Drupal/Core/Plugin/Definition/PluginCategoryDefinitionInterface.php b/core/lib/Drupal/Core/Plugin/Definition/PluginCategoryDefinitionInterface.php
index 2c0c943..e06bf9d 100644
--- a/core/lib/Drupal/Core/Plugin/Definition/PluginCategoryDefinitionInterface.php
+++ b/core/lib/Drupal/Core/Plugin/Definition/PluginCategoryDefinitionInterface.php
@@ -17,7 +17,6 @@
   /**
    * Sets the category.
    *
-   *
    * @param \Drupal\Core\StringTranslation\TranslationWrapper|string $category
    *   The category.
    *