Merge branch 'master' into v3

# Conflicts:
#	.github/workflows/ci.yml
#	.gitignore

Author: mnapoli

.github/FUNDING.yml

@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: 'https://bref.sh/#enterprise' # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: 'https://bref.sh/support' # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/ISSUE_TEMPLATE/config.yml

@@ -3,9 +3,12 @@ contact_links:
     - name: Community support
       url: https://github.com/brefphp/bref/discussions?discussions_q=category%3ASupport
       about: Please ask and answer questions in GitHub Discussions.
+    - name: Slack community
+      url: https://bref.sh/slack
+      about: Ask questions in the `#help` channel.
     - name: Professional support
-      url: https://bref.sh/#enterprise
+      url: https://bref.sh/support
       about: Get in touch with Null, the company behind Bref.
     - name: Sponsor a feature
-      url: https://bref.sh/#enterprise
+      url: https://bref.sh/support
       about: Sponsor the development of a new feature you want to see in Bref.

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
     push:
-        branches: ['master', 'v3']
+        branches: ['master', '2.x', 'v3']
     pull_request:
         branches: ['*']
     schedule:
@@ -24,14 +24,14 @@ jobs:
                         dependency-version: '--prefer-lowest'
         steps:
             -   name: Checkout
-                uses: actions/checkout@v4
+                uses: actions/checkout@v6
             # Node is required by some tests
-            -   uses: actions/setup-node@v3
+            -   uses: actions/setup-node@v6
                 with:
-                    node-version: 18
+                    node-version: 22
             # serverless is required by some tests
             -   name: Install serverless
-                run: npm i -g serverless@3
+                run: npm i -g osls
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
@@ -49,15 +49,15 @@ jobs:
         name: PHPStan
         steps:
             -   name: Checkout
-                uses: actions/checkout@v4
+                uses: actions/checkout@v6
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: '8.3'
                     tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v3
+                uses: actions/cache@v5
                 with:
                     path: ~/.composer/cache
                     key: php-composer-locked-${{ hashFiles('composer.lock') }}
@@ -72,15 +72,15 @@ jobs:
         name: PHP CodeSniffer
         steps:
             -   name: Checkout
-                uses: actions/checkout@v4
+                uses: actions/checkout@v6
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
                     php-version: '8.3'
                     tools: composer:v2, cs2pr
                     coverage: none
             -   name: Cache Composer dependencies
-                uses: actions/cache@v3
+                uses: actions/cache@v5
                 with:
                     path: ~/.composer/cache
                     key: php-composer-locked-${{ hashFiles('composer.lock') }}
@@ -94,11 +94,11 @@ jobs:
         runs-on: ubuntu-22.04
         name: JS type validation and linting
         steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-node@v3
+            - uses: actions/checkout@v6
+            - uses: actions/setup-node@v6
               with:
-                  node-version: 18
-            - uses: actions/cache@v3
+                  node-version: 22
+            - uses: actions/cache@v5
               with:
                   path: ~/.npm
                   key: ${{ runner.os }}-node-${{ hashFiles('**/package.json') }}

.github/workflows/update-layer-versions.yml

@@ -6,10 +6,13 @@ on:
         inputs:
             release_url:
                 type: string
+                description: The URL of the GitHub release that triggered this workflow
             release_html_url:
                 type: string
+                description: The URL of the GitHub release that triggered this workflow
             release_name:
                 type: string
+                description: The name of the GitHub release that triggered this workflow
 
 # Necessary to connect to AWS using OIDC
 # https://docs.github.com/en/actions/deployment/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services
@@ -24,7 +27,7 @@ jobs:
         name: Update layer versions
         runs-on: ubuntu-22.04
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v6
                 with:
                     ref: v3 # temporary until v3 becomes the main branch
 
@@ -40,9 +43,9 @@ jobs:
                 with:
                     php-version: '8.3'
                     tools: composer
+                    coverage: none
 
-            -   name: Install Composer dependencies
-                run: composer install --prefer-dist
+            -   run: composer install --prefer-dist
 
             -   run: make layers.json
 

.github/workflows/website.yml

@@ -22,7 +22,7 @@ jobs:
             name: prod
             url: https://bref.sh
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v6
                 with:
                     fetch-depth: 0 # fetch all history for "latest modified time"
             -   run: npm install --global vercel@latest

.gitignore

@@ -9,4 +9,4 @@
 .phpunit.cache
 node_modules/
 package-lock.json
-.claude
+/.claude