Initial commit for 2.0

contao-community-alliance · Sep 5, 2023 · d340213 · d340213
1 parent fe0ac04
commit d340213
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml
@@ -11,10 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: 7.4
-            output: '-o github-action -o default'
-            phpcq_install: 'install'
-          - php: 8.0
+          - php: 8.2
             output: '-o default'
             phpcq_install: 'update'
 
@@ -31,15 +28,15 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: PHP ${{ matrix.php }} Cache composer cache directory
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         env:
           cache-name: composer-cache-dir
         with:
           path: ~/.cache/composer
           key: ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}
 
       - name: PHP ${{ matrix.php }} Cache vendor directory
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         env:
           cache-name: composer-vendor
         with:
@@ -49,7 +46,7 @@ jobs:
             ${{ runner.os }}-${{ matrix.php }}-build-${{ env.cache-name }}-
 
       - name: PHP ${{ matrix.php }} Cache phpcq directory
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         env:
           cache-name: phpcq
         with:
@@ -68,7 +65,7 @@ jobs:
         run: ./vendor/bin/phpcq run -v ${{ matrix.output }}
 
       - name: PHP ${{ matrix.php }} Upload build directory to artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: ${{ success() }} || ${{ failure() }}
         with:
           name: phpcq-builds-php-${{ matrix.php }}

diff --git a/composer.json b/composer.json
@@ -22,17 +22,13 @@
     "source": "https://github.com/contao-community-alliance/url-builder"
   },
   "require": {
-    "php": "^5.6 || ^7.0 || ^8.0"
+    "php": "^8.2"
   },
   "require-dev": {
-    "contao/core-bundle": "^4.4",
-    "php-http/guzzle6-adapter": "^1.1",
+    "contao/core-bundle": "^5.x-dev, <5.7",
+    "php-http/guzzle6-adapter": "^2.0",
     "phpcq/runner-bootstrap": "^1.0@dev",
-    "symfony/security-csrf": "^4.4 || ^5.2"
-  },
-  "conflict": {
-    "contao/core-bundle": "<4.4 || >=5.0",
-    "symfony/security-csrf": "<4.4 || >=6.0"
+    "symfony/security-csrf": "^6.3"
   },
   "autoload": {
     "psr-4": {
@@ -52,8 +48,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-develop": "1.4.x-dev",
-      "dev-master": "1.3.x-dev"
+      "dev-feature/2.0.0": "2.0.x-dev"
     }
   }
 }