diff -u b/core/modules/system/system.tokens.inc b/core/modules/system/system.tokens.inc
--- b/core/modules/system/system.tokens.inc
+++ b/core/modules/system/system.tokens.inc
@@ -193,7 +193,8 @@
           $config = \Drupal::config('system.theme.global');
           $theme_config = \Drupal::config($theme . '.settings');
 
-          // If there is no logo key, we set the theme to NULL to use the global fallback.
+          // If there is no logo key, we set the theme to NULL to use the global
+          // fallback.
           if (!$theme_config->get('logo.path')) {
             $theme = NULL;
           }
@@ -219,7 +220,8 @@
           $config = \Drupal::config('system.theme.global');
           $theme_config = \Drupal::config($theme . '.settings');
 
-          // If there is no logo key, we set the theme to NULL to use the global fallback.
+          // If there is no logo key, we set the theme to NULL to use the global
+          // fallback.
           if (!$theme_config->get('logo.path')) {
             $theme = NULL;
           }
diff -u b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
--- b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
+++ b/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
@@ -129,10 +129,10 @@
   }
 
   /**
-   * Tests the generation of site logo tokens
+   * Tests the generation of site logo tokens.
    */
   public function testSystemSiteLogoTokenReplacement() {
-    // Install Bartik
+    // Install Bartik.
     \Drupal::service('theme_installer')->install(['bartik']);
 
     // Set the default theme to bartik.