Skip to content

Commit fa16b9a

Browse files
committed
Merge branch '2.1' into 2.2
* 2.1: bumped Symfony version to 2.1.11-DEV updated VERSION for 2.1.10 update CONTRIBUTORS for 2.1.10 updated CHANGELOG for 2.1.10 fixed CS [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI [Filesystem] Fix regression introduced in 10dea948 Conflicts: src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
2 parents 4671c92 + 51393fc commit fa16b9a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Filesystem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Filesystem
3535
*/
3636
public function copy($originFile, $targetFile, $override = false)
3737
{
38-
if (!is_file($originFile)) {
38+
if (stream_is_local($originFile) && !is_file($originFile)) {
3939
throw new IOException(sprintf('Failed to copy %s because file not exists', $originFile));
4040
}
4141

0 commit comments

Comments
 (0)