diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7cd050..1d03cd5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -141,14 +141,13 @@ jobs: if: "matrix.composer-dependencies == 'lowest'" name: "Install lowest dependencies with composer" run: | - composer update --no-ansi --no-interaction | - --no-progress --prefer-lowest + composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest composer show - if: "matrix.composer-dependencies == 'highest'" name: "Install highest dependencies with composer" run: | - composer update --no-ansi --no-interaction --no-progress + composer update --no-ansi --no-interaction --no-progress --with-dependencies composer show - name: "Run unit tests" @@ -157,6 +156,7 @@ jobs: matrix: composer-dependencies: - highest + - lowest php-version: - 7.2 - 7.3 @@ -199,14 +199,13 @@ jobs: if: "matrix.composer-dependencies == 'lowest'" name: "Install lowest dependencies with composer" run: | - composer update --no-ansi --no-interaction | - --no-progress --prefer-lowest + composer update --no-ansi --no-interaction --no-progress --with-dependencies --prefer-lowest composer show - if: "matrix.composer-dependencies == 'highest'" name: "Install highest dependencies with composer" run: | - composer update --no-ansi --no-interaction --no-progress + composer update --no-ansi --no-interaction --no-progress --with-dependencies composer show - name: "Start MySQL" @@ -223,6 +222,7 @@ jobs: matrix: composer-dependencies: - highest + - lowest php-version: - 7.2 - 7.3 diff --git a/composer.json b/composer.json index 58e023d..619850b 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "require-dev": { "codeception/codeception": "^4.1.5", "friendsofphp/php-cs-fixer": "^2.16.3", - "helhum/typo3-composer-setup": "^0.5.6", + "helhum/typo3-composer-setup": "^0.5.7", "helmich/typo3-typoscript-lint": "^2.1.1", "nimut/testing-framework": "^5.0.3", "phpunit/phpunit": "^7.5.20", @@ -45,6 +45,9 @@ "j13k/yaml-lint": "1.1.x-dev", "sebastian/phpcpd": "^4.1.0" }, + "conflict": { + "typo3/class-alias-loader": "< 1.1.0" + }, "replace": { "typo3-ter/tea": "self.version" },