From fdf6422da783a5669e9403ac744b4bbeab804395 Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 30 Sep 2021 10:14:38 -0600 Subject: [PATCH] Fix some errors in tests due to changing method signatures --- api/tests/Vfs/SharingBase.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/api/tests/Vfs/SharingBase.php b/api/tests/Vfs/SharingBase.php index 5903ab51b7..3fb8350bf2 100644 --- a/api/tests/Vfs/SharingBase.php +++ b/api/tests/Vfs/SharingBase.php @@ -296,15 +296,18 @@ class SharingBase extends LoggedInTest */ protected function mountVersioned($path) { - if (!class_exists('EGroupware\Stylite\Vfs\Versioning\StreamWrapper')) + if(!class_exists('EGroupware\Stylite\Vfs\Versioning\StreamWrapper')) { $this->markTestSkipped("No versioning available"); } - if(substr($path, -1) == '/') $path = substr($path, 0, -1); + if(substr($path, -1) == '/') + { + $path = substr($path, 0, -1); + } $backup = Vfs::$is_root; Vfs::$is_root = true; - $url = Versioning\StreamWrapper::PREFIX.$path; - $this->assertTrue(Vfs::mount($url,$path), "Unable to mount $path as versioned"); + $url = Versioning\StreamWrapper::PREFIX . $path; + $this->assertTrue(Vfs::mount($url, $path, false), "Unable to mount $path as versioned"); Vfs::$is_root = $backup; $this->mounts[] = $path; @@ -362,8 +365,8 @@ class SharingBase extends LoggedInTest Vfs::chmod($path, 0750); Vfs::chown($path, $GLOBALS['egw_info']['user']['account_id']); - $url = \EGroupware\Stylite\Vfs\Merge\StreamWrapper::SCHEME.'://default'.$path.'?merge=' . realpath(__DIR__ . '/../fixtures/Vfs/filesystem_mount'); - $this->assertTrue(Vfs::mount($url,$path), "Unable to mount $url to $path"); + $url = \EGroupware\Stylite\Vfs\Merge\StreamWrapper::SCHEME . '://default' . $path . '?merge=' . realpath(__DIR__ . '/../fixtures/Vfs/filesystem_mount'); + $this->assertTrue(Vfs::mount($url, $path, false), "Unable to mount $url to $path"); Vfs::$is_root = $backup; $this->mounts[] = $path;