Merge branch refs/heads/1.12.x into 2.0.x

Author: phpstan-bot

src/Rules/Keywords/RequireFileExistsRule.php

@@ -77,8 +77,7 @@ private function doesFileExist(string $path, Scope $scope): bool
 	private function doesFileExistForDirectory(string $path, string $workingDirectory): bool
 	{
 		$fileHelper = new FileHelper($workingDirectory);
-		$normalisedPath = $fileHelper->normalizePath($path);
-		$absolutePath = $fileHelper->absolutizePath($normalisedPath);
+		$absolutePath = $fileHelper->absolutizePath($path);
 
 		return is_file($absolutePath);
 	}

tests/PHPStan/Rules/Keywords/RequireFileExistsRuleTest.php

@@ -16,18 +16,11 @@
 class RequireFileExistsRuleTest extends RuleTestCase
 {
 
-	private RequireFileExistsRule $rule;
-
-	public function setUp(): void
-	{
-		parent::setUp();
-
-		$this->rule = $this->getDefaultRule();
-	}
+	private string $currentWorkingDirectory = __DIR__ . '/../';
 
 	protected function getRule(): Rule
 	{
-		return $this->rule;
+		return new RequireFileExistsRule($this->currentWorkingDirectory);
 	}
 
 	public static function getAdditionalConfigFiles(): array
@@ -37,11 +30,6 @@ public static function getAdditionalConfigFiles(): array
 		];
 	}
 
-	private function getDefaultRule(): RequireFileExistsRule
-	{
-		return new RequireFileExistsRule(__DIR__ . '/../');
-	}
-
 	public function testBasicCase(): void
 	{
 		$this->analyse([__DIR__ . '/data/require-file-simple-case.php'], [
@@ -124,13 +112,13 @@ public function testRelativePathWithIncludePath(): void
 
 	public function testRelativePathWithSameWorkingDirectory(): void
 	{
-		$this->rule = new RequireFileExistsRule(__DIR__);
+		$this->currentWorkingDirectory = __DIR__;
+		$this->analyse([__DIR__ . '/data/require-file-relative-path.php'], []);
+	}
 
-		try {
-			$this->analyse([__DIR__ . '/data/require-file-relative-path.php'], []);
-		} finally {
-			$this->rule = $this->getDefaultRule();
-		}
+	public function testBug11738(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11738/bug-11738.php'], []);
 	}
 
 }

tests/PHPStan/Rules/Keywords/data/bug-11738-included.php

@@ -0,0 +1,2 @@
+<?php
+

tests/PHPStan/Rules/Keywords/data/bug-11738/bug-11738.php

@@ -0,0 +1,3 @@
+<?php
+
+require_once('../bug-11738-included.php');