Merge pull request #8915 from owncloud/MorrisJobke-travis

Travis support for PRs and master, stable5 and stable6

2 files changed, 4 insertions, 0 deletions

diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php
index d5cf2f52eb2..c49dd80091e 100644
--- a/lib/private/appframework/utility/controllermethodreflector.php
+++ b/lib/private/appframework/utility/controllermethodreflector.php
@@ -62,6 +62,7 @@ class ControllerMethodReflector {
 		} else {
 			$this->types = array_combine($matches['var'], $matches['type']);
 		}
+
 		// get method parameters
 		foreach ($reflection->getParameters() as $param) {
 			if($param->isOptional()) {
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index e08cb20f73d..85af4a9abef 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -781,6 +781,9 @@ class View {
 			return false;
 		}
 		$defaultRoot = Filesystem::getRoot();
+		if ($defaultRoot === null) {
+			return false;
+		}
 		if ($this->fakeRoot === $defaultRoot) {
 			return true;
 		}