Merge branch 'main' into new/use-twig-rendering-for-markdown

MbinOrg · Jan 28, 2025 · 0993087 · 0993087
2 parents 752a352 + 1b9ce4f
commit 0993087
Show file tree

Hide file tree

Showing 5 changed files with 878 additions and 42 deletions.
diff --git a/.github/workflows/action.yaml b/.github/workflows/action.yaml
@@ -12,6 +12,10 @@ on:
     tags:
       - 'v*'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -12,6 +12,10 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
+
 jobs:
   php-security-scan:
     runs-on: ubuntu-latest
@@ -22,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Psalm Security Scan by Mbin
         uses: docker://ghcr.io/mbinorg/psalm-security-scan

diff --git a/composer.json b/composer.json
@@ -125,7 +125,7 @@
         "phpunit/phpunit": "^11.3.4",
         "symfony/browser-kit": "7.2.*",
         "symfony/debug-bundle": "7.2.*",
-        "symfony/maker-bundle": "1.61.0",
+        "symfony/maker-bundle": "1.62.1",
         "symfony/phpunit-bridge": "7.2.*",
         "symfony/stopwatch": "7.2.*",
         "symfony/web-profiler-bundle": "7.2.*"

diff --git a/composer.lock b/composer.lock