diff options
author | provokateurin <kate@provokateurin.de> | 2024-08-25 20:40:47 +0200 |
---|---|---|
committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-03-28 11:03:03 +0000 |
commit | cd19fe6a7c620e5567c66f8431fe52710bcb190e (patch) | |
tree | b4a7c5518b82f46c95608af4554f32570c8f230f | |
parent | c6874f8c55ed2af26a8047e159f17dfe32f06d0b (diff) | |
download | nextcloud-server-backport/47474/stable29.tar.gz nextcloud-server-backport/47474/stable29.zip |
fix(cs-fixer): Correctly ignore files ignored by gitbackport/47474/stable29
Signed-off-by: provokateurin <kate@provokateurin.de>
-rw-r--r-- | .php-cs-fixer.dist.php | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index a360624b553..fca094004bd 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -9,29 +9,23 @@ use Nextcloud\CodingStandard\Config; $config = new Config(); $config ->getFinder() - ->ignoreVCSIgnored(true) ->exclude('config') - ->exclude('data') - ->notPath('3rdparty') - ->notPath('build/integration/vendor') - ->notPath('build/lib') - ->notPath('build/node_modules') - ->notPath('build/stubs') - ->notPath('composer') - ->notPath('node_modules') - ->notPath('vendor') - ->in('apps') + ->exclude('3rdparty') + ->exclude('build/stubs') + ->exclude('composer') ->in(__DIR__); -// Ignore additional app directories -$rootDir = new \DirectoryIterator(__DIR__); -foreach ($rootDir as $node) { - if (str_starts_with($node->getFilename(), 'apps')) { - $return = shell_exec('git check-ignore ' . escapeshellarg($node->getFilename() . '/')); +$ignoredEntries = shell_exec('git status --porcelain --ignored ' . escapeshellarg(__DIR__)); +$ignoredEntries = explode("\n", $ignoredEntries); +$ignoredEntries = array_filter($ignoredEntries, static fn (string $line) => str_starts_with($line, '!! ')); +$ignoredEntries = array_map(static fn (string $line) => substr($line, 3), $ignoredEntries); +$ignoredEntries = array_values($ignoredEntries); - if ($return !== null) { - $config->getFinder()->exclude($node->getFilename()); - } +foreach ($ignoredEntries as $ignoredEntry) { + if (str_ends_with($ignoredEntry, '/')) { + $config->getFinder()->exclude($ignoredEntry); + } else { + $config->getFinder()->notPath($ignoredEntry); } } |