Autoloading is gone from user-facing messages

ondrejmirtes · ondrejmirtes · commit e7b7030d4cdf · 2020-06-07T18:00:23.000+02:00
diff --git a/src/Broker/ClassAutoloadingException.php b/src/Broker/ClassAutoloadingException.php
@@ -14,14 +14,14 @@ public function __construct(
 	{
 		if ($previous !== null) {
 			parent::__construct(sprintf(
-				'%s (%s) thrown while autoloading class %s.',
+				'%s (%s) thrown while looking for class %s.',
 				get_class($previous),
 				$previous->getMessage(),
 				$functionName
 			), 0, $previous);
 		} else {
 			parent::__construct(sprintf(
-				'Class %s not found and could not be autoloaded.',
+				'Class %s not found.',
 				$functionName
 			), 0);
 		}
@@ -36,7 +36,7 @@ public function getClassName(): string
 
 	public function getTip(): ?string
 	{
-		return 'Learn more at https://phpstan.org/user-guide/autoloading';
+		return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';
 	}
 
 }
diff --git a/src/Broker/ClassNotFoundException.php b/src/Broker/ClassNotFoundException.php
@@ -9,7 +9,7 @@ class ClassNotFoundException extends \PHPStan\AnalysedCodeException
 
 	public function __construct(string $functionName)
 	{
-		parent::__construct(sprintf('Class %s was not found while trying to analyse it - autoloading is probably not configured properly.', $functionName));
+		parent::__construct(sprintf('Class %s was not found while trying to analyse it - discovering symbols is probably not configured properly.', $functionName));
 		$this->className = $functionName;
 	}
 
@@ -20,7 +20,7 @@ public function getClassName(): string
 
 	public function getTip(): ?string
 	{
-		return 'Learn more at https://phpstan.org/user-guide/autoloading';
+		return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';
 	}
 
 }
diff --git a/src/Broker/ConstantNotFoundException.php b/src/Broker/ConstantNotFoundException.php
@@ -20,7 +20,7 @@ public function getConstantName(): string
 
 	public function getTip(): ?string
 	{
-		return 'Learn more at https://phpstan.org/user-guide/autoloading';
+		return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';
 	}
 
 }
diff --git a/src/Broker/FunctionNotFoundException.php b/src/Broker/FunctionNotFoundException.php
@@ -9,7 +9,7 @@ class FunctionNotFoundException extends \PHPStan\AnalysedCodeException
 
 	public function __construct(string $functionName)
 	{
-		parent::__construct(sprintf('Function %s not found while trying to analyse it - autoloading is probably not configured properly.', $functionName));
+		parent::__construct(sprintf('Function %s not found while trying to analyse it - discovering symbols is probably not configured properly.', $functionName));
 		$this->functionName = $functionName;
 	}
 
@@ -20,7 +20,7 @@ public function getFunctionName(): string
 
 	public function getTip(): ?string
 	{
-		return 'Learn more at https://phpstan.org/user-guide/autoloading';
+		return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -69,7 +69,7 @@ public function testExtendingUnknownClass(): void
 			$this->assertSame('Class ExtendingUnknownClass\Foo extends unknown class ExtendingUnknownClass\Bar.', $errors[0]->getMessage());
 		} else {
 			$this->assertNull($errors[0]->getLine());
-			$this->assertSame('Class ExtendingUnknownClass\Bar not found and could not be autoloaded.', $errors[0]->getMessage());
+			$this->assertSame('Class ExtendingUnknownClass\Bar not found.', $errors[0]->getMessage());
 		}
 	}
 
