Skip to content

Commit

Permalink
Initial commit for 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
e-spin committed Sep 6, 2023
1 parent fe0ac04 commit 7cc5d04
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 161 deletions.
13 changes: 5 additions & 8 deletions .github/workflows/diagnostics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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 }}
Expand Down
18 changes: 7 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
}
59 changes: 0 additions & 59 deletions src/Contao/BackendUrlBuilder.php

This file was deleted.

83 changes: 0 additions & 83 deletions tests/Contao/BackendUrlBuilderTest.php

This file was deleted.

0 comments on commit 7cc5d04

Please sign in to comment.