diff --git a/core/lib/Drupal/Component/Plugin/PluginManagerBase.php b/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
index eb216379990049ec6bb717585ea5cebf44973abf..d8500f3456edac603904007d576fb24f88aeb061 100644
--- a/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
+++ b/core/lib/Drupal/Component/Plugin/PluginManagerBase.php
@@ -125,7 +125,7 @@ protected function handlePluginNotFound($plugin_id, array $configuration) {
    *   If the method is not implemented in the concrete plugin manager class.
    */
   protected function getFallbackPluginId($plugin_id, array $configuration = []) {
-    throw new \BadMethodCallException(get_class() . '::getFallbackPluginId() not implemented.');
+    throw new \BadMethodCallException(static::class . '::getFallbackPluginId() not implemented.');
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index fbc70208c84d0b4c06fc43b288add3284b0d80f4..96f441681d7c260aeb327adbe3cdce0c298cccdb 100644
--- a/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void {
     parent::setUp();
 
     $property = new \ReflectionProperty('Drupal\Component\Utility\Html', 'seenIdsInit');
-    $property->setValue(NULL);
+    $property->setValue(NULL, NULL);
   }
 
   /**