diff -u b/modules/mie_demo_base/mie_demo_base.module b/modules/mie_demo_base/mie_demo_base.module
--- b/modules/mie_demo_base/mie_demo_base.module
+++ b/modules/mie_demo_base/mie_demo_base.module
@@ -44,7 +44,7 @@
  * Implements hook_preprocess().
  */
 function mie_demo_base_preprocess(&$variables, $hook, &$info) {
-  $module_path = drupal_get_path('module', 'mie_demo_base');
+  $module_path = \Drupal::service('extension.list.module')->getPath('mie_demo_base');
 
   if ($hook == 'menu') {
     if (substr($info['theme path'], 0, 7) != 'themes/') {
only in patch2:
unchanged:
--- a/menu_item_extras.module
+++ b/menu_item_extras.module
@@ -36,7 +36,7 @@ function menu_item_extras_help($route_name, RouteMatchInterface $route_match) {
           '#value' => t('Provides additional custom fields which can be used on Menu Link.'),
         ],
       ];
-      return render($output);
+      return \Drupal::service('renderer')->render($output);
   }
 }
 
only in patch2:
unchanged:
--- a/modules/mie_demo_base/src/Utility/MieDemoBaseUtility.php
+++ b/modules/mie_demo_base/src/Utility/MieDemoBaseUtility.php
@@ -5,6 +5,7 @@ namespace Drupal\mie_demo_base\Utility;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\file\Entity\File;
 use Drupal\Core\StreamWrapper\PublicStream;
+use Drupal\file\FileInterface;
 use Drupal\menu_link_content\Entity\MenuLinkContent;
 use Drupal\taxonomy\Entity\Term;
 
@@ -25,7 +26,7 @@ class MieDemoBaseUtility {
    *   Drupal File entity.
    */
   public static function createFile($file_name, $module_path = 'mie_demo_base') {
-    $source = drupal_get_path('module', 'mie_demo_base') . '/files/' . $file_name;
+    $source = \Drupal::service('extension.list.module')->getPath('mie_demo_base') . '/files/' . $file_name;
     $destination = PublicStream::basePath();
     /** @var \Drupal\Core\File\FileSystemInterface $file_system */
     $file_system = \Drupal::service('file_system');
@@ -36,7 +37,7 @@ class MieDemoBaseUtility {
     }
     $demo_image_uri = 'public://' . $file_name;
     /** @var \Drupal\file\FileInterface $file */
-    $demo_image = File::create(['uri' => $demo_image_uri, 'status' => FILE_STATUS_PERMANENT]);
+    $demo_image = File::create(['uri' => $demo_image_uri, 'status' => FileInterface::STATUS_PERMANENT]);
     $demo_image->save();
     return $demo_image;
   }
only in patch2:
unchanged:
--- a/tests/src/Functional/MenuItemExtrasRenderTest.php
+++ b/tests/src/Functional/MenuItemExtrasRenderTest.php
@@ -50,7 +50,7 @@ class MenuItemExtrasRenderTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['menu_item_extras'];
+  protected static $modules = ['menu_item_extras'];
 
   /**
    * {@inheritdoc}
only in patch2:
unchanged:
--- a/tests/src/Functional/MenuItemExtrasUninstallTest.php
+++ b/tests/src/Functional/MenuItemExtrasUninstallTest.php
@@ -75,7 +75,8 @@ class MenuItemExtrasUninstallTest extends BrowserTestBase {
     $url = Url::fromRoute('entity.menu_link_content.edit_form', ['menu_link_content' => $link->id()]);
     $this->drupalGet($url);
     $this->assertSame(200, $this->getSession()->getStatusCode(), 'Unexpected error on the menu item edit page.');
-    $this->drupalPostForm($url, [], 'Save');
+    $this->drupalGet($url);
+    $this->submitForm([], 'Save');
     $this->assertNotSame(500, $this->getSession()->getStatusCode(), "Unexpected error on the menu item edit page.");
     $this->drupalLogout();
     FieldStorageConfig::create([
only in patch2:
unchanged:
--- a/tests/src/Kernel/MenuLinksOriginTest.php
+++ b/tests/src/Kernel/MenuLinksOriginTest.php
@@ -50,7 +50,7 @@ class MenuLinksOriginTest extends KernelTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
 
     $this->menuLinkManager = \Drupal::service('plugin.manager.menu.link');