Skip to content

Commit 697ae4b

Browse files
committed
Migrate to ramsey/composer-install
1 parent e3922b5 commit 697ae4b

File tree

3 files changed

+18
-35
lines changed

3 files changed

+18
-35
lines changed

.github/workflows/coding-standards.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,10 @@ jobs:
3030
php-version: "${{ matrix.php-version }}"
3131
tools: "cs2pr"
3232

33-
- name: "Cache dependencies installed with Composer"
34-
uses: "actions/cache@v2"
35-
with:
36-
path: "~/.composer/cache"
37-
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
38-
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
39-
4033
- name: "Install dependencies with Composer"
41-
run: "composer install --no-interaction --no-progress --no-suggest"
34+
uses: "ramsey/composer-install@v1"
35+
with:
36+
dependency-versions: "highest"
4237

4338
# https://github.com/doctrine/.github/issues/3
4439
- name: "Run PHP_CodeSniffer"

.github/workflows/continuous-integration.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ jobs:
2424
- "7.2"
2525
- "7.3"
2626
- "7.4"
27-
deps:
28-
- "normal"
27+
dependencies:
28+
- "highest"
29+
stability:
30+
- "stable"
2931
include:
30-
- deps: "low"
32+
- dependencies: "lowest"
3133
php-version: "7.1"
32-
- deps: "dev"
34+
- stability: "dev"
3335
php-version: "8.0"
3436

3537
steps:
@@ -54,24 +56,15 @@ jobs:
5456
coverage: "xdebug"
5557
ini-values: "zend.assertions=1"
5658

57-
- name: "Cache dependencies installed with composer"
58-
uses: "actions/cache@v2"
59-
with:
60-
path: "~/.composer/cache"
61-
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
62-
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
63-
6459
- name: "Allow installing dev dependencies"
6560
run: "composer config minimum-stability dev"
66-
if: "${{ matrix.deps == 'dev' }}"
61+
if: "${{ matrix.stability == 'dev' }}"
6762

68-
- name: "Install dependencies with composer"
69-
run: "composer update --no-interaction --prefer-dist"
70-
if: "${{ matrix.deps != 'low' }}"
71-
72-
- name: "Install lowest possible dependencies with composer"
73-
run: "composer update --no-interaction --prefer-dist --prefer-lowest"
74-
if: "${{ matrix.deps == 'low' }}"
63+
- name: "Install dependencies with Composer"
64+
uses: "ramsey/composer-install@v1"
65+
with:
66+
dependency-versions: "${{ matrix.dependencies }}"
67+
composer-options: "--prefer-dist"
7568

7669
- name: "Run PHPUnit"
7770
run: "vendor/bin/phpunit --coverage-clover=coverage.xml"

.github/workflows/static-analysis.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,10 @@ jobs:
3030
php-version: "${{ matrix.php-version }}"
3131
tools: "cs2pr"
3232

33-
- name: "Cache dependencies installed with composer"
34-
uses: "actions/cache@v2"
33+
- name: "Install dependencies with Composer"
34+
uses: "ramsey/composer-install@v1"
3535
with:
36-
path: "~/.composer/cache"
37-
key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
38-
restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
39-
40-
- name: "Install dependencies with composer"
41-
run: "composer install --no-interaction --no-progress --no-suggest"
36+
dependency-versions: "highest"
4237

4338
- name: "Run a static analysis with phpstan/phpstan"
4439
run: "vendor/bin/phpstan analyse --error-format=checkstyle | cs2pr"

0 commit comments

Comments
 (0)