Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Changelog

Bug fixes:

- [wr] Ignore exceptions (permission denied f.e.) when traversing files #1569
- [wr] Fix resolutin of virtual method
- [ct] Fix missing properties refactor does not import class #1534
- [ct] Fix false diagnostic for missing method #1500
Expand Down
11 changes: 9 additions & 2 deletions lib/Filesystem/Adapter/Simple/SimpleFileListProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,21 @@ public function fileList(): FileList
private function createFileIterator(string $path): Iterator
{
$path = $path ? $this->path->makeAbsoluteFromString($path) : $this->path->path();
$flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::SKIP_DOTS;
$flags =
FilesystemIterator::KEY_AS_PATHNAME |
FilesystemIterator::CURRENT_AS_FILEINFO |
FilesystemIterator::SKIP_DOTS;

if ($this->followSymlinks) {
$flags = $flags | FilesystemIterator::FOLLOW_SYMLINKS;
}

$files = new RecursiveDirectoryIterator($path, $flags);
$files = new RecursiveIteratorIterator($files);
$files = new RecursiveIteratorIterator(
$files,
RecursiveIteratorIterator::LEAVES_ONLY,
RecursiveIteratorIterator::CATCH_GET_CHILD
);

return $files;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Filesystem/Domain/FilePath.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ private function __construct(string $path)
{
if (false === Path::isAbsolute($path)) {
throw new InvalidArgumentException(sprintf(
'File path must be absolute, but %s given',
'File path must be absolute, but "%s" given',
$path
));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Filesystem/Tests/Unit/Domain/FilePathTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class FilePathTest extends TestCase
public function testNotAbsolute(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('File path must be absolute, but foobar given');
$this->expectExceptionMessage('File path must be absolute, but "foobar" given');
FilePath::fromString('foobar');
}

Expand Down
1 change: 1 addition & 0 deletions lib/Indexer/Tests/IntegrationTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ protected function container(array $config = []): Container
LoggingExtension::PARAM_ENABLED=> true,
LoggingExtension::PARAM_PATH=> 'php://stderr',
WorseReflectionExtension::PARAM_ENABLE_CACHE=> false,
WorseReflectionExtension::PARAM_STUB_DIR => $this->workspace()->path(),
], $config)
);

Expand Down