diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml index 0e8fda5..d7d9a39 100644 --- 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,7 +28,7 @@ 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: @@ -39,7 +36,7 @@ jobs: 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 index b878777..0952cc2 100644 --- 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.3.x-dev", + "php-http/guzzle7-adapter": "^1.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": { @@ -47,13 +43,13 @@ "config": { "allow-plugins": { "composer/package-versions-deprecated": true, - "contao-components/installer": false + "contao-components/installer": false, + "php-http/discovery": true } }, "extra": { "branch-alias": { - "dev-develop": "1.4.x-dev", - "dev-master": "1.3.x-dev" + "dev-feature/2.0.0": "2.0.x-dev" } } }