Karl Shea
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorage.php
+   * @param \Drupal\Core\Routing\RouteProviderInterface|null $route_provider
+   *   The route provider.
   * @param array $options
   *   (optional) Any additional database connection options to use in queries.
   */
-  public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, array $options = []) {
+  public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, $route_provider = NULL, array $options = []) {
    $this->connection = $connection;
    $this->menuCacheBackend = $menu_cache_backend;
    $this->cacheTagsInvalidator = $cache_tags_invalidator;
+    if (!$route_provider instanceof RouteProviderInterface) {
+      if (is_array($route_provider)) {
+        $options = $route_provider;
+      }
+      $route_provider = \Drupal::service('router.route_provider');
+      @trigger_error('Calling ' . __METHOD__ . '() without the $route_provider argument is deprecated in drupal:9.5.10 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3364323', E_USER_DEPRECATED);