diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 4c3336d179c664447fbaf38554e0f74c0f8fc00e..62db41130fb213af18aece0f275ab53ce2a20931 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -124,14 +124,14 @@ function search_preprocess_block(&$variables) {
  * This function is meant for use by search page plugins, or for building a
  * user interface that lets users clear all or parts of the search index.
  *
- * @param $type
+ * @param string|null $type
  *   (optional) The plugin ID or other machine-readable type for the items to
  *   remove from the search index. If omitted, $sid and $langcode are ignored
  *   and the entire search index is cleared.
- * @param $sid
+ * @param string|null $sid
  *   (optional) The ID of the items to remove from the search index. If
  *   omitted, all items matching $type are cleared, and $langcode is ignored.
- * @param $langcode
+ * @param string|null $langcode
  *   (optional) Language code of the item to remove from the search index. If
  *   omitted, all items matching $sid and $type are cleared.
  */
diff --git a/core/modules/search/src/SearchQuery.php b/core/modules/search/src/SearchQuery.php
index 375ca2ab44287cb15da790601f3e688772de3c15..3a62fb047518c82f3a7f653e32aa1de9518a7196 100644
--- a/core/modules/search/src/SearchQuery.php
+++ b/core/modules/search/src/SearchQuery.php
@@ -196,9 +196,9 @@ class SearchQuery extends SelectExtender {
   /**
    * Sets the search query expression.
    *
-   * @param $expression
+   * @param string $expression
    *   A search string, which can contain keywords and options.
-   * @param $type
+   * @param string $type
    *   The search type. This maps to {search_index}.type in the database.
    *
    * @return $this
@@ -547,7 +547,7 @@ public function addScore($score, $arguments = array(), $multiply = FALSE) {
    * Error and warning conditions can apply. Call getStatus() after calling
    * this method to retrieve them.
    *
-   * @return
+   * @return \Drupal\Core\Database\StatementInterface|null
    *   A query result set containing the results of the query.
    */
   public function execute() {
diff --git a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
index ad2445f91c22d80e87a60dcdfecf5ffa83dfcbe5..aec10e01b2706ad8a02347531e74647b36c2d155 100644
--- a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
+++ b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
@@ -264,11 +264,11 @@ function testMultilingualSearch() {
   /**
    * Verifies the indexing status counts.
    *
-   * @param $remaining
+   * @param int $remaining
    *   Count of remaining items to verify.
-   * @param $total
+   * @param int $total
    *   Count of total items to verify.
-   * @param $message
+   * @param string $message
    *   Message to use, something like "after updating the search index".
    */
   protected function assertIndexCounts($remaining, $total, $message) {