From 3a5709bf5e30d298a55aace94078c45c9b3b7784 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Thu, 6 Feb 2020 13:23:18 +0000
Subject: [PATCH] start using phpstan-phpunit not using extension-installer
 because I want to part-integrate phpstan-strict-rules later on.

---
 composer.json     |  3 ++-
 composer.lock     | 58 ++++++++++++++++++++++++++++++++++++++++++++++-
 phpstan.neon.dist |  2 ++
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index c2e694880..3579c4dab 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,8 @@
    },
    "require-dev": {
       "phpstan/phpstan": "^0.12.8",
-      "irstea/phpunit-shim": "^8.5"
+      "irstea/phpunit-shim": "^8.5",
+      "phpstan/phpstan-phpunit": "^0.12.6"
    },
    "autoload": {
       "psr-4": {
diff --git a/composer.lock b/composer.lock
index edff2d066..dd690eca4 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": "d8245ae04afc2a5b7a3c8f52ccd4f892",
+    "content-hash": "82c757af39ed282d0d329dcd3053d045",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -467,6 +467,62 @@
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
             "time": "2020-02-04T22:30:27+00:00"
+        },
+        {
+            "name": "phpstan/phpstan-phpunit",
+            "version": "0.12.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan-phpunit.git",
+                "reference": "26394996368b6d033d012547d3197f4e07e23021"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/26394996368b6d033d012547d3197f4e07e23021",
+                "reference": "26394996368b6d033d012547d3197f4e07e23021",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.1",
+                "phpstan/phpstan": "^0.12.4"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<7.0"
+            },
+            "require-dev": {
+                "consistence/coding-standard": "^3.5",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
+                "ergebnis/composer-normalize": "^2.0.2",
+                "jakub-onderka/php-parallel-lint": "^1.0",
+                "phing/phing": "^2.16.0",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^7.0",
+                "satooshi/php-coveralls": "^1.0",
+                "slevomat/coding-standard": "^4.7.2"
+            },
+            "type": "phpstan-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                },
+                "phpstan": {
+                    "includes": [
+                        "extension.neon",
+                        "rules.neon"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPUnit extensions and rules for PHPStan",
+            "time": "2020-01-10T12:07:21+00:00"
         }
     ],
     "aliases": [],
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 631a1f539..ef316e5c4 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -7,6 +7,8 @@ includes:
 	- tests/phpstan/configs/phpunit-wiring-tests.neon
 	- tests/phpstan/configs/pthreads-bugs.neon
 	- tests/phpstan/configs/runtime-type-checks.neon
+	- vendor/phpstan/phpstan-phpunit/extension.neon
+	- vendor/phpstan/phpstan-phpunit/rules.neon
 
 parameters:
 	level: 6