danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7163 from dvz/explicit-symlink-resolution

Browse Source 
Add explicit `resolveSymlinks` option for project directories
This commit is contained in:
orklah 2022-01-10 21:50:08 +01:00 committed by GitHub
commit d52c3f0117
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.xsd
View File

@ -118,6 +118,7 @@
<xs:complexType name="ProjectDirectoryAttributeType">
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="ignoreTypeStats" type="xs:string" />
<xs:attribute name="resolveSymlinks" type="xs:boolean" />
<xs:attribute name="useStrictTypes" type="xs:string" />
<xs:anyAttribute processContents="skip"/>
</xs:complexType>

39
src/Psalm/Config/FileFilter.php
View File

@ -2,6 +2,7 @@
namespace Psalm\Config;
use FilesystemIterator;
use Psalm\Exception\ConfigException;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
@ -112,6 +113,7 @@ class FileFilter
foreach ($config['directory'] as $directory) {
$directory_path = (string) ($directory['name'] ?? '');
$ignore_type_stats = (bool) ($directory['ignoreTypeStats'] ?? false);
$resolve_symlinks = (bool) ($directory['resolveSymlinks'] ?? false);
$declare_strict_types = (bool) ($directory['useStrictTypes'] ?? false);
if ($directory_path[0] === '/' && DIRECTORY_SEPARATOR === '/') {
@ -182,27 +184,33 @@ class FileFilter
);
}
/** @var RecursiveDirectoryIterator */
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory_path));
$iterator->rewind();
if ($resolve_symlinks) {
/** @var RecursiveDirectoryIterator */
$iterator = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($directory_path, FilesystemIterator::SKIP_DOTS)
);
$iterator->rewind();
while ($iterator->valid()) {
if (!$iterator->isDot() && $iterator->isLink()) {
$linked_path = readlink($iterator->getPathname());
while ($iterator->valid()) {
if ($iterator->isLink()) {
$linked_path = readlink($iterator->getPathname());
if (stripos($linked_path, $directory_path) !== 0) {
if ($ignore_type_stats && $filter instanceof ProjectFileFilter) {
$filter->ignore_type_stats[$directory_path] = true;
}
if (stripos($linked_path, $directory_path) !== 0) {
if ($ignore_type_stats && $filter instanceof ProjectFileFilter) {
$filter->ignore_type_stats[$directory_path] = true;
}
if ($declare_strict_types && $filter instanceof ProjectFileFilter) {
$filter->declare_strict_types[$directory_path] = true;
}
if ($declare_strict_types && $filter instanceof ProjectFileFilter) {
$filter->declare_strict_types[$directory_path] = true;
}
if (is_dir($linked_path)) {
$filter->addDirectory($linked_path);
if (is_dir($linked_path)) {
$filter->addDirectory($linked_path);
}
}
}
$iterator->next();
}
$iterator->next();
@ -346,6 +354,7 @@ class FileFilter
$config['directory'][] = [
'name' => (string) $directory['name'],
'ignoreTypeStats' => strtolower((string) ($directory['ignoreTypeStats'] ?? '')) === 'true',
'resolveSymlinks' => strtolower((string) ($directory['resolveSymlinks'] ?? '')) === 'true',
'useStrictTypes' => strtolower((string) ($directory['useStrictTypes'] ?? '')) === 'true',
];
}

2
tests/Config/ConfigTest.php
View File

@ -188,7 +188,7 @@ class ConfigTest extends TestCase
<projectFiles>
<directory name="tests" />
<ignoreFiles>
<directory name="tests/fixtures/symlinktest/ignored" />
<directory name="tests/fixtures/symlinktest/ignored" resolveSymlinks="true" />
</ignoreFiles>
</projectFiles>
</psalm>'