Merge branch '3.0' into 3.1

nicolas-grekas · nicolas-grekas · commit bb29adceb552 · 2016-07-20T08:44:26.000+03:00
* 3.0:
  Fix merge
diff --git a/Filesystem.php b/Filesystem.php
@@ -491,7 +491,7 @@ public function tempnam($dir, $prefix)
 
         // If no scheme or scheme is "file" or "gs" (Google Cloud) create temp file in local filesystem
         if (null === $scheme || 'file' === $scheme || 'gs' === $scheme) {
-            $tmpFile = tempnam($hierarchy, $prefix);
+            $tmpFile = @tempnam($hierarchy, $prefix);
 
             // If tempnam failed or no scheme return the filename otherwise prepend the scheme
             if (false !== $tmpFile) {
