Merge remote-tracking branch 'upstream/master'

Author: vedmant

.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/aws/github-role.yml

@@ -15,12 +15,12 @@ Resources:
                     - Effect: Allow
                       Action: sts:AssumeRoleWithWebIdentity
                       Principal:
-                          Federated: arn:aws:iam::534081306603:oidc-provider/token.actions.githubusercontent.com
+                          Federated: arn:aws:iam::873528684822:oidc-provider/token.actions.githubusercontent.com
                       Condition:
                           StringLike:
                               token.actions.githubusercontent.com:sub: !Sub repo:${FullRepoName}:*
             Policies:
-                -   PolicyName: RetrieveLayersForLayerJsRole
+                -   PolicyName: RetrieveLayersForLayerRole
                     PolicyDocument:
                         Statement:
                             -   Effect: Allow

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: CI
 
 on:
     push:
-        branches: ['master']
+        branches: ['master', '2.x']
     pull_request:
         branches: ['*']
     schedule:
@@ -16,22 +16,22 @@ jobs:
         timeout-minutes: 15
         strategy:
             matrix:
-                php: [ '8.4', '8.3', '8.2', '8.1', '8.0' ]
+                php: [ '8.5', '8.4', '8.3', '8.2' ]
                 dependency-version: [ '' ]
                 platform-reqs: [ '' ]
                 include:
-                    -   php: '8.0'
+                    -   php: '8.2'
                         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

@@ -1,15 +1,18 @@
-name: Update layer versions (Bref v2)
+name: Update layer versions
 
 # Triggered manually or automatically when new Bref layers published
 on:
     workflow_dispatch:
         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,14 +27,14 @@ jobs:
         name: Update layer versions
         runs-on: ubuntu-22.04
         steps:
-            -   uses: actions/checkout@v4
+            -   uses: actions/checkout@v6
                 with:
                     ref: master
 
             -   name: Set AWS credentials
                 uses: aws-actions/configure-aws-credentials@v4
                 with:
-                    role-to-assume: arn:aws:iam::534081306603:role/bref-github-actions
+                    role-to-assume: arn:aws:iam::873528684822:role/bref-github-actions
                     role-session-name: bref-github-actions
                     aws-region: us-east-1
 
@@ -40,17 +43,17 @@ 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
 
             -   name: Create Pull Request
-                uses: peter-evans/create-pull-request@v5
+                uses: peter-evans/create-pull-request@v7
                 with:
                     commit-message: Update layer versions
-                    title: Update Lambda layers [${{ inputs.release_name }}](${{ inputs.release_html_url }})
+                    title: Update v3 layers [${{ inputs.release_name }}](${{ inputs.release_html_url }})
                     body: |
                         New AWS Lambda layers [have been released](https://github.com/brefphp/aws-lambda-layers/releases):
                         
@@ -60,7 +63,8 @@ jobs:
                         After merging, a new Bref release needs to be created.
                         
                         If you are using AWS Lambda layer ARNs, check out [runtimes.bref.sh](https://runtimes.bref.sh/) to see the latest ARNs.
-                    branch: new-layer-versions
+                    branch: new-layer-versions-v3
+                    base: master
                     delete-branch: true # delete after merging or closing the PR
                     # https://github.com/actions/checkout/issues/13#issuecomment-724415212
                     committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.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

@@ -1,17 +1,13 @@
 /vendor
 /.idea
-/tests/Bridge/Symfony/var
-/tests/Bridge/Symfony/cache
-/tests/Bridge/Symfony/logs
 /.bref/
 /.phpcs-cache
 /composer.lock
-/.couscous/
 /website/node_modules/
-/website/template/output.css
-/.netlify/
 .DS_Store
 /.serverless/
-.phpunit.result.cache
+.phpunit.cache
 node_modules/
 package-lock.json
+/.claude
+/.playwright-mcp

.phpcs.xml

@@ -7,7 +7,6 @@
     <!-- Show sniff names -->
     <arg value="s"/>
 
-    <file>bref</file>
     <file>src</file>
     <file>tests</file>
 

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Matthieu Napoli
+Copyright (c) 2025 Matthieu Napoli
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,11 +1,5 @@
 .EXPORT_ALL_VARIABLES:
 
-trigger_runtimes:
-	aws codepipeline start-pipeline-execution --name bref-php-binary
-
-runtime_build_status:
-	aws codepipeline get-pipeline-state --name=bref-php-binary | jq ".stageStates[1].latestExecution.status"
-
 layers.json:
 	php utils/layers.json/update.php
 
@@ -15,4 +9,4 @@ test-stack:
 preview:
 	cd website && make preview
 
-.PHONY: demo layers.json test-stack
+.PHONY: layers.json test-stack