Don't use runInSeparateProcess

Directly calling "header" in the PHPUnit process causes the "Cannot
modify header information - headers already sent by" error to be thrown.
Instead of running the test in a separate process, which is slower, this
commit wraps the call to "header" in a method that can be mocked in the
tests.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php
index 2db956a3da8..2d20c0958ff 100644
--- a/apps/dav/lib/Connector/Sabre/File.php
+++ b/apps/dav/lib/Connector/Sabre/File.php
@@ -235,7 +235,7 @@ class File extends Node implements IFile {
 			if (isset($this->request->server['HTTP_X_OC_MTIME'])) {
 				$mtime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_MTIME']);
 				if ($this->fileView->touch($this->path, $mtime)) {
-					header('X-OC-MTime: accepted');
+					$this->header('X-OC-MTime: accepted');
 				}
 			}
 					
@@ -492,7 +492,7 @@ class File extends Node implements IFile {
 				if (isset($this->request->server['HTTP_X_OC_MTIME'])) {
 					$mtime = $this->sanitizeMtime($this->request->server['HTTP_X_OC_MTIME']);
 					if ($targetStorage->touch($targetInternalPath, $mtime)) {
-						header('X-OC-MTime: accepted');
+						$this->header('X-OC-MTime: accepted');
 					}
 				}
 
@@ -605,4 +605,8 @@ class File extends Node implements IFile {
 	public function getChecksum() {
 		return $this->info->getChecksum();
 	}
+
+	protected function header($string) {
+		\header($string);
+	}
 }