Fix missing menu active trail
Closes #3359511
Merge request reports
Activity
added 123 commits
-
196a56fe...c73225d6 - 122 commits from branch
project:11.x
- 0a5535f5 - Fix missing menu active trail
-
196a56fe...c73225d6 - 122 commits from branch
added 914 commits
-
0a5535f5...77b8e596 - 913 commits from branch
project:11.x
- 221357ca - Fix missing menu active trail
-
0a5535f5...77b8e596 - 913 commits from branch
added 1032 commits
-
f9a873e3...6dd918c9 - 1029 commits from branch
project:11.x
- 49e02684 - Fix missing menu active trail
- 0e0dc52c - Fix lint error
- 7f1e51ef - Remove fallback
Toggle commit list-
f9a873e3...6dd918c9 - 1029 commits from branch
99 * @param \Drupal\Core\Routing\RouteProviderInterface|null $route_provider 100 * The route provider. 90 101 * @param array $options 91 102 * (optional) Any additional database connection options to use in queries. 92 103 */ 93 public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, array $options = []) { 104 public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, $route_provider = NULL, array $options = []) { 94 105 $this->connection = $connection; 95 106 $this->menuCacheBackend = $menu_cache_backend; 96 107 $this->cacheTagsInvalidator = $cache_tags_invalidator; 108 if (!$route_provider instanceof RouteProviderInterface) { 109 if (is_array($route_provider)) { 110 $options = $route_provider; 111 } 112 $route_provider = \Drupal::service('router.route_provider'); 113 @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); changed this line in version 17 of the diff
- Resolved by Matthew Radcliffe
added 169 commits
-
b9b7e6c2...42209999 - 168 commits from branch
project:11.x
- 7ddd6b04 - Merge branch drupal:11.x into 3359511-regression-missing-menu
-
b9b7e6c2...42209999 - 168 commits from branch
100 * @param \Drupal\Core\Routing\RouteProviderInterface|null $route_provider 101 * The route provider. 91 102 * @param array $options 92 103 * (optional) Any additional database connection options to use in queries. 93 104 */ 94 public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, array $options = []) { 105 public function __construct(Connection $connection, CacheBackendInterface $menu_cache_backend, CacheTagsInvalidatorInterface $cache_tags_invalidator, $table, $route_provider = NULL, array $options = []) { 95 106 $this->connection = $connection; 96 107 $this->menuCacheBackend = $menu_cache_backend; 97 108 $this->cacheTagsInvalidator = $cache_tags_invalidator; 109 if (!$route_provider instanceof RouteProviderInterface) { 110 if (is_array($route_provider)) { 111 $options = $route_provider; 112 } 113 $route_provider = \Drupal::service('router.route_provider'); 114 @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); 114 @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); 114 @trigger_error('Calling ' . __METHOD__ . '() without the $route_provider argument is deprecated in drupal:11.3.0 and will be required in drupal:12.0.0. See https://www.drupal.org/node/3364323', E_USER_DEPRECATED); changed this line in version 17 of the diff
460 461 $this->assertEqualsCanonicalizing($children, array_keys($this->treeStorage->loadAllChildren($id))); 461 462 } 462 463 464 /** 465 * Tests backwards compatibility layer. 466 * 467 * @group legacy 468 * @dataProvider providerBackwardsCompatibilityLayer 469 */ 470 public function testBackwardsCompatibilityLayer(bool $pass_options = FALSE): void { 471 $this->expectDeprecation('Calling Drupal\Core\Menu\MenuTreeStorage::__construct() 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'); 471 $this->expectDeprecation('Calling Drupal\Core\Menu\MenuTreeStorage::__construct() 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'); 471 $this->expectDeprecation('Calling Drupal\Core\Menu\MenuTreeStorage::__construct() without the $route_provider argument is deprecated in drupal:11.3 and will be required in drupal:12.0.0. See https://www.drupal.org/node/3364323'); changed this line in version 17 of the diff
214 214 'SELECT "base"."fid" AS "fid", "base"."uuid" AS "uuid", "base"."langcode" AS "langcode", "base"."uid" AS "uid", "base"."filename" AS "filename", "base"."uri" AS "uri", "base"."filemime" AS "filemime", "base"."filesize" AS "filesize", "base"."status" AS "status", "base"."created" AS "created", "base"."changed" AS "changed" FROM "file_managed" "base" WHERE "base"."fid" IN (5)', 215 215 'SELECT "name", "value" FROM "key_value" WHERE "name" IN ( "theme:umami" ) AND "collection" = "config.entity.key_store.block"', 216 216 'SELECT "base_table"."id" AS "id", "base_table"."path" AS "path", "base_table"."alias" AS "alias", "base_table"."langcode" AS "langcode" FROM "path_alias" "base_table" WHERE ("base_table"."status" = 1) AND ("base_table"."path" LIKE "/node/1" ESCAPE \'\\\\\') AND ("base_table"."langcode" IN ("es", "und")) ORDER BY "base_table"."langcode" ASC, "base_table"."id" DESC', 217 'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE ("route_name" = "entity.node.canonical") AND ("route_param_key" = "node=1") AND ("menu_name" = "account") ORDER BY "depth" ASC, "weight" ASC, "id" ASC', 218 'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE ("route_name" = "entity.node.canonical") AND ("route_param_key" = "node=1") AND ("menu_name" = "main") ORDER BY "depth" ASC, "weight" ASC, "id" ASC', 219 'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE ("route_name" = "entity.node.canonical") AND ("route_param_key" = "node=1") AND ("menu_name" = "footer") ORDER BY "depth" ASC, "weight" ASC, "id" ASC', 217 'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE·("route_name" = "entity.node.canonical") AND ("route_param_key" IN ("node=1", "node=1")) AND ("menu_name" = "account") ORDER·BY "depth" ASC, "weight" ASC, "id" ASC, "route_param_key" ASC', 217 'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE·("route_name" = "entity.node.canonical") AND ("route_param_key" IN ("node=1", "node=1")) AND ("menu_name" = "account") ORDER·BY "depth" ASC, "weight" ASC, "id" ASC, "route_param_key" ASC', 217 'SELECT "menu_tree"."menu_name" AS "menu_name", "menu_tree"."route_name" AS "route_name", "menu_tree"."route_parameters" AS "route_parameters", "menu_tree"."url" AS "url", "menu_tree"."title" AS "title", "menu_tree"."description" AS "description", "menu_tree"."parent" AS "parent", "menu_tree"."weight" AS "weight", "menu_tree"."options" AS "options", "menu_tree"."expanded" AS "expanded", "menu_tree"."enabled" AS "enabled", "menu_tree"."provider" AS "provider", "menu_tree"."metadata" AS "metadata", "menu_tree"."class" AS "class", "menu_tree"."form_class" AS "form_class", "menu_tree"."id" AS "id" FROM "menu_tree" "menu_tree" WHERE ("route_name" = "entity.node.canonical") AND ("route_param_key" IN ("node=1", "node=1")) AND ("menu_name" = "account") ORDER·BY "depth" ASC, "weight" ASC, "id" ASC, "route_param_key" ASC', changed this line in version 18 of the diff
Please register or sign in to reply