Skip to content

Commit

Permalink
Require dev version of phpbench (#10328)
Browse files Browse the repository at this point in the history
It is important to have the same version of all dependencies in dev and
in the CI, otherwise it makes it hard to have the right static analysis
baseline for every environment.
  • Loading branch information
greg0ire authored Dec 20, 2022
1 parent 30a2680 commit ff6bad4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
12 changes: 0 additions & 12 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ jobs:
run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
if: "${{ matrix.dbal-version != 'default' }}"

- name: "Uninstall PHPBench"
run: "composer remove --dev --no-update phpbench/phpbench"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
Expand Down Expand Up @@ -156,9 +153,6 @@ jobs:
run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
if: "${{ matrix.dbal-version != 'default' }}"

- name: "Uninstall PHPBench"
run: "composer remove --dev --no-update phpbench/phpbench"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
Expand Down Expand Up @@ -220,9 +214,6 @@ jobs:
run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
if: "${{ matrix.dbal-version != 'default' }}"

- name: "Uninstall PHPBench"
run: "composer remove --dev --no-update phpbench/phpbench"

- name: "Install PHP"
uses: "shivammathur/setup-php@v2"
with:
Expand Down Expand Up @@ -300,9 +291,6 @@ jobs:
run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update"
if: "${{ matrix.dbal-version != 'default' }}"

- name: "Uninstall PHPBench"
run: "composer remove --dev --no-update phpbench/phpbench"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ jobs:
- name: "Require specific persistence version"
run: "composer require doctrine/persistence ^$([ ${{ matrix.persistence-version }} = default ] && echo '3.1' || echo ${{ matrix.persistence-version }}) --no-update"

- name: "Uninstall PHPBench"
run: "composer remove --dev --no-update phpbench/phpbench"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
Expand Down Expand Up @@ -97,9 +94,6 @@ jobs:
- name: "Require specific persistence version"
run: "composer require doctrine/persistence ^3.1 --no-update"

- name: "Uninstall PHPBench"
run: "composer remove --dev --no-update phpbench/phpbench"

- name: "Install dependencies with Composer"
uses: "ramsey/composer-install@v2"
with:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"require-dev": {
"doctrine/annotations": "^1.13 || ^2",
"doctrine/coding-standard": "^9.0.2 || ^11.0",
"phpbench/phpbench": "^0.16.10 || ^1.0",
"phpbench/phpbench": "^0.16.10 || ^1.0 || dev-master",
"phpstan/phpstan": "~1.4.10 || 1.9.4",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"psr/log": "^1 || ^2 || ^3",
Expand Down

0 comments on commit ff6bad4

Please sign in to comment.