Skip to content

Commit

Permalink
Fix: Require at least phpstan/phpstan:0.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Dec 13, 2019
1 parent d58d72f commit d1f2567
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
25 changes: 11 additions & 14 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,9 @@ jobs:
php-version:
- 7.4

phpstan-version:
- "^0.10.3"
- "^0.11.0"
- "^0.12.0"

dependencies:
- lowest
- locked
- highest

steps:
Expand All @@ -82,20 +78,21 @@ jobs:
uses: actions/[email protected]
with:
path: ~/.composer/cache
key: php-${{ matrix.php-version }}-phpstan-${{ matrix.phpstan-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
php-${{ matrix.php-version }}-phpstan-${{ matrix.phpstan-version }}-composer-${{ matrix.dependencies }}-
php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
- name: "Require phpstan/phpstan:${{ matrix.phpstan-version }} with lowest dependencies"
- name: "Install lowest dependencies with composer"
if: matrix.dependencies == 'lowest'
run: composer require phpstan/phpstan:${{ matrix.phpstan-version }} --no-interaction --no-progress --no-suggest --prefer-lowest --update-with-dependencies
run: composer update --no-interaction --no-progress --no-suggest --prefer-lowest

- name: "Require phpstan/phpstan:${{ matrix.phpstan-version }} with highest dependencies"
if: matrix.dependencies == 'highest'
run: composer require phpstan/phpstan:${{ matrix.phpstan-version }} --no-interaction --no-progress --no-suggest --update-with-dependencies
- name: "Install locked dependencies with composer"
if: matrix.dependencies == 'locked'
run: composer install --no-interaction --no-progress --no-suggest

- name: "Run composer show phpstan/phpstan"
run: composer show phpstan/phpstan
- name: "Install highest dependencies with composer"
if: matrix.dependencies == 'highest'
run: composer update --no-interaction --no-progress --no-suggest

- name: "Run phpstan/phpstan"
run: vendor/bin/phpstan analyse --configuration=phpstan.neon
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For a full diff see [`0.5.0...master`][0.5.0...master].

### Changed

* Required at least `phpstan/phpstan:^0.10.3` [#79], by [@localheinz]
* Required at least `phpstan/phpstan:^0.12.0` [#79], by [@localheinz]

## [`0.5.0`][0.5.0]

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"require": {
"php": "^7.1",
"phpstan/phpstan": "^0.10.3 || ^0.11.0 || ^0.12.2"
"phpstan/phpstan": "^0.12.0"
},
"conflict": {
"phpspec/prophecy": "<1.7,>=2.0",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d1f2567

Please sign in to comment.