bug #53785 [FrameworkBundle] Prevent silenced warning by checking if /proc/mount exists (shyim)

nicolas-grekas · nicolas-grekas · commit 354cc2ce3f4f · 2024-02-06T08:12:21.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [FrameworkBundle] Prevent silenced warning by checking if /proc/mount exists | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT `cache:clear` sometimes throws a warning as it tries to access `/proc/mounts`. This does not exist on macOS. Therefore I skipped that check completely for non linux systems. Example output from the command line: <img width="918" alt="Screenshot 2024-02-04 at 18 34 30" src="https://github.com/symfony/symfony/assets/6224096/7edab2a9-e07c-436a-917d-4b4f8572f553"> Commits ------- 349b3e7 [FrameworkBundle] Prevent silenced warning by checking if /proc/mount exists
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -49,9 +49,6 @@ public function __construct(CacheClearerInterface $cacheClearer, ?Filesystem $fi
         $this->filesystem = $filesystem ?? new Filesystem();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function configure()
     {
         $this
@@ -71,9 +68,6 @@ protected function configure()
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $fs = $this->filesystem;
@@ -208,7 +202,7 @@ private function isNfs(string $dir): bool
 
         if (null === $mounts) {
             $mounts = [];
-            if ('/' === \DIRECTORY_SEPARATOR && $files = @file('/proc/mounts')) {
+            if ('/' === \DIRECTORY_SEPARATOR && is_readable('/proc/mounts') && $files = @file('/proc/mounts')) {
                 foreach ($files as $mount) {
                     $mount = \array_slice(explode(' ', $mount), 1, -3);
                     if (!\in_array(array_pop($mount), ['vboxsf', 'nfs'])) {

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,6 @@ public function __construct(CacheClearerInterface $cacheClearer, ?Filesystem $fi`
`49`	`49`	`$this->filesystem = $filesystem ?? new Filesystem();`
`50`	`50`	`}`
`51`	`51`
`52`		`- /**`
`53`		`- * {@inheritdoc}`
`54`		`- */`
`55`	`52`	`protected function configure()`
`56`	`53`	`{`
`57`	`54`	`$this`
`@@ -71,9 +68,6 @@ protected function configure()`
`71`	`68`	`;`
`72`	`69`	`}`
`73`	`70`
`74`		`- /**`
`75`		`- * {@inheritdoc}`
`76`		`- */`
`77`	`71`	`protected function execute(InputInterface $input, OutputInterface $output): int`
`78`	`72`	`{`
`79`	`73`	`$fs = $this->filesystem;`
`@@ -208,7 +202,7 @@ private function isNfs(string $dir): bool`
`208`	`202`
`209`	`203`	`if (null === $mounts) {`
`210`	`204`	`$mounts = [];`
`211`		`- if ('/' === \DIRECTORY_SEPARATOR && $files = @file('/proc/mounts')) {`
	`205`	`+ if ('/' === \DIRECTORY_SEPARATOR && is_readable('/proc/mounts') && $files = @file('/proc/mounts')) {`
`212`	`206`	`foreach ($files as $mount) {`
`213`	`207`	`$mount = \array_slice(explode(' ', $mount), 1, -3);`
`214`	`208`	`if (!\in_array(array_pop($mount), ['vboxsf', 'nfs'])) {`