Merge branch '3.0' into 3.1

nicolas-grekas · nicolas-grekas · commit 6d24c55a2615 · 2016-07-20T08:44:26.000+03:00
* 3.0:
  Fix merge
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
@@ -19,7 +19,7 @@
         "php": ">=5.5.9"
     },
     "require-dev": {
-        "symfony/yaml": "~2.8.7|~3.0.9|~3.1.3|~3.2",
+        "symfony/yaml": "~2.8.7|~3.0.7|~3.1.1|~3.2",
         "symfony/config": "~2.8|~3.0",
         "symfony/expression-language": "~2.8|~3.0"
     },
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/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) {
