Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit f4c58b452b39 · 2018-10-31T11:56:31.000+01:00
* 4.1:
  [DependencyInjection] Fix tags on multiple decorated service
  fix merge
  SCA: reverted code style changes
  SCA: reverted code style changes
  SCA: applied requested code style changes
  SCA: simplify some ifs in favour of null coalescing operator
diff --git a/Filesystem.php b/Filesystem.php
@@ -557,10 +557,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
             }
         }
 
-        $copyOnWindows = false;
-        if (isset($options['copy_on_windows'])) {
-            $copyOnWindows = $options['copy_on_windows'];
-        }
+        $copyOnWindows = $options['copy_on_windows'] ?? false;
 
         if (null === $iterator) {
             $flags = $copyOnWindows ? \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS : \FilesystemIterator::SKIP_DOTS;

Original file line number	Diff line number	Diff line change
`@@ -557,10 +557,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`
`560`		`- $copyOnWindows = false;`
`561`		`- if (isset($options['copy_on_windows'])) {`
`562`		`- $copyOnWindows = $options['copy_on_windows'];`
`563`		`- }`
	`560`	`+ $copyOnWindows = $options['copy_on_windows'] ?? false;`
`564`	`561`
`565`	`562`	`if (null === $iterator) {`
`566`	`563`	`$flags = $copyOnWindows ? \FilesystemIterator::SKIP_DOTS \| \FilesystemIterator::FOLLOW_SYMLINKS : \FilesystemIterator::SKIP_DOTS;`