Skip to content
Snippets Groups Projects
Commit 8c14f1a1 authored by Michael Lee's avatar Michael Lee
Browse files

Upgrading drupal/admin_toolbar (3.4.1 => 3.4.2)

parent 074eb1e0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 179 additions and 121 deletions
composer.lock
+ 20
− 20
View file @ 8c14f1a1
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "c1924af4e3a2b694889f8b96c6df0edb",
"content-hash": "bf9e73d9d431245fc815cc7a4a68c7c5",
"packages": [
{
"name": "alchemy/zippy",
......@@ -1685,17 +1685,17 @@
},
{
"name": "drupal/admin_toolbar",
"version": "3.4.1",
"version": "3.4.2",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
"reference": "3.4.1"
"reference": "3.4.2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.1.zip",
"reference": "3.4.1",
"shasum": "bcb15ab40016becdb3ac8f21d7d1a721f48f3577"
"url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip",
"reference": "3.4.2",
"shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854"
},
"require": {
"drupal/core": "^9.2 || ^10"
......@@ -1706,8 +1706,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "3.4.1",
"datestamp": "1684944156",
"version": "3.4.2",
"datestamp": "1696006195",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
......@@ -15279,16 +15279,16 @@
},
{
"name": "symfony/string",
"version": "v6.3.2",
"version": "v6.3.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "53d1a83225002635bca3482fcbf963001313fb68"
"reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
"reference": "53d1a83225002635bca3482fcbf963001313fb68",
"url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
"reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
"shasum": ""
},
"require": {
......@@ -15345,7 +15345,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v6.3.2"
"source": "https://github.com/symfony/string/tree/v6.3.5"
},
"funding": [
{
......@@ -15361,7 +15361,7 @@
"type": "tidelift"
}
],
"time": "2023-07-05T08:41:27+00:00"
"time": "2023-09-18T10:38:32+00:00"
},
{
"name": "symfony/translation",
......@@ -15638,16 +15638,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v5.4.28",
"version": "v5.4.29",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "684b36ff415e1381d4a943c3ca2502cd2debad73"
"reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73",
"reference": "684b36ff415e1381d4a943c3ca2502cd2debad73",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65",
"reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65",
"shasum": ""
},
"require": {
......@@ -15707,7 +15707,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.4.28"
"source": "https://github.com/symfony/var-dumper/tree/v5.4.29"
},
"funding": [
{
......@@ -15723,7 +15723,7 @@
"type": "tidelift"
}
],
"time": "2023-08-24T13:38:36+00:00"
"time": "2023-09-12T10:09:58+00:00"
},
{
"name": "symfony/var-exporter",
......
vendor/composer/installed.json
+ 22
− 22
View file @ 8c14f1a1
......@@ -1745,18 +1745,18 @@
},
{
"name": "drupal/admin_toolbar",
"version": "3.4.1",
"version_normalized": "3.4.1.0",
"version": "3.4.2",
"version_normalized": "3.4.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/admin_toolbar.git",
"reference": "3.4.1"
"reference": "3.4.2"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.1.zip",
"reference": "3.4.1",
"shasum": "bcb15ab40016becdb3ac8f21d7d1a721f48f3577"
"url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip",
"reference": "3.4.2",
"shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854"
},
"require": {
"drupal/core": "^9.2 || ^10"
......@@ -1767,8 +1767,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "3.4.1",
"datestamp": "1684944156",
"version": "3.4.2",
"datestamp": "1696006195",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
......@@ -15897,17 +15897,17 @@
},
{
"name": "symfony/string",
"version": "v6.3.2",
"version_normalized": "6.3.2.0",
"version": "v6.3.5",
"version_normalized": "6.3.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "53d1a83225002635bca3482fcbf963001313fb68"
"reference": "13d76d0fb049051ed12a04bef4f9de8715bea339"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68",
"reference": "53d1a83225002635bca3482fcbf963001313fb68",
"url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339",
"reference": "13d76d0fb049051ed12a04bef4f9de8715bea339",
"shasum": ""
},
"require": {
......@@ -15927,7 +15927,7 @@
"symfony/translation-contracts": "^2.5|^3.0",
"symfony/var-exporter": "^5.4|^6.0"
},
"time": "2023-07-05T08:41:27+00:00",
"time": "2023-09-18T10:38:32+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
......@@ -15966,7 +15966,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v6.3.2"
"source": "https://github.com/symfony/string/tree/v6.3.5"
},
"funding": [
{
......@@ -16268,17 +16268,17 @@
},
{
"name": "symfony/var-dumper",
"version": "v5.4.28",
"version_normalized": "5.4.28.0",
"version": "v5.4.29",
"version_normalized": "5.4.29.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "684b36ff415e1381d4a943c3ca2502cd2debad73"
"reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73",
"reference": "684b36ff415e1381d4a943c3ca2502cd2debad73",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65",
"reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65",
"shasum": ""
},
"require": {
......@@ -16302,7 +16302,7 @@
"ext-intl": "To show region name in time zone dump",
"symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script"
},
"time": "2023-08-24T13:38:36+00:00",
"time": "2023-09-12T10:09:58+00:00",
"bin": [
"Resources/bin/var-dump-server"
],
......@@ -16340,7 +16340,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.4.28"
"source": "https://github.com/symfony/var-dumper/tree/v5.4.29"
},
"funding": [
{
......
vendor/composer/installed.php
+ 11
− 11
View file @ 8c14f1a1
......@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '0ad7ccabc0bd4a0578e1282f9f8ed59e0ecd9c18',
'reference' => '074eb1e036c4485855cd343bd55ec2f452a1e754',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
......@@ -272,9 +272,9 @@
'dev_requirement' => false,
),
'drupal/admin_toolbar' => array(
'pretty_version' => '3.4.1',
'version' => '3.4.1.0',
'reference' => '3.4.1',
'pretty_version' => '3.4.2',
'version' => '3.4.2.0',
'reference' => '3.4.2',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/admin_toolbar',
'aliases' => array(),
......@@ -1531,7 +1531,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '0ad7ccabc0bd4a0578e1282f9f8ed59e0ecd9c18',
'reference' => '074eb1e036c4485855cd343bd55ec2f452a1e754',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
......@@ -2391,9 +2391,9 @@
),
),
'symfony/string' => array(
'pretty_version' => 'v6.3.2',
'version' => '6.3.2.0',
'reference' => '53d1a83225002635bca3482fcbf963001313fb68',
'pretty_version' => 'v6.3.5',
'version' => '6.3.5.0',
'reference' => '13d76d0fb049051ed12a04bef4f9de8715bea339',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/string',
'aliases' => array(),
......@@ -2433,9 +2433,9 @@
'dev_requirement' => false,
),
'symfony/var-dumper' => array(
'pretty_version' => 'v5.4.28',
'version' => '5.4.28.0',
'reference' => '684b36ff415e1381d4a943c3ca2502cd2debad73',
'pretty_version' => 'v5.4.29',
'version' => '5.4.29.0',
'reference' => '6172e4ae3534d25ee9e07eb487c20be7760fcc65',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-dumper',
'aliases' => array(),
......
vendor/symfony/string/Resources/data/wcswidth_table_wide.php
+ 15
− 3
View file @ 8c14f1a1
......@@ -3,8 +3,8 @@
/*
* This file has been auto-generated by the Symfony String Component for internal use.
*
* Unicode version: 15.0.0
* Date: 2022-10-05T17:16:36+02:00
* Unicode version: 15.1.0
* Date: 2023-09-13T11:47:12+00:00
*/
return [
......@@ -166,7 +166,7 @@
],
[
12272,
12283,
12287,
],
[
12288,
......@@ -396,6 +396,10 @@
12736,
12771,
],
[
12783,
12783,
],
[
12784,
12799,
......@@ -1110,6 +1114,14 @@
],
[
191457,
191471,
],
[
191472,
192093,
],
[
192094,
194559,
],
[
......
vendor/symfony/string/Resources/data/wcswidth_table_zero.php
+ 2
− 2
View file @ 8c14f1a1
......@@ -3,8 +3,8 @@
/*
* This file has been auto-generated by the Symfony String Component for internal use.
*
* Unicode version: 15.0.0
* Date: 2022-10-05T17:16:37+02:00
* Unicode version: 15.1.0
* Date: 2023-09-13T11:47:13+00:00
*/
return [
......
web/modules/admin_toolbar/admin_toolbar.info.yml
+ 3
− 3
View file @ 8c14f1a1
......@@ -7,7 +7,7 @@ core_version_requirement: ^9.2 || ^10
dependencies:
- drupal:toolbar
# Information added by Drupal.org packaging script on 2023-05-24
version: '3.4.1'
# Information added by Drupal.org packaging script on 2023-09-29
version: '3.4.2'
project: 'admin_toolbar'
datestamp: 1684944158
datestamp: 1696006156
web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.info.yml
+ 3
− 3
View file @ 8c14f1a1
......@@ -6,7 +6,7 @@ core_version_requirement: ^9.2 || ^10
dependencies:
- admin_toolbar:admin_toolbar
# Information added by Drupal.org packaging script on 2023-05-24
version: '3.4.1'
# Information added by Drupal.org packaging script on 2023-09-29
version: '3.4.2'
project: 'admin_toolbar'
datestamp: 1684944158
datestamp: 1696006156
web/modules/admin_toolbar/admin_toolbar_links_access_filter/admin_toolbar_links_access_filter.module
+ 53
− 46
View file @ 8c14f1a1
......@@ -65,60 +65,67 @@ function admin_toolbar_links_access_filter_filter_non_accessible_links(array &$i
$access_manager = \Drupal::accessManager();
foreach ($items as $menu_id => &$item) {
$route_name = NULL;
$route_params = [];
if (!empty($item['original_link'])) {
/** @var \Drupal\Core\Menu\MenuLinkBase $original_link */
$original_link = $item['original_link'];
if ($original_link->getUrlObject()->isExternal()) {
// Do not filter external URL at all.
continue;
try {
$route_name = NULL;
$route_params = [];
if (!empty($item['original_link'])) {
/** @var \Drupal\Core\Menu\MenuLinkBase $original_link */
$original_link = $item['original_link'];
if ($original_link->getUrlObject()->isExternal() || !$original_link->getUrlObject()->isRouted()) {
// Do not filter external URL at all.
continue;
}
$route_name = $original_link->getRouteName() ?: $original_link->getUrlObject()->getRouteName();
$route_params = $original_link->getRouteParameters() ?: $original_link->getUrlObject()->getRouteParameters();
}
$route_name = $original_link->getRouteName() ?: $original_link->getUrlObject()->getRouteName();
$route_params = $original_link->getRouteParameters() ?: $original_link->getUrlObject()->getRouteParameters();
}
elseif (!empty($item['url'])) {
/** @var \Drupal\Core\Url $url */
$url = $item['url'];
if ($url->isExternal()) {
// Do not filter external URL at all.
continue;
elseif (!empty($item['url'])) {
/** @var \Drupal\Core\Url $url */
$url = $item['url'];
if ($url->isExternal() || !$original_link->getUrlObject()->isRouted()) {
// Do not filter external URL at all.
continue;
}
$route_name = $url->getRouteName();
$route_params = $url->getRouteParameters();
}
$route_name = $url->getRouteName();
$route_params = $url->getRouteParameters();
}
// Check, if user has access rights to the route.
if (!$access_manager->checkNamedRoute($route_name, $route_params)) {
unset($items[$menu_id]);
}
else {
if (!empty($items[$menu_id]['below'])) {
// Recursively call this function for the child items.
admin_toolbar_links_access_filter_filter_non_accessible_links($items[$menu_id]['below']);
// Check, if user has access rights to the route.
if (!$access_manager->checkNamedRoute($route_name, $route_params)) {
unset($items[$menu_id]);
}
if (empty($items[$menu_id]['below'])) {
// Every child item has been cleared out.
// Now check, if the given route represents an overview page only,
// without having functionality on its own. In this case, we can safely
// unset this item, as there aren't any children left.
// This assumption is only valid, when the admin_toolbar module is
// installed because otherwise we won't have child items at all.
if (admin_toolbar_links_access_filter_is_overview_page($route_name)) {
unset($items[$menu_id]);
}
// If there are no sub-items and the parent does not have a link, then
// it is safe to remove it.
elseif ($route_name === '<nolink>') {
unset($items[$menu_id]);
else {
if (!empty($items[$menu_id]['below'])) {
// Recursively call this function for the child items.
admin_toolbar_links_access_filter_filter_non_accessible_links($items[$menu_id]['below']);
}
else {
// Let's remove the expanded flag.
$items[$menu_id]['is_expanded'] = FALSE;
if (empty($items[$menu_id]['below'])) {
// Every child item has been cleared out.
// Now check, if the given route represents an overview page only,
// without having functionality on its own. In this case, we can
// safely unset this item, as there aren't any children left.
// This assumption is only valid, when the admin_toolbar module is
// installed because otherwise we won't have child items at all.
if (admin_toolbar_links_access_filter_is_overview_page($route_name)) {
unset($items[$menu_id]);
}
// If there are no sub-items and the parent does not have a link, then
// it is safe to remove it.
elseif ($route_name === '<nolink>') {
unset($items[$menu_id]);
}
else {
// Let's remove the expanded flag.
$items[$menu_id]['is_expanded'] = FALSE;
}
}
}
}
catch (\UnexpectedValueException $e) {
// Skip on errors like "base:block has no corresponding route":
\Drupal::logger('my_module')->error($e->getMessage());
continue;
}
}
}
......
web/modules/admin_toolbar/admin_toolbar_search/admin_toolbar_search.info.yml
+ 3
− 3
View file @ 8c14f1a1
......@@ -7,7 +7,7 @@ configure: admin_toolbar_search.settings
dependencies:
- admin_toolbar:admin_toolbar_tools
# Information added by Drupal.org packaging script on 2023-05-24
version: '3.4.1'
# Information added by Drupal.org packaging script on 2023-09-29
version: '3.4.2'
project: 'admin_toolbar'
datestamp: 1684944158
datestamp: 1696006156
web/modules/admin_toolbar/admin_toolbar_search/css/admin.toolbar_search.css
+ 1
− 1
View file @ 8c14f1a1
......@@ -88,7 +88,7 @@
}
#toolbar-item-administration-search-tray div.form-item {
margin: 0.75em ;
margin: 0.75em;
}
#toolbar-item-administration-search-tray input {
......
web/modules/admin_toolbar/admin_toolbar_tools/admin_toolbar_tools.info.yml
+ 3
− 3
View file @ 8c14f1a1
......@@ -7,7 +7,7 @@ core_version_requirement: ^9.2 || ^10
dependencies:
- admin_toolbar:admin_toolbar
# Information added by Drupal.org packaging script on 2023-05-24
version: '3.4.1'
# Information added by Drupal.org packaging script on 2023-09-29
version: '3.4.2'
project: 'admin_toolbar'
datestamp: 1684944158
datestamp: 1696006156
web/modules/admin_toolbar/admin_toolbar_tools/src/AdminToolbarToolsHelper.php
+ 2
− 2
View file @ 8c14f1a1
......@@ -114,8 +114,8 @@ public function buildLocalTasksToolbar() {
// We can't use #lazy_builder here because
// ToolbarItem::preRenderToolbarItem will insert #attributes before
// lazy_builder callback and this will produce Exception.
// This means that for now we always render Local Tasks item even when
// the tray is empty.
// This means that for now we always render Local Tasks item even
// when the tray is empty.
'#type' => 'link',
'#title' => $this->t('Local Tasks'),
'#url' => Url::fromRoute('<none>'),
......
web/modules/admin_toolbar/admin_toolbar_tools/src/Controller/ToolbarController.php
+ 1
− 1
View file @ 8c14f1a1
......@@ -288,7 +288,7 @@ public function cacheRender() {
*/
public function themeRebuild() {
$this->themeRegistry->reset();
$this->messenger()->addMessage($this->t('Theme registry rebuilded.'));
$this->messenger()->addMessage($this->t('Theme registry rebuilt.'));
return new RedirectResponse($this->reloadPage());
}
......
web/modules/admin_toolbar/logo.png 0 → 100644
+ 39
− 0
View file @ 8c14f1a1
web/modules/admin_toolbar/logo.png

6.18 KiB

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment