From 61f0cc657c99e08ebc00cebb897752ccf9bd8631 Mon Sep 17 00:00:00 2001 From: Patrick Jahns Date: Mon, 10 Sep 2018 17:04:57 +0200 Subject: [PATCH] minimum desktop client version is 2.3.3 --- apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php | 2 +- .../unit/Connector/Sabre/BlockLegacyClientPluginTest.php | 4 ++-- config/config.sample.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php index c7e11ff18a7d..93685e82324a 100644 --- a/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php +++ b/apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php @@ -66,7 +66,7 @@ public function beforeHandler(RequestInterface $request) { return; } - $minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.2.4'); + $minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '2.3.3'); // Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or // "mirall/%1" for older releases diff --git a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php index 380903b50975..c80a56463eba 100644 --- a/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/BlockLegacyClientPluginTest.php @@ -77,7 +77,7 @@ public function testBeforeHandlerException($userAgent) { $this->config ->expects($this->once()) ->method('getSystemValue') - ->with('minimum.supported.desktop.version', '2.2.4') + ->with('minimum.supported.desktop.version', $this->anything()) ->will($this->returnValue('2.2.4')); $this->blockLegacyClientVersionPlugin->beforeHandler($request); @@ -112,7 +112,7 @@ public function testBeforeHandlerSuccess($userAgent) { $this->config ->expects($this->once()) ->method('getSystemValue') - ->with('minimum.supported.desktop.version', '2.2.4') + ->with('minimum.supported.desktop.version', $this->anything()) ->will($this->returnValue('2.2.4')); $this->blockLegacyClientVersionPlugin->beforeHandler($request); diff --git a/config/config.sample.php b/config/config.sample.php index 2d8757f86adb..5b718a756eec 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -1296,7 +1296,7 @@ * client may not function as expected, and could lead to permanent data loss for * clients or other unexpected results. */ -'minimum.supported.desktop.version' => '2.2.4', +'minimum.supported.desktop.version' => '2.3.3', /** * EXPERIMENTAL: option whether to include external storage in quota