From 579801157ad7cfb28e55d6d49d173eff01230e56 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 20 Jul 2016 08:41:28 +0300 Subject: [PATCH 1/2] Fix merge --- src/Symfony/Component/DependencyInjection/composer.json | 2 +- src/Symfony/Component/Filesystem/Filesystem.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index b2c7ec0d56..2506690ca6 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.9" }, "require-dev": { - "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.9", + "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7", "symfony/config": "~2.2|~3.0.0", "symfony/expression-language": "~2.6|~3.0.0" }, diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index 7390783de6..e1d62fa427 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -491,7 +491,7 @@ class Filesystem // 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) { From eccbe677c8146f2e68aeabcd117edbb35800eb11 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 20 Jul 2016 08:55:49 +0300 Subject: [PATCH 2/2] Fix merge --- composer.json | 3 ++- src/Symfony/Bundle/FrameworkBundle/composer.json | 3 ++- src/Symfony/Component/PropertyInfo/composer.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index c1aed01591..b6ac1e65d2 100644 --- a/composer.json +++ b/composer.json @@ -90,7 +90,8 @@ "phpdocumentor/reflection-docblock": "^3.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.0" + "phpdocumentor/reflection-docblock": "<3.0", + "phpdocumentor/type-resolver": "<0.2.0" }, "autoload": { "psr-4": { diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index db6b040039..80327f96ec 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -55,7 +55,8 @@ "twig/twig": "~1.23|~2.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.0" + "phpdocumentor/reflection-docblock": "<3.0", + "phpdocumentor/type-resolver": "<0.2.0" }, "suggest": { "ext-apcu": "For best performance of the system caches", diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json index dfc345fc53..fdb1b4d368 100644 --- a/src/Symfony/Component/PropertyInfo/composer.json +++ b/src/Symfony/Component/PropertyInfo/composer.json @@ -32,7 +32,8 @@ "doctrine/annotations": "~1.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.0" + "phpdocumentor/reflection-docblock": "<3.0", + "phpdocumentor/type-resolver": "<0.2.0" }, "suggest": { "psr/cache-implementation": "To cache results",