Merge pull request #8338 from owncloud/phpunit-4.0-compat

Make PHPUnit_Framework_TestListener implementations compatible to 4.0.

* owncloud/phpunit-4.0-compat:
  Normalise testcleanuplistener.php indentation and end of file.
  Make PHPUnit_Framework_TestListener implementations compatible to 4.0.

2 files changed, 22 insertions, 17 deletions

diff --git a/tests/startsessionlistener.php b/tests/startsessionlistener.php
index 808a2a2226f..ba049559c6e 100644
--- a/tests/startsessionlistener.php
+++ b/tests/startsessionlistener.php
@@ -20,6 +20,9 @@ class StartSessionListener implements PHPUnit_Framework_TestListener {
 	public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
 	}
 
+	public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
+
 	public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
 	}
 
diff --git a/tests/testcleanuplistener.php b/tests/testcleanuplistener.php
index 2083ffce67c..b544c8fbe40 100644
--- a/tests/testcleanuplistener.php
+++ b/tests/testcleanuplistener.php
@@ -16,28 +16,31 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
 		$this->verbosity = $verbosity;
 	}
 
-    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {
-    }
+	public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
 
-    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {
-    }
+	public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {
+	}
 
-    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
-    }
+	public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
+
+	public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
 
-    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
-    }
+	public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
 
-    public function startTest(PHPUnit_Framework_Test $test) {
-    }
+	public function startTest(PHPUnit_Framework_Test $test) {
+	}
 
-    public function endTest(PHPUnit_Framework_Test $test, $time) {
-    }
+	public function endTest(PHPUnit_Framework_Test $test, $time) {
+	}
 
-    public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
-    }
+	public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
+	}
 
-    public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
+	public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
 		if ($this->cleanStrayDataFiles() && $this->isShowSuiteWarning()) {
 			printf("TestSuite '%s': Did not clean up data dir\n", $suite->getName());
 		}
@@ -47,7 +50,7 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
 		if ($this->cleanProxies() && $this->isShowSuiteWarning()) {
 			printf("TestSuite '%s': Did not clean up proxies\n", $suite->getName());
 		}
-    }
+	}
 
 	private function isShowSuiteWarning() {
 		return $this->verbosity === 'suite' || $this->verbosity === 'detail';
@@ -140,4 +143,3 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
 		return count($proxies) > 0;
 	}
 }
-?>