Skip to content

Commit acd612a

Browse files
committed
Release 2.0.0
Merge branch 'main' into production
2 parents 526060d + 3cf704d commit acd612a

File tree

10 files changed

+18
-23
lines changed

10 files changed

+18
-23
lines changed

.ddev/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: drupal-project
2-
type: drupal
2+
type: drupal11
33
docroot: web
44
php_version: "8.3"
55
webserver_type: nginx-fpm
@@ -8,7 +8,7 @@ additional_hostnames: []
88
additional_fqdns: []
99
database:
1010
type: mariadb
11-
version: "10.11"
11+
version: "10.6"
1212
use_dns_when_possible: true
1313
composer_version: "2"
1414
nodejs_version: "20"

.lando.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: drupal-project
2-
recipe: drupal10
2+
recipe: drupal11
33

44
config:
55
php: "8.3"
@@ -96,7 +96,7 @@ services:
9696
image: drupalci/webdriver-chromedriver:production
9797
command: chromedriver --log-path=/tmp/chromedriver.log --verbose --whitelisted-ips=
9898
database:
99-
type: "mariadb:10.6.18"
99+
type: "mariadb:10.6.20"
100100
# Assign a static port if you need to access the database from your host machine.
101101
# @see: https://docs.lando.dev/guides/external-access.html
102102
# portforward: 34567

.lando/.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Inject additional environment variables into every Lando service
22
# @see: https://docs.lando.dev/config/env.html#environment-files
3-
DB_NAME=drupal10
4-
DB_USER=drupal10
5-
DB_PASS=drupal10
3+
DB_NAME=drupal11
4+
DB_USER=drupal11
5+
DB_PASS=drupal11
66
DB_HOST=database

.lando/adminer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AutoLogin extends Adminer
1515
* Overwrite top left 'logo' link to landing page of Adminer app.
1616
*
1717
* By default, it would open link to Adminer home page. Let's also preselect
18-
* Drupal 10 db.
18+
* Drupal db.
1919
*/
2020
function name() {
2121
return '<a href="' . '/?username=&db=' . getenv('DB_NAME') . '" id="h1">Adminer</a>';
@@ -47,7 +47,7 @@ function loginForm() {
4747
Adminer::loginForm();
4848
$original_form = ob_get_clean();
4949

50-
// Preselect Drupal 10 db.
50+
// Preselect Drupal db.
5151
$original_form = str_replace('name="auth[db]" value=""', 'name="auth[db]" value="' . getenv('DB_NAME') . '"', $original_form);
5252

5353
// Add id attribute to the submit button to target it with js in next

composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wunderio/drupal-project",
3-
"description": "Wunder's template for Drupal 10 projects.",
3+
"description": "Wunder's template for Drupal projects.",
44
"type": "project",
55
"license": "GPL-2.0-or-later",
66
"homepage": "https://www.drupal.org/project/drupal",
@@ -19,18 +19,18 @@
1919
"composer/installers": "^2.3",
2020
"cweagans/composer-patches": "^1.7",
2121
"drupal/admin_toolbar": "^3.5",
22-
"drupal/core-composer-scaffold": "^10.4",
23-
"drupal/core-recommended": "^10.4",
22+
"drupal/core-composer-scaffold": "^11.1",
23+
"drupal/core-recommended": "^11.1",
2424
"drupal/monolog": "^3.0",
2525
"drupal/purge": "^3.6",
26-
"drupal/simplei": "^2.1",
27-
"drupal/varnish_purge": "^2.2",
26+
"drupal/simplei": "^3.0",
27+
"drupal/varnish_purge": "^2.3",
2828
"drush/drush": "^13.3",
2929
"vlucas/phpdotenv": "^5.6",
3030
"wunderio/drupal-ping": "^2.5"
3131
},
3232
"require-dev": {
33-
"drupal/core-dev": "^10.4",
33+
"drupal/core-dev": "^11.1",
3434
"wunderio/code-quality": "^3.0"
3535
},
3636
"conflict": {

grumphp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ grumphp:
1717
'The commit must start with the JIRA or GitHub issue number': '/^[A-Z][A-Z0-9_]+-[1-9][0-9]*: /'
1818
php_compatibility:
1919
run_on: '%grumphp.run_on_paths%'
20-
testVersion: '8.2'
20+
testVersion: '8.3'
2121
check_file_permissions: ~
2222
php_check_syntax:
2323
run_on: '%grumphp.run_on_paths%'

phpcs.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<ruleset name="Drupal Custom">
44
<description>Drupal coding standard</description>
55

6-
<!-- Set ignore warnings. -->
7-
<!-- <config name="ignore_warnings_on_exit" value="1" /> -->
8-
96
<file>.</file>
107

118
<!-- exclude vendor code -->

recipes/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/README.txt

silta/silta.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# @see: https://github.com/wunderio/charts/blob/master/drupal/values.yaml
55

66
php:
7-
drupalCoreVersion: "10"
7+
drupalCoreVersion: "11"
88
cron:
99
drupal:
1010
# Disable cron jobs in feature environments by using non-existing date.

web/sites/default/settings.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
// @see: https://github.com/wunderio/charts/blob/master/drupal/files/silta.services.yml
3333
$settings['container_yamls'][] = DRUPAL_ROOT . '/sites/services.yml';
3434

35-
// Enable state cache for Drupal 10 performance
36-
$settings['state_cache'] = TRUE;
37-
3835
// The default list of directories that will be ignored by Drupal's file API.
3936
$settings['file_scan_ignore_directories'] = [
4037
'node_modules',

0 commit comments

Comments
 (0)