Commit 0bfa507

committed

fix PathRoutingParser

1 parent 683f3a8 commit 0bfa507Copy full SHA for 0bfa507

File tree

1 file changed

+16

-2

lines changed

src/Parser
- PathRoutingParser.php

1 file changed

+16

-2

lines changed

`‎src/Parser/PathRoutingParser.php‎`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,23 +19,37 @@ final class PathRoutingParser implements Parser`
`19`	`19`	`/** @var bool[] filePath(string) => bool(true) */`
`20`	`20`	`private array $analysedFiles = [];`
`21`	`21`
	`22`	`+ private bool $caseInsensitiveFilesystem;`
	`23`	`+`
`22`	`24`	`public function __construct(`
`23`	`25`	`private FileHelper $fileHelper,`
`24`	`26`	`private Parser $currentPhpVersionRichParser,`
`25`	`27`	`private Parser $currentPhpVersionSimpleParser,`
`26`	`28`	`private Parser $php8Parser,`
`27`	`29`	`)`
`28`	`30`	`{`
	`31`	`+ $this->caseInsensitiveFilesystem = PHP_OS_FAMILY === 'Darwin';`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`/**`
`32`	`35`	`* @param string[] $files`
`33`	`36`	`*/`
`34`	`37`	`public function setAnalysedFiles(array $files): void`
`35`	`38`	`{`
	`39`	`+ if ($this->caseInsensitiveFilesystem) {`
	`40`	`+ $files = array_map(static fn (string $file): string => strtolower($file), $files);`
	`41`	`+ }`
`36`	`42`	`$this->analysedFiles = array_fill_keys($files, true);`
`37`	`43`	`}`
`38`	`44`
	`45`	`+ private function isInAnalyzedFiles(string $file): bool {`
	`46`	`+ if ($this->caseInsensitiveFilesystem) {`
	`47`	`+ $file = strtolower($file);`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ return isset($this->analysedFiles[$file]);`
	`51`	`+ }`
	`52`	`+`
`39`	`53`	`public function parseFile(string $file): array`
`40`	`54`	`{`
`41`	`55`	`$normalizedPath = $this->fileHelper->normalizePath($file, '/');`
`@@ -47,7 +61,7 @@ public function parseFile(string $file): array`
`47`	`61`	`}`
`48`	`62`
`49`	`63`	`$file = $this->fileHelper->normalizePath($file);`
`50`		`- if (!isset($this->analysedFiles[$file])) {`
	`64`	`+ if (!$this->isInAnalyzedFiles($file)) {`
`51`	`65`	`// check symlinked file that still might be in analysedFiles`
`52`	`66`	`$pathParts = explode(DIRECTORY_SEPARATOR, $file);`
`53`	`67`	`for ($i = count($pathParts); $i > 1; $i--) {`
`@@ -59,7 +73,7 @@ public function parseFile(string $file): array`
`59`	`73`	`$realFilePath = realpath($file);`
`60`	`74`	`if ($realFilePath !== false) {`
`61`	`75`	`$normalizedRealFilePath = $this->fileHelper->normalizePath($realFilePath);`
`62`		`- if (isset($this->analysedFiles[$normalizedRealFilePath])) {`
	`76`	`+ if ($this->isInAnalyzedFiles($normalizedRealFilePath)) {`
`63`	`77`	`return $this->currentPhpVersionRichParser->parseFile($file);`
`64`	`78`	`}`
`65`	`79`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 0bfa507

File tree

1 file changed

1 file changed

`‎src/Parser/PathRoutingParser.php‎`

0 commit comments