Skip to content

Commit

Permalink
Merge branch 'contao:5.3' into 5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@veronikaplenta
veronikaplenta authored May 17, 2024
2 parents d3b3590 + 95ac936 commit 99f1ba3
Show file tree
Hide file tree
Showing 19 changed files with 202 additions and 206 deletions.
165 changes: 110 additions & 55 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ on:

permissions: read-all

defaults:
run:
# Simulate an interactive terminal with color support
shell: script -q -e -c "export TERM=xterm; bash {0}"

jobs:
rector:
name: Rector
Expand All @@ -18,12 +23,17 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: |
composer install --no-interaction --no-progress
composer bin rector install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Install Rector
uses: ramsey/composer-install@v3
with:
working-directory: vendor-bin/rector

- name: Run Rector
run: vendor-bin/rector/vendor/bin/rector --dry-run --no-progress-bar
Expand All @@ -40,12 +50,17 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: |
composer install --no-interaction --no-progress
composer bin ecs install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Install ECS
uses: ramsey/composer-install@v3
with:
working-directory: vendor-bin/ecs

- name: Run ECS
run: vendor-bin/ecs/vendor/bin/ecs check --no-progress-bar
Expand All @@ -62,12 +77,17 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: |
composer install --no-interaction --no-progress
composer bin ecs install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Install ECS
uses: ramsey/composer-install@v3
with:
working-directory: vendor-bin/ecs

- name: Run ECS
run: |
Expand All @@ -86,12 +106,17 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: |
composer install --no-interaction --no-progress
composer bin phpstan install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Install PHPStan
uses: ramsey/composer-install@v3
with:
working-directory: vendor-bin/phpstan

- name: Run PHPStan
run: vendor-bin/phpstan/vendor/bin/phpstan analyse --no-progress
Expand All @@ -101,14 +126,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Run YAMLlint
run: |
python3 -m pip install --upgrade pip
python3 -m pip install --upgrade setuptools wheel
python3 -m pip install --upgrade yamllint
/home/runner/.local/bin/yamllint .
run: yamllint --format=github .

service-linter:
name: Service linter
Expand All @@ -122,12 +145,17 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: |
composer install --no-interaction --no-progress
composer bin service-linter install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Install the service linter
uses: ramsey/composer-install@v3
with:
working-directory: vendor-bin/service-linter

- name: Run the service linter
run: vendor-bin/service-linter/bin/lint-service-ids
Expand All @@ -144,19 +172,27 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
show-progress: false

- name: Install the dependencies
run: |
composer install --no-interaction --no-progress
composer -dcore-bundle install --no-interaction --no-progress
composer bin depcheck install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Install depcheck
uses: ramsey/composer-install@v3
with:
working-directory: vendor-bin/depcheck

- name: Check for unknown symbols (contao/contao)
run: vendor-bin/depcheck/vendor/bin/composer-dependency-analyser --config=depcheck.php

- name: Install the core bundle
uses: ramsey/composer-install@v3
with:
working-directory: core-bundle

- name: Check for unknown symbols (contao/core-bundle)
run: vendor-bin/depcheck/vendor/bin/composer-dependency-analyser --config=depcheck.php --composer-json=core-bundle/composer.json

Expand All @@ -181,10 +217,12 @@ jobs:
mysql -uroot -proot -e "CREATE database contao_test"
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: composer install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Run the unit tests
run: vendor/bin/phpunit
Expand All @@ -211,10 +249,12 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: composer install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Run the unit tests in reverse order
run: vendor/bin/phpunit --order-by=reverse --extensions Contao\\CoreBundle\\Tests\\PhpunitExtension\\GlobalStateWatcher
Expand All @@ -237,10 +277,14 @@ jobs:
mysql -uroot -proot -e "CREATE database contao_test"
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: composer install --ignore-platform-req=php+ --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3
with:
composer-options: --ignore-platform-req=php+

- name: Run the unit tests
run: vendor/bin/phpunit
Expand All @@ -267,10 +311,14 @@ jobs:
mysql -uroot -proot -e "CREATE database contao_test"
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: composer update --prefer-lowest --prefer-stable --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3
with:
dependency-versions: lowest

