diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5da2c8e86..9b60401fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,20 +20,20 @@ jobs: - '7.4' - '8.0' symfony-version: - - '4.4.*' - - '5.3.*' + - '4.4' + - '5.3' dependencies: - 'lowest' - 'highest' remove-dependencies: [ '' ] - coverage: [ '' ] + coverage: [ 'none' ] include: - php-version: '8.0' - symfony-version: '5.3.*' + symfony-version: '5.3' dependencies: 'lowest' remove-dependencies: '--dev symfony/validator' - php-version: '8.0' - symfony-version: '5.3.*' + symfony-version: '5.3' dependencies: 'lowest' coverage: "pcov" steps: @@ -48,11 +48,11 @@ jobs: - name: "Change stability" if: "matrix.stability != ''" - run: perl -pi -e 's/^}$/,"minimum-stability":"'"${{ matrix.minimum-stability }}"'"}/' composer.json + run: perl -pi -e 's/^}$/,"minimum-stability":"'"${{ matrix.minimum-stability }}"'"}/' composer.json && cat composer.json - name: "Symfony version" if: "matrix.symfony-version != ''" - run: perl -pi -e 's#"(symfony/.*)":\s*".*"#"$1":"'"${{ matrix.symfony-version }}.\*"'"#' composer.json + run: perl -pi -e 's#"(symfony/.*)":\s*"\^.*"#"$1":"'"${{ matrix.symfony-version }}.*"'"#' composer.json && cat composer.json - name: "Webonyx GraphQL version" if: "matrix.graphql-version != ''" @@ -64,6 +64,8 @@ jobs: - name: "Install dependencies" uses: ramsey/composer-install@1.3.0 + with: + dependency-versions: ${{ matrix.dependencies }} - name: "Run tests" run: composer test diff --git a/composer.json b/composer.json index ecb406248..332f3c1aa 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,7 @@ "phpstan/phpstan": "^0.12.58", "phpstan/phpstan-phpunit": "^0.12.11", "phpstan/phpstan-symfony": "^0.12.6", - "phpunit/phpunit": "^9.2", + "phpunit/phpunit": "^9.5", "react/promise": "^2.5", "symfony/asset": "^4.4 || ^5.2", "symfony/browser-kit": "^4.4 || ^5.2", @@ -67,6 +67,11 @@ "symfony/yaml": "^4.4 || ^5.2", "twig/twig": "^2.10|^3.0" }, + "conflict": { + "phpdocumentor/type-resolver": "<1.4.0", + "react/promise": "<2.8", + "symfony/phpunit-bridge": "<4.4.9" + }, "extra": { "branch-alias": { "dev-master": "0.14-dev"