Skip to content

Commit 57f4a6c

Browse files
elgandozelgandoz
authored
feat: upgrade to Drupal 10 (#28)
* Dockerfile: remove composer install Composer is already available within the ddev container * Upgrade to latest D9.5.x and prepare for D10 upgrade * Upgrade to D10
1 parent c0f5100 commit 57f4a6c

24 files changed

+1532
-2276
lines changed

‎.ddev/config.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
name: drupalpod-tome-starterkit
2-
type: drupal9
2+
type: drupal10
33
docroot: web
4-
php_version: "7.4"
4+
php_version: "8.1"
55
webserver_type: nginx-fpm
66
router_http_port: "80"
77
router_https_port: "443"
88
xdebug_enabled: false
99
additional_hostnames: []
1010
additional_fqdns: []
11-
mariadb_version: "10.3"
12-
mysql_version: ""
11+
database:
12+
type: mariadb
13+
version: "10.4"
1314
nfs_mount_enabled: false
1415
mutagen_enabled: false
1516
use_dns_when_possible: true

‎.gitattributes‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@
1919
*.config text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2020
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2121
*.dist text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
22-
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
22+
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
2323
*.html text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
24-
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
25-
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
24+
*.inc text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
25+
*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
2626
*.js text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2727
*.json text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2828
*.lock text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
2929
*.map text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
3030
*.md text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
31-
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
32-
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
31+
*.module text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
32+
*.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
3333
*.po text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
34-
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
34+
*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
3535
*.script text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
36-
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
36+
*.sh text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
3737
*.sql text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
3838
*.svg text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
39-
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
39+
*.theme text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
4040
*.twig text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
4141
*.txt text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
4242
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

‎.gitpod/Dockerfile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,3 @@ RUN sudo apt-get -qq update
55

66
# Install ddev
77
RUN brew update && brew install drud/ddev/ddev
8-
9-
# Install latest composer
10-
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
11-
RUN php -r "if (hash_file('sha384', 'composer-setup.php') === '906a84df04cea2aa72f40b5f787e49f22d4c2f19492ac310e8cba5b96ac8b64115ac402c8cd292b8a03482574915d1a8') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
12-
RUN sudo php composer-setup.php --install-dir /usr/bin --filename composer
13-
RUN php -r "unlink('composer-setup.php');"

‎composer.json‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "drupal/recommended-project",
3-
"description": "Project template for Drupal 9 projects with a relocated document root",
3+
"description": "Project template for Drupal projects with a relocated document root",
44
"type": "project",
55
"license": "GPL-2.0-or-later",
66
"homepage": "https://www.drupal.org/project/drupal",
@@ -9,23 +9,19 @@
99
"chat": "https://www.drupal.org/node/314178"
1010
},
1111
"repositories": [
12-
{
13-
"type": "vcs",
14-
"url": "https://github.com/realityloop/tome_drush"
15-
},
1612
{
1713
"type": "composer",
1814
"url": "https://packages.drupal.org/8"
1915
}
2016
],
2117
"require": {
22-
"composer/installers": "2.1.1",
23-
"drupal-tome/tome_drush": "dev-feature/3-drush_11",
24-
"drupal/core-composer-scaffold": "9.4.3",
25-
"drupal/core-project-message": "9.4.3",
26-
"drupal/core-recommended": "9.4.3",
27-
"drupal/tome": "1.7.0",
28-
"drush/drush": "11.1.1"
18+
"composer/installers": "^2.0",
19+
"drupal-tome/tome_drush": "dev-master",
20+
"drupal/core-composer-scaffold": "^10.0",
21+
"drupal/core-project-message": "^10.0",
22+
"drupal/core-recommended": "^10.0",
23+
"drupal/tome": "^1.0",
24+
"drush/drush": "^11.6"
2925
},
3026
"conflict": {
3127
"drupal/drupal": "*"

0 commit comments

Comments
 (0)