Skip to content

Commit

Permalink
Merge pull request #79 from localheinz/feature/phpstan
Browse files Browse the repository at this point in the history
Fix: Require at least phpstan/phpstan:^0.12.0
  • Loading branch information
localheinz authored Dec 13, 2019
2 parents 88bc17d + 03cfd5b commit 3ca2d78
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 11 deletions.
23 changes: 16 additions & 7 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ jobs:
php-version:
- 7.4

dependencies:
- lowest
- locked
- highest

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

- name: "Install locked dependencies with composer"
if: matrix.dependencies == 'locked'
run: composer install --no-interaction --no-progress --no-suggest

- 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 All @@ -91,15 +105,10 @@ jobs:
strategy:
matrix:
php-version:
- 7.1
- 7.2
- 7.3
- 7.4

dependencies:
- lowest
- locked
- highest

steps:
- name: "Checkout"
Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`0.5.0...master`][0.5.0...master].
For a full diff see [`0.5.1...master`][0.5.1...master].

## [`0.5.1`][0.5.1]

For a full diff see [`0.5.0...0.5.1`][0.5.0...0.5.1].

### Changed

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

## [`0.5.0`][0.5.0]

Expand Down Expand Up @@ -57,6 +65,7 @@ For a full diff see [`afd6fd9...0.1`][afd6fd9...0.1].
[0.4.1]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.4.1
[0.4.2]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.4.2
[0.5.0]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.5.0
[0.5.1]: https://github.com/Jan0707/phpstan-prophecy/releases/tag/0.5.1

[afd6fd9...0.1]: https://github.com/Jan0707/phpstan-prophecy/compare/afd6fd9...0.1
[0.1...0.1.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.1...0.1.1
Expand All @@ -67,9 +76,11 @@ For a full diff see [`afd6fd9...0.1`][afd6fd9...0.1].
[0.4...0.4.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.4...0.4.1
[0.4.1...0.4.2]: https://github.com/Jan0707/phpstan-prophecy/compare/0.4.1...0.4.2
[0.4.2...0.5.0]: https://github.com/Jan0707/phpstan-prophecy/compare/0.4.2...0.5.0
[0.5.0...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.5.0...master
[0.5.0...0.5.1]: https://github.com/Jan0707/phpstan-prophecy/compare/0.5.0...0.5.1
[0.5.1...master]: https://github.com/Jan0707/phpstan-prophecy/compare/0.5.1...master

[#67]: https://github.com/Jan0707/phpstan-prophecy/pull/67
[#79]: https://github.com/Jan0707/phpstan-prophecy/pull/79

[@localheinz]: https://github.com/localheinz
[@PedroTroller]: https://github.com/PedroTroller
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.0 || ^0.11.0 || ^0.12.2"
"phpstan/phpstan": "^0.12.0"
},
"conflict": {
"phpspec/prophecy": "<1.7,>=2.0",
Expand Down
3 changes: 2 additions & 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 3ca2d78

Please sign in to comment.