diff --git a/modules/schemadotorg_auto_entitylabel/tests/src/Kernel/SchemaDotOrgAutoEntityLabelTest.php b/modules/schemadotorg_auto_entitylabel/tests/src/Kernel/SchemaDotOrgAutoEntityLabelTest.php
index e06e4c3..4010aec 100644
--- a/modules/schemadotorg_auto_entitylabel/tests/src/Kernel/SchemaDotOrgAutoEntityLabelTest.php
+++ b/modules/schemadotorg_auto_entitylabel/tests/src/Kernel/SchemaDotOrgAutoEntityLabelTest.php
@@ -18,7 +18,7 @@ class SchemaDotOrgAutoEntityLabelTest extends SchemaDotOrgKernelEntityTestBase {
    *
    * @var array
    */
-  public static $modules = [
+  protected static $modules = [
     'system',
     'user',
     'node',
@@ -31,7 +31,7 @@ class SchemaDotOrgAutoEntityLabelTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('node');
diff --git a/modules/schemadotorg_descriptions/tests/src/Functional/SchemaDotOrgDescriptionsTest.php b/modules/schemadotorg_descriptions/tests/src/Functional/SchemaDotOrgDescriptionsTest.php
index 2649414..38d7a26 100644
--- a/modules/schemadotorg_descriptions/tests/src/Functional/SchemaDotOrgDescriptionsTest.php
+++ b/modules/schemadotorg_descriptions/tests/src/Functional/SchemaDotOrgDescriptionsTest.php
@@ -30,7 +30,7 @@ class SchemaDotOrgDescriptionsTest extends SchemaDotOrgBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->placeBlock('help_block');
   }
diff --git a/modules/schemadotorg_field_group/tests/src/Kernel/SchemaDotOrgFieldGroupEntityDisplayBuilderTest.php b/modules/schemadotorg_field_group/tests/src/Kernel/SchemaDotOrgFieldGroupEntityDisplayBuilderTest.php
index ae184cd..2a8f308 100644
--- a/modules/schemadotorg_field_group/tests/src/Kernel/SchemaDotOrgFieldGroupEntityDisplayBuilderTest.php
+++ b/modules/schemadotorg_field_group/tests/src/Kernel/SchemaDotOrgFieldGroupEntityDisplayBuilderTest.php
@@ -50,7 +50,7 @@ class SchemaDotOrgFieldGroupEntityDisplayBuilderTest extends SchemaDotOrgKernelE
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['schemadotorg_field_group']);
diff --git a/modules/schemadotorg_inline_entity_form/tests/src/Kernel/SchemaDotOrgInlineEntityFormTest.php b/modules/schemadotorg_inline_entity_form/tests/src/Kernel/SchemaDotOrgInlineEntityFormTest.php
index e91130e..c817c2f 100644
--- a/modules/schemadotorg_inline_entity_form/tests/src/Kernel/SchemaDotOrgInlineEntityFormTest.php
+++ b/modules/schemadotorg_inline_entity_form/tests/src/Kernel/SchemaDotOrgInlineEntityFormTest.php
@@ -33,7 +33,7 @@ class SchemaDotOrgInlineEntityFormTest extends SchemaDotOrgKernelEntityTestBase
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['schemadotorg_inline_entity_form']);
diff --git a/modules/schemadotorg_jsonapi/tests/src/Kernel/SchemaDotOrgJsonApiManagerTest.php b/modules/schemadotorg_jsonapi/tests/src/Kernel/SchemaDotOrgJsonApiManagerTest.php
index bdc2165..0942c34 100644
--- a/modules/schemadotorg_jsonapi/tests/src/Kernel/SchemaDotOrgJsonApiManagerTest.php
+++ b/modules/schemadotorg_jsonapi/tests/src/Kernel/SchemaDotOrgJsonApiManagerTest.php
@@ -61,7 +61,7 @@ class SchemaDotOrgJsonApiManagerTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping');
diff --git a/modules/schemadotorg_jsonapi/tests/src/Unit/SchemaDotOrgJsonApiBreadcrumbBuilderTest.php b/modules/schemadotorg_jsonapi/tests/src/Unit/SchemaDotOrgJsonApiBreadcrumbBuilderTest.php
index 9646610..9b415b4 100644
--- a/modules/schemadotorg_jsonapi/tests/src/Unit/SchemaDotOrgJsonApiBreadcrumbBuilderTest.php
+++ b/modules/schemadotorg_jsonapi/tests/src/Unit/SchemaDotOrgJsonApiBreadcrumbBuilderTest.php
@@ -24,9 +24,7 @@ class SchemaDotOrgJsonApiBreadcrumbBuilderTest extends UnitTestCase {
     // @see \Drupal\Core\Breadcrumb\Breadcrumb
     // @see \Drupal\Core\Cache\RefinableCacheableDependencyTrait
     // @see \Drupal\Core\Cache\Cache
-    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
     // Always return TRUE for ::assertValidTokens so that any cache context
     // will be accepted.
     $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
@@ -49,9 +47,7 @@ class SchemaDotOrgJsonApiBreadcrumbBuilderTest extends UnitTestCase {
    * @covers ::applies
    */
   public function testApplies($expected, $route_name = NULL) {
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_jsonapi\Breadcrumb\SchemaDotOrgJsonApiBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_jsonapi\Breadcrumb\SchemaDotOrgJsonApiBreadcrumbBuilder');
 
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
@@ -86,9 +82,7 @@ class SchemaDotOrgJsonApiBreadcrumbBuilderTest extends UnitTestCase {
    */
   public function testBuild() {
     // Build a breadcrumb builder to test.
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_jsonapi\Breadcrumb\SchemaDotOrgJsonApiBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_jsonapi\Breadcrumb\SchemaDotOrgJsonApiBreadcrumbBuilder');
 
     // Add a translation manager for t().
     $translation_manager = $this->getStringTranslationStub();
diff --git a/modules/schemadotorg_jsonld/schemadotorg_jsonld.api.php b/modules/schemadotorg_jsonld/schemadotorg_jsonld.api.php
index 0339022..7656a9b 100644
--- a/modules/schemadotorg_jsonld/schemadotorg_jsonld.api.php
+++ b/modules/schemadotorg_jsonld/schemadotorg_jsonld.api.php
@@ -1,5 +1,10 @@
 <?php
 
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\taxonomy\VocabularyInterface;
+use Drupal\taxonomy\TermInterface;
+use Drupal\Core\Field\FieldItemInterface;
 /**
  * @file
  * Hooks to define and alter Schema.org JSON-LD.
@@ -25,7 +30,7 @@
  * @return array
  *   Custom Schema.org JSON-LD data.
  */
-function hook_schemadotorg_jsonld(\Drupal\Core\Routing\RouteMatchInterface $route_match) {
+function hook_schemadotorg_jsonld(RouteMatchInterface $route_match) {
   return [
     '@context' => 'https://schema.org',
     '@type' => 'BreadcrumbList',
@@ -58,7 +63,7 @@ function hook_schemadotorg_jsonld(\Drupal\Core\Routing\RouteMatchInterface $rout
  * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
  *   The current route match.
  */
-function hook_schemadotorg_jsonld_alter(array &$data, \Drupal\Core\Routing\RouteMatchInterface $route_match) {
+function hook_schemadotorg_jsonld_alter(array &$data, RouteMatchInterface $route_match) {
   /** @var \Drupal\schemadotorg_jsonld\SchemaDotOrgJsonLdManagerInterface $manager */
   $manager = \Drupal::service('schemadotorg_jsonld.manager');
   $entity = $manager->getRouteMatchEntity($route_match);
@@ -91,8 +96,8 @@ function hook_schemadotorg_jsonld_alter(array &$data, \Drupal\Core\Routing\Route
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity.
  */
-function hook_schemadotorg_jsonld_entity_load(array &$data, \Drupal\Core\Entity\EntityInterface $entity) {
-  if (!$entity instanceof \Drupal\taxonomy\VocabularyInterface) {
+function hook_schemadotorg_jsonld_entity_load(array &$data, EntityInterface $entity) {
+  if (!$entity instanceof VocabularyInterface) {
     return;
   }
 
@@ -128,8 +133,8 @@ function hook_schemadotorg_jsonld_entity_load(array &$data, \Drupal\Core\Entity\
  * @param \Drupal\Core\Entity\EntityInterface $entity
  *   The entity.
  */
-function hook_schemadotorg_jsonld_entity_alter(array &$data, \Drupal\Core\Entity\EntityInterface $entity) {
-  if (!$entity instanceof \Drupal\taxonomy\TermInterface) {
+function hook_schemadotorg_jsonld_entity_alter(array &$data, EntityInterface $entity) {
+  if (!$entity instanceof TermInterface) {
     return;
   }
 
@@ -168,7 +173,7 @@ function hook_schemadotorg_jsonld_entity_alter(array &$data, \Drupal\Core\Entity
  * @param \Drupal\Core\Field\FieldItemInterface $item
  *   Tn entity's field item.
  */
-function hook_schemadotorg_jsonld_schema_property_alter(&$value, \Drupal\Core\Field\FieldItemInterface $item) {
+function hook_schemadotorg_jsonld_schema_property_alter(&$value, FieldItemInterface $item) {
   // Get entity information.
   $entity = $item->getEntity();
   $entity_type_id = $entity->getEntityTypeId();
diff --git a/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdBuilderTest.php b/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdBuilderTest.php
index f5648b0..045e13f 100644
--- a/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdBuilderTest.php
+++ b/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdBuilderTest.php
@@ -34,7 +34,7 @@ class SchemaDotOrgJsonLdBuilderTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['schemadotorg_jsonld']);
     $this->builder = $this->container->get('schemadotorg_jsonld.builder');
diff --git a/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdManagerTest.php b/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdManagerTest.php
index a2a4ae8..0e1e820 100644
--- a/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdManagerTest.php
+++ b/modules/schemadotorg_jsonld/tests/src/Kernel/SchemaDotOrgJsonLdManagerTest.php
@@ -36,7 +36,7 @@ class SchemaDotOrgJsonLdManagerTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['schemadotorg_jsonld']);
     $this->manager = $this->container->get('schemadotorg_jsonld.manager');
diff --git a/modules/schemadotorg_jsonld/tests/src/Unit/SchemaDotOrgJsonLdBreadcrumbBuilderTest.php b/modules/schemadotorg_jsonld/tests/src/Unit/SchemaDotOrgJsonLdBreadcrumbBuilderTest.php
index 68e190d..f52853d 100644
--- a/modules/schemadotorg_jsonld/tests/src/Unit/SchemaDotOrgJsonLdBreadcrumbBuilderTest.php
+++ b/modules/schemadotorg_jsonld/tests/src/Unit/SchemaDotOrgJsonLdBreadcrumbBuilderTest.php
@@ -24,9 +24,7 @@ class SchemaDotOrgJsonLdBreadcrumbBuilderTest extends UnitTestCase {
     // @see \Drupal\Core\Breadcrumb\Breadcrumb
     // @see \Drupal\Core\Cache\RefinableCacheableDependencyTrait
     // @see \Drupal\Core\Cache\Cache
-    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
     // Always return TRUE for ::assertValidTokens so that any cache context
     // will be accepted.
     $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
@@ -49,9 +47,7 @@ class SchemaDotOrgJsonLdBreadcrumbBuilderTest extends UnitTestCase {
    * @covers ::applies
    */
   public function testApplies($expected, $route_name = NULL) {
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_jsonld\Breadcrumb\SchemaDotOrgJsonLdBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_jsonld\Breadcrumb\SchemaDotOrgJsonLdBreadcrumbBuilder');
 
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
@@ -86,9 +82,7 @@ class SchemaDotOrgJsonLdBreadcrumbBuilderTest extends UnitTestCase {
    */
   public function testBuild() {
     // Build a breadcrumb builder to test.
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_jsonld\Breadcrumb\SchemaDotOrgJsonLdBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_jsonld\Breadcrumb\SchemaDotOrgJsonLdBreadcrumbBuilder');
 
     // Add a translation manager for t().
     $translation_manager = $this->getStringTranslationStub();
diff --git a/modules/schemadotorg_jsonld_breadcrumb/tests/src/Kernel/SchemaDotOrgJsonLdBreadcrumbTest.php b/modules/schemadotorg_jsonld_breadcrumb/tests/src/Kernel/SchemaDotOrgJsonLdBreadcrumbTest.php
index 5684ab9..e50ca46 100644
--- a/modules/schemadotorg_jsonld_breadcrumb/tests/src/Kernel/SchemaDotOrgJsonLdBreadcrumbTest.php
+++ b/modules/schemadotorg_jsonld_breadcrumb/tests/src/Kernel/SchemaDotOrgJsonLdBreadcrumbTest.php
@@ -40,7 +40,7 @@ class SchemaDotOrgJsonLdBreadcrumbTest extends SchemaDotOrgKernelEntityTestBase
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['schemadotorg_jsonld']);
     $this->manager = $this->container->get('schemadotorg_jsonld.manager');
diff --git a/modules/schemadotorg_jsonld_embed/tests/src/Kernel/SchemaDotOrgJsonLdEmbedTest.php b/modules/schemadotorg_jsonld_embed/tests/src/Kernel/SchemaDotOrgJsonLdEmbedTest.php
index 8f8235d..6da15e1 100644
--- a/modules/schemadotorg_jsonld_embed/tests/src/Kernel/SchemaDotOrgJsonLdEmbedTest.php
+++ b/modules/schemadotorg_jsonld_embed/tests/src/Kernel/SchemaDotOrgJsonLdEmbedTest.php
@@ -50,7 +50,7 @@ class SchemaDotOrgJsonLdEmbedTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['schemadotorg_jsonld']);
     $this->manager = $this->container->get('schemadotorg_jsonld.manager');
diff --git a/modules/schemadotorg_mapping_set/tests/src/Kernel/SchemaDotOrgMappingSetManagerTest.php b/modules/schemadotorg_mapping_set/tests/src/Kernel/SchemaDotOrgMappingSetManagerTest.php
index 2badbf5..7e7ef49 100644
--- a/modules/schemadotorg_mapping_set/tests/src/Kernel/SchemaDotOrgMappingSetManagerTest.php
+++ b/modules/schemadotorg_mapping_set/tests/src/Kernel/SchemaDotOrgMappingSetManagerTest.php
@@ -40,7 +40,7 @@ class SchemaDotOrgMappingSetManagerTest extends SchemaDotOrgKernelEntityTestBase
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['schemadotorg_mapping_set']);
diff --git a/modules/schemadotorg_mapping_set/tests/src/Unit/Breadcrumb/SchemaDotOrgMappingSetBreadcrumbBuilderTest.php b/modules/schemadotorg_mapping_set/tests/src/Unit/Breadcrumb/SchemaDotOrgMappingSetBreadcrumbBuilderTest.php
index a92e651..1604b98 100644
--- a/modules/schemadotorg_mapping_set/tests/src/Unit/Breadcrumb/SchemaDotOrgMappingSetBreadcrumbBuilderTest.php
+++ b/modules/schemadotorg_mapping_set/tests/src/Unit/Breadcrumb/SchemaDotOrgMappingSetBreadcrumbBuilderTest.php
@@ -24,9 +24,7 @@ class SchemaDotOrgMappingSetBreadcrumbBuilderTest extends UnitTestCase {
     // @see \Drupal\Core\Breadcrumb\Breadcrumb
     // @see \Drupal\Core\Cache\RefinableCacheableDependencyTrait
     // @see \Drupal\Core\Cache\Cache
-    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
     // Always return TRUE for ::assertValidTokens so that any cache context
     // will be accepted.
     $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
@@ -49,9 +47,7 @@ class SchemaDotOrgMappingSetBreadcrumbBuilderTest extends UnitTestCase {
    * @covers ::applies
    */
   public function testApplies($expected, $route_name = NULL) {
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_mapping_set\Breadcrumb\SchemaDotOrgMappingSetBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_mapping_set\Breadcrumb\SchemaDotOrgMappingSetBreadcrumbBuilder');
 
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
@@ -87,9 +83,7 @@ class SchemaDotOrgMappingSetBreadcrumbBuilderTest extends UnitTestCase {
    */
   public function testBuild() {
     // Build a breadcrumb builder to test.
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_mapping_set\Breadcrumb\SchemaDotOrgMappingSetBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_mapping_set\Breadcrumb\SchemaDotOrgMappingSetBreadcrumbBuilder');
 
     // Add a translation manager for t().
     $translation_manager = $this->getStringTranslationStub();
diff --git a/modules/schemadotorg_metatag/tests/src/Kernel/SchemaDotOrgMetatagTest.php b/modules/schemadotorg_metatag/tests/src/Kernel/SchemaDotOrgMetatagTest.php
index 2037e8d..f85a167 100644
--- a/modules/schemadotorg_metatag/tests/src/Kernel/SchemaDotOrgMetatagTest.php
+++ b/modules/schemadotorg_metatag/tests/src/Kernel/SchemaDotOrgMetatagTest.php
@@ -35,7 +35,7 @@ class SchemaDotOrgMetatagTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['metatag']);
diff --git a/modules/schemadotorg_paragraphs/tests/src/Kernel/SchemaDotOrgParagraphsTest.php b/modules/schemadotorg_paragraphs/tests/src/Kernel/SchemaDotOrgParagraphsTest.php
index d9b9314..b941400 100644
--- a/modules/schemadotorg_paragraphs/tests/src/Kernel/SchemaDotOrgParagraphsTest.php
+++ b/modules/schemadotorg_paragraphs/tests/src/Kernel/SchemaDotOrgParagraphsTest.php
@@ -39,7 +39,7 @@ class SchemaDotOrgParagraphsTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('view');
diff --git a/modules/schemadotorg_rdf/tests/src/Functional/SchemaDotOrgRdfTest.php b/modules/schemadotorg_rdf/tests/src/Functional/SchemaDotOrgRdfTest.php
index bb0f4e1..e8b71c3 100644
--- a/modules/schemadotorg_rdf/tests/src/Functional/SchemaDotOrgRdfTest.php
+++ b/modules/schemadotorg_rdf/tests/src/Functional/SchemaDotOrgRdfTest.php
@@ -42,7 +42,7 @@ class SchemaDotOrgRdfTest extends SchemaDotOrgBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Create Event node with field.
diff --git a/modules/schemadotorg_report/tests/src/Functional/SchemaDotOrgReportTest.php b/modules/schemadotorg_report/tests/src/Functional/SchemaDotOrgReportTest.php
index c69d261..078a831 100644
--- a/modules/schemadotorg_report/tests/src/Functional/SchemaDotOrgReportTest.php
+++ b/modules/schemadotorg_report/tests/src/Functional/SchemaDotOrgReportTest.php
@@ -28,7 +28,7 @@ class SchemaDotOrgReportTest extends SchemaDotOrgBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->reportUser = $this->drupalCreateUser(['access site reports']);
diff --git a/modules/schemadotorg_report/tests/src/Unit/Breadcrumb/SchemaDotOrgReportBreadcrumbBuilderTest.php b/modules/schemadotorg_report/tests/src/Unit/Breadcrumb/SchemaDotOrgReportBreadcrumbBuilderTest.php
index c2e9a51..440324d 100644
--- a/modules/schemadotorg_report/tests/src/Unit/Breadcrumb/SchemaDotOrgReportBreadcrumbBuilderTest.php
+++ b/modules/schemadotorg_report/tests/src/Unit/Breadcrumb/SchemaDotOrgReportBreadcrumbBuilderTest.php
@@ -24,9 +24,7 @@ class SchemaDotOrgReportBreadcrumbBuilderTest extends UnitTestCase {
     // @see \Drupal\Core\Breadcrumb\Breadcrumb
     // @see \Drupal\Core\Cache\RefinableCacheableDependencyTrait
     // @see \Drupal\Core\Cache\Cache
-    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
     // Always return TRUE for ::assertValidTokens so that any cache context
     // will be accepted.
     $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
@@ -49,9 +47,7 @@ class SchemaDotOrgReportBreadcrumbBuilderTest extends UnitTestCase {
    * @covers ::applies
    */
   public function testApplies($expected, $route_name = NULL) {
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_report\Breadcrumb\SchemaDotOrgReportBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_report\Breadcrumb\SchemaDotOrgReportBreadcrumbBuilder');
 
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
@@ -86,9 +82,7 @@ class SchemaDotOrgReportBreadcrumbBuilderTest extends UnitTestCase {
    */
   public function testBuild() {
     // Build a breadcrumb builder to test.
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_report\Breadcrumb\SchemaDotOrgReportBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_report\Breadcrumb\SchemaDotOrgReportBreadcrumbBuilder');
 
     // Add a translation manager for t().
     $translation_manager = $this->getStringTranslationStub();
diff --git a/modules/schemadotorg_report/tests/src/Unit/Form/SchemaDotOrgReportFilterFormTest.php b/modules/schemadotorg_report/tests/src/Unit/Form/SchemaDotOrgReportFilterFormTest.php
index 99eda04..60e3a2b 100644
--- a/modules/schemadotorg_report/tests/src/Unit/Form/SchemaDotOrgReportFilterFormTest.php
+++ b/modules/schemadotorg_report/tests/src/Unit/Form/SchemaDotOrgReportFilterFormTest.php
@@ -35,16 +35,12 @@ class SchemaDotOrgReportFilterFormTest extends UnitTestCase {
     $container->set('string_translation', $this->getStringTranslationStub());
 
     // Mock URL generator.
-    $url_generator = $this->getMockBuilder('Drupal\Core\Routing\UrlGenerator')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $url_generator = $this->createMock('Drupal\Core\Routing\UrlGenerator');
     $container->set('url_generator', $url_generator);
 
     // Mock Schema.org type manager which is only used to validate
     // type and property ids.
-    $schema_type_manager = $this->getMockBuilder('\Drupal\schemadotorg\SchemaDotOrgSchemaTypeManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $schema_type_manager = $this->createMock('\Drupal\schemadotorg\SchemaDotOrgSchemaTypeManager');
     $schema_type_manager->method('isId')->willReturnMap([
       ['types', 'Thing', TRUE],
       ['types', 'Th', FALSE],
diff --git a/modules/schemadotorg_subtype/tests/src/Unit/SchemaDotOrgSubtypeBreadcrumbBuilderTest.php b/modules/schemadotorg_subtype/tests/src/Unit/SchemaDotOrgSubtypeBreadcrumbBuilderTest.php
index 50ae3b1..818408e 100644
--- a/modules/schemadotorg_subtype/tests/src/Unit/SchemaDotOrgSubtypeBreadcrumbBuilderTest.php
+++ b/modules/schemadotorg_subtype/tests/src/Unit/SchemaDotOrgSubtypeBreadcrumbBuilderTest.php
@@ -24,9 +24,7 @@ class SchemaDotOrgSubtypeBreadcrumbBuilderTest extends UnitTestCase {
     // @see \Drupal\Core\Breadcrumb\Breadcrumb
     // @see \Drupal\Core\Cache\RefinableCacheableDependencyTrait
     // @see \Drupal\Core\Cache\Cache
-    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
     // Always return TRUE for ::assertValidTokens so that any cache context
     // will be accepted.
     $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
@@ -49,9 +47,7 @@ class SchemaDotOrgSubtypeBreadcrumbBuilderTest extends UnitTestCase {
    * @covers ::applies
    */
   public function testApplies($expected, $route_name = NULL) {
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_subtype\Breadcrumb\SchemaDotOrgSubtypeBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_subtype\Breadcrumb\SchemaDotOrgSubtypeBreadcrumbBuilder');
 
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
@@ -86,9 +82,7 @@ class SchemaDotOrgSubtypeBreadcrumbBuilderTest extends UnitTestCase {
    */
   public function testBuild() {
     // Build a breadcrumb builder to test.
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg_subtype\Breadcrumb\SchemaDotOrgSubtypeBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg_subtype\Breadcrumb\SchemaDotOrgSubtypeBreadcrumbBuilder');
 
     // Add a translation manager for t().
     $translation_manager = $this->getStringTranslationStub();
diff --git a/modules/schemadotorg_taxonomy/tests/src/Functional/SchemaDotOrgTaxonomyJsonLdTest.php b/modules/schemadotorg_taxonomy/tests/src/Functional/SchemaDotOrgTaxonomyJsonLdTest.php
index 4f9215b..70c52d0 100644
--- a/modules/schemadotorg_taxonomy/tests/src/Functional/SchemaDotOrgTaxonomyJsonLdTest.php
+++ b/modules/schemadotorg_taxonomy/tests/src/Functional/SchemaDotOrgTaxonomyJsonLdTest.php
@@ -37,7 +37,7 @@ class SchemaDotOrgTaxonomyJsonLdTest extends SchemaDotOrgBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->builder = $this->container->get('schemadotorg_jsonld.builder');
   }
diff --git a/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyJsonLdTest.php b/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyJsonLdTest.php
index 0302c68..34a2aac 100644
--- a/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyJsonLdTest.php
+++ b/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyJsonLdTest.php
@@ -35,7 +35,7 @@ class SchemaDotOrgTaxonomyJsonLdTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('taxonomy_vocabulary');
diff --git a/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyPropertyVocabularyManagerTest.php b/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyPropertyVocabularyManagerTest.php
index 77cd3c9..5cf2eca 100644
--- a/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyPropertyVocabularyManagerTest.php
+++ b/modules/schemadotorg_taxonomy/tests/src/Kernel/SchemaDotOrgTaxonomyPropertyVocabularyManagerTest.php
@@ -37,7 +37,7 @@ class SchemaDotOrgTaxonomyPropertyVocabularyManagerTest extends SchemaDotOrgKern
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('taxonomy_vocabulary');
diff --git a/modules/schemadotorg_translation/tests/Kernel/SchemaDotOrgTranslationManagerTest.php b/modules/schemadotorg_translation/tests/Kernel/SchemaDotOrgTranslationManagerTest.php
index 1e9af79..da1dd09 100644
--- a/modules/schemadotorg_translation/tests/Kernel/SchemaDotOrgTranslationManagerTest.php
+++ b/modules/schemadotorg_translation/tests/Kernel/SchemaDotOrgTranslationManagerTest.php
@@ -52,7 +52,7 @@ class SchemaDotOrgTranslationManagerTest extends SchemaDotOrgKernelEntityTestBas
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('language_content_settings');
     $this->installConfig(['schemadotorg_translation']);
diff --git a/schemadotorg.api.php b/schemadotorg.api.php
index 2ab439d..f2983b7 100644
--- a/schemadotorg.api.php
+++ b/schemadotorg.api.php
@@ -1,5 +1,6 @@
 <?php
 
+use Drupal\schemadotorg\SchemaDotOrgEntityFieldManagerInterface;
 /**
  * @file
  * Hooks to define and alter mappings, entity types and fields.
@@ -170,7 +171,7 @@ function hook_schemadotorg_mapping_defaults($entity_type_id, $bundle, $schema_ty
   // Get the field name which can either be _add_ or empty.
   // This value is displayed via a checkbox.
   $name = (!$mapping && in_array($schema_type, $default_subtypes))
-    ? \Drupal\schemadotorg\SchemaDotOrgEntityFieldManagerInterface::ADD_FIELD
+    ? SchemaDotOrgEntityFieldManagerInterface::ADD_FIELD
     : '';
 
   // Get machine name with subtype suffix.
diff --git a/src/SchemaDotOrgHelpManager.php b/src/SchemaDotOrgHelpManager.php
index 7ec7bc6..c546f9f 100644
--- a/src/SchemaDotOrgHelpManager.php
+++ b/src/SchemaDotOrgHelpManager.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\schemadotorg;
 
+use Michelf\Markdown;
 use Drupal\Core\Extension\ExtensionPathResolver;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -87,7 +88,7 @@ class SchemaDotOrgHelpManager implements SchemaDotOrgHelpManagerInterface {
     if (class_exists('\Michelf\Markdown')) {
       return [
         // phpcs:ignore Drupal.Classes.FullyQualifiedNamespace.UseStatementMissing
-        '#markup' => \Michelf\Markdown::defaultTransform($contents),
+        '#markup' => Markdown::defaultTransform($contents),
       ];
     }
     else {
diff --git a/tests/src/Kernel/SchemaDotOrgAutocompleteControllerTest.php b/tests/src/Kernel/SchemaDotOrgAutocompleteControllerTest.php
index b57a400..80234e5 100644
--- a/tests/src/Kernel/SchemaDotOrgAutocompleteControllerTest.php
+++ b/tests/src/Kernel/SchemaDotOrgAutocompleteControllerTest.php
@@ -30,7 +30,7 @@ class SchemaDotOrgAutocompleteControllerTest extends SchemaDotOrgKernelTestBase
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping_type');
diff --git a/tests/src/Kernel/SchemaDotOrgEntityFieldManagerTest.php b/tests/src/Kernel/SchemaDotOrgEntityFieldManagerTest.php
index 57a09f0..4b8a570 100644
--- a/tests/src/Kernel/SchemaDotOrgEntityFieldManagerTest.php
+++ b/tests/src/Kernel/SchemaDotOrgEntityFieldManagerTest.php
@@ -55,7 +55,7 @@ class SchemaDotOrgEntityFieldManagerTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     // Install the Schema.org mapping entity.
diff --git a/tests/src/Kernel/SchemaDotOrgEntityTest.php b/tests/src/Kernel/SchemaDotOrgEntityTest.php
index c68679d..bfe0894 100644
--- a/tests/src/Kernel/SchemaDotOrgEntityTest.php
+++ b/tests/src/Kernel/SchemaDotOrgEntityTest.php
@@ -21,7 +21,7 @@ class SchemaDotOrgEntityTest extends SchemaDotOrgKernelEntityTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['schemadotorg_subtype']);
   }
diff --git a/tests/src/Kernel/SchemaDotOrgEntityTypeBuilderTest.php b/tests/src/Kernel/SchemaDotOrgEntityTypeBuilderTest.php
index 9f245a4..91921c6 100644
--- a/tests/src/Kernel/SchemaDotOrgEntityTypeBuilderTest.php
+++ b/tests/src/Kernel/SchemaDotOrgEntityTypeBuilderTest.php
@@ -32,7 +32,7 @@ class SchemaDotOrgEntityTypeBuilderTest extends SchemaDotOrgKernelEntityTestBase
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->entityDisplayRepository = $this->container->get('entity_display.repository');
diff --git a/tests/src/Kernel/SchemaDotOrgInstallerTest.php b/tests/src/Kernel/SchemaDotOrgInstallerTest.php
index dbb903a..3c2b0ac 100644
--- a/tests/src/Kernel/SchemaDotOrgInstallerTest.php
+++ b/tests/src/Kernel/SchemaDotOrgInstallerTest.php
@@ -20,7 +20,7 @@ class SchemaDotOrgInstallerTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installer = $this->container->get('schemadotorg.installer');
diff --git a/tests/src/Kernel/SchemaDotOrgKernelEntityTestBase.php b/tests/src/Kernel/SchemaDotOrgKernelEntityTestBase.php
index 0f5179b..18fd699 100644
--- a/tests/src/Kernel/SchemaDotOrgKernelEntityTestBase.php
+++ b/tests/src/Kernel/SchemaDotOrgKernelEntityTestBase.php
@@ -92,7 +92,7 @@ abstract class SchemaDotOrgKernelEntityTestBase extends SchemaDotOrgKernelTestBa
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping');
diff --git a/tests/src/Kernel/SchemaDotOrgMappingEntityTest.php b/tests/src/Kernel/SchemaDotOrgMappingEntityTest.php
index 1f60bdc..861f3ed 100644
--- a/tests/src/Kernel/SchemaDotOrgMappingEntityTest.php
+++ b/tests/src/Kernel/SchemaDotOrgMappingEntityTest.php
@@ -64,7 +64,7 @@ class SchemaDotOrgMappingEntityTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping');
diff --git a/tests/src/Kernel/SchemaDotOrgMappingFormTest.php b/tests/src/Kernel/SchemaDotOrgMappingFormTest.php
index 163afd9..3a6fe71 100644
--- a/tests/src/Kernel/SchemaDotOrgMappingFormTest.php
+++ b/tests/src/Kernel/SchemaDotOrgMappingFormTest.php
@@ -53,7 +53,7 @@ class SchemaDotOrgMappingFormTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping');
diff --git a/tests/src/Kernel/SchemaDotOrgMappingManagerTest.php b/tests/src/Kernel/SchemaDotOrgMappingManagerTest.php
index 35dd791..5ebc97b 100644
--- a/tests/src/Kernel/SchemaDotOrgMappingManagerTest.php
+++ b/tests/src/Kernel/SchemaDotOrgMappingManagerTest.php
@@ -49,7 +49,7 @@ class SchemaDotOrgMappingManagerTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping');
diff --git a/tests/src/Kernel/SchemaDotOrgMappingStorageTest.php b/tests/src/Kernel/SchemaDotOrgMappingStorageTest.php
index e0b65ca..7e68334 100644
--- a/tests/src/Kernel/SchemaDotOrgMappingStorageTest.php
+++ b/tests/src/Kernel/SchemaDotOrgMappingStorageTest.php
@@ -41,7 +41,7 @@ class SchemaDotOrgMappingStorageTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping');
diff --git a/tests/src/Kernel/SchemaDotOrgMappingTypeEntityTest.php b/tests/src/Kernel/SchemaDotOrgMappingTypeEntityTest.php
index 3f7a44e..898a559 100644
--- a/tests/src/Kernel/SchemaDotOrgMappingTypeEntityTest.php
+++ b/tests/src/Kernel/SchemaDotOrgMappingTypeEntityTest.php
@@ -35,7 +35,7 @@ class SchemaDotOrgMappingTypeEntityTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('user');
diff --git a/tests/src/Kernel/SchemaDotOrgMappingTypeStorageTest.php b/tests/src/Kernel/SchemaDotOrgMappingTypeStorageTest.php
index 8d45e90..ce9dbef 100644
--- a/tests/src/Kernel/SchemaDotOrgMappingTypeStorageTest.php
+++ b/tests/src/Kernel/SchemaDotOrgMappingTypeStorageTest.php
@@ -36,7 +36,7 @@ class SchemaDotOrgMappingTypeStorageTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installEntitySchema('schemadotorg_mapping_type');
diff --git a/tests/src/Kernel/SchemaDotOrgNamesTest.php b/tests/src/Kernel/SchemaDotOrgNamesTest.php
index c7f5a16..8d91feb 100644
--- a/tests/src/Kernel/SchemaDotOrgNamesTest.php
+++ b/tests/src/Kernel/SchemaDotOrgNamesTest.php
@@ -20,7 +20,7 @@ class SchemaDotOrgNamesTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['schemadotorg']);
diff --git a/tests/src/Kernel/SchemaDotOrgSchemaTypeManagerTest.php b/tests/src/Kernel/SchemaDotOrgSchemaTypeManagerTest.php
index 0f05464..ed2a80e 100644
--- a/tests/src/Kernel/SchemaDotOrgSchemaTypeManagerTest.php
+++ b/tests/src/Kernel/SchemaDotOrgSchemaTypeManagerTest.php
@@ -22,7 +22,7 @@ class SchemaDotOrgSchemaTypeManagerTest extends SchemaDotOrgKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->installConfig(['schemadotorg']);
diff --git a/tests/src/Unit/Breadcrumb/SchemaDotOrgBreadcrumbBuilderTest.php b/tests/src/Unit/Breadcrumb/SchemaDotOrgBreadcrumbBuilderTest.php
index 507be35..197ee13 100644
--- a/tests/src/Unit/Breadcrumb/SchemaDotOrgBreadcrumbBuilderTest.php
+++ b/tests/src/Unit/Breadcrumb/SchemaDotOrgBreadcrumbBuilderTest.php
@@ -24,9 +24,7 @@ class SchemaDotOrgBreadcrumbBuilderTest extends UnitTestCase {
     // @see \Drupal\Core\Breadcrumb\Breadcrumb
     // @see \Drupal\Core\Cache\RefinableCacheableDependencyTrait
     // @see \Drupal\Core\Cache\Cache
-    $cache_contexts_manager = $this->getMockBuilder('Drupal\Core\Cache\Context\CacheContextsManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $cache_contexts_manager = $this->createMock('Drupal\Core\Cache\Context\CacheContextsManager');
     // Always return TRUE for ::assertValidTokens so that any cache context
     // will be accepted.
     $cache_contexts_manager->method('assertValidTokens')->willReturn(TRUE);
@@ -49,9 +47,7 @@ class SchemaDotOrgBreadcrumbBuilderTest extends UnitTestCase {
    * @covers ::applies
    */
   public function testApplies($expected, $route_name = NULL) {
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg\Breadcrumb\SchemaDotOrgBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg\Breadcrumb\SchemaDotOrgBreadcrumbBuilder');
 
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
@@ -88,9 +84,7 @@ class SchemaDotOrgBreadcrumbBuilderTest extends UnitTestCase {
    */
   public function testBuild() {
     // Build a breadcrumb builder to test.
-    $breadcrumb_builder = $this->getMockBuilder('\Drupal\schemadotorg\Breadcrumb\SchemaDotOrgBreadcrumbBuilder')
-      ->onlyMethods([])
-      ->getMock();
+    $breadcrumb_builder = $this->createMock('\Drupal\schemadotorg\Breadcrumb\SchemaDotOrgBreadcrumbBuilder');
 
     // Add a translation manager for t().
     $translation_manager = $this->getStringTranslationStub();
diff --git a/tests/src/Unit/SchemaDotOrgSchemaTypeBuilderTest.php b/tests/src/Unit/SchemaDotOrgSchemaTypeBuilderTest.php
index 933ba38..d019ffd 100644
--- a/tests/src/Unit/SchemaDotOrgSchemaTypeBuilderTest.php
+++ b/tests/src/Unit/SchemaDotOrgSchemaTypeBuilderTest.php
@@ -49,9 +49,7 @@ class SchemaDotOrgSchemaTypeBuilderTest extends UnitTestCase {
 
     $this->currentUser = $this->createMock('Drupal\Core\Session\AccountInterface');
 
-    $this->schemaTypeManager = $this->getMockBuilder('\Drupal\schemadotorg\SchemaDotOrgSchemaTypeManager')
-      ->disableOriginalConstructor()
-      ->getMock();
+    $this->schemaTypeManager = $this->createMock('\Drupal\schemadotorg\SchemaDotOrgSchemaTypeManager');
 
     $this->schemaTypeBuilder = new SchemaDotOrgSchemaTypeBuilder(
       $this->moduleHandler,