diff --git a/core/lib/Drupal/Core/Form/FormState.php b/core/lib/Drupal/Core/Form/FormState.php
index a4fa4658c4b93de49bb0a1d484f398827cc82692..125aedb7d1cac7e02a28e454a1f3b78f7a864dfa 100644
--- a/core/lib/Drupal/Core/Form/FormState.php
+++ b/core/lib/Drupal/Core/Form/FormState.php
@@ -186,6 +186,8 @@ class FormState implements FormStateInterface {
   protected $requestMethod = 'GET';
 
   /**
+   * Determines if the unprocessed form structure is cached.
+   *
    * If set to TRUE the original, unprocessed form structure will be cached,
    * which allows the entire form to be rebuilt from cache. A typical form
    * workflow involves two page requests; first, a form is built and rendered
diff --git a/core/modules/editor/tests/src/Functional/Update/EditorAddLazyLoadImageFilterUpdateTest.php b/core/modules/editor/tests/src/Functional/Update/EditorAddLazyLoadImageFilterUpdateTest.php
index a4e9b659b1546a16c12b7831f58e91aeafbe755a..54082847b19db0f240ef08c686fd510b20f38212 100644
--- a/core/modules/editor/tests/src/Functional/Update/EditorAddLazyLoadImageFilterUpdateTest.php
+++ b/core/modules/editor/tests/src/Functional/Update/EditorAddLazyLoadImageFilterUpdateTest.php
@@ -7,8 +7,7 @@
 use Drupal\FunctionalTests\Update\UpdatePathTestBase;
 
 /**
- * Tests automatically adding editor_image_lazy_load filter to text formats
- * using editor_file_reference.
+ * Tests adding editor_image_lazy_load filter to editor_file_reference.
  *
  * @group Update
  */
diff --git a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
index 2ce8fb0c7fb6833504c406dc28847f05d31b8e10..0fd9a4fb6949cd3dff6f5704b2488adc225c65de 100644
--- a/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
+++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
@@ -54,8 +54,7 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
   protected $referencedEntity;
 
   /**
-   * The entity that is not yet saved to its persistent storage to be referenced
-   * in this test.
+   * An entity that is not yet saved to its persistent storage.
    *
    * @var \Drupal\Core\Entity\EntityInterface
    */
diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php
index 33c1486fb711f5507c1f079295a59546a1eecef4..01a09a184e3215af5df0b58f697bd9d4315bb910 100644
--- a/core/modules/migrate/src/Plugin/Migration.php
+++ b/core/modules/migrate/src/Plugin/Migration.php
@@ -205,8 +205,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
   protected $destinationIds = [];
 
   /**
-   * Specify value of source_row_status for current map row. Usually set by
-   * MigrateFieldHandler implementations.
+   * The source_row_status for the current map row.
    *
    * @var int
    */
diff --git a/core/modules/phpass/phpass.module b/core/modules/phpass/phpass.module
index a78e333156972b55a7c00f5a9566b2c63bb08205..a463fb8097cb40dfaf395276c20ca9f68b51db70 100644
--- a/core/modules/phpass/phpass.module
+++ b/core/modules/phpass/phpass.module
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * The password compatibility module provides the password checking algorithm
- * for user entities created with Drupal prior to version 10.1.x.
+ * Provides the password checking algorithm used prior to version 10.1.x.
  */
 
 use Drupal\Core\Routing\RouteMatchInterface;
diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index 8560454fad798d8d18d7b1f78c6942e70be228f9..5816b340e1562a393b54cfbe34ddf4d4437dc26f 100644
--- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -87,16 +87,18 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
   protected static $patchProtectedFieldNames;
 
   /**
-   * The fields that need a different (random) value for each new entity created
-   * by a POST request.
+   * A list of fields that need a unique value.
+   *
+   * This is for each new each entity created by a POST request.
    *
    * @var string[]
    */
   protected static $uniqueFieldNames = [];
 
   /**
-   * Optionally specify which field is the 'label' field. Some entities do not
-   * specify a 'label' entity key. For example: User.
+   * Optionally specify which field is the 'label' field.
+   *
+   * Some entities do not specify a 'label' entity key. For example: User.
    *
    * @see ::getInvalidNormalizedEntityToCreate
    *
diff --git a/core/modules/system/tests/fixtures/update/drupal.timestamp-formatter-settings-2921810.php b/core/modules/system/tests/fixtures/update/drupal.timestamp-formatter-settings-2921810.php
index 2c8555da74c75fb0ef49dfc3d2458985b0b29760..d2b9ddc248f27e7d0894fda499a61c544b95eeea 100644
--- a/core/modules/system/tests/fixtures/update/drupal.timestamp-formatter-settings-2921810.php
+++ b/core/modules/system/tests/fixtures/update/drupal.timestamp-formatter-settings-2921810.php
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Contains database additions to drupal-9.4.0.bare.standard.php.gz for testing
- * the upgrade path of https://www.drupal.org/project/drupal/issues/2921810.
+ * Provides database changes for testing the TimestampFormatter upgrade path.
  *
  * @see \Drupal\Tests\system\Functional\Update\TimestampFormatterSettingsUpdateTest
  */
diff --git a/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php b/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
index b2d03e39b2c9881b9fac87eb30caf0f6ae0d979a..57977d2a1e6b3f8229daafb2b6d37bac3273a555 100644
--- a/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
+++ b/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
@@ -93,8 +93,7 @@ public function destination() {
   }
 
   /**
-   * Returns a sample response with some early rendering in
-   * common_test_page_attachments.
+   * Returns a response with early rendering in common_test_page_attachments.
    *
    * @return \Symfony\Component\HttpFoundation\Response
    *   A new Response object.
diff --git a/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php b/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
index 225da3ebb9630672f0f6de4f1b00d97f8804946f..45ed0878e5eb6146c222f477fdf876328656f9a0 100644
--- a/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
+++ b/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
@@ -80,8 +80,7 @@ public function assertPageRenderHookExceptions(string $module, string $hook): vo
   }
 
   /**
-   * Assert that HtmlRenderer::invokePageAttachmentHooks is called in a render
-   * context.
+   * Tests HtmlRenderer::invokePageAttachmentHooks in a render context.
    */
   public function testHtmlRendererAttachmentsRenderContext(): void {
     $this->enableModules(['common_test', 'system']);
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 58866d93e8a15db2775a6800f6beafcd8cf2d6cc..337f131c783d430b58551236a6a76346da4bd103 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -58,7 +58,6 @@
     <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
     <exclude name="Drupal.Commenting.DocComment.ParamNotFirst"/>
     <exclude name="Drupal.Commenting.DocComment.ShortNotCapital"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortSingleLine"/>
     <exclude name="Drupal.Commenting.DocComment.SpacingBeforeTags"/>
   </rule>
   <rule ref="Drupal.Commenting.DocCommentAlignment"/>
diff --git a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptErrorsTest.php b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptErrorsTest.php
index 89204403c1efdeec290548f22d0fb540da45d0a3..69d9bcbfc678ceb26c8e88450bdda21293f80cd2 100644
--- a/core/tests/Drupal/FunctionalJavascriptTests/JavascriptErrorsTest.php
+++ b/core/tests/Drupal/FunctionalJavascriptTests/JavascriptErrorsTest.php
@@ -40,8 +40,7 @@ public function testJavascriptErrors(): void {
   }
 
   /**
-   * Tests that JavaScript console errors will result in a test failure
-   * during asynchronous calls.
+   * Tests JavaScript console errors during asynchronous calls.
    */
   public function testJavascriptErrorsAsync(): void {
     // Visit page that will throw a JavaScript console error in async context.
diff --git a/core/tests/Drupal/KernelTests/Core/Archiver/ArchiverTestBase.php b/core/tests/Drupal/KernelTests/Core/Archiver/ArchiverTestBase.php
index 759c21d73d5026f25c1fe03f135a917a75bd689f..0a5a1fd9ba4d7940dc5d47f12c380c9b52e60556 100644
--- a/core/tests/Drupal/KernelTests/Core/Archiver/ArchiverTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/Archiver/ArchiverTestBase.php
@@ -6,8 +6,7 @@
 use Drupal\Tests\TestFileCreationTrait;
 
 /**
- * Base class for archive tests that adds some additional archive specific
- * assertions and helper properties.
+ * Provides archive specific assertions and helper properties for archive tests.
  */
 abstract class ArchiverTestBase extends FileTestBase {
   use TestFileCreationTrait;
diff --git a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
index e4c44674f9a2ee5c10b034b994cc1c5cf846bb5d..b332eccfe6b4fb4fa19d98e83cc31e7913e19ac7 100644
--- a/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
@@ -271,6 +271,8 @@ public function providerTestImageFiles(): array {
   }
 
   /**
+   * Tests height, width and color for the corners for the final images.
+   *
    * Since PHP can't visually check that our images have been manipulated
    * properly, build a list of expected color values for each of the corners and
    * the expected height and widths for the final images.