Skip to content

Commit e201353

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Fix NFS detection on macOs
2 parents 3f4d333 + 0663407 commit e201353

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Command/CacheClearCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ private function isNfs(string $dir): bool
207207

208208
if (null === $mounts) {
209209
$mounts = [];
210-
if ('/' === \DIRECTORY_SEPARATOR && $mounts = @file('/proc/mounts')) {
211-
foreach ($mounts as $mount) {
210+
if ('/' === \DIRECTORY_SEPARATOR && $files = @file('/proc/mounts')) {
211+
foreach ($files as $mount) {
212212
$mount = \array_slice(explode(' ', $mount), 1, -3);
213213
if (!\in_array(array_pop($mount), ['vboxsf', 'nfs'])) {
214214
continue;

0 commit comments

Comments
 (0)