Better message for misconfigured autoloader

phpstan · Dec 6, 2016 · 1e95c58 · 1e95c58
1 parent 8d8c2dd
commit 1e95c58
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/src/Broker/ClassNotFoundException.php b/src/Broker/ClassNotFoundException.php
@@ -10,7 +10,7 @@ class ClassNotFoundException extends \PHPStan\AnalysedCodeException
 
 	public function __construct(string $functionName)
 	{
-		parent::__construct(sprintf('Class %s not found.', $functionName));
+		parent::__construct(sprintf('Class %s was not found while trying to analyse it - autoloading is not probably configured properly.', $functionName));
 		$this->className = $functionName;
 	}
 

diff --git a/src/Rules/FunctionDefinitionCheck.php b/src/Rules/FunctionDefinitionCheck.php
@@ -53,6 +53,9 @@ public function checkFunction(
 	): array
 	{
 		if ($function instanceof ClassMethod && $scope->getClass() !== null) {
+			if (!$this->broker->hasClass($scope->getClass())) {
+				return [];
+			}
 			return $this->checkParametersAcceptor(
 				$this->broker->getClass($scope->getClass())->getMethod($function->name),
 				$parameterMessage,

diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -29,4 +29,16 @@ public function testMissingPropertyAndMethod()
 		$this->assertNull($error->getLine());
 	}
 
+	public function testErrorAboutMisconfiguredAutoloader()
+	{
+		$file = __DIR__ . '/../../notAutoloaded/Bar.php';
+		$analyser = $this->getContainer()->getByType(Analyser::class);
+		$errors = $analyser->analyse([$file]);
+		$this->assertCount(1, $errors);
+		$error = $errors[0];
+		$this->assertSame('Class PHPStan\Tests\Bar was not found while trying to analyse it - autoloading is not probably configured properly.', $error->getMessage());
+		$this->assertSame($file, $error->getFile());
+		$this->assertNull($error->getLine());
+	}
+
 }
diff --git a/tests/PHPStan/Broker/BrokerTest.php b/tests/PHPStan/Broker/BrokerTest.php
@@ -25,7 +25,7 @@ protected function setUp()
 	public function testClassNotFound()
 	{
 		$this->expectException(\PHPStan\Broker\ClassNotFoundException::class);
-		$this->expectExceptionMessage('Class NonexistentClass not found.');
+		$this->expectExceptionMessage('NonexistentClass');
 		$this->broker->getClass('NonexistentClass');
 	}
 

diff --git a/tests/notAutoloaded/Bar.php b/tests/notAutoloaded/Bar.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Tests;
+
+class Bar
+{
+
+	public function doFoo()
+	{
+	}
+
+}