[#124455] 10.3.x updated

-Docroot moved upper to match previous versions
-Fixed libraries installation from modules
-Added core patch(3323621) to correct update from previous version

.gitignore

-docroot/sites/*/files
-!docroot/sites/*/files/
-docroot/sites/*/files/*
-!docroot/sites/*/files/translations
-docroot/sites/*/private
-docroot/sites/*/settings.php
+sites/*/files
+!sites/*/files/
+sites/*/files/*
+!sites/*/files/translations
+sites/*/private
+sites/*/settings.php
 # Exclude update module
-docroot/core/modules/update
+core/modules/update
 
 # Exclude IDE specific directories.
 .idea

.htaccess

@@ -35,8 +35,8 @@ AddEncoding gzip svgz
   # Enable expirations.
   ExpiresActive On
 
-  # Cache all files and redirects for 2 weeks after access (A).
-  ExpiresDefault A1209600
+  # Cache all files for 1 year after access.
+  ExpiresDefault "access plus 1 year"
 
   <FilesMatch \.php$>
     # Do not allow PHP scripts to be cached unless they explicitly send cache
@@ -151,12 +151,12 @@ AddEncoding gzip svgz
     # Serve gzip compressed CSS files if they exist and the client accepts gzip.
     RewriteCond %{HTTP:Accept-encoding} gzip
     RewriteCond %{REQUEST_FILENAME}\.gz -s
-    RewriteRule ^(.*css_[a-zA-Z0-9-_])\.css$ $1\.css\.gz [QSA]
+    RewriteRule ^(.*css_[a-zA-Z0-9-_]+)\.css$ $1\.css\.gz [QSA]
 
     # Serve gzip compressed JS files if they exist and the client accepts gzip.
     RewriteCond %{HTTP:Accept-encoding} gzip
     RewriteCond %{REQUEST_FILENAME}\.gz -s
-    RewriteRule ^(.*js_[a-zA-Z0-9-_])\.js$ $1\.js\.gz [QSA]
+    RewriteRule ^(.*js_[a-zA-Z0-9-_]+)\.js$ $1\.js\.gz [QSA]
 
     # Serve correct content types, and prevent double compression.
     RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]
@@ -173,7 +173,13 @@ AddEncoding gzip svgz
 
 # Various header fixes.
 <IfModule mod_headers.c>
-  # Disable content sniffing, since it's an attack vector.
+  # Disable content sniffing for all responses, since it's an attack vector.
+  # This header is also set in FinishResponseSubscriber, which depending on
+  # Apache configuration might get placed in the 'onsuccess' table. To prevent
+  # header duplication, unset that one prior to setting in the 'always' table.
+  # See "To circumvent this limitation..." in
+  # https://httpd.apache.org/docs/current/mod/mod_headers.html.
+  Header onsuccess unset X-Content-Type-Options
   Header always set X-Content-Type-Options nosniff
   # Disable Proxy header, since it's an attack vector.
   RequestHeader unset Proxy

INSTALL.txt

 
-Please read core/INSTALL.txt for detailed installation instructions for your
-Drupal website.
+Read core/INSTALL.txt for detailed installation instructions for your Drupal
+website.

composer.json

@@ -130,7 +130,8 @@
         "drupal/xls_serialization": "^1.3",
         "drush/drush": "^12.4",
         "npm-asset/select2": "^4.0",
-        "oomphinc/composer-installers-extender": "^2.0"
+        "oomphinc/composer-installers-extender": "^2.0",
+        "wikimedia/composer-merge-plugin": "^2.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -145,53 +146,57 @@
             "phpstan/extension-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "cweagans/composer-patches": true,
-            "oomphinc/composer-installers-extender": true
+            "oomphinc/composer-installers-extender": true,
+            "wikimedia/composer-merge-plugin": true
         },
         "sort-packages": true
     },
     "extra": {
         "drupal-scaffold": {
             "locations": {
-                "web-root": "docroot/"
+                "web-root": "."
             }
         },
         "installer-paths": {
-            "docroot/core": [
+            "core": [
                 "type:drupal-core"
             ],
-            "docroot/libraries/{$name}": [
+            "libraries/{$name}": [
                 "type:drupal-library",
                 "type:bower-asset",
                 "type:npm-asset"
             ],
-            "docroot/modules/contrib/{$name}": [
+            "modules/contrib/{$name}": [
                 "type:drupal-module"
             ],
-            "docroot/profiles/contrib/{$name}": [
+            "profiles/contrib/{$name}": [
                 "type:drupal-profile"
             ],
-            "docroot/themes/contrib/{$name}": [
+            "themes/contrib/{$name}": [
                 "type:drupal-theme"
             ],
             "drush/Commands/contrib/{$name}": [
                 "type:drupal-drush"
             ],
-            "docroot/modules/custom/{$name}": [
+            "modules/custom/{$name}": [
                 "type:drupal-custom-module"
             ],
-            "docroot/profiles/custom/{$name}": [
+            "profiles/custom/{$name}": [
                 "type:drupal-custom-profile"
             ],
-            "docroot/themes/custom/{$name}": [
+            "themes/custom/{$name}": [
                 "type:drupal-custom-theme"
             ]
         },
         "installer-types": ["bower-asset", "npm-asset"],
         "merge-plugin": {
             "include": [
-                "docroot/modules/contrib/dropzonejs/composer.libraries.json",
-                "docroot/modules/contrib/webform/composer.libraries.json"
-            ]
+                "modules/contrib/dropzonejs/composer.libraries.json",
+                "modules/contrib/webform/composer.libraries.json"
+            ],
+            "merge-extra": true,
+            "merge-extra-deep": true,
+            "merge-scripts": true
         },
         "drupal-core-project-message": {
             "include-keys": [
@@ -219,7 +224,8 @@
                 "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",
-                "Remove update module": "./patches/drupal_core/remove-update-module.patch"
+                "Remove update module": "./patches/drupal_core/remove-update-module.patch",
+                "3323621: Exception: Warning: Undefined array key \"preprocess functions\" Drupal\\Core\\Theme\\Registry->mergePreprocessFunctions()": "https://www.drupal.org/files/issues/2022-11-25/3323621-2.patch"
             },
             "drupal/admin_toolbar": {
                 "Replace icons": "./patches/admin_toolbar/replace-icons.patch"

core/PATCHES.txt

+This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
+Patches applied to this directory:
+
+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)
+Source: 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
+Source: https://www.drupal.org/files/issues/2022-08-23/3302838-13.patch
+
+
+Replace icons
+Source: ./patches/drupal_core/core-icons.patch
+
+
+Remove update module
+Source: ./patches/drupal_core/remove-update-module.patch
+
+
+3323621: Exception: Warning: Undefined array key "preprocess functions" Drupal\Core\Theme\Registry->mergePreprocessFunctions()
+Source: https://www.drupal.org/files/issues/2022-11-25/3323621-2.patch
+
+