diff --git a/core/lib/Drupal/Core/Asset/AssetResolver.php b/core/lib/Drupal/Core/Asset/AssetResolver.php
index fd35cbc448..297f97f8c2 100644
--- a/core/lib/Drupal/Core/Asset/AssetResolver.php
+++ b/core/lib/Drupal/Core/Asset/AssetResolver.php
@@ -155,7 +155,7 @@ public function getCssAssets(AttachedAssetsInterface $assets, $optimize) {
     $this->themeManager->alter('css', $css, $assets);
 
     // Sort CSS items, so that they appear in the correct order.
-    uasort($css, 'static::sort');
+    uasort($css, [static::class, 'sort']);
 
     if ($optimize) {
       $css = \Drupal::service('asset.css.collection_optimizer')->optimize($css);
@@ -262,7 +262,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
       $this->themeManager->alter('js', $javascript, $assets);
 
       // Sort JavaScript assets, so that they appear in the correct order.
-      uasort($javascript, 'static::sort');
+      uasort($javascript, [static::class, 'sort']);
 
       // Prepare the return value: filter JavaScript assets per scope.
       $js_assets_header = [];
diff --git a/core/lib/Drupal/Core/Session/UserSession.php b/core/lib/Drupal/Core/Session/UserSession.php
index 5ed8e4c724..cbda563a2d 100644
--- a/core/lib/Drupal/Core/Session/UserSession.php
+++ b/core/lib/Drupal/Core/Session/UserSession.php
@@ -66,6 +66,16 @@ class UserSession implements AccountInterface {
    * @var string
    */
   protected $timezone;
+  protected $langcode;
+  protected $pass;
+  protected $status;
+  protected $created;
+  protected $changed;
+  protected $login;
+  protected $init;
+  protected $default_langcode;
+  public $pass_raw;
+  public $passRaw;
 
   /**
    * Constructs a new user session.
diff --git a/core/modules/user/src/Entity/Role.php b/core/modules/user/src/Entity/Role.php
index f65af51088..af05336658 100644
--- a/core/modules/user/src/Entity/Role.php
+++ b/core/modules/user/src/Entity/Role.php
@@ -169,7 +169,7 @@ public static function postLoad(EntityStorageInterface $storage, array &$entitie
     parent::postLoad($storage, $entities);
     // Sort the queried roles by their weight.
     // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort().
-    uasort($entities, 'static::sort');
+    uasort($entities, [static::class, 'sort']);
   }
 
   /**