Initial commit for 2.4

contao-community-alliance · Aug 7, 2024 · f77efa0 · f77efa0
1 parent a699871
commit f77efa0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml
@@ -1,9 +1,10 @@
 name: Code Quality Diagnostics
 
 on:
-  pull_request:
   push:
-    branches:
+    branches-ignore:
+      - '**-translation'
+  pull_request:
 
 jobs:
   build:
@@ -12,14 +13,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '8.1', '8.2' ]
-        contao: [ '~4.13.0' ]
+        php: [ '8.2', '8.3' ]
+        contao: [ '~5.3' ]
         phpcq_install: [ 'update' ]
         output: [ '-o github-action -o default' ]
 
     steps:
       - name: Pull source
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP with PECL extension
         uses: shivammathur/setup-php@v2
@@ -28,15 +29,15 @@ jobs:
 
       # setup caches
       - name: Cache composer cache directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: composer-cache-dir
         with:
           path: ~/.cache/composer
           key: ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}
 
       - name: Cache vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: vendor
         with:
@@ -46,7 +47,7 @@ jobs:
             ${{ runner.os }}-${{ matrix.php }}-${{ matrix.contao }}-build-${{ env.cache-name }}-
 
       - name: Cache phpcq directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: phpcq
         with:
@@ -68,8 +69,9 @@ jobs:
         run: ./vendor/bin/phpcq run -v ${{ matrix.output }}
 
       - name: Upload build directory to artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ success() }} || ${{ failure() }}
         with:
           name: phpcq-builds-php-${{ matrix.php }}-${{ matrix.contao }}
           path: .phpcq/build/
+
diff --git a/composer.json b/composer.json
@@ -29,15 +29,15 @@
     "source": "https://github.com/contao-community-alliance/dc-general-contao-frontend"
   },
   "require": {
-    "php": "^8.1",
-    "contao-community-alliance/dc-general": "^2.3",
-    "contao-community-alliance/translator": "^2.4.2",
-    "contao-community-alliance/url-builder": "^1.3",
-    "contao/core-bundle": "^4.13.0 <5.0",
-    "symfony/event-dispatcher": "^5.4"
+    "php": "^8.2",
+    "contao-community-alliance/dc-general": "^2.4@dev",
+    "contao-community-alliance/translator": "^2.5@dev",
+    "contao-community-alliance/url-builder": "^2.0@dev",
+    "contao/core-bundle": "^5.3 <5.7",
+    "symfony/event-dispatcher": "^6.4"
   },
   "require-dev": {
-    "contao/manager-bundle": "^4.13.0 <5.0",
+    "contao/manager-plugin": "^2.8",
     "phpcq/runner-bootstrap": "^1.0@dev",
     "roave/security-advisories": "dev-latest"
   },
@@ -56,9 +56,10 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "2.3.x-dev",
+      "dev-feature/2.4.0": "2.4.x-dev",
       "dev-support/2.1.x": "2.1.x-dev",
-      "dev-support/2.2.x": "2.2.x-dev"
+      "dev-support/2.2.x": "2.2.x-dev",
+      "dev-support/2.3.x": "2.3.x-dev"
     },
     "contao-manager-plugin": "ContaoCommunityAlliance\\DcGeneral\\ContaoFrontend\\ContaoManager\\Plugin"
   }