From d1f2567600a8c90fc4677f776abbca1dba89e13f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Fri, 13 Dec 2019 23:00:44 +0100
Subject: [PATCH] Fix: Require at least phpstan/phpstan:0.12.0

---
 .github/workflows/continuous-integration.yml | 25 +++++++++-----------
 CHANGELOG.md                                 |  2 +-
 composer.json                                |  2 +-
 composer.lock                                |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index f3aad76..bed9f61 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -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:
@@ -82,20 +78,21 @@ jobs:
         uses: actions/cache@v1.0.3
         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
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73479ad..6c169d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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]
 
diff --git a/composer.json b/composer.json
index 333ba83..a2e9bc6 100644
--- a/composer.json
+++ b/composer.json
@@ -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",
diff --git a/composer.lock b/composer.lock
index dbf31a4..5420b82 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "000a439c13adbd76d76e6251effffb44",
+    "content-hash": "89d1d4b13b8dc1293b6ae500b26a67b3",
     "packages": [
         {
             "name": "nikic/php-parser",