Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit c0e249644dd2 · 2018-05-22T15:00:37.000+02:00
* 3.4:
  [Form] fix tests on old phpunit versions
  [FrameworkBundle] fix typo in CacheClearCommand
  bumped Symfony version to 3.4.11
  updated VERSION for 3.4.10
  updated CHANGELOG for 3.4.10
  fixed test
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ('/' === \DIRECTORY_SEPARATOR && $mounts = @file('/proc/mounts')) {
             foreach ($mounts as $mount) {
                 $mount = array_slice(explode(' ', $mount), 1, -3);
-                if (!\in_array(array_pop($mount), array('vboxfs', 'nfs'))) {
+                if (!\in_array(array_pop($mount), array('vboxsf', 'nfs'))) {
                     continue;
                 }
                 $mount = implode(' ', $mount).'/';

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`122`	`122`	`if ('/' === \DIRECTORY_SEPARATOR && $mounts = @file('/proc/mounts')) {`
`123`	`123`	`foreach ($mounts as $mount) {`
`124`	`124`	`$mount = array_slice(explode(' ', $mount), 1, -3);`
`125`		`- if (!\in_array(array_pop($mount), array('vboxfs', 'nfs'))) {`
	`125`	`+ if (!\in_array(array_pop($mount), array('vboxsf', 'nfs'))) {`
`126`	`126`	`continue;`
`127`	`127`	`}`
`128`	`128`	`$mount = implode(' ', $mount).'/';`