Merge branch 'develop' into cafuego/fix-it-upstream

.docksal/docksal.env

@@ -1,5 +1,5 @@
 DOCKSAL_STACK=default
 DOCROOT=html
 DB_IMAGE="docksal/db:1.1-mysql-5.7"
-CLI_IMAGE='docksal/cli:php8.1-build'
+CLI_IMAGE='docksal/cli:php8.2-build'
 XDEBUG_ENABLED=1

.gitattributes

@@ -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."

.github/workflows/composer-update.yml

@@ -11,12 +11,11 @@ jobs:
     steps:
     - name: Update The Thing
       id: update-action
-      uses: UN-OCHA/actions/composer-update@main
+      # uses: UN-OCHA/actions/composer-update@main
+      uses: UN-OCHA/actions/composer-update@OPS-10254-config-too
       with:
         github_access_token: ${{ secrets.PAT }}
-        patch_branch: 'develop'
-        patch_packages: 'drupal/*'
+        patch_branch: ${{ github.head_ref || github.ref_name }}
         patch_maintainers: ${{ secrets.DRUPAL_MAINTAINERS }}
         slack_bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
         slack_channel_name: ${{ secrets.SLACK_CHANNEL }}
-        flowdock_token: ${{ secrets.FLOWDOCK_TOKEN }}

.github/workflows/run-tests.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Checkout Code
         id: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Extract PHP Version
         id: php
@@ -72,7 +72,7 @@ jobs:
       - name: Configure AWS Credentials
         id: aws
         if: ${{ !env.ACT }}
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
@@ -81,7 +81,7 @@ jobs:
       - name: Login to Public ECR
         id: aws-login
         if: ${{ !env.ACT }}
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: public.ecr.aws
           username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
@@ -175,7 +175,7 @@ jobs:
             docker compose -f tests/docker-compose.yml exec -T drupal drush watchdog:show
 
       - name: Find Comment
-        uses: peter-evans/find-comment@v2
+        uses: peter-evans/find-comment@v3
         if: ${{ !env.ACT }}
         id: fc
         with:
@@ -185,7 +185,7 @@ jobs:
           body-includes: Build output
 
       - name: Create or update comment
-        uses: peter-evans/create-or-update-comment@v2
+        uses: peter-evans/create-or-update-comment@v4
         if: ${{ !env.ACT }}
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -213,7 +213,7 @@ jobs:
       - name: Slack Success Notification
         id: slack_success
         if: ${{ !env.ACT && success() }}
-        uses: slackapi/slack-github-action@v1.23.0
+        uses: slackapi/slack-github-action@v1.25.0
         with:
           channel-id: '${{ vars.SLACK_CHANNEL }}'
           payload: |
@@ -240,7 +240,7 @@ jobs:
       - name: Slack Failure Notification
         id: slack_failure
         if: ${{ !env.ACT && failure() }}
-        uses: slackapi/slack-github-action@v1.23.0
+        uses: slackapi/slack-github-action@v1.25.0
         with:
           channel-id: '${{ vars.SLACK_CHANNEL }}'
           payload: |

README.md

@@ -89,6 +89,49 @@ See the [Running the site](#running-the-site) section below.
 
 Here's a list of commonly used modules among the UN-OCHA websites.
 
+### Components
+
+Used with the Common Design theme.
+
+- https://www.drupal.org/project/components
+
+### Social auth humanitarian id
+
+For logging in through HID
+
+- https://www.drupal.org/project/social_auth_hid
+
+### Admin Denied
+
+Prevent login as user 1
+
+- https://www.drupal.org/project/admin_denied
+
+### Imagemagick
+
+Faster and more memory efficient image handling
+
+- https://www.drupal.org/project/imagemagick
+
+### Pathauto
+
+For better urls
+
+- https://www.drupal.org/project/pathauto 
+
+### GTM Barebones
+
+- https://github.com/UN-OCHA/gtm_barebones
+
+### User expire
+
+Automatically “block” inactive users
+- https://www.drupal.org/project/user_expire
+
+### Username Enumeration Prevention
+
+- https://www.drupal.org/project/username_enumeration_prevention
+
 ### Paragraphs
 
 Many UN-OCHA websites use the `paragraphs` module and related ones to structure the content of the site.
@@ -98,6 +141,15 @@ Many UN-OCHA websites use the `paragraphs` module and related ones to structure
 
 *This is enabled by default as of 2023-01-19.*
 
+Layout Paragraphs provide better editor UX for Paragraphs.
+
+Use these Form Display settings for each Paragraphs field you add to the site:
+
+- Preview view mode: Preview
+- Maximum nesting depth: 0
+- Require paragraphs to be added inside a layout: FALSE (unchecked)
+- Placeholder message when field is empty: [blank string]
+
 ### XML Sitemap
 
 To help search engines index your website, the `xmlsitemap` can help generate and submit a site map of your content.