Commit d78a5d8

committed

DefaultStubFilesProvider - normalize stub file paths

1 parent c71e75e commit d78a5d8Copy full SHA for d78a5d8

File tree

2 files changed

-5

lines changed

src/PhpDoc
- DefaultStubFilesProvider.php
tests/PHPStan/PhpDoc
- DefaultStubFilesProviderTest.php

2 files changed

-5

lines changed

`‎src/PhpDoc/DefaultStubFilesProvider.php‎`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@`
`5`	`5`	`use PHPStan\DependencyInjection\AutowiredParameter;`
`6`	`6`	`use PHPStan\DependencyInjection\AutowiredService;`
`7`	`7`	`use PHPStan\DependencyInjection\Container;`
	`8`	`+use PHPStan\File\FileHelper;`
`8`	`9`	`use PHPStan\Internal\ComposerHelper;`
`9`	`10`	`use function array_filter;`
`10`	`11`	`use function array_values;`
`11`	`12`	`use function str_contains;`
`12`		`-use function strtr;`
`13`	`13`
`14`	`14`	`#[AutowiredService(as: StubFilesProvider::class)]`
`15`	`15`	`final class DefaultStubFilesProvider implements StubFilesProvider`
`@@ -27,6 +27,7 @@ final class DefaultStubFilesProvider implements StubFilesProvider`
`27`	`27`	`*/`
`28`	`28`	`public function __construct(`
`29`	`29`	`private Container $container,`
	`30`	`+ private FileHelper $fileHelper,`
`30`	`31`	`#[AutowiredParameter]`
`31`	`32`	`private array $stubFiles,`
`32`	`33`	`#[AutowiredParameter]`
`@@ -45,7 +46,7 @@ public function getStubFiles(): array`
`45`	`46`	`$extensions = $this->container->getServicesByTag(StubFilesExtension::EXTENSION_TAG);`
`46`	`47`	`foreach ($extensions as $extension) {`
`47`	`48`	`foreach ($extension->getFiles() as $extensionFile) {`
`48`		`- $files[] = $extensionFile;`
	`49`	`+ $files[] = $this->fileHelper->normalizePath($extensionFile);`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`
`@@ -66,10 +67,10 @@ public function getProjectStubFiles(): array`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`$vendorDir = ComposerHelper::getVendorDirFromComposerConfig($composerAutoloaderProjectPath, $composerConfig);`
`69`		`- $vendorDir = strtr($vendorDir, '\\', '/');`
	`70`	`+ $vendorDir = $this->fileHelper->normalizePath($vendorDir);`
`70`	`71`	`$filteredStubFiles = array_filter(`
`71`	`72`	`$filteredStubFiles,`
`72`		`- static fn (string $file): bool => !str_contains(strtr($file, '\\', '/'), $vendorDir),`
	`73`	`+ static fn (string $file): bool => !str_contains($file, $vendorDir),`
`73`	`74`	`);`
`74`	`75`	`}`
`75`	`76`

`‎tests/PHPStan/PhpDoc/DefaultStubFilesProviderTest.php‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace PHPStan\PhpDoc;`
`4`	`4`
`5`	`5`	`use Override;`
	`6`	`+use PHPStan\File\FileHelper;`
`6`	`7`	`use PHPStan\Testing\PHPStanTestCase;`
`7`	`8`	`use function sprintf;`
`8`	`9`
`@@ -49,7 +50,7 @@ public function testGetProjectStubFilesWhenPathContainsWindowsSeparator(): void`
`49`	`50`	`*/`
`50`	`51`	`private function createDefaultStubFilesProvider(array $stubFiles): DefaultStubFilesProvider`
`51`	`52`	`{`
`52`		`- return new DefaultStubFilesProvider($this->getContainer(), $stubFiles, [$this->currentWorkingDirectory]);`
	`53`	`+ return new DefaultStubFilesProvider($this->getContainer(), newFileHelper(__DIR__), $stubFiles, [$this->currentWorkingDirectory]);`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`}`

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 d78a5d8

File tree

2 files changed

2 files changed

`‎src/PhpDoc/DefaultStubFilesProvider.php‎`

`‎tests/PHPStan/PhpDoc/DefaultStubFilesProviderTest.php‎`

0 commit comments