diff --git a/tests/PHPStan/Broker/BrokerTest.php b/tests/PHPStan/Broker/BrokerTest.php
@@ -74,7 +74,7 @@ public function testClassNotFound(): void
 	public function testFunctionNotFound(): void
 	{
 		$this->expectException(\PHPStan\Broker\FunctionNotFoundException::class);
-		$this->expectExceptionMessage('Function nonexistentFunction not found while trying to analyse it - autoloading is probably not configured properly.');
+		$this->expectExceptionMessage('Function nonexistentFunction not found while trying to analyse it - discovering symbols is probably not configured properly.');
 
 		$scope = $this->createMock(Scope::class);
 		$scope->method('getNamespace')
@@ -85,7 +85,7 @@ public function testFunctionNotFound(): void
 	public function testClassAutoloadingException(): void
 	{
 		$this->expectException(\PHPStan\Broker\ClassAutoloadingException::class);
-		$this->expectExceptionMessage("ParseError (syntax error, unexpected '{') thrown while autoloading class NonexistentClass.");
+		$this->expectExceptionMessage("ParseError (syntax error, unexpected '{') thrown while looking for class NonexistentClass.");
 		spl_autoload_register(static function (): void {
 			require_once __DIR__ . '/../Analyser/data/parse-error.php';
 		}, true, true);

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ public function __construct(`
`14`	`14`	`{`
`15`	`15`	`if ($previous !== null) {`
`16`	`16`	`parent::__construct(sprintf(`
`17`		`- '%s (%s) thrown while autoloading class %s.',`
	`17`	`+ '%s (%s) thrown while looking for class %s.',`
`18`	`18`	`get_class($previous),`
`19`	`19`	`$previous->getMessage(),`
`20`	`20`	`$functionName`
`21`	`21`	`), 0, $previous);`
`22`	`22`	`} else {`
`23`	`23`	`parent::__construct(sprintf(`
`24`		`- 'Class %s not found and could not be autoloaded.',`
	`24`	`+ 'Class %s not found.',`
`25`	`25`	`$functionName`
`26`	`26`	`), 0);`
`27`	`27`	`}`
`@@ -36,7 +36,7 @@ public function getClassName(): string`
`36`	`36`
`37`	`37`	`public function getTip(): ?string`
`38`	`38`	`{`
`39`		`- return 'Learn more at https://phpstan.org/user-guide/autoloading';`
	`39`	`+ return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class ClassNotFoundException extends \PHPStan\AnalysedCodeException`
`9`	`9`
`10`	`10`	`public function __construct(string $functionName)`
`11`	`11`	`{`
`12`		`- parent::__construct(sprintf('Class %s was not found while trying to analyse it - autoloading is probably not configured properly.', $functionName));`
	`12`	`+ parent::__construct(sprintf('Class %s was not found while trying to analyse it - discovering symbols is probably not configured properly.', $functionName));`
`13`	`13`	`$this->className = $functionName;`
`14`	`14`	`}`
`15`	`15`
`@@ -20,7 +20,7 @@ public function getClassName(): string`
`20`	`20`
`21`	`21`	`public function getTip(): ?string`
`22`	`22`	`{`
`23`		`- return 'Learn more at https://phpstan.org/user-guide/autoloading';`
	`23`	`+ return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function getConstantName(): string`
`20`	`20`
`21`	`21`	`public function getTip(): ?string`
`22`	`22`	`{`
`23`		`- return 'Learn more at https://phpstan.org/user-guide/autoloading';`
	`23`	`+ return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class FunctionNotFoundException extends \PHPStan\AnalysedCodeException`
`9`	`9`
`10`	`10`	`public function __construct(string $functionName)`
`11`	`11`	`{`
`12`		`- parent::__construct(sprintf('Function %s not found while trying to analyse it - autoloading is probably not configured properly.', $functionName));`
	`12`	`+ parent::__construct(sprintf('Function %s not found while trying to analyse it - discovering symbols is probably not configured properly.', $functionName));`
`13`	`13`	`$this->functionName = $functionName;`
`14`	`14`	`}`
`15`	`15`
`@@ -20,7 +20,7 @@ public function getFunctionName(): string`
`20`	`20`
`21`	`21`	`public function getTip(): ?string`
`22`	`22`	`{`
`23`		`- return 'Learn more at https://phpstan.org/user-guide/autoloading';`
	`23`	`+ return 'Learn more at https://phpstan.org/user-guide/discovering-symbols';`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testExtendingUnknownClass(): void`
`69`	`69`	`$this->assertSame('Class ExtendingUnknownClass\Foo extends unknown class ExtendingUnknownClass\Bar.', $errors[0]->getMessage());`
`70`	`70`	`} else {`
`71`	`71`	`$this->assertNull($errors[0]->getLine());`
`72`		`- $this->assertSame('Class ExtendingUnknownClass\Bar not found and could not be autoloaded.', $errors[0]->getMessage());`
	`72`	`+ $this->assertSame('Class ExtendingUnknownClass\Bar not found.', $errors[0]->getMessage());`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`