diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.1' 

* 3.1:
  Fix merge
  Fix merge

Conflicts:
	src/Symfony/Component/DependencyInjection/composer.json
This commit is contained in:
Nicolas Grekas 2016-07-20 08:56:17 +03:00
parent a5a03aab9e eccbe677c8
commit 695549fdde
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -91,7 +91,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": {

3
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -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",

2
src/Symfony/Component/Filesystem/Filesystem.php
View File

@ -534,7 +534,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) {

3
src/Symfony/Component/PropertyInfo/composer.json
View File

@ -33,7 +33,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",