Permalink
Browse files

Merge branch '2.2'

* 2.2:
  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/Process/Tests/AbstractProcessTest.php
  • Loading branch information...
2 parents eb6c99c + 64c0a87 commit 9458bbbea59211fcfcaf028cf1c9817afa82541a @fabpot fabpot committed May 6, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 Filesystem.php
View
@@ -35,7 +35,7 @@ class Filesystem
*/
public function copy($originFile, $targetFile, $override = false)
{
- if (!is_file($originFile)) {
+ if (stream_is_local($originFile) && !is_file($originFile)) {
throw new IOException(sprintf('Failed to copy %s because file not exists', $originFile));
}

0 comments on commit 9458bbb

Please sign in to comment.