diff --git a/core/modules/taxonomy/src/Controller/TaxonomyController.php b/core/modules/taxonomy/src/Controller/TaxonomyController.php
index e24eb6f..24c5622 100644
--- a/core/modules/taxonomy/src/Controller/TaxonomyController.php
+++ b/core/modules/taxonomy/src/Controller/TaxonomyController.php
@@ -23,7 +23,7 @@ class TaxonomyController extends ControllerBase {
    * @param \Drupal\taxonomy\TermInterface $term
    *   A taxonomy term entity.
    *
-   * @return
+   * @return string
    *   The term name to be used as the page title.
    */
   public function getTitle(TermInterface $term) {
diff --git a/core/modules/taxonomy/src/TermStorageInterface.php b/core/modules/taxonomy/src/TermStorageInterface.php
index f60d7a2..5dc7e65 100644
--- a/core/modules/taxonomy/src/TermStorageInterface.php
+++ b/core/modules/taxonomy/src/TermStorageInterface.php
@@ -21,7 +21,7 @@
    * @param array $tids
    *   Array of terms that need to be removed from hierarchy.
    */
-  public function deleteTermHierarchy($tids);
+  public function deleteTermHierarchy(array $tids);
 
   /**
    * Updates terms hierarchy information with the hierarchy trail of it.
@@ -121,6 +121,6 @@ public function resetWeights($vid);
    * @return array
    *   An array of nids and the term entities they were tagged with.
    */
-  public function getNodeTerms($nids, $vocabs = array(), $langcode = NULL);
+  public function getNodeTerms(array $nids, $vocabs = array(), $langcode = NULL);
 
 }
diff --git a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
index d58b2d5..7fb7947 100644
--- a/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
+++ b/core/modules/taxonomy/src/Tests/Views/TaxonomyFieldFilterTest.php
@@ -137,7 +137,7 @@ public function testFilters() {
    * @param string $message
    *   Message suffix to display.
    */
-  protected function assertPageCounts($path, $counts, $message) {
+  protected function assertPageCounts($path, array $counts, $message) {
     // Get the text of the page.
     $this->drupalGet($path);
     $text = $this->getTextContent();
@@ -159,7 +159,7 @@ protected function assertPageCounts($path, $counts, $message) {
    * @return \Drupal\taxonomy\TermInterface
    *   The created taxonomy term.
    */
-  protected function createTermWithProperties($properties) {
+  protected function createTermWithProperties(array $properties) {
     // Use the first available text format.
     $filter_formats = filter_formats();
     $format = array_pop($filter_formats);
diff --git a/core/modules/taxonomy/src/VocabularyInterface.php b/core/modules/taxonomy/src/VocabularyInterface.php
index 78b38d7..e6e9e79 100644
--- a/core/modules/taxonomy/src/VocabularyInterface.php
+++ b/core/modules/taxonomy/src/VocabularyInterface.php
@@ -17,7 +17,7 @@
   /**
    * Returns the vocabulary hierarchy.
    *
-   * @return integer
+   * @return int
    *   The vocabulary hierarchy.
    */
   public function getHierarchy();
@@ -25,7 +25,7 @@ public function getHierarchy();
   /**
    * Sets the vocabulary hierarchy.
    *
-   * @param integer $hierarchy
+   * @param int $hierarchy
    *   The hierarchy type of vocabulary.
    *   Possible values:
    *    - TAXONOMY_HIERARCHY_DISABLED: No parents.
diff --git a/core/modules/taxonomy/src/VocabularyStorage.php b/core/modules/taxonomy/src/VocabularyStorage.php
index 6eeed05..5bf7173 100644
--- a/core/modules/taxonomy/src/VocabularyStorage.php
+++ b/core/modules/taxonomy/src/VocabularyStorage.php
@@ -26,7 +26,7 @@ public function resetCache(array $ids = NULL) {
   /**
    * {@inheritdoc}
    */
-  public function getToplevelTids($vids) {
+  public function getToplevelTids(array $vids) {
     return db_query('SELECT t.tid FROM {taxonomy_term_data} t INNER JOIN {taxonomy_term_hierarchy} th ON th.tid = t.tid WHERE t.vid IN ( :vids[] ) AND th.parent = 0', array(':vids[]' => $vids))->fetchCol();
   }
 
diff --git a/core/modules/taxonomy/src/VocabularyStorageInterface.php b/core/modules/taxonomy/src/VocabularyStorageInterface.php
index c6f15f0..ae8ea10 100644
--- a/core/modules/taxonomy/src/VocabularyStorageInterface.php
+++ b/core/modules/taxonomy/src/VocabularyStorageInterface.php
@@ -23,6 +23,6 @@
    * @return array
    *   Array of top-level term IDs.
    */
-  public function getToplevelTids($vids);
+  public function getToplevelTids(array $vids);
 
 }
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 42c543a..980b606 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -141,10 +141,10 @@ function taxonomy_theme() {
  *
  * @param \Drupal\taxonomy\VocabularyInterface $vocabulary
  *   A taxonomy vocabulary entity.
- * @param $changed_term
+ * @param array $changed_term
  *   An array of the term structure that was updated.
  *
- * @return
+ * @return int
  *   An integer that represents the level of the vocabulary's hierarchy.
  */
 function taxonomy_check_vocabulary_hierarchy(VocabularyInterface $vocabulary, $changed_term) {
@@ -262,6 +262,8 @@ function template_preprocess_taxonomy_term(&$variables) {
  *
  * @param \Drupal\taxonomy\Entity\Term $term
  *   A taxonomy term entity.
+ *
+ * @return bool
  */
 function taxonomy_term_is_page(Term $term) {
   if (\Drupal::routeMatch()->getRouteName() == 'entity.taxonomy_term.canonical' && $page_term_id = \Drupal::routeMatch()->getRawParameter('taxonomy_term')) {
@@ -382,7 +384,7 @@ function taxonomy_get_tree($vid, $parent = 0, $max_depth = NULL, $load_entities
  * @param $vocabulary
  *   (optional) Vocabulary machine name to limit the search. Defaults to NULL.
  *
- * @return
+ * @return array
  *   An array of matching term objects.
  */
 function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
@@ -506,13 +508,13 @@ function taxonomy_implode_tags($tags, $vid = NULL) {
 /**
  * Title callback for term pages.
  *
- * @param \Drupal\taxonomy\Entity\Term $term
- *   A taxonomy term entity.
+ * @param \Drupal\taxonomy\TermInterface $term
+ *   The taxonomy term.
  *
- * @return
+ * @return string
  *   The term name to be used as the page title.
  */
-function taxonomy_term_title(Term $term) {
+function taxonomy_term_title(TermInterface $term) {
   return $term->getName();
 }
 
@@ -536,6 +538,9 @@ function taxonomy_term_title(Term $term) {
 
 /**
  * Implements hook_ENTITY_TYPE_insert() for node entities.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $node
+ *   The node entity.
  */
 function taxonomy_node_insert(EntityInterface $node) {
   // Add taxonomy index entries for the node.
@@ -548,10 +553,10 @@ function taxonomy_node_insert(EntityInterface $node) {
  * The index lists all terms that are related to a given node entity, and is
  * therefore maintained at the entity level.
  *
- * @param \Drupal\node\Entity\Node $node
+ * @param \Drupal\Core\Entity\EntityInterface $node
  *   The node entity.
  */
-function taxonomy_build_node_index($node) {
+function taxonomy_build_node_index(EntityInterface $node) {
   // We maintain a denormalized table of term/node relationships, containing
   // only data for current, published nodes.
   if (!\Drupal::config('taxonomy.settings')->get('maintain_index_table') || !(\Drupal::entityManager()->getStorage('node') instanceof SqlContentEntityStorage)) {
@@ -590,6 +595,8 @@ function taxonomy_build_node_index($node) {
 
 /**
  * Implements hook_ENTITY_TYPE_update() for node entities.
+ * @param \Drupal\Core\Entity\EntityInterface $node
+ *   The node entity.
  */
 function taxonomy_node_update(EntityInterface $node) {
   // Always rebuild the node's taxonomy index entries on node save.
@@ -599,6 +606,9 @@ function taxonomy_node_update(EntityInterface $node) {
 
 /**
  * Implements hook_ENTITY_TYPE_predelete() for node entities.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $node
+ *   The node entity.
  */
 function taxonomy_node_predelete(EntityInterface $node) {
   // Clean up the {taxonomy_index} table when nodes are deleted.
@@ -619,8 +629,11 @@ function taxonomy_delete_node_index(EntityInterface $node) {
 
 /**
  * Implements hook_ENTITY_TYPE_delete() for taxonomy_term entities.
+ *
+ * @param \Drupal\taxonomy\TermInterface $term
+ *   The taxonomy term.
  */
-function taxonomy_taxonomy_term_delete(Term $term) {
+function taxonomy_taxonomy_term_delete(TermInterface $term) {
   if (\Drupal::config('taxonomy.settings')->get('maintain_index_table')) {
     // Clean up the {taxonomy_index} table when terms are deleted.
     db_delete('taxonomy_index')->condition('tid', $term->id())->execute();