[#124455] Patches

- remove update module - remove google_analytics module - add patched icons from admin_toolbar module

[#124455] Patches
- remove update module - remove google_analytics module - add patched icons from admin_toolbar module
ba849e0f · Sergey Shadrin · f7ae80d5 · ba849e0f · ba849e0f · ba849e0f
Commit ba849e0f authored Jun 22, 2024 by Sergey Shadrin
14 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ docroot/sites/*/files/*
 !docroot/sites/*/files/translations
 docroot/sites/*/private
 docroot/sites/*/settings.php
+# Exclude update module
+docroot/core/modules/update

 # Exclude IDE specific directories.
 .idea

--- a/composer.json
+++ b/composer.json
@@ -146,7 +146,8 @@
            "drupal/core": {
                "Deprecated function: mb_strtolower(): Passing null to parameter #1 ($string) of type string is deprecated in Drupal\\Component\\Utility\\Html::getId() (line 219 of core/lib/Drupal/Component/Utility/Html.php)": "https://www.drupal.org/files/issues/2023-04-06/3326684-apply-condition1.patch",
                "Querying with NULL values results in warning mb_strtolower(): Passing null to parameter is deprecated" : "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch",
-                "Replace icons": "./patches/drupal_core/core-icons.patch"
+                "Replace icons": "./patches/drupal_core/core-icons.patch",
+                "Remove update module": "./patches/drupal_core/remove-update-module.patch"
            },
            "drupal/admin_toolbar": {
                "Replace icons": "./patches/admin_toolbar/replace-icons.patch"

--- a/composer.lock
+++ b/composer.lock
@@ -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": "959e18525a0c3be4168b24e7e108e5ee",
+    "content-hash": "31748d5e481c8a5e81094d544125f6cc",
    "packages": [
        {
            "name": "asm89/stack-cors",

--- a/docroot/core/PATCHES.txt
+++ b/docroot/core/PATCHES.txt
@@ -13,3 +13,7 @@ Replace icons
 Source: ./patches/drupal_core/core-icons.patch


+Remove update module
+Source: ./patches/drupal_core/remove-update-module.patch
+
+
--- a/docroot/core/modules/system/system.install
+++ b/docroot/core/modules/system/system.install
@@ -1307,24 +1307,6 @@ function system_requirements($phase) {
  }

  if ($phase == 'runtime') {
-    // Check for update status module.
-    if (!\Drupal::moduleHandler()->moduleExists('update')) {
-      $requirements['update status'] = [
-        'value' => t('Not enabled'),
-        'severity' => REQUIREMENT_WARNING,
-        'description' => t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the Update Manager module from the <a href=":module">module administration page</a> in order to stay up-to-date on new releases. For more information, <a href=":update">Update status handbook page</a>.', [
-          ':update' => 'https://www.drupal.org/documentation/modules/update',
-          ':module' => Url::fromRoute('system.modules_list')->toString(),
-        ]),
-      ];
-    }
-    else {
-      $requirements['update status'] = [
-        'value' => t('Enabled'),
-      ];
-    }
-    $requirements['update status']['title'] = t('Update notifications');
-
    if (Settings::get('rebuild_access')) {
      $requirements['rebuild access'] = [
        'title' => t('Rebuild access'),

--- a/docroot/core/modules/system/system.module
+++ b/docroot/core/modules/system/system.module
@@ -125,13 +125,6 @@ function system_help($route_name, RouteMatchInterface $route_match) {
    case 'system.theme_settings':
      return '<p>' . t('Control default display settings for your site, across all themes. Use theme-specific settings to override these defaults.') . '</p>';

-    case 'system.modules_list':
-      $output = '<p>' . t('Add <a href=":modules">contributed modules</a> to extend your site\'s functionality.', [':modules' => 'https://www.drupal.org/project/modules']) . '</p>';
-      if (!\Drupal::moduleHandler()->moduleExists('update')) {
-        $output .= '<p>' . t('Regularly review available updates and update as required to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated. Install the <a href=":update-manager">Update Manager module</a> to update and add modules and themes.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':update-manager' => Url::fromRoute('system.modules_list', [], ['fragment' => 'module-update'])->toString()]) . '</p>';
-      }
-      return $output;
-
    case 'system.modules_uninstall':
      return '<p>' . t('The uninstall process removes all data related to a module.') . '</p>';


--- a/docroot/modules/contrib/admin_toolbar/PATCHES.txt
+++ b/docroot/modules/contrib/admin_toolbar/PATCHES.txt
+This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
+Patches applied to this directory:
+
+Replace icons
+Source: ./patches/admin_toolbar/replace-icons.patch
+
+
--- a/docroot/modules/contrib/admin_toolbar/admin_toolbar_tools/misc/icons/ffffff/drupal-8-logo.svg
+++ b/docroot/modules/contrib/admin_toolbar/admin_toolbar_tools/misc/icons/ffffff/drupal-8-logo.svg
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin" viewBox="0 0 611 646"><path fill="#2ba9e0" d="M 161.14248,607.07981 C 135.931,577.51327 120.7662,539.33875 120.7662,497.60876 c 0,-87.01545 66.15644,-158.68624 151.648,-168.60413 -14.59612,-20.95856 -23.31588,-46.40824 -23.31588,-73.72922 0,-71.85792 58.95316,-129.86822 131.7442,-129.86822 6.06592,0 11.94228,0.37426 17.62908,1.12278 C 355.44148,89.85249 312.41136,52.61362 278.48012,12.00641 295.73008,190.15417 114.1316,125.40719 46.8378,289.70733 1.91208,399.73977 42.47792,535.78328 161.14248,607.07981 Z m 143.1178,-351.8044 c 0,41.72999 34.31036,75.41339 76.39268,75.41339 42.08232,0 76.58224,-33.87053 76.58224,-75.41339 0,-41.72999 -34.31036,-75.41339 -76.39268,-75.41339 -42.08232,0 -76.58224,33.6834 -76.58224,75.41339 z m 112.97776,124.81571 c 29.57136,30.50219 47.76912,71.85792 47.76912,117.51764 0,57.82317 -29.19224,108.72253 -73.73884,139.41185 82.4586,-25.07542 150.7002,-86.26693 181.21936,-160.37041 42.27188,-102.54724 2.8434,-179.6448 -63.12348,-249.63142 2.08516,8.98224 3.22252,18.52587 3.22252,28.0695 -0.18956,59.50734 -40.37628,109.47105 -95.34868,125.00284 z m -124.35136,18.90013 c -55.16196,0 -99.89812,44.16268 -99.89812,98.61751 0,54.45483 44.73616,98.61751 99.89812,98.61751 55.16196,0 99.89812,-44.16268 99.89812,-98.61751 0,-54.45483 -44.73616,-98.61751 -99.89812,-98.61751 z" /></svg>
+<svg width="214" height="214" viewBox="0 0 214 214" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M172 59C154.963 36 135 19 105 0C110.5 30.5 58.5 50 41 68.5C23.5 87 17 106.188 17 125.902C17 174.204 57.6985 213.5 106 213.5C154.302 213.5 196.5 174.204 196.5 125.902C196.5 106.188 189.037 82 172 59Z" fill="#008CF2"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M105.318 83.5C92.4745 83.5 81.0102 88.6894 73.0589 96.8593C70.2775 99.7171 68.2075 104.354 67.3793 109.481C66.5258 114.766 67.2414 118.928 68.2111 120.763C58 122 51.5 113 52.5 104.5C53.2059 98.5 55.8754 91.5746 61.5929 85.7C72.5277 74.4646 88.115 67.5 105.318 67.5C137.872 67.5 165 92.6234 165 124.5C165 156.377 137.872 181.5 105.318 181.5C100.829 181.5 93.7529 180.358 90 180C85.3088 179.654 71.5 179 64 182L83.5 108.5C85.5 102 91.7553 98.2637 102.602 99.6635L84.5586 164.168C86.3276 164.183 88.0427 164.274 89.7083 164.397C91.628 164.538 93.3802 164.707 95.0667 164.87C98.4724 165.198 101.61 165.5 105.318 165.5C129.85 165.5 149 146.747 149 124.5C149 102.253 129.85 83.5 105.318 83.5Z" fill="white"/>
+</svg>
--- a/docroot/modules/contrib/admin_toolbar/admin_toolbar_tools/misc/icons/ffffff/drupal-9-logo.svg
+++ b/docroot/modules/contrib/admin_toolbar/admin_toolbar_tools/misc/icons/ffffff/drupal-9-logo.svg
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42.15 55.08"><defs><style>.cls-1{fill:#009cde;}</style></defs><title>Risorsa 23</title><g id="Livello_2" data-name="Livello 2"><g id="Livello_1-2" data-name="Livello 1"><path class="cls-1" d="M29.75,11.73C25.87,7.86,22.18,4.16,21.08,0,20,4.16,16.28,7.86,12.4,11.73,6.59,17.54,0,24.12,0,34a21.08,21.08,0,1,0,42.15,0C42.15,24.12,35.56,17.54,29.75,11.73ZM10.84,35.92a14.13,14.13,0,0,0-1.65,2.62.54.54,0,0,1-.36.3H8.65c-.47,0-1-.92-1-.92h0c-.14-.22-.27-.45-.4-.69l-.09-.19C5.94,34.25,7,30.28,7,30.28h0a17.42,17.42,0,0,1,2.52-5.41,31.53,31.53,0,0,1,2.28-3l1,1,4.72,4.82a.54.54,0,0,1,0,.72l-4.93,5.47h0ZM21.32,49.73a7.29,7.29,0,0,1-5.4-12.14c1.54-1.83,3.42-3.63,5.46-6,2.42,2.58,4,4.35,5.55,6.29a3.08,3.08,0,0,1,.32.48,7.15,7.15,0,0,1,1.3,4.12A7.23,7.23,0,0,1,21.32,49.73ZM35,38.14v0a.84.84,0,0,1-.67.58h-.14a1.22,1.22,0,0,1-.68-.55h0a37.77,37.77,0,0,0-4.28-5.31l-1.93-2-6.41-6.65a54,54,0,0,1-3.84-3.94,1.3,1.3,0,0,0-.1-.15,3.84,3.84,0,0,1-.51-1c0-.06,0-.13,0-.19a3.4,3.4,0,0,1,1-3c1.24-1.24,2.49-2.49,3.67-3.79,1.3,1.44,2.69,2.82,4.06,4.19v0a57.6,57.6,0,0,1,7.55,8.58A16,16,0,0,1,35.65,34,14.55,14.55,0,0,1,35,38.14Z"/></g></g></svg>
\ No newline at end of file
+<svg width="214" height="214" viewBox="0 0 214 214" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M172 59C154.963 36 135 19 105 0C110.5 30.5 58.5 50 41 68.5C23.5 87 17 106.188 17 125.902C17 174.204 57.6985 213.5 106 213.5C154.302 213.5 196.5 174.204 196.5 125.902C196.5 106.188 189.037 82 172 59Z" fill="#008CF2"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M105.318 83.5C92.4745 83.5 81.0102 88.6894 73.0589 96.8593C70.2775 99.7171 68.2075 104.354 67.3793 109.481C66.5258 114.766 67.2414 118.928 68.2111 120.763C58 122 51.5 113 52.5 104.5C53.2059 98.5 55.8754 91.5746 61.5929 85.7C72.5277 74.4646 88.115 67.5 105.318 67.5C137.872 67.5 165 92.6234 165 124.5C165 156.377 137.872 181.5 105.318 181.5C100.829 181.5 93.7529 180.358 90 180C85.3088 179.654 71.5 179 64 182L83.5 108.5C85.5 102 91.7553 98.2637 102.602 99.6635L84.5586 164.168C86.3276 164.183 88.0427 164.274 89.7083 164.397C91.628 164.538 93.3802 164.707 95.0667 164.87C98.4724 165.198 101.61 165.5 105.318 165.5C129.85 165.5 149 146.747 149 124.5C149 102.253 129.85 83.5 105.318 83.5Z" fill="white"/>
+</svg>
--- a/docroot/profiles/dar/config/install/google_analytics.settings.yml
+++ b/docroot/profiles/dar/config/install/google_analytics.settings.yml
-_core:
-  default_config_hash: tgZdajrXWh7tQl-UNXPeD6eqdwLIjrICPt6iXIUa8Kk
-account: ''
-premium: false
-domain_mode: 0
-cross_domains: ''
-visibility:
-  request_path_mode: 0
-  request_path_pages: |-
-    /admin
-    /admin/*
-    /batch
-    /node/add*
-    /node/*/*
-    /user/*/*
-  user_role_mode: 0
-  user_role_roles: {  }
-  user_account_mode: 0
-track:
-  outbound: true
-  mailto: true
-  files: true
-  files_extensions: '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip'
-  colorbox: true
-  linkid: false
-  urlfragments: false
-  userid: false
-  messages: {  }
-  site_search: false
-  adsense: false
-  displayfeatures: false
-privacy:
-  anonymizeip: true
-custom:
-  dimension: {  }
-  metric: {  }
-codesnippet:
-  create: {  }
-  before: ''
-  after: ''
-translation_set: false
-cache: false
-debug: false
-langcode: ru
--- a/docroot/profiles/dar/config/install/ultimate_cron.job.google_analytics_cron.yml
+++ b/docroot/profiles/dar/config/install/ultimate_cron.job.google_analytics_cron.yml
-uuid: 6b6a5960-17c5-49c2-90ef-8329b920b5cc
-langcode: ru
-status: true
-dependencies:
-  module:
-    - google_analytics
-_core:
-  default_config_hash: 9ZdcjUHSJ-fzxxlRPfn0n2eiAEPDXHKS1bCRgHvbBeU
-title: 'Default cron handler'
-id: google_analytics_cron
-weight: 0
-module: google_analytics
-callback: google_analytics_cron
-scheduler:
-  id: simple
-launcher:
-  id: serial
-logger:
-  id: database
--- a/docroot/profiles/dar/dar.info.yml
+++ b/docroot/profiles/dar/dar.info.yml
@@ -42,7 +42,6 @@ dependencies:
  - field_ui
  - file
  - filter
-  - google_analytics
  - help
  - history
  - image

--- a/patches/drupal_core/remove-update-module.patch
+++ b/patches/drupal_core/remove-update-module.patch
+diff --git a/core/modules/system/system.install b/core/modules/system/system.install
+index 118125e60f..b8c141fe4b 100644
+--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
+@@ -1307,24 +1307,6 @@ function system_requirements($phase) {
+   }
+ 
+   if ($phase == 'runtime') {
+-    // Check for update status module.
+-    if (!\Drupal::moduleHandler()->moduleExists('update')) {
+-      $requirements['update status'] = [
+-        'value' => t('Not enabled'),
+-        'severity' => REQUIREMENT_WARNING,
+-        'description' => t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the Update Manager module from the <a href=":module">module administration page</a> in order to stay up-to-date on new releases. For more information, <a href=":update">Update status handbook page</a>.', [
+-          ':update' => 'https://www.drupal.org/documentation/modules/update',
+-          ':module' => Url::fromRoute('system.modules_list')->toString(),
+-        ]),
+-      ];
+-    }
+-    else {
+-      $requirements['update status'] = [
+-        'value' => t('Enabled'),
+-      ];
+-    }
+-    $requirements['update status']['title'] = t('Update notifications');
+-
+     if (Settings::get('rebuild_access')) {
+       $requirements['rebuild access'] = [
+         'title' => t('Rebuild access'),
+diff --git a/core/modules/system/system.module b/core/modules/system/system.module
+index 1d7b4e656f..6912cd4682 100644
+--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
+@@ -125,13 +125,6 @@ function system_help($route_name, RouteMatchInterface $route_match) {
+     case 'system.theme_settings':
+       return '<p>' . t('Control default display settings for your site, across all themes. Use theme-specific settings to override these defaults.') . '</p>';
+ 
+-    case 'system.modules_list':
+-      $output = '<p>' . t('Add <a href=":modules">contributed modules</a> to extend your site\'s functionality.', [':modules' => 'https://www.drupal.org/project/modules']) . '</p>';
+-      if (!\Drupal::moduleHandler()->moduleExists('update')) {
+-        $output .= '<p>' . t('Regularly review available updates and update as required to maintain a secure and current site. Always run the <a href=":update-php">update script</a> each time a module is updated. Install the <a href=":update-manager">Update Manager module</a> to update and add modules and themes.', [':update-php' => Url::fromRoute('system.db_update')->toString(), ':update-manager' => Url::fromRoute('system.modules_list', [], ['fragment' => 'module-update'])->toString()]) . '</p>';
+-      }
+-      return $output;
+-
+     case 'system.modules_uninstall':
+       return '<p>' . t('The uninstall process removes all data related to a module.') . '</p>';
+ 
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2591,7 +2591,8 @@
                "patches_applied": {
                    "Deprecated function: mb_strtolower(): Passing null to parameter #1 ($string) of type string is deprecated in Drupal\\Component\\Utility\\Html::getId() (line 219 of core/lib/Drupal/Component/Utility/Html.php)": "https://www.drupal.org/files/issues/2023-04-06/3326684-apply-condition1.patch",
                    "Querying with NULL values results in warning mb_strtolower(): Passing null to parameter is deprecated": "https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch",
-                    "Replace icons": "./patches/drupal_core/core-icons.patch"
+                    "Replace icons": "./patches/drupal_core/core-icons.patch",
+                    "Remove update module": "./patches/drupal_core/remove-update-module.patch"
                }
            },
            "installation-source": "dist",