- name: Run the unit tests
run: vendor/bin/phpunit
Expand All @@ -297,7 +345,9 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Test the single bundles
run: |
Expand Down Expand Up @@ -337,12 +387,17 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: |
composer install --no-interaction --no-progress
composer bin monorepo-tools install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Install the monorepo tools
uses: ramsey/composer-install@v3
with:
working-directory: vendor-bin/monorepo-tools

- name: Validate the composer.json files
run: vendor-bin/monorepo-tools/vendor/bin/monorepo-tools composer-json --validate
15 changes: 11 additions & 4 deletions .github/workflows/coverage.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ on:

permissions: read-all

defaults:
run:
# Simulate an interactive terminal with color support
shell: script -q -e -c "export TERM=xterm; bash {0}"

jobs:
coverage:
name: Codecov
Expand All @@ -23,16 +28,18 @@ jobs:
coverage: pcov

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Install the dependencies
run: composer install --no-interaction --no-progress
- name: Install Contao
uses: ramsey/composer-install@v3

- name: Generate the coverage report
run: php -d pcov.enabled=1 vendor/bin/phpunit --testsuite=coverage --coverage-clover=clover.xml

- name: Upload the coverage report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
files: ./clover.xml
fail_ci_if_error: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- name: Assign the PR
uses: toshimaru/auto-author-assign@v1.4.0
- name: Assign the author
uses: toshimaru/auto-author-assign@v2.1.0

- name: Assign the milestone
uses: zoispag/action-assign-milestone@v1
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/split.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ on:

permissions: read-all

defaults:
run:
# Simulate an interactive terminal with color support
shell: script -q -e -c "export TERM=xterm; bash {0}"

jobs:
monorepo-split:
name: Monorepo split
Expand All @@ -22,16 +27,18 @@ jobs:
coverage: none

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
show-progress: false

- name: Cache the monorepo split
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .monorepo-split-cache
key: dev-${GITHUB_REF##*/}

- name: Install the dependencies
run: composer global require contao/monorepo-tools:dev-main
run: composer global require contao/monorepo-tools:^0.2

- name: Split the monorepo
run: $HOME/.composer/vendor/bin/monorepo-tools split ${GITHUB_REF##*/} ${{ github.event.forced && '--force-push' || '' }}
Expand Down
4 changes: 1 addition & 3 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"toflar/psr6-symfony-http-cache-store": "^4.0",
"twig/extra-bundle": "^3.0",
"twig/string-extra": "^3.0",
"twig/twig": "^3.8",
"twig/twig": "^3.10.2",
"ua-parser/uap-php": "^3.9",
"webignition/robots-txt-file": "^3.0",
"wikimedia/less.php": "^1.7"
Expand Down Expand Up @@ -202,8 +202,6 @@
"nikic/php-parser": "4.7.0",
"terminal42/contao-ce-access": "<3.0",
"thecodingmachine/safe": "<1.2",
"twig/intl-extra": "3.9.0",
"twig/twig": "3.9.0",
"zendframework/zend-code": "<3.3.1"
},
"autoload": {
Expand Down
6 changes: 2 additions & 4 deletions core-bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"terminal42/service-annotation-bundle": "^1.1",
"toflar/cronjob-supervisor": "^2.0",
"twig/string-extra": "^3.0",
"twig/twig": "^3.8",
"twig/twig": "^3.10.2",
"ua-parser/uap-php": "^3.9",
"webignition/robots-txt-file": "^3.0",
"wikimedia/less.php": "^1.7"
Expand Down Expand Up @@ -179,9 +179,7 @@
"contao/manager-plugin": "<2.0 || >=3.0",
"doctrine/cache": "<1.10",
"terminal42/contao-ce-access": "<3.0",
"thecodingmachine/safe": "<1.2",
"twig/intl-extra": "3.9.0",
"twig/twig": "3.9.0"
"thecodingmachine/safe": "<1.2"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 99f1ba3

Please sign in to comment.