diff --git a/src/du.php b/src/du.php index 636581a..a993c60 100644 --- a/src/du.php +++ b/src/du.php @@ -105,8 +105,12 @@ function coreutilsDuBytes(array $stat, bool $apparent, string $name, array &$res $value = $apparent ? ($stat['size'] ?? null) : ($stat['blocks'] ?? null); $factor = $apparent ? 1 : 512; if (!is_int($value) || $value < 0) { - coreutilsAddError($result, coreutilsError('du', 'size-unavailable', - "size metadata unavailable for '$name'" . ($apparent ? '' : '; use --apparent-size'), $name)); + coreutilsAddError($result, coreutilsError( + 'du', + 'size-unavailable', + "size metadata unavailable for '$name'" . ($apparent ? '' : '; use --apparent-size'), + $name + )); return null; } if ($value > intdiv(PHP_INT_MAX, $factor)) { diff --git a/src/lib/searching.php b/src/lib/searching.php index eecf667..6a142f1 100644 --- a/src/lib/searching.php +++ b/src/lib/searching.php @@ -328,8 +328,12 @@ function coreutilsGrepPaths(array $args, string $base, array $settings, array &$ } if (isset($active[$identity])) { // Keep cycle diagnostics separate from filesystem errors, as GNU grep does. - $result['data']['warnings'][] = coreutilsError('grep', 'directory-cycle', - "recursive directory loop at '" . $entry['name'] . "'", $entry['name']); + $result['data']['warnings'][] = coreutilsError( + 'grep', + 'directory-cycle', + "recursive directory loop at '" . $entry['name'] . "'", + $entry['name'] + ); continue; } $children = coreutilsFsCall(fn () => scandir($path, SCANDIR_SORT_ASCENDING), $warning); diff --git a/tests/du.php b/tests/du.php index 7d693f3..fc9f366 100644 --- a/tests/du.php +++ b/tests/du.php @@ -86,14 +86,18 @@ file_put_contents($base . '/tree/file', 'small'); $file = lstat($base . '/tree/file'); $directory = lstat($base . '/tree'); - skipUnless(isset($file['blocks'], $directory['blocks']) && $file['blocks'] >= 0 && $directory['blocks'] >= 0, - 'allocated block metadata is unavailable'); + skipUnless( + isset($file['blocks'], $directory['blocks']) && $file['blocks'] >= 0 && $directory['blocks'] >= 0, + 'allocated block metadata is unavailable' + ); $result = du(parseCommand('du -ac tree'), $base); same(0, $result['status']); same($file['blocks'] * 512, $result['data']['entries'][0]['bytes']); same(($file['blocks'] + $directory['blocks']) * 512, $result['data']['total']); - same((string) (intdiv($result['data']['total'], 1024) + ($result['data']['total'] % 1024 ? 1 : 0)) . "\ttotal\n", - substr(coreutilsText($result), strrpos(rtrim(coreutilsText($result)), "\n") + 1)); + same( + (string) (intdiv($result['data']['total'], 1024) + ($result['data']['total'] % 1024 ? 1 : 0)) . "\ttotal\n", + substr(coreutilsText($result), strrpos(rtrim(coreutilsText($result)), "\n") + 1) + ); }); $tests['du sparse apparent size does not require reading contents'] = fn () => fixture(function ($base) {