From 1c9a51b8d94f969d2a038744b51c59c1761e8193 Mon Sep 17 00:00:00 2001
From: Sebastian Schreiber <breakpoint@schreibersebastian.de>
Date: Sat, 19 Oct 2019 19:53:56 +0200
Subject: [PATCH 1/2] [FEATURE] Possibility to add custom phpstan.neon
 configuration

---
 .../DependencyInjection/PHPStanServicesFactory.php    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php b/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php
index 4448f8aebbbf..837568c07386 100644
--- a/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php
+++ b/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php
@@ -20,15 +20,22 @@ final class PHPStanServicesFactory
 
     public function __construct()
     {
-        $containerFactory = new ContainerFactory(getcwd());
+        $currentWorkingDirectory = getcwd();
+
+        $containerFactory = new ContainerFactory($currentWorkingDirectory);
         $additionalConfigFiles = [];
 
         // possible path collision for Docker
-        $phpstanPhpunitExtensionConfig = getcwd() . '/vendor/phpstan/phpstan-phpunit/extension.neon';
+        $phpstanPhpunitExtensionConfig = $currentWorkingDirectory . '/vendor/phpstan/phpstan-phpunit/extension.neon';
         if (file_exists($phpstanPhpunitExtensionConfig) && class_exists('PHPUnit\\Framework\\TestCase')) {
             $additionalConfigFiles[] = $phpstanPhpunitExtensionConfig;
         }
 
+        $currentProjectConfigFile = $currentWorkingDirectory . 'phpstan.neon';
+        if (file_exists($currentProjectConfigFile)) {
+            $additionalConfigFiles[] = $currentProjectConfigFile;
+        }
+
         $additionalConfigFiles[] = __DIR__ . '/../../config/phpstan/type-extensions.neon';
 
         $this->container = $containerFactory->create(sys_get_temp_dir(), $additionalConfigFiles, []);

From 2f230f0a4acb160d9ca1041b07cec4c037c22a68 Mon Sep 17 00:00:00 2001
From: Sebastian Schreiber <breakpoint@schreibersebastian.de>
Date: Sat, 19 Oct 2019 20:20:07 +0200
Subject: [PATCH 2/2] [FEATURE] Possibility to add custom phpstan.neon
 configuration

---
 .../src/DependencyInjection/PHPStanServicesFactory.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php b/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php
index 837568c07386..534a5ae94a31 100644
--- a/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php
+++ b/packages/NodeTypeResolver/src/DependencyInjection/PHPStanServicesFactory.php
@@ -31,7 +31,7 @@ public function __construct()
             $additionalConfigFiles[] = $phpstanPhpunitExtensionConfig;
         }
 
-        $currentProjectConfigFile = $currentWorkingDirectory . 'phpstan.neon';
+        $currentProjectConfigFile = $currentWorkingDirectory . '/phpstan.neon';
         if (file_exists($currentProjectConfigFile)) {
             $additionalConfigFiles[] = $currentProjectConfigFile;
         }