Merge branch '3.1'
* 3.1: Fix merge Fix merge Conflicts: src/Symfony/Component/DependencyInjection/composer.json
This commit is contained in:
commit
695549fdde
|
@ -91,7 +91,8 @@
|
||||||
"phpdocumentor/reflection-docblock": "^3.0"
|
"phpdocumentor/reflection-docblock": "^3.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpdocumentor/reflection-docblock": "<3.0"
|
"phpdocumentor/reflection-docblock": "<3.0",
|
||||||
|
"phpdocumentor/type-resolver": "<0.2.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
|
|
|
@ -55,7 +55,8 @@
|
||||||
"twig/twig": "~1.23|~2.0"
|
"twig/twig": "~1.23|~2.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpdocumentor/reflection-docblock": "<3.0"
|
"phpdocumentor/reflection-docblock": "<3.0",
|
||||||
|
"phpdocumentor/type-resolver": "<0.2.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"ext-apcu": "For best performance of the system caches",
|
"ext-apcu": "For best performance of the system caches",
|
||||||
|
|
|
@ -534,7 +534,7 @@ class Filesystem
|
||||||
|
|
||||||
// If no scheme or scheme is "file" or "gs" (Google Cloud) create temp file in local 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) {
|
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 tempnam failed or no scheme return the filename otherwise prepend the scheme
|
||||||
if (false !== $tmpFile) {
|
if (false !== $tmpFile) {
|
||||||
|
|
|
@ -33,7 +33,8 @@
|
||||||
"doctrine/annotations": "~1.0"
|
"doctrine/annotations": "~1.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"phpdocumentor/reflection-docblock": "<3.0"
|
"phpdocumentor/reflection-docblock": "<3.0",
|
||||||
|
"phpdocumentor/type-resolver": "<0.2.0"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"psr/cache-implementation": "To cache results",
|
"psr/cache-implementation": "To cache results",
|
||||||
|
|
Reference in New Issue