.ht.router.php

@@ -39,7 +39,7 @@
 // Work around the PHP bug.
 $path = $url['path'];
 $script = 'index.php';
-if (strpos($path, '.php') !== FALSE) {
+if (str_contains($path, '.php')) {
   // Work backwards through the path to check if a script exists. Otherwise
   // fallback to index.php.
   do {

.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]

composer.json

@@ -18,25 +18,27 @@
         "behat/mink": "^1.10",
         "behat/mink-browserkit-driver": "^2.1",
         "behat/mink-selenium2-driver": "^1.4",
+        "colinodell/psr-testlogger": "^1.2",
         "composer/composer": "^2.4",
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
-        "mglaman/phpstan-drupal": "^1.1.27",
+        "justinrainbow/json-schema": "^5.2",
+        "mglaman/phpstan-drupal": "^1.1.29",
         "mikey179/vfsstream": "^1.6.11",
-        "phpunit/phpunit": "^9.5",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.9.9",
+        "phpstan/phpstan": "^1.10.1",
+        "phpstan/phpstan-phpunit": "^1.3.11",
+        "phpunit/phpunit": "^9.5",
+        "symfony/browser-kit": "^6.2",
         "symfony/css-selector": "^6.2",
-        "symfony/phpunit-bridge": "^6.2",
-        "symfony/var-dumper": "^6.2",
+        "symfony/dom-crawler": "^6.2",
         "symfony/error-handler": "^6.2",
-        "justinrainbow/json-schema": "^5.2",
         "symfony/filesystem": "^6.2",
         "symfony/finder": "^6.2",
         "symfony/lock": "^6.2",
-        "symfony/browser-kit": "^6.2",
-        "symfony/dom-crawler": "^6.2"
+        "symfony/phpunit-bridge": "^6.2",
+        "symfony/var-dumper": "^6.2"
     },
     "replace": {
         "symfony/polyfill-php72": "*",
@@ -49,6 +51,7 @@
     "prefer-stable": true,
     "config": {
         "preferred-install": "dist",
+        "sort-packages": true,
         "platform": {
             "php": "8.1.0"
         },
@@ -93,11 +96,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
+            "Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer",
             "Drupal\\Composer\\": "composer"
         }
     },

composer/Generator/ComponentGenerator.php

@@ -162,7 +162,7 @@ protected function getPackage(IOInterface $io, string $original_json): array {
       }
       // The package wasn't in the lock file, which means we need to tell the
       // user. But there are some packages we want to exclude from this list.
-      elseif ($package_name !== 'php' && (strpos($package_name, 'drupal/core-') === FALSE)) {
+      elseif ($package_name !== 'php' && !str_contains($package_name, 'drupal/core-')) {
         $not_in_core[$package_name] = $package_name;
       }
 
@@ -174,7 +174,7 @@ protected function getPackage(IOInterface $io, string $original_json): array {
 
       // Reconcile dependencies on other Drupal components, so we can set the
       // constraint to our current version.
-      if (strpos($package_name, 'drupal/core-') !== FALSE) {
+      if (str_contains($package_name, 'drupal/core-')) {
         if ($stability === 'stable') {
           // Set the constraint to ^maj.min.
           $package_data['require'][$package_name] = SemanticVersion::majorMinorConstraint(\Drupal::VERSION);

composer/Metapackage/CoreRecommended/composer.json

@@ -10,14 +10,15 @@
         "drupal/core": "10.1.x-dev",
         "asm89/stack-cors": "~v2.1.1",
         "composer/semver": "~3.3.2",
-        "doctrine/annotations": "~1.14.2",
-        "doctrine/lexer": "~1.2.3",
-        "egulias/email-validator": "~3.2.1",
+        "doctrine/annotations": "~1.14.3",
+        "doctrine/deprecations": "~v1.0.0",
+        "doctrine/lexer": "~2.1.0",
+        "egulias/email-validator": "~3.2.5",
         "guzzlehttp/guzzle": "~7.5.0",
         "guzzlehttp/promises": "~1.5.2",
-        "guzzlehttp/psr7": "~2.4.3",
+        "guzzlehttp/psr7": "~2.4.4",
         "masterminds/html5": "~2.7.6",
-        "mck89/peast": "~v1.15.0",
+        "mck89/peast": "~v1.15.1",
         "pear/archive_tar": "~1.4.14",
         "pear/console_getopt": "~v1.4.3",
         "pear/pear-core-minimal": "~v1.10.11",
@@ -30,32 +31,33 @@
         "psr/http-message": "~1.0.1",
         "psr/log": "~3.0.0",
         "ralouphie/getallheaders": "~3.0.3",
-        "symfony/console": "~v6.2.5",
-        "symfony/dependency-injection": "~v6.2.6",
-        "symfony/deprecation-contracts": "~v3.2.0",
-        "symfony/error-handler": "~v6.2.5",
-        "symfony/event-dispatcher": "~v6.2.5",
-        "symfony/event-dispatcher-contracts": "~v3.2.0",
-        "symfony/http-foundation": "~v6.2.6",
-        "symfony/http-kernel": "~v6.2.6",
-        "symfony/mime": "~v6.2.5",
+        "sebastian/diff": "~4.0.4",
+        "symfony/console": "~v6.2.8",
+        "symfony/dependency-injection": "~v6.2.8",
+        "symfony/deprecation-contracts": "~v3.2.1",
+        "symfony/error-handler": "~v6.2.7",
+        "symfony/event-dispatcher": "~v6.2.8",
+        "symfony/event-dispatcher-contracts": "~v3.2.1",
+        "symfony/http-foundation": "~v6.2.8",
+        "symfony/http-kernel": "~v6.2.8",
+        "symfony/mime": "~v6.2.7",
         "symfony/polyfill-ctype": "~v1.27.0",
         "symfony/polyfill-iconv": "~v1.27.0",
         "symfony/polyfill-intl-grapheme": "~v1.27.0",
         "symfony/polyfill-intl-idn": "~v1.27.0",
         "symfony/polyfill-intl-normalizer": "~v1.27.0",
         "symfony/polyfill-mbstring": "~v1.27.0",
-        "symfony/process": "~v6.2.5",
+        "symfony/process": "~v6.2.8",
         "symfony/psr-http-message-bridge": "~v2.1.4",
-        "symfony/routing": "~v6.2.5",
-        "symfony/serializer": "~v6.2.5",
-        "symfony/service-contracts": "~v3.2.0",
-        "symfony/string": "~v6.2.5",
-        "symfony/translation-contracts": "~v3.2.0",
-        "symfony/validator": "~v6.2.5",
-        "symfony/var-dumper": "~v6.2.5",
-        "symfony/var-exporter": "~v6.2.5",
-        "symfony/yaml": "~v6.2.5",
-        "twig/twig": "~v3.5.0"
+        "symfony/routing": "~v6.2.8",
+        "symfony/serializer": "~v6.2.8",
+        "symfony/service-contracts": "~v3.2.1",
+        "symfony/string": "~v6.2.8",
+        "symfony/translation-contracts": "~v3.2.1",
+        "symfony/validator": "~v6.2.8",
+        "symfony/var-dumper": "~v6.2.8",
+        "symfony/var-exporter": "~v6.2.8",
+        "symfony/yaml": "~v6.2.7",
+        "twig/twig": "~v3.5.1"
     }
 }

composer/Metapackage/DevDependencies/composer.json

@@ -10,15 +10,17 @@
         "behat/mink": "^1.10",
         "behat/mink-browserkit-driver": "^2.1",
         "behat/mink-selenium2-driver": "^1.4",
+        "colinodell/psr-testlogger": "^1.2",
         "composer/composer": "^2.4",
         "drupal/coder": "^8.3.10",
         "instaclick/php-webdriver": "^1.4.1",
         "justinrainbow/json-schema": "^5.2",
-        "mglaman/phpstan-drupal": "^1.1.27",
+        "mglaman/phpstan-drupal": "^1.1.29",
         "mikey179/vfsstream": "^1.6.11",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^1.9.9",
+        "phpstan/phpstan": "^1.10.1",
+        "phpstan/phpstan-phpunit": "^1.3.11",
         "phpunit/phpunit": "^9.5",
         "symfony/browser-kit": "^6.2",
         "symfony/css-selector": "^6.2",

composer/Metapackage/PinnedDevDependencies/composer.json

@@ -11,68 +11,69 @@
         "behat/mink": "v1.10.0",
         "behat/mink-browserkit-driver": "v2.1.0",
         "behat/mink-selenium2-driver": "v1.6.0",
-        "composer/ca-bundle": "1.3.4",
+        "colinodell/psr-testlogger": "v1.2.0",
+        "composer/ca-bundle": "1.3.5",
         "composer/class-map-generator": "1.0.0",
-        "composer/composer": "2.4.4",
+        "composer/composer": "2.5.5",
         "composer/metadata-minifier": "1.0.0",
         "composer/pcre": "3.1.0",
         "composer/spdx-licenses": "1.5.7",
         "composer/xdebug-handler": "3.0.3",
-        "dealerdirect/phpcodesniffer-composer-installer": "v0.7.2",
-        "doctrine/instantiator": "1.4.1",
-        "drupal/coder": "8.3.16",
+        "dealerdirect/phpcodesniffer-composer-installer": "v1.0.0",
+        "doctrine/instantiator": "2.0.0",
+        "drupal/coder": "8.3.17",
         "instaclick/php-webdriver": "1.4.16",
         "justinrainbow/json-schema": "5.2.12",
-        "mglaman/phpstan-drupal": "1.1.27",
+        "mglaman/phpstan-drupal": "1.1.29",
         "mikey179/vfsstream": "v1.6.11",
-        "myclabs/deep-copy": "1.11.0",
-        "nikic/php-parser": "v4.15.2",
+        "myclabs/deep-copy": "1.11.1",
+        "nikic/php-parser": "v4.15.4",
         "phar-io/manifest": "2.0.3",
         "phar-io/version": "3.2.1",
         "phpdocumentor/reflection-common": "2.2.0",
         "phpdocumentor/reflection-docblock": "5.3.0",
-        "phpdocumentor/type-resolver": "1.6.2",
-        "phpspec/prophecy": "v1.16.0",
+        "phpdocumentor/type-resolver": "1.7.1",
+        "phpspec/prophecy": "v1.17.0",
         "phpspec/prophecy-phpunit": "v2.0.1",
         "phpstan/extension-installer": "1.2.0",
-        "phpstan/phpdoc-parser": "1.13.1",
-        "phpstan/phpstan": "1.9.9",
-        "phpunit/php-code-coverage": "9.2.19",
+        "phpstan/phpdoc-parser": "1.16.1",
+        "phpstan/phpstan": "1.10.9",
+        "phpstan/phpstan-phpunit": "1.3.11",
+        "phpunit/php-code-coverage": "9.2.26",
         "phpunit/php-file-iterator": "3.0.6",
         "phpunit/php-invoker": "3.1.1",
         "phpunit/php-text-template": "2.0.4",
         "phpunit/php-timer": "5.0.3",
-        "phpunit/phpunit": "9.5.26",
+        "phpunit/phpunit": "9.5.28",
         "react/promise": "v2.9.0",
         "sebastian/cli-parser": "1.0.1",
         "sebastian/code-unit": "1.0.8",
         "sebastian/code-unit-reverse-lookup": "2.0.3",
         "sebastian/comparator": "4.0.8",
         "sebastian/complexity": "2.0.2",
-        "sebastian/diff": "4.0.4",
-        "sebastian/environment": "5.1.4",
+        "sebastian/environment": "5.1.5",
         "sebastian/exporter": "4.0.5",
         "sebastian/global-state": "5.0.5",
         "sebastian/lines-of-code": "1.0.3",
         "sebastian/object-enumerator": "4.0.4",
         "sebastian/object-reflector": "2.0.4",
-        "sebastian/recursion-context": "4.0.4",
+        "sebastian/recursion-context": "4.0.5",
         "sebastian/resource-operations": "3.0.3",
-        "sebastian/type": "3.2.0",
+        "sebastian/type": "3.2.1",
         "sebastian/version": "3.0.2",
         "seld/jsonlint": "1.9.0",
         "seld/phar-utils": "1.2.1",
         "seld/signal-handler": "2.0.1",
-        "sirbrillig/phpcs-variable-analysis": "v2.11.9",
-        "slevomat/coding-standard": "8.6.4",
-        "squizlabs/php_codesniffer": "3.7.1",
-        "symfony/browser-kit": "v6.2.5",
-        "symfony/css-selector": "v6.2.5",
-        "symfony/dom-crawler": "v6.2.5",
-        "symfony/filesystem": "v6.2.5",
-        "symfony/finder": "v6.2.5",
-        "symfony/lock": "v6.2.5",
-        "symfony/phpunit-bridge": "v6.2.5",
+        "sirbrillig/phpcs-variable-analysis": "v2.11.14",
+        "slevomat/coding-standard": "8.9.1",
+        "squizlabs/php_codesniffer": "3.7.2",
+        "symfony/browser-kit": "v6.2.7",
+        "symfony/css-selector": "v6.2.7",
+        "symfony/dom-crawler": "v6.2.8",
+        "symfony/filesystem": "v6.2.7",
+        "symfony/finder": "v6.2.7",
+        "symfony/lock": "v6.2.8",
+        "symfony/phpunit-bridge": "v6.2.7",
         "theseer/tokenizer": "1.2.1",
         "webflo/drupal-finder": "1.2.2",
         "webmozart/assert": "1.11.0"

composer/Plugin/Scaffold/Operations/AppendOp.php

@@ -201,7 +201,7 @@ protected function existingFileHasData($contents, $data_path) {
     }
     $data = file_get_contents($data_path->fullPath());
 
-    return strpos($contents, $data) !== FALSE;
+    return str_contains($contents, $data);
   }
 
 }

composer/Plugin/Scaffold/Operations/OperationFactory.php

@@ -122,7 +122,7 @@ protected function createAppendOp(PackageInterface $package, OperationData $oper
   /**
    * Checks to see if the specified scaffold file exists and has content.
    *
-   * @param Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $file
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFilePath $file
    *   Scaffold file to check.
    *
    * @return bool

composer/Plugin/Scaffold/Operations/ScaffoldFileCollection.php

@@ -96,7 +96,7 @@ public function filterFiles(array $files_to_filter) {
   /**
    * Scans through a list of scaffold files and determines if any has contents.
    *
-   * @param Drupal\Composer\Plugin\Scaffold\ScaffoldFileInfo[] $scaffold_files
+   * @param \Drupal\Composer\Plugin\Scaffold\ScaffoldFileInfo[] $scaffold_files
    *   List of scaffold files, path: ScaffoldFileInfo
    *
    * @return bool

composer/Plugin/Scaffold/README.md

@@ -103,7 +103,8 @@ This makes it possible to configure a project with different file layouts; for
 example, either the `drupal/drupal` file layout or the
 `drupal-composer/drupal-project` file layout could be used to set up a project.
 
-If a web-root is not explicitly defined, then it will default to `./`.
+If a web-root is not explicitly defined, then it will default to `.`, the same
+directory as the composer.json file.
 
 ### Altering Scaffold Files
 

core/.cspell.json

@@ -2,6 +2,7 @@
     "version": "0.1",
     "language": "en-US",
     "allowCompoundWords": false,
+    "globRoot": ".",
     "ignorePaths": [
       "**/.*.json",
       ".*ignore",

core/.deprecation-ignore.txt

@@ -21,3 +21,12 @@
 %"PHPUnit\\Framework\\TestListenerDefaultImplementation".*is deprecated%
 %"PHPUnit\\Framework\\TestSuite".*is considered internal%
 %"PHPUnit\\TextUI\\DefaultResultPrinter".*is considered internal%
+
+# Skip deprecations for EditorMediaDialog, EditorImageDialog and EditorLinkDialog triggered by
+# \Drupal\Core\Entity\EntityResolverManager::setRouteOptions().
+%Drupal\\media\\Form\\EditorMediaDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493%
+%Drupal\\editor\\Form\\EditorImageDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493%
+%Drupal\\editor\\Form\\EditorLinkDialog is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/project/drupal/issues/3291493%
+
+# Symfony 7.
+%Method "Symfony\\Contracts\\Service\\ResetInterface::reset\(\)" might add "void" as a native return type declaration in the future. Do the same in implementation "Drupal\\Component\\DependencyInjection\\Container" now to avoid errors or add an explicit @return annotation to suppress this message.%

core/.eslintrc.jquery.json

@@ -38,7 +38,7 @@
     "jquery/no-parse-html": 0,
     "jquery/no-prop": 0,
     "jquery/no-proxy": 0,
-    "jquery/no-ready": 0,
+    "jquery/no-ready": 2,
     "jquery/no-serialize": 0,
     "jquery/no-show": 0,
     "jquery/no-size": 2,

core/.stylelintrc.json

@@ -9,7 +9,6 @@
     "comment-empty-line-before": null,
     "custom-property-pattern": "^[a-z][-_a-z0-9IE]*$",
     "declaration-block-no-redundant-longhand-properties": null,
-    "function-linear-gradient-no-nonstandard-direction": null,
     "function-url-quotes": null,
     "function-whitespace-after": null,
     "hue-degree-notation": "number",

core/MAINTAINERS.txt

@@ -32,8 +32,10 @@ Framework managers
 
   Frontend
   - Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii
+  - (provisional) Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
   - (provisional) Cristina Chumillas 'ckrina' https://www.drupal.org/u/ckrina
   - (provisional) Ben Mullins 'bnjmnm' https://www.drupal.org/u/bnjmnm
+  - (provisional) Sally Young 'justafish' https://www.drupal.org/u/justafish
 
 Release managers
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
@@ -42,8 +44,8 @@ Release managers
 - (provisional) Victoria Spagnolo 'quietone' https://www.drupal.org/u/quietone
 
 Core JavaScript packages
- - (provisional) Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
- - (provisional) Sally Young 'justafish' https://www.drupal.org/u/justafish
+ - Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
+ - Sally Young 'justafish' https://www.drupal.org/u/justafish
 
 Committer team facilitators
 - Pamela Barone 'pameeela' https://www.drupal.org/u/pameeela
@@ -56,7 +58,7 @@ subsystems. See https://www.drupal.org/contribute/core-maintainers for more
 information on their responsibilities, and to find out how to become a subsystem
 maintainer. Current subsystem maintainers:
 
-Actions
+Actions UI
 - ?
 
 Ajax
@@ -339,10 +341,6 @@ Plugin
 Queue
 - James Gilliland 'neclimdul' https://www.drupal.org/u/neclimdul
 
-Quick Edit
-- Wim Leers 'Wim Leers' https://www.drupal.org/u/wim-leers
-- Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
-
 Render API
 - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
 - Moshe Weitzman 'moshe weitzman' https://www.drupal.org/u/moshe-weitzman

core/assets/scaffold/files/default.services.yml

@@ -37,6 +37,13 @@ parameters:
     # @default none
     # cookie_domain: '.example.com'
     #
+    # Set the SameSite cookie attribute: 'None', 'Lax', or 'Strict'. If set,
+    # this value will override the server value. See
+    # https://www.php.net/manual/en/session.security.ini.php for more
+    # information.
+    # @default no value
+    cookie_samesite: Lax
+    #
     # Set the session ID string length. The length can be between 22 to 256. The
     # PHP recommended value is 48. See
     # https://www.php.net/manual/session.security.ini.php for more information.
@@ -213,3 +220,9 @@ parameters:
     maxAge: false
     # Sets the Access-Control-Allow-Credentials header.
     supportsCredentials: false
+
+  queue.config:
+    # The maximum number of seconds to wait if a queue is temporarily suspended.
+    # This is not applicable when a queue is suspended but does not specify
+    # how long to wait before attempting to resume.
+    suspendMaximumWait: 30

core/assets/scaffold/files/default.settings.php

@@ -256,7 +256,8 @@
  * variable has the same value on each server.
  *
  * For enhanced security, you may set this variable to the contents of a file
- * outside your document root; you should also ensure that this file is not
+ * outside your document root, and vary the value across environments (like
+ * production and development); you should also ensure that this file is not
  * stored with backups of your database.
  *
  * Example:
@@ -486,6 +487,15 @@
 # $settings['file_chmod_directory'] = 0775;
 # $settings['file_chmod_file'] = 0664;
 
+/**
+ * Optimized assets path:
+ *
+ * A local file system path where optimized assets will be stored. This directory
+ * must exist and be writable by Drupal. This directory must be relative to
+ * the Drupal installation directory and be accessible over the web.
+ */
+# $settings['file_assets_path'] = 'sites/default/files';
+
 /**
  * Public file base URL:
  *
@@ -580,7 +590,7 @@
  * any added language. (eg locale_custom_strings_de for german).
  */
 # $settings['locale_custom_strings_en'][''] = [
-#   'forum'      => 'Discussion board',
+#   'Home' => 'Front page',
 #   '@count min' => '@count minutes',
 # ];
 
@@ -705,6 +715,7 @@
  *
  * @see https://www.drupal.org/docs/installing-drupal/trusted-host-settings
  */
+# $settings['trusted_host_patterns'] = [];
 
 /**
  * The default list of directories that will be ignored by Drupal's file API.

core/assets/scaffold/files/ht.router.php

@@ -39,7 +39,7 @@
 // Work around the PHP bug.
 $path = $url['path'];
 $script = 'index.php';
-if (strpos($path, '.php') !== FALSE) {
+if (str_contains($path, '.php')) {
   // Work backwards through the path to check if a script exists. Otherwise
   // fallback to index.php.
   do {