pull in v11.0.1 from upstream

app/View/Composers/App.php

@@ -17,10 +17,13 @@ class App extends Composer
     ];
 
     /**
-     * Data to be passed to view before rendering.
-     *
-     * @return array
+     * Retrieve the site name.
      */
+    public function siteName(): string
+    {
+        return get_bloginfo('name', 'display');
+    }
+
     public function with()
     {
         return [
@@ -28,20 +31,9 @@ class App extends Composer
             'VideoSrcset' => new Utilities\VideoSrcset,
             'ImageSrcset' => new Utilities\ImageSrcset,
             'siteName' => $this->siteName(),
-            'siteLogo' => @file_get_contents(get_template_directory() . '/resources/images/logo-rhythm-road-entertainment.svg'),
             'company_legal' => get_field('badegg_company_legal', 'option'),
             'company_tel' => get_field('badegg_company_tel', 'option'),
             'company_email' => get_field('badegg_company_email', 'option'),
         ];
     }
-
-    /**
-     * Returns the site name.
-     *
-     * @return string
-     */
-    public function siteName()
-    {
-        return get_bloginfo('name', 'display');
-    }
 }