summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-11-30 14:25:35 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-11-30 14:25:35 +0100
commitfc21aa6c41c231b4ae2e9fcca39c1774948d7ba6 (patch)
treed15b78c25d7abd8d2ffff1b1a71275d94f0342a7 /lib
parenta94819f4a47ba98b185c9c75eab43d8cb933ed5c (diff)
parentdddfa6de78459e772c24e60f7404c9a188787540 (diff)
downloadnextcloud-server-fc21aa6c41c231b4ae2e9fcca39c1774948d7ba6.tar.gz
nextcloud-server-fc21aa6c41c231b4ae2e9fcca39c1774948d7ba6.zip
Merge pull request #20248 from owncloud/use-phpunit-groups-to-run-database-code-in-isolation
Use phpunit groups to run database code in isolation
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/storage/dav.php1
-rw-r--r--lib/private/urlgenerator.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 9147f572461..dda163e41a0 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -105,6 +105,7 @@ class DAV extends Common {
$this->secure = false;
}
if ($this->secure === true) {
+ // inject mock for testing
$certPath = \OC_User::getHome(\OC_User::getUser()) . '/files_external/rootcerts.crt';
if (file_exists($certPath)) {
$this->certPath = $certPath;
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index 104cf7df596..428a222f9c7 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -62,6 +62,7 @@ class URLGenerator implements IURLGenerator {
* Returns a url to the given route.
*/
public function linkToRoute($route, $parameters = array()) {
+ // TODO: mock router
$urlLinkTo = \OC::$server->getRouter()->generate($route, $parameters);
return $urlLinkTo;
}