Merge branch 'backdrop:1.x' into 1.x

Author: herbdool

.cspell/backdrop.dic

@@ -83,6 +83,8 @@ datelimits
 dbinfo
 dblog
 DDTHH
+dependee
+dependees
 derf
 devmajor
 devminor
@@ -102,6 +104,7 @@ editunblock
 elementtype
 enddate
 endskip
+Enregistrer
 entityreference
 éøïвβ
 errorcode
@@ -143,6 +146,7 @@ formfocusborder
 formtest
 foundkeys
 fourthcolumn
+Fozzie
 freso
 fromto
 fter
@@ -186,11 +190,13 @@ ieid
 iend
 ignoretag
 iinet
+imagecreatefrom
 imagefield
 imageto
 indigoxela
 infourl
 innodb
+instantiatable
 isid
 istart
 jahwohl
@@ -223,6 +229,7 @@ lished
 Lisu
 litespeed
 localzone
+lundi
 LXSS
 manytoone
 marzo
@@ -235,6 +242,7 @@ merlinofchaos
 metacharacters
 meus
 microweights
+milli
 mimeheaders
 minadjustment
 mindate
@@ -249,6 +257,7 @@ mouton
 moutons
 msgbox
 multibundle
+multipage
 multisites
 Műveletek
 myclass
@@ -313,6 +322,7 @@ oldserver
 oldtext
 oneof
 onmediaerror
+onoff
 opensans
 Optionchecker
 otherjob
@@ -324,6 +334,7 @@ pagenum
 pagerpieces
 phptemplate
 phpwiki
+plid
 plids
 pneum
 Ponedjeljak
@@ -341,7 +352,11 @@ Punycode
 queryor
 quicktime
 Quieligo
+rawurlencoded
 ratis
+rawurldecode
+rawurlencode
+rawurlencoded
 readwrite
 realelement
 refclass
@@ -384,6 +399,7 @@ softtabstop
 someplugin
 sometable
 sourcedir
+spacebar
 stackoverflow
 statiya
 stdobj
@@ -418,6 +434,7 @@ tempstore
 testconfig
 testfiles
 testviews
+textgroup
 textgroups
 textinput
 themeable
@@ -439,10 +456,15 @@ triptych
 typeflag
 Üidentifier
 unaggregated
+unaliased
+unconfigured
 uncustomized
 undeletable
+undraggable
 unescapes
 unescaping
+unextracted
+unflagged
 unhighlight
 unhighlights
 unioned
@@ -454,6 +476,10 @@ unmunged
 unmunging
 unnested
 unpackage
+unpermissioned
+unpromoted
+unrendered
+unshortened
 uploadimage
 uploadwidget
 USERAGENT
@@ -466,7 +492,9 @@ vendredi
 VERIFYHOST
 VERIFYPEER
 verygreatbackdropmodule
+viewmode
 VIEWNAME
+viewmode
 watchdog
 WCAG
 wday

.cspell/cspell.json

@@ -57,6 +57,7 @@
     "/core/misc/opensans/",
     "/core/misc/smartmenus/",
     "/core/misc/ui/",
+    "/core/modules/ckeditor5/lib/ckeditor5/",
     "/core/modules/search/tests/UnicodeTest.txt",
     "/core/modules/system/system.tar.inc",
     "/core/themes/bartik/color/preview.html",

.github/actions/set-up-webserver/action.yml

