Skip to content

Commit

Permalink
Upgrade to last drupal 11.x HEAD (and drush ^13.x-dev)
Browse files Browse the repository at this point in the history
  • Loading branch information
penyaskito committed Apr 27, 2024
1 parent 91f9f6b commit ae5db7f
Show file tree
Hide file tree
Showing 13 changed files with 1,487 additions and 1,289 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

# PHPStan's baseline uses tabs instead of spaces.
core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php

# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"drupal/core-project-message": "11.x-dev",
"drupal/core-recommended": "11.x-dev",
"drupal/dashboard": "2.x-dev",
"drush/drush": "^12"
"drush/drush": "^13"
},
"conflict": {
"drupal/drupal": "*"
Expand Down
2,682 changes: 1,439 additions & 1,243 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/sync/block_content.type.basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ _core:
default_config_hash: zglzjmYxi0G0ag9MZ02y0LSJOdpWRwJxyP_OvFojFyo
id: basic
label: 'Basic block'
revision: 0
revision: false
description: 'A basic block contains a title and a body.'
6 changes: 3 additions & 3 deletions config/sync/editor.editor.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ image_upload:
status: true
scheme: public
directory: inline-images
max_size: ''
max_size: null
max_dimensions:
width: 0
height: 0
width: null
height: null
6 changes: 3 additions & 3 deletions config/sync/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ image_upload:
status: true
scheme: public
directory: inline-images
max_size: ''
max_size: null
max_dimensions:
width: 0
height: 0
width: null
height: null
2 changes: 1 addition & 1 deletion config/sync/system.cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ _core:
threshold:
requirements_warning: 172800
requirements_error: 1209600
logging: 1
logging: true
1 change: 1 addition & 0 deletions config/sync/taxonomy.vocabulary.tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ name: Tags
vid: tags
description: 'Use tags to group articles on similar topics into categories.'
weight: 0
new_revision: false
4 changes: 0 additions & 4 deletions web/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,6 @@ AddEncoding gzip svgz
RewriteCond %{REQUEST_URI} !/core/[^/]*\.php$
# Allow access to test-specific PHP files:
RewriteCond %{REQUEST_URI} !/core/modules/system/tests/https?\.php
# Allow access to Statistics module's custom front controller.
# Copy and adapt this rule to directly execute PHP files in contributed or
# custom modules or to run another PHP application in the same directory.
RewriteCond %{REQUEST_URI} !/core/modules/statistics/statistics\.php$
# Deny access to any other PHP files that do not match the rules above.
# Specifically, disallow autoload.php from being served directly.
RewriteRule "^(.+/.*|autoload)\.php($|/)" - [F]
Expand Down
1 change: 0 additions & 1 deletion web/robots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Disallow: /composer/Template/README.txt
Disallow: /modules/README.txt
Disallow: /sites/README.txt
Disallow: /themes/README.txt
Disallow: /web.config
# Paths (clean URLs)
Disallow: /admin/
Disallow: /comment/reply/
Expand Down
4 changes: 4 additions & 0 deletions web/sites/default/default.services.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
parameters:
# Toggles the super user access policy. If your website has at least one user
# with the Administrator role, it is advised to set this to false. This allows
# you to make user 1 a regular user, strengthening the security of your site.
security.enable_super_user: true
session.storage.options:
# Default ini options for sessions.
#
Expand Down
49 changes: 24 additions & 25 deletions web/sites/default/default.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
* 'sites/default' will be used.
*
* For example, for a fictitious site installed at
* https://www.drupal.org:8080/mysite/test/, the 'settings.php' file is searched
* https://www.drupal.org:8080/my-site/test/, the 'settings.php' file is searched
* for in the following directories:
*
* - sites/8080.www.drupal.org.mysite.test
* - sites/www.drupal.org.mysite.test
* - sites/drupal.org.mysite.test
* - sites/org.mysite.test
* - sites/8080.www.drupal.org.my-site.test
* - sites/www.drupal.org.my-site.test
* - sites/drupal.org.my-site.test
* - sites/org.my-site.test
*
* - sites/8080.www.drupal.org.mysite
* - sites/www.drupal.org.mysite
* - sites/drupal.org.mysite
* - sites/org.mysite
* - sites/8080.www.drupal.org.my-site
* - sites/www.drupal.org.my-site
* - sites/drupal.org.my-site
* - sites/org.my-site
*
* - sites/8080.www.drupal.org
* - sites/www.drupal.org
Expand All @@ -46,8 +46,8 @@
*
* Note that if you are installing on a non-standard port number, prefix the
* hostname with that number. For example,
* https://www.drupal.org:8080/mysite/test/ could be loaded from
* sites/8080.www.drupal.org.mysite.test/.
* https://www.drupal.org:8080/my-site/test/ could be loaded from
* sites/8080.www.drupal.org.my-site.test/.
*
* @see example.sites.php
* @see \Drupal\Core\DrupalKernel::getSitePath()
Expand Down Expand Up @@ -77,7 +77,7 @@
*
* @code
* $databases['default']['default'] = [
* 'database' => 'databasename',
* 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
Expand Down Expand Up @@ -181,8 +181,8 @@
*
* WARNING: The above defaults are designed for database portability. Changing
* them may cause unexpected behavior, including potential data loss. See
* https://www.drupal.org/developing/api/database/configuration for more
* information on these defaults and the potential issues.
* https://www.drupal.org/docs/8/api/database-api/database-configuration for
* more information on these defaults and the potential issues.
*
* More details can be found in the constructor methods for each driver:
* - \Drupal\mysql\Driver\Database\mysql\Connection::__construct()
Expand All @@ -193,7 +193,7 @@
* @code
* $databases['default']['default'] = [
* 'driver' => 'pgsql',
* 'database' => 'databasename',
* 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
Expand All @@ -215,7 +215,7 @@
* 'driver' => 'my_driver',
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
* 'database' => 'databasename',
* 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
Expand All @@ -230,7 +230,7 @@
* 'driver' => 'my_driver',
* 'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
* 'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
* 'database' => 'databasename',
* 'database' => 'database_name',
* 'username' => 'sql_username',
* 'password' => 'sql_password',
* 'host' => 'localhost',
Expand Down Expand Up @@ -355,14 +355,13 @@
* security, or encryption benefits. In an environment where Drupal
* is behind a reverse proxy, the real IP address of the client should
* be determined such that the correct client IP address is available
* to Drupal's logging, statistics, and access management systems. In
* the most simple scenario, the proxy server will add an
* X-Forwarded-For header to the request that contains the client IP
* address. However, HTTP headers are vulnerable to spoofing, where a
* malicious client could bypass restrictions by setting the
* X-Forwarded-For header directly. Therefore, Drupal's proxy
* configuration requires the IP addresses of all remote proxies to be
* specified in $settings['reverse_proxy_addresses'] to work correctly.
* to Drupal's logging and access management systems. In the most simple
* scenario, the proxy server will add an X-Forwarded-For header to the request
* that contains the client IP address. However, HTTP headers are vulnerable to
* spoofing, where a malicious client could bypass restrictions by setting the
* X-Forwarded-For header directly. Therefore, Drupal's proxy configuration
* requires the IP addresses of all remote proxies to be specified in
* $settings['reverse_proxy_addresses'] to work correctly.
*
* Enable this setting to get Drupal to determine the client IP from the
* X-Forwarded-For header. If you are unsure about this setting, do not have a
Expand Down
14 changes: 7 additions & 7 deletions web/sites/example.sites.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Configuration file for multi-site support and directory aliasing feature.
*
* This file is required for multi-site support and also allows you to define a
* set of aliases that map hostnames, ports, and pathnames to configuration
* set of aliases that map host names, ports, and path names to configuration
* directories in the sites directory. These aliases are loaded prior to
* scanning for directories, and they are exempt from the normal discovery
* rules. See default.settings.php to view how Drupal discovers the
Expand All @@ -23,14 +23,14 @@
*
* Aliases are defined in an associative array named $sites. The array is
* written in the format: '<port>.<domain>.<path>' => 'directory'. As an
* example, to map https://www.drupal.org:8080/mysite/test to the configuration
* example, to map https://www.drupal.org:8080/my-site/test to the configuration
* directory sites/example.com, the array should be defined as:
* @code
* $sites = [
* '8080.www.drupal.org.mysite.test' => 'example.com',
* '8080.www.drupal.org.my-site.test' => 'example.com',
* ];
* @endcode
* The URL, https://www.drupal.org:8080/mysite/test/, could be a symbolic link
* The URL, https://www.drupal.org:8080/my-site/test/, could be a symbolic link
* or an Apache Alias directive that points to the Drupal root containing
* index.php. An alias could also be created for a subdomain. See the
* @link https://www.drupal.org/documentation/install online Drupal installation guide @endlink
Expand All @@ -47,11 +47,11 @@
* URL: http://localhost:8080/example
* $sites['8080.localhost.example'] = 'example.com';
*
* URL: https://www.drupal.org:8080/mysite/test/
* $sites['8080.www.drupal.org.mysite.test'] = 'example.com';
* URL: https://www.drupal.org:8080/my-site/test/
* $sites['8080.www.drupal.org.my-site.test'] = 'example.com';
* @endcode
*
* @see default.settings.php
* @see \Drupal\Core\DrupalKernel::getSitePath()
* @see https://www.drupal.org/documentation/install/multi-site
* @see https://www.drupal.org/docs/getting-started/multisite-drupal
*/

0 comments on commit ae5db7f

Please sign in to comment.