@@ -0,0 +1,62 @@
+name: "Set up webserver"
+description: "Set up a webserver with PHP and a database"
+inputs:
+  php-version:
+    description: "PHP version to install"
+    required: true
+  database-version:
+    description: "Database (mysql/mariadb) version to install"
+    required: true
+outputs: {}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Prepare for database
+      shell: bash
+      run: |
+        # The database runs as user "runner".
+        sudo mkdir /dev/shm/mysql_tmp
+        sudo chown runner:runner /dev/shm/mysql_tmp
+
+    - name: Install database server
+      uses: shogo82148/actions-setup-mysql@v1
+      with:
+        mysql-version: ${{ inputs.database-version }}
+        root-password: 'root'
+        my-cnf: |
+          datadir=/dev/shm/mysql
+          tmpdir=/dev/shm/mysql_tmp
+        auto-start: true
+
+    - name: Verify setup and create database
+      shell: bash
+      run: |
+        echo -e '[client]\nuser = root\npassword = root\nhost = 127.0.0.1' > ~/.my.cnf
+        mysql -e 'SELECT version()\G'
+        mysql -e 'CREATE DATABASE backdrop;'
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ inputs.php-version }}
+        coverage: none
+        tools: none
+
+    - name: Disable mod_php if necessary
+      if: ${{ inputs.php-version == '5.6' }}
+      shell: bash
+      run: if [ $(sudo apache2ctl -M | grep -c 'php.*module') -eq 1 ]; then sudo a2dismod php5.6; fi
+
+    - name: Finish webserver setup
+      shell: bash
+      run: |
+        # Set up apache with php-fpm.
+        sudo cp .github/misc/default.conf /etc/apache2/sites-available/000-default.conf
+        sudo sed -i -e "s/_PHP_VERSION_/${{ inputs.php-version }}/" /etc/apache2/sites-available/000-default.conf
+        # Setup php-fpm, this script is intentionally not executable by default.
+        chmod 700 .github/misc/setup-php-fpm.sh
+        ./.github/misc/setup-php-fpm.sh ${{ inputs.php-version }}
+        # This should be a redirect to the installer:
+        echo 'Verify webserver setup'
+        curl -sI 'http://localhost/'

.github/misc/settings.local.php

@@ -3,11 +3,15 @@
  * @file
  * Settings applied during automated test runs.
  *
- * @see .github/workflows/functional-tests.yml
+ * @see .github/workflows/simpletest.yml
  */
 
 // Disable sending of telemetry data from GitHub Action runners.
 $settings['telemetry_enabled'] = FALSE;
 
 // Turn off Drupal compatibility layer for tests.
 $settings['backdrop_drupal_compatibility'] = FALSE;
+
+// Use a consistent config directory.
+$config_directories['active'] = 'files/config/active';
+$config_directories['staging'] = 'files/config/staging';

.github/misc/setup-php-fpm.sh

@@ -17,12 +17,15 @@ sudo sed -i -e 's/user = www-data/user = runner/' \
   -e 's/pm.start_servers = 2/pm.start_servers = 4/' \
   -e 's/pm.min_spare_servers = 1/pm.min_spare_servers = 2/' \
   -e 's/pm.max_spare_servers = 3/pm.max_spare_servers = 4/' \
-  ls /etc/php/*/fpm/pool.d/www.conf
+  /etc/php/*/fpm/pool.d/www.conf
 
 # Let above changes take effect and setup Apache to work with php-fpm.
 sudo systemctl restart php${1}-fpm.service
 sudo apt-get -q install libapache2-mod-fcgid
 sudo a2enmod rewrite proxy fcgid proxy_fcgi
-sudo systemctl start apache2.service
+sudo systemctl restart apache2.service
+# This prevents the "denied (filesystem path '/home/runner/work') because search
+# permissions are missing on a component of the path" problem.
+sudo chmod 751 /home/runner
 
 exit 0

.github/workflows/functional-tests.yml

@@ -0,0 +1,48 @@
+name: SimpleTest (Database Config)
+on:
+  pull_request:
+    branches: [1.*]
+jobs:
+  simpletest-db-config:
+    name: SimpleTest
+    runs-on: ubuntu-22.04
+    # Skip this job if the PR title contains "[skip tests]".
+    if: ${{ !contains(github.event.pull_request.title, '[skip tests]') }}
+    timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['8.3']
+        database-versions: ['mariadb-10.3']
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up webserver
+        uses: ./.github/actions/set-up-webserver
+        with:
+          php-version: ${{ matrix.php-versions }}
+          database-version: ${{ matrix.database-versions }}
+
+      - name: Install Backdrop
+        run: |
+          cp ./.github/misc/settings.local.php .
+
+          # Set the config storage class to use the database.
+          echo "\$settings['config_active_class'] = 'ConfigDatabaseStorage';" >> settings.local.php
+          echo "\$config_directories['active'] = NULL;" >> settings.local.php
+
+          core/scripts/install.sh --db-url=mysql://root:[email protected]/backdrop
+
+      - name: Run tests
+        run: |
+          # Run a subset of the total test suite for configuration management.
+          core/scripts/run-tests.sh --force --cache --verbose --color --group Configuration 2>&1
+
+      - name: Save Test Results
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: simpletest-db-config-${{ matrix.php-versions }}
+          path: files/simpletest/